update user schema

wermarter · Jan 18, 2024 · 70b0a81 · 70b0a81
1 parent 78727a8
commit 70b0a81
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git a/apps/hcdc-access-service/src/domain/entity/user/entity.ts b/apps/hcdc-access-service/src/domain/entity/user/entity.ts
@@ -5,12 +5,13 @@ import { Branch } from '../branch'
 
 export type User = BaseEntity & {
   username: string
-  password: string
+  passwordHash: string
+
   name: string
   phoneNumber: string
 
-  branchId: string
-  branch?: Branch | null
+  branchIds: string[]
+  branches?: (Branch | null)[]
 
   // roles: string[] | Role[]
   // inlinePermissions: string[] | Permission[]

diff --git a/apps/hcdc-access-service/src/domain/entity/user/example.ts b/apps/hcdc-access-service/src/domain/entity/user/example.ts
@@ -1,4 +1,4 @@
-import { exampleMongoObjectId } from '@diut/nest-core'
+import { exampleMongoObjectIds } from '@diut/nest-core'
 
 import { EntityExample } from '../base-entity'
 import { User } from './entity'
@@ -16,9 +16,9 @@ export const exampleUser: EntityExample<User> = {
     example: '1234567890',
     description: 'phoneNumber',
   },
-  password: {
+  passwordHash: {
     example: 'hashed_password',
-    description: 'password',
+    description: 'passwordHash',
   },
-  branchId: exampleMongoObjectId,
+  branchIds: exampleMongoObjectIds,
 }
diff --git a/apps/hcdc-access-service/src/domain/use-case/auth/login.ts b/apps/hcdc-access-service/src/domain/use-case/auth/login.ts
@@ -28,7 +28,7 @@ export class AuthLoginUseCase {
       throw new EAuthnLoginInvalidUsername()
     }
 
-    const isCorrect = await argon2.verify(user.password, password)
+    const isCorrect = await argon2.verify(user.passwordHash, password)
     if (!isCorrect) {
       throw new EAuthnLoginInvalidPassword()
     }

diff --git a/apps/hcdc-access-service/src/domain/use-case/auth/populate-context.ts b/apps/hcdc-access-service/src/domain/use-case/auth/populate-context.ts
@@ -19,7 +19,7 @@ export class AuthPopulateContextUseCase {
   async execute(input: AuthPayload): Promise<AuthContextData> {
     const user = await this.userRepository.findOne({
       filter: { _id: input.userId },
-      populates: [{ path: 'branch' }],
+      populates: [{ path: 'branches' }],
     })
 
     if (!user) {

diff --git a/apps/hcdc-access-service/src/infrastructure/mongo/user/schema.ts b/apps/hcdc-access-service/src/infrastructure/mongo/user/schema.ts
@@ -9,12 +9,12 @@ import { BranchSchema } from '../branch'
   ...baseSchemaOptions,
   collection: COLLECTION.USER,
   virtuals: {
-    branch: {
+    branches: {
       options: {
         ref: BranchSchema.name,
-        localField: 'branchId',
+        localField: 'branchIds',
         foreignField: '_id',
-        justOne: true,
+        justOne: false,
       },
     },
   },
@@ -24,16 +24,16 @@ export class UserSchema extends BaseSchema {
   username: string
 
   @Prop({ required: true })
-  password: string
+  passwordHash: string
 
   @Prop({ required: true })
   name: string
 
   @Prop({ required: true })
   phoneNumber: string
 
-  @Prop({ required: true, type: Types.ObjectId })
-  branchId: string
+  @Prop({ required: true, type: [Types.ObjectId] })
+  branchIds: string[]
 
-  branch?: BranchSchema | null
+  branches?: (BranchSchema | null)[]
 }
diff --git a/apps/hcdc-access-service/src/presentation/http/v1/auth/dto/login.request.ts b/apps/hcdc-access-service/src/presentation/http/v1/auth/dto/login.request.ts
@@ -9,7 +9,7 @@ export class AuthLoginRequestDto {
   @IsNotEmpty()
   username: string
 
-  @ApiProperty(exampleUser.password)
+  @ApiProperty(exampleUser.passwordHash)
   @IsString()
   @IsNotEmpty()
   password: string

diff --git a/libs/nest-core/src/mongo/mongo.common.ts b/libs/nest-core/src/mongo/mongo.common.ts
@@ -19,6 +19,11 @@ export const exampleMongoObjectId = {
   description: 'MongoDB ObjectId',
 }
 
+export const exampleMongoObjectIds = {
+  example: ['634180269de1f07e47bbf494'],
+  description: 'MongoDB ObjectIds',
+}
+
 export const exampleDate = {
   format: 'date-time',
   example: '2018-03-20T09:12:28Z',