Refactor IdentitiesCreateDto and IdentitiesService

Author: tacxou

src/management/identities/_dto/identities.dto.ts

@@ -18,7 +18,7 @@ export class IdentitiesCreateDto extends IntersectionType(CustomFieldsDto, Metad
   @IsNumber()
   @IsEnum(InitStatesEnum)
   @ApiProperty({ enum: InitStatesEnum })
-  public initState: InitStatesEnum = InitStatesEnum.NOSENT;
+  public initState: InitStatesEnum;
 
   @IsNumber()
   @IsOptional()
@@ -56,5 +56,7 @@ export class IdentitiesDto extends IdentitiesCreateDto { }
 export class IdentitiesUpdateDto extends PartialType(IdentitiesCreateDto) { }
 
 export class IdentitiesUpsertDto extends PartialType(IdentitiesUpdateDto) {
+  @IsOptional()
+  @Type(() => IdentitiesUpdateDto)
   public $setOnInsert?: Partial<IdentitiesUpdateDto>;
 }

src/management/identities/identities.service.ts

@@ -51,6 +51,7 @@ export class IdentitiesService extends AbstractServiceSchema {
     data?: IdentitiesUpsertDto,
     options?: QueryOptions<T>,
   ): Promise<[HttpStatus.OK | HttpStatus.CREATED, ModifyResult<Query<T, T, any, T>>]> {
+    console.log('data', data);
     data = this.transformNullsToString(data);
     const identity = await this.model.findOne<Identities>(filters).exec();
     this.logger.log(`Upserting identity with filters ${JSON.stringify(filters)}`);
@@ -68,13 +69,12 @@ export class IdentitiesService extends AbstractServiceSchema {
       ]),
     });
 
-    // console.log('data', data);
-
     if (!data?.inetOrgPerson?.employeeNumber || !data?.inetOrgPerson?.employeeType) {
       throw new BadRequestException(
         'inetOrgPerson.employeeNumber and inetOrgPerson.employeeType are required for create identity.',
       );
     }
+    console.log('data.inetOrgPerson?.employeeNumber', data.inetOrgPerson?.employeeNumber)
     if (data.inetOrgPerson?.employeeNumber.indexOf('174981') >= 0 || data.inetOrgPerson?.employeeNumber.indexOf('162982') >= 0) {
       console.log('test');
     }
@@ -108,6 +108,18 @@ export class IdentitiesService extends AbstractServiceSchema {
     );
     await this.checkFingerprint(filters, fingerprint);
 
+    console.log('insert', {
+      $setOnInsert: {
+        ...crushedSetOnInsert,
+        // 'state': IdentityState.TO_CREATE,
+      },
+      $set: {
+        ...crushedUpdate,
+        'additionalFields.objectClasses': data.additionalFields.objectClasses,
+        lastSync: new Date(),
+      },
+    })
+
     const upserted = await super.upsert(
       filters,
       {