Mise a jours du service et du controller identity pour y ajouter la query errorOnNotFound sur l'endpoint d'upsert

Author: RICHARD-Quentin

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

@@ -4,15 +4,17 @@ import { IsString, IsEmail, IsOptional } from 'class-validator';
 export class inetOrgPersonCreateDto {
   @IsString()
   @ApiProperty()
-  cn: string;
+  uid: string;
 
   @IsString()
   @ApiProperty()
-  sn: string;
+  @IsOptional()
+  cn?: string;
 
   @IsString()
   @ApiProperty()
-  uid: string;
+  @IsOptional()
+  sn?: string;
 
   @IsString()
   @ApiProperty({ required: false })

src/management/identities/identities.controller.ts

@@ -8,6 +8,7 @@ import {
   Param,
   Patch,
   Post,
+  Query,
   Res,
 } from '@nestjs/common';
 import { IdentitiesDto, IdentitiesCreateDto, IdentitiesUpdateDto } from './_dto/identities.dto';
@@ -87,6 +88,7 @@ export class IdentitiesController extends AbstractController {
     @Res()
     res: Response,
     @Body() body: IdentitiesCreateDto,
+    @Query('errorOnNotFound') errorOnNotFound: string = 'false',
   ): Promise<
     Response<
       {
@@ -100,7 +102,9 @@ export class IdentitiesController extends AbstractController {
   > {
     let statusCode = HttpStatus.CREATED;
     let message = null;
-    const data = await this._service.upsert<Identities>(body);
+    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) {

src/management/identities/identities.service.ts

@@ -1,3 +1,4 @@
+import { inetOrgPerson } from './_schemas/_parts/inetOrgPerson.part';
 import { HttpException, Injectable, Logger } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Identities } from './_schemas/identities.schema';
@@ -32,6 +33,13 @@ export class IdentitiesService extends AbstractServiceSchema {
   ): 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.uid': data.inetOrgPerson.uid });
+    console.log(identity);
+    if (!identity && options.errorOnNotFound) {
+      this.logger.error(`${logPrefix} Identity not found.`);
+      throw new HttpException('Identity not found.', 404);
+    }
     data.additionalFields.validations = {};
     try {
       this.logger.log(`${logPrefix} Starting additionalFields validation.`);
@@ -44,9 +52,13 @@ export class IdentitiesService extends AbstractServiceSchema {
     }
 
     //TODO: ameliorer la logique d'upsert
-    const identity = await this._model.findOne({ 'inetOrgPerson.uid': data.inetOrgPerson.uid });
+
     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]),
       ];

src/management/identities/validations/_config/inetorgperson.yml

@@ -64,5 +64,5 @@
       "description": "User password of the inetOrgPerson."
     }
   },
-  "required": ["cn", "sn", "uid"]
+  "required": ["uid"]
 }