mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-11-26 20:34:55 +00:00
add booking points to user table (#461)
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
import { PlatformType } from '@app/common/constants/platform-type.enum';
|
||||
import { RoleType } from '@app/common/constants/role.type.enum';
|
||||
import { UserEntity } from '@app/common/modules/user/entities';
|
||||
import {
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
@ -32,7 +33,7 @@ export class AuthService {
|
||||
pass: string,
|
||||
regionUuid?: string,
|
||||
platform?: PlatformType,
|
||||
): Promise<any> {
|
||||
): Promise<Omit<UserEntity, 'password'>> {
|
||||
const user = await this.userRepository.findOne({
|
||||
where: {
|
||||
email,
|
||||
@ -70,8 +71,9 @@ export class AuthService {
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
const { password, ...result } = user;
|
||||
return result;
|
||||
// const { password, ...result } = user;
|
||||
delete user.password;
|
||||
return user;
|
||||
}
|
||||
|
||||
async createSession(data): Promise<UserSessionEntity> {
|
||||
@ -114,6 +116,7 @@ export class AuthService {
|
||||
hasAcceptedWebAgreement: user.hasAcceptedWebAgreement,
|
||||
hasAcceptedAppAgreement: user.hasAcceptedAppAgreement,
|
||||
project: user?.project,
|
||||
bookingPoints: user?.bookingPoints,
|
||||
};
|
||||
if (payload.googleCode) {
|
||||
const profile = await this.getProfile(payload.googleCode);
|
||||
|
||||
@ -82,6 +82,12 @@ export class UserEntity extends AbstractEntity<UserDto> {
|
||||
})
|
||||
public isActive: boolean;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
type: Number,
|
||||
})
|
||||
public bookingPoints?: number;
|
||||
|
||||
@Column({ default: false })
|
||||
hasAcceptedWebAgreement: boolean;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user