feat: add isAnonymous field to user schema

xgeekshq · Feb 17, 2023 · 5fdb7a1 · 5fdb7a1
1 parent fdb775a
commit 5fdb7a1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/backend/src/modules/auth/controller/auth.controller.ts b/backend/src/modules/auth/controller/auth.controller.ts
@@ -332,8 +332,9 @@ export default class AuthController {
 	})
 	@Post('registerGuest')
 	async registerGuest(@Body() guestUserData: CreateGuestUserDto) {
-		const { _id } = await this.registerAuthApp.createGuestUser(guestUserData);
+		const { board } = guestUserData;
+		const { _id: user } = await this.registerAuthApp.createGuestUser(guestUserData);
 
-		return { user: _id, board: guestUserData.board };
+		return { user, board };
 	}
 }
diff --git a/backend/src/modules/users/entities/user.schema.ts b/backend/src/modules/users/entities/user.schema.ts
@@ -37,6 +37,9 @@ export default class User extends BaseModel {
 
 	@Prop({ nullable: true })
 	providerAccountCreatedAt?: Date;
+
+	@Prop({ default: false })
+	isAnonymous: boolean;
 }
 
 export const UserSchema = SchemaFactory.createForClass(User);
diff --git a/backend/src/modules/users/repository/user.repository.ts b/backend/src/modules/users/repository/user.repository.ts
@@ -46,10 +46,11 @@ export class UserRepository
 	}
 
 	getAllWithPagination(page: number, size: number, searchUser?: string) {
-		let query: FilterQuery<UserDocument>;
+		let query: FilterQuery<UserDocument> = { isAnonymous: false || undefined };
 
 		if (searchUser) {
 			query = {
+				isAnonymous: false || undefined,
 				$or: [
 					{ firstName: { $regex: new RegExp('^.*' + searchUser + '.*$'), $options: 'i' } },
 					{ lastName: { $regex: new RegExp('^.*' + searchUser + '.*$'), $options: 'i' } },

diff --git a/backend/src/modules/users/services/create.user.service.ts b/backend/src/modules/users/services/create.user.service.ts
@@ -5,6 +5,7 @@ import { CreateUserService } from '../interfaces/services/create.user.service.in
 import { TYPES } from '../interfaces/types';
 import { UserRepositoryInterface } from '../repository/user.repository.interface';
 import CreateGuestUserDto from '../dto/create.guest.user.dto';
+import faker from '@faker-js/faker';
 
 @Injectable()
 export default class CreateUserServiceImpl implements CreateUserService {
@@ -19,23 +20,27 @@ export default class CreateUserServiceImpl implements CreateUserService {
 			strategy: '',
 			isSAdmin: false,
 			isDeleted: false,
-			joinedAt: new Date()
+			joinedAt: new Date(),
+			isAnonymous: false
 		};
 
 		return this.userRepository.create(user);
 	}
 
 	createGuest(guestUserData: CreateGuestUserDto) {
 		const { firstName, lastName } = guestUserData;
+
+		const email = faker.internet.email(firstName, lastName, '', { allowSpecialCharacters: true });
 		const user: User = {
 			firstName,
 			lastName: lastName ?? '',
 			password: '',
-			email: '',
+			email: email,
 			strategy: '',
 			isSAdmin: false,
 			isDeleted: false,
-			joinedAt: new Date()
+			joinedAt: new Date(),
+			isAnonymous: true
 		};
 
 		return this.userRepository.create(user);

diff --git a/backend/src/modules/users/services/get.user.service.ts b/backend/src/modules/users/services/get.user.service.ts
@@ -43,7 +43,8 @@ export default class GetUserServiceImpl implements GetUserService {
 		return this.userRepository.findAll(
 			{
 				password: 0,
-				currentHashedRefreshToken: 0
+				currentHashedRefreshToken: 0,
+				isAnonymous: 0
 			},
 			{ firstName: 'asc', lastName: 'asc' }
 		);