Refactor identity service schema and CRUD operations; omit unnecessary fields in updates

Author: tacxou

src/_common/abstracts/abstract.service.schema.ts

@@ -17,6 +17,7 @@ import { AbstractService, AbstractServiceContext } from './abstract.service';
 import { ServiceSchemaInterface } from './interfaces/service.schema.interface';
 import { AbstractSchema } from './schemas/abstract.schema';
 import mongodb from 'mongodb';
+import { omit } from 'radash';
 
 @Injectable()
 export abstract class AbstractServiceSchema extends AbstractService implements ServiceSchemaInterface {
@@ -227,17 +228,18 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
         if (beforeEvent?.options) options = { ...options, ...beforeEvent.options }
       }
     }
+    console.log('_id', update)
     let updated = await this._model
       .findByIdAndUpdate<Query<T | null, T, any, T>>(
-        { _id },
+        _id,
         {
-          ...update,
+          ...omit(update, ['_id']),
           $setOnInsert: {
             'metadata.createdBy': this.request?.user?.username || 'anonymous',
             'metadata.createdAt': new Date(),
           },
           $set: {
-            ...(update?.$set || {}),
+            ...omit(update?.$set || {}, ['_id']),
             'metadata.lastUpdatedBy': this.request?.user?.username || 'anonymous',
             'metadata.lastUpdatedAt': new Date(),
           }

src/management/identities/_schemas/_parts/inetOrgPerson.part.ts

@@ -60,7 +60,7 @@ export class inetOrgPerson extends Document {
   })
   public employeeNumber: string[];
 
-  @Prop({ type: String, required: true })
+  @Prop({ type: String })
   public employeeType: string;
 
   @Prop({ type: Array, of: String, required: true, default: [] })

src/management/identities/identities-crud.service.ts

@@ -5,6 +5,7 @@ import { ValidationConfigException, ValidationSchemaException } from '~/_common/
 import { IdentityState } from '~/management/identities/_enums/states.enum';
 import { Identities } from '~/management/identities/_schemas/identities.schema';
 import { HttpException } from '@nestjs/common';
+import { omit } from 'radash';
 
 export class IdentitiesCrudService extends AbstractIdentitiesService {
   public async create<T extends AbstractSchema | Document>(
@@ -14,9 +15,9 @@ export class IdentitiesCrudService extends AbstractIdentitiesService {
     data = this.transformNullsToString(data);
     await this.checkInetOrgPersonJpegPhoto(data);
     //recherche si email oy uid deja present
-    const f:any = { $or: [{ 'inetOrgPerson.uid' : data.inetOrgPerson.uid}, {'inetOrgPerson.mail': data.inetOrgPerson.mail }]};
+    const f: any = { $or: [{ 'inetOrgPerson.uid': data.inetOrgPerson.uid }, { 'inetOrgPerson.mail': data.inetOrgPerson.mail }] };
     let dataDup = await this._model.countDocuments(f).exec()
-    if (dataDup > 0){
+    if (dataDup > 0) {
       this.logger.error('Identité existante');
       throw new HttpException("Uid ou mail déjà présent dans une autre identité", 400);
     }
@@ -53,16 +54,22 @@ export class IdentitiesCrudService extends AbstractIdentitiesService {
     }
 
     // if (update.state === IdentityState.TO_COMPLETE) {
-    update = { ...update, state: IdentityState.TO_VALIDATE };
+    update = {
+      ...omit(update, ['inetOrgPerson']),
+      inetOrgPerson: omit(update.inetOrgPerson, ['employeeNumber', 'employeeType']),
+      state: IdentityState.TO_VALIDATE,
+    };
 
     await this.checkInetOrgPersonJpegPhoto(update);
 
+    console.log('update', update, _id, options)
+
     // }
     // if (update.state === IdentityState.SYNCED) {
     //   update = { ...update, state: IdentityState.TO_VALIDATE };
     // }
     //update.state = IdentityState.TO_VALIDATE;
-    const updated = await super.update(_id, update, options);
+    const updated = await super.update(_id, { $set: update }, options);
     //TODO: add backends service logic here (TO_SYNC)
     return await this.generateFingerprint(updated as unknown as Identities);
   }