Refactor inetOrgPerson.dto.ts to add departmentNumber field

tacxou · tacxou · commit f5ec46e2a461 · 2024-05-21T15:20:01.000+02:00
diff --git a/src/_common/abstracts/abstract.service.schema.ts b/src/_common/abstracts/abstract.service.schema.ts
@@ -110,7 +110,8 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
     }
     if (!data) {
       this.logger.debug(['findById', JSON.stringify(Object.values(arguments))].join(' '))
-      throw new NotFoundException()}
+      throw new NotFoundException()
+    }
     return data
   }
 
@@ -135,7 +136,8 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
     let data = await this._model.findOne<Query<T | null, T, any, T>>(filter, projection, options).exec()
     if (!data) {
       this.logger.debug(['findById', JSON.stringify(Object.values(arguments))].join(' '))
-      throw new NotFoundException()}
+      throw new NotFoundException()
+    }
     if (this.eventEmitter) {
       const afterEvents = await this.eventEmitter?.emitAsync(
         [this.moduleName.toLowerCase(), this.serviceName.toLowerCase(), 'service', 'afterFindOne'].join(EventEmitterSeparator),
@@ -238,7 +240,8 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
       .exec()
     if (!updated) {
       this.logger.debug(['findById', JSON.stringify(Object.values(arguments))].join(' '))
-      throw new NotFoundException()}
+      throw new NotFoundException()
+    }
     if (this.eventEmitter) {
       const afterEvents = await this.eventEmitter?.emitAsync(
         [this.moduleName.toLowerCase(), this.serviceName.toLowerCase(), 'service', 'afterFindAndCount'].join(EventEmitterSeparator),
@@ -252,9 +255,9 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
   }
 
   public async upsert<T extends AbstractSchema | Document>(
-  filter: FilterQuery<T>,
-  update: UpdateQuery<T>,
-  options?: QueryOptions<T>
+    filter: FilterQuery<T>,
+    update: UpdateQuery<T>,
+    options?: QueryOptions<T>
   ): Promise<ModifyResult<Query<T, T, any, T>>> {
     this.logger.debug(['upsert', JSON.stringify(Object.values(arguments))].join(' '));
     if (this.eventEmitter) {
@@ -275,6 +278,7 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
         {
           ...update,
           $setOnInsert: {
+            ...(update?.$setOnInsert || {}),
             'metadata.createdBy': this.request?.user?.username || 'anonymous',
             'metadata.createdAt': new Date(),
           },
@@ -326,7 +330,8 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
     let deleted = await this._model.findByIdAndDelete<Query<T | null, T, any, T>>({ _id }, options).exec()
     if (!deleted) {
       this.logger.debug(['findById', JSON.stringify(Object.values(arguments))].join(' '))
-      throw new NotFoundException()}
+      throw new NotFoundException()
+    }
     if (this.eventEmitter) {
       const afterEvents = await this.eventEmitter?.emitAsync(
         [this.moduleName.toLowerCase(), this.serviceName.toLowerCase(), 'service', 'afterFindAndCount'].join(EventEmitterSeparator),
diff --git a/src/core/backends/backends.service.ts b/src/core/backends/backends.service.ts
@@ -115,7 +115,7 @@ export class BackendsService extends AbstractQueueProcessor {
         },
         { upsert: true, new: true },
       );
-      console.log('completedJob', completedJob);
+      // console.log('completedJob', completedJob);
       await this.identitiesService.model.findByIdAndUpdate(completedJob.concernedTo.id, {
         $set: {
           state: IdentityState.SYNCED,
diff --git a/src/management/identities/_dto/_parts/inetOrgPerson.dto.ts b/src/management/identities/_dto/_parts/inetOrgPerson.dto.ts
@@ -18,6 +18,11 @@ export class inetOrgPersonCreateDto {
   @ApiProperty()
   employeeType: string;
 
+  @IsString()
+  @ApiProperty()
+  @IsOptional()
+  departmentNumber: string;
+
   @IsString()
   @ApiProperty()
   @IsOptional()
diff --git a/src/management/identities/_dto/identities.dto.ts b/src/management/identities/_dto/identities.dto.ts
@@ -49,5 +49,5 @@ export class IdentitiesDto extends IdentitiesCreateDto { }
 export class IdentitiesUpdateDto extends PartialType(IdentitiesCreateDto) { }
 
 export class IdentitiesUpsertDto extends PartialType(IdentitiesUpdateDto) {
-  $addToSet?: Partial<IdentitiesUpdateDto>;
+  $setOnInsert?: Partial<IdentitiesUpdateDto>;
 }
diff --git a/src/management/identities/_schemas/_parts/inetOrgPerson.part.ts b/src/management/identities/_schemas/_parts/inetOrgPerson.part.ts
@@ -38,7 +38,7 @@ export class inetOrgPerson {
   @Prop()
   title?: string;
 
-  @Prop({ required: true, unique: true })
+  @Prop({ required: true })
   uid: string;
 
   @Prop({ required: true })
@@ -47,6 +47,9 @@ export class inetOrgPerson {
   @Prop({ required: true })
   employeeType: string;
 
+  @Prop()
+  departmentNumber: string;
+
   @Prop()
   userCertificate?: string;
 
diff --git a/src/management/identities/_stubs/_parts/inetOrgPerson.dto.stub.ts b/src/management/identities/_stubs/_parts/inetOrgPerson.dto.stub.ts
@@ -7,6 +7,7 @@ export const inetOrgPersonDtoStub = (): inetOrgPersonDto => {
     uid: 'uid',
     employeeNumber: 'employeeNumber',
     employeeType: 'employeeType',
+    departmentNumber: 'departmentNumber',
     displayName: 'displayName',
     facsimileTelephoneNumber: 'facsimileTelephoneNumber',
     givenName: 'givenName',
diff --git a/src/management/identities/identities.controller.ts b/src/management/identities/identities.controller.ts
@@ -29,7 +29,7 @@ import { FilterOptions, FilterSchema, SearchFilterOptions, SearchFilterSchema }
 import { IdentitiesValidationService } from './validations/identities.validation.service';
 import { MixedValue } from '~/_common/types/mixed-value.type';
 import { Identities } from './_schemas/identities.schema';
-import { Types, Document } from 'mongoose';
+import { Types, Document, isValidObjectId } from 'mongoose';
 import { IdentityState } from './_enums/states.enum';
 // import { IdentitiesValidationFilter } from '~/_common/filters/identities-validation.filter';
 
@@ -89,53 +89,48 @@ export class IdentitiesController extends AbstractController {
     @Res()
     res: Response,
     @Body() body: IdentitiesUpsertDto,
+    @Query('filters')
+    filtersQuery: {
+      [key: string]: string;
+    }[] = [],
     @Query('errorOnNotFound') errorOnNotFound: string = 'false',
-  ): Promise<Response<any>> {
-    const data = await this._service.upsert<Identities>(body, {
+  ): Promise<
+    Response<{
+      statusCode: number;
+      data?: Document<Identities, any, Identities>;
+      message?: string;
+      validations?: MixedValue;
+    }>
+  > {
+    const filters = {};
+    if (filtersQuery.length === 0) {
+      throw new BadRequestException('Missing filters array');
+    }
+    for (const [key, filter] of Object.entries(filtersQuery)) {
+      filters[key] = isValidObjectId(filter) ? new Types.ObjectId(`${filter}`) : filter;
+    }
+
+    const data = await this._service.upsert<Identities>(filters, body, {
       errorOnNotFound: /true|on|yes|1/i.test(errorOnNotFound),
     });
-    return res.status(200).json({
+
+    // If the state is TO_COMPLETE, the identity is created but additional fields are missing or invalid
+    // Else the state is TO_VALIDATE, we return a 201 status code
+    if ((data as unknown as Identities).state === IdentityState.TO_COMPLETE) {
+      return res.status(HttpStatus.ACCEPTED).json({
+        statusCode: HttpStatus.ACCEPTED,
+        message: 'Identitée créée avec succès, mais des champs additionnels sont manquants ou invalides.',
+        data,
+      });
+    }
+
+    return res.status(HttpStatus.CREATED).json({
+      statusCode: HttpStatus.CREATED,
+      message: 'Identitée créée avec succès.',
       data,
     });
   }
 
-  // @Post('upsert')
-  // @ApiCreateDecorator(IdentitiesCreateDto, IdentitiesDto)
-  // public async upsertV1(
-  //   @Res()
-  //   res: Response,
-  //   @Body() body: IdentitiesCreateDto,
-  //   @Query('errorOnNotFound') errorOnNotFound: string = 'false',
-  // ): Promise<
-  //   Response<
-  //     {
-  //       statusCode: number;
-  //       data?: Document<Identities, any, Identities>;
-  //       message?: string;
-  //       validations?: MixedValue;
-  //     },
-  //     any
-  //   >
-  // > {
-  //   let statusCode = HttpStatus.CREATED;
-  //   let message = null;
-  //   const data = await this._service.upsert<Identities>(body, {
-  //     errorOnNotFound: errorOnNotFound.toLowerCase() === 'true',
-  //   });
-  //   // If the state is TO_COMPLETE, the identity is created but additional fields are missing or invalid
-  //   // Else the state is TO_VALIDATE, we return a 201 status code
-  //   if ((data as unknown as Identities).state === IdentityState.TO_COMPLETE) {
-  //     statusCode = HttpStatus.ACCEPTED;
-  //     message = 'Identitée créée avec succès, mais des champs additionnels sont manquants ou invalides.';
-  //   }
-
-  //   return res.status(statusCode).json({
-  //     statusCode,
-  //     data,
-  //     message,
-  //   });
-  // }
-
   @Get()
   @ApiPaginatedDecorator(PickProjectionHelper(IdentitiesDto, IdentitiesController.projection))
   public async search(
diff --git a/src/management/identities/identities.service.ts b/src/management/identities/identities.service.ts
@@ -1,12 +1,24 @@
 import { HttpException, Injectable, Logger } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Identities } from './_schemas/identities.schema';
-import { Document, Model, ModifyResult, Query, QueryOptions, SaveOptions, Types, UpdateQuery } from 'mongoose';
+import {
+  Document,
+  FilterQuery,
+  Model,
+  ModifyResult,
+  Query,
+  QueryOptions,
+  SaveOptions,
+  Types,
+  UpdateQuery,
+} from 'mongoose';
 import { AbstractServiceSchema } from '~/_common/abstracts/abstract.service.schema';
 import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema';
 import { IdentitiesValidationService } from './validations/identities.validation.service';
 import { ValidationConfigException, ValidationSchemaException } from '~/_common/errors/ValidationException';
 import { IdentityState } from './_enums/states.enum';
+import { construct, crush, omit } from 'radash';
+import { IdentitiesUpsertDto } from './_dto/identities.dto';
 
 @Injectable()
 export class IdentitiesService extends AbstractServiceSchema {
@@ -27,56 +39,41 @@ export class IdentitiesService extends AbstractServiceSchema {
   }
 
   public async upsert<T extends AbstractSchema | Document>(
-    data?: any,
+    filters: FilterQuery<T>,
+    data?: IdentitiesUpsertDto,
     options?: QueryOptions<T>,
   ): Promise<ModifyResult<Query<T, T, any, T>>> {
-    Logger.log(`Upserting identity: ${JSON.stringify(data)}`);
-    const logPrefix = `Validation [${data.inetOrgPerson.cn}]:`;
-    // console.log(options);
-    const identity = await this._model.findOne({
-      'inetOrgPerson.employeeNumber': data.inetOrgPerson.employeeNumber,
-      'inetOrgPerson.employeeType': data.inetOrgPerson.employeeType,
+    this.logger.log(`Upserting identity with filters ${JSON.stringify(filters)}`);
+    const crushedUpdate = crush(JSON.parse(JSON.stringify(omit(data || {}, ['$setOnInsert']))));
+    const crushedSetOnInsert = crush(JSON.parse(JSON.stringify(data.$setOnInsert || {})));
+
+    data = construct({
+      ...crushedUpdate,
+      ...crushedSetOnInsert,
     });
-    // console.log(identity);
-    if (!identity && options.errorOnNotFound) {
-      this.logger.error(`${logPrefix} Identity not found.`);
-      throw new HttpException('Identity not found.', 404);
-    }
     data.additionalFields.validations = {};
+    const logPrefix = `Validation [${data.inetOrgPerson.cn}]:`;
+
     try {
       this.logger.log(`${logPrefix} Starting additionalFields validation.`);
       const validations = await this._validation.validate(data.additionalFields);
       this.logger.log(`${logPrefix} AdditionalFields validation successful.`);
-      this.logger.log(`Validations : ${validations}`);
-      data.state = IdentityState.TO_VALIDATE;
+      this.logger.log(`Validations : ${JSON.stringify(validations)}`);
+      crushedUpdate['state'] = IdentityState.TO_VALIDATE;
     } catch (error) {
       data = this.handleValidationError(error, data, logPrefix);
+      crushedUpdate['state'] = data.state;
+      crushedUpdate['additionalFields.validations'] = data.additionalFields.validations;
     }
 
-    //TODO: ameliorer la logique d'upsert
-    if (identity) {
-      this.logger.log(`${logPrefix} Identity already exists. Updating.`);
-      data.inetOrgPerson = {
-        ...identity.inetOrgPerson,
-        ...data.inetOrgPerson,
-      };
-      data.additionalFields.objectClasses = [
-        ...new Set([...identity.additionalFields.objectClasses, ...data.additionalFields.objectClasses]),
-      ];
-      data.additionalFields.attributes = {
-        ...identity.additionalFields.attributes,
-        ...data.additionalFields.attributes,
-      };
-      data.additionalFields.validations = {
-        ...identity.additionalFields.validations,
-        ...data.additionalFields.validations,
-      };
-    }
-
-    //TODO: rechercher par uid ou employeeNumber + employeeType ?
-    const upsert = await super.upsert({ 'inetOrgPerson.uid': data.inetOrgPerson.uid }, data, options);
-    return upsert;
-    //TODO: add backends service logic here
+    return await super.upsert(
+      filters,
+      {
+        $set: crushedUpdate,
+        $setOnInsert: crushedSetOnInsert,
+      },
+      options,
+    );
   }
 
   // public async upsert<T extends AbstractSchema | Document>(
@@ -191,15 +188,19 @@ export class IdentitiesService extends AbstractServiceSchema {
     return deleted;
   }
 
-  private handleValidationError(error: Error | HttpException, identity: Identities, logPrefix: string) {
+  private handleValidationError(
+    error: Error | HttpException,
+    identity: Identities | IdentitiesUpsertDto,
+    logPrefix: string,
+  ): any {
     if (error instanceof ValidationConfigException) {
       this.logger.error(`${logPrefix} Validation config error. ${JSON.stringify(error.getValidations())}`);
       throw new ValidationConfigException(error.getPayload());
     }
 
     if (error instanceof ValidationSchemaException) {
       this.logger.warn(`${logPrefix} Validation schema error. ${JSON.stringify(error.getValidations())}`);
-      identity.additionalFields.validations = error.getValidations();
+      identity.additionalFields.validations = error.getValidations() as any;
       if (identity.state === IdentityState.TO_CREATE) {
         this.logger.warn(`${logPrefix} State set to TO_COMPLETE.`);
         identity.state = IdentityState.TO_COMPLETE;
diff --git a/src/management/identities/jsonforms/_config/supannPerson.ui.yml b/src/management/identities/jsonforms/_config/supannPerson.ui.yml
@@ -1,5 +1,5 @@
 type: Group
-label: supann
+label: supannPerson
 elements:
   - type: HorizontalLayout
     elements:
diff --git a/src/management/identities/validations/_config/supannPerson.yml b/src/management/identities/validations/_config/supannPerson.yml
@@ -52,6 +52,9 @@ properties:
   supannEmpDateFin:
     type: string
     description: Field corresponding to supannEmpDateFin
+  supannEtablissement:
+    type: string
+    description: etablissement
 required:
 - supanncivilite
 - supannAutreMail
@@ -61,7 +64,7 @@ required:
 # - supannCodeINSEEVilleDeNaissance
 # - supannMailPerso
 # - supannEntiteAffectationPrincipale
-- supannCodeINSEEPaysDeNaissance
+#- supannCodeINSEEPaysDeNaissance
 - supannRefId
 - supannPrenomsEtatCivil
 # - mailForwardingAddress
diff --git a/src/management/identities/validations/identities.validation.service.ts b/src/management/identities/validations/identities.validation.service.ts
@@ -9,6 +9,7 @@ import { buildYup } from 'schema-to-yup';
 import ajvErrors from 'ajv-errors';
 import validSchema from './_config/validSchema';
 import { ValidationConfigException, ValidationSchemaException } from '~/_common/errors/ValidationException';
+import { additionalFieldsPartDto } from '../_dto/_parts/additionalFields.dto';
 
 /**
  * Service responsible for validating identities.
@@ -42,7 +43,7 @@ export class IdentitiesValidationService {
    * @param data - The additional fields data to validate.
    * @returns A promise that resolves if validation succeeds, or rejects with validation errors.
    */
-  async validate(data: AdditionalFieldsPart): Promise<object> {
+  async validate(data: AdditionalFieldsPart | additionalFieldsPartDto): Promise<object> {
     const objectClasses = data.objectClasses;
     const attributes = data.attributes;
     const attributesKeys = Object.keys(attributes);

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ export class IdentitiesDto extends IdentitiesCreateDto { }`
`49`	`49`	`export class IdentitiesUpdateDto extends PartialType(IdentitiesCreateDto) { }`
`50`	`50`
`51`	`51`	`export class IdentitiesUpsertDto extends PartialType(IdentitiesUpdateDto) {`
`52`		`- $addToSet?: Partial<IdentitiesUpdateDto>;`
	`52`	`+ $setOnInsert?: Partial<IdentitiesUpdateDto>;`
`53`	`53`	`}`