Add IdentitiesCommand and IdentitiesFingerprintCommand for identity management; refactor initForFingerprint and update access modifiers in AbstractIdentitiesService

tacxou · tacxou · commit b7a38deb586b · 2025-05-05T09:45:43.000+02:00
diff --git a/src/cli/cli.module.ts b/src/cli/cli.module.ts
@@ -14,6 +14,8 @@ import { BackendsCommand } from './backends.command';
 import { BackendsModule } from '~/core/backends/backends.module';
 import { AuthModule } from '~/core/auth/auth.module';
 import { FactorydriveModule } from '@the-software-compagny/nestjs_module_factorydrive';
+import { IdentitiesCommand } from './identities.command';
+import { IdentitiesModule } from '~/management/identities/identities.module';
 
 @Module({
   imports: [
@@ -65,12 +67,14 @@ import { FactorydriveModule } from '@the-software-compagny/nestjs_module_factory
     AgentsModule,
     KeyringsModule,
     BackendsModule,
+    IdentitiesModule,
     AuthModule,
   ],
   providers: [
     ...AgentsCommand.registerWithSubCommands(),
     ...KeyringsCommand.registerWithSubCommands(),
     ...BackendsCommand.registerWithSubCommands(),
+    ...IdentitiesCommand.registerWithSubCommands(),
     AgentCreateQuestions,
     KeyringsCreateQuestions,
   ],
diff --git a/src/cli/identities.command.ts b/src/cli/identities.command.ts
@@ -0,0 +1,49 @@
+import { Logger } from "@nestjs/common";
+import { ModuleRef } from "@nestjs/core";
+import { Command, CommandRunner, SubCommand } from "nest-commander";
+import { Identities } from "~/management/identities/_schemas/identities.schema";
+import { IdentitiesUpsertService } from "~/management/identities/identities-upsert.service";
+
+
+@SubCommand({ name: 'fingerprint' })
+export class IdentitiesFingerprintCommand extends CommandRunner {
+  private readonly logger = new Logger(IdentitiesFingerprintCommand.name);
+
+  public constructor(
+    protected moduleRef: ModuleRef,
+    private readonly identitiesUpsertService: IdentitiesUpsertService,
+  ) {
+    super();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async run(inputs: string[], options: any): Promise<void> {
+    const total = await this.identitiesUpsertService.count();
+    this.logger.log(`Total identities: ${total}`);
+
+    const identities = await this.identitiesUpsertService.find<Identities>() as unknown as Identities[];
+
+    for await (const identity of identities) {
+      this.logger.log(`Processing identity: ${identity._id}`);
+      const fingerprint = await this.identitiesUpsertService.previewFingerprint(identity.toJSON());
+      this.logger.log(`Identity: ${identity._id}, Fingerprint: ${fingerprint}, Old: ${identity.fingerprint}`);
+
+      if (identity.fingerprint !== fingerprint) {
+        this.logger.warn(`Updating fingerprint for identity: ${identity._id}`);
+        await this.identitiesUpsertService.generateFingerprint(identity, fingerprint);
+      } else {
+        this.logger.log(`Fingerprint already up to date for identity: ${identity._id}`);
+      }
+    }
+  }
+}
+
+@Command({ name: 'identities', arguments: '<task>', subCommands: [IdentitiesFingerprintCommand] })
+export class IdentitiesCommand extends CommandRunner {
+  public constructor(protected moduleRef: ModuleRef) {
+    super();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async run(inputs: string[], options: any): Promise<void> { }
+}
diff --git a/src/management/identities/_dto/_parts/inetOrgPerson.dto.ts b/src/management/identities/_dto/_parts/inetOrgPerson.dto.ts
@@ -4,28 +4,33 @@ import { IsString, IsEmail, IsOptional, IsArray, ValidateIf } from 'class-valida
 
 export class inetOrgPersonCreateDto {
   public static initForFingerprint(partial: Partial<inetOrgPersonCreateDto>) {
-    return plainToInstance(inetOrgPersonCreateDto, {
-      cn: partial.cn || null,
-      sn: partial.sn || null,
-      uid: partial.uid || null,
-      employeeNumber: partial.employeeNumber || [],
-      employeeType: partial.employeeType || null,
-      departmentNumber: partial.departmentNumber || [],
-      displayName: partial.displayName || null,
-      facsimileTelephoneNumber: partial.facsimileTelephoneNumber || null,
-      givenName: partial.givenName || null,
-      labeledURI: partial.labeledURI || null,
-      mail: partial.mail || null,
-      mobile: partial.mobile || null,
-      postalAddress: partial.postalAddress || null,
-      preferredLanguage: partial.preferredLanguage || null,
-      telephoneNumber: partial.telephoneNumber || null,
-      title: partial.title || null,
-      userCertificate: partial.userCertificate || null,
-      jpegPhoto: partial.jpegPhoto || null,
-
-      ...partial
-    });
+    try {
+      return plainToInstance(inetOrgPersonCreateDto, {
+        cn: partial.cn || null,
+        sn: partial.sn || null,
+        uid: partial.uid || null,
+        employeeNumber: partial.employeeNumber || [],
+        employeeType: partial.employeeType || null,
+        departmentNumber: partial.departmentNumber || [],
+        displayName: partial.displayName || null,
+        facsimileTelephoneNumber: partial.facsimileTelephoneNumber || null,
+        givenName: partial.givenName || null,
+        labeledURI: partial.labeledURI || null,
+        mail: partial.mail || null,
+        mobile: partial.mobile || null,
+        postalAddress: partial.postalAddress || null,
+        preferredLanguage: partial.preferredLanguage || null,
+        telephoneNumber: partial.telephoneNumber || null,
+        title: partial.title || null,
+        userCertificate: partial.userCertificate || null,
+        jpegPhoto: partial.jpegPhoto || null,
+
+        ...partial
+      });
+    } catch (error) {
+      console.error('inetOrgPersonCreateDto.initForFingerprint', error);
+      throw error;
+    }
   }
 
   @IsString()
diff --git a/src/management/identities/abstract-identities.service.ts b/src/management/identities/abstract-identities.service.ts
@@ -97,7 +97,8 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
       }
     }
   }
-  protected async generateFingerprint<T extends AbstractSchema | Document>(
+
+  public async generateFingerprint<T extends AbstractSchema | Document>(
     identity: Identities,
     fingerprint?: string,
   ): Promise<ModifyResult<Query<T, T, any, T>>> {
@@ -136,7 +137,7 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     ).join(',')}}`;
   }
 
-  protected async previewFingerprint(identity: any): Promise<string> {
+  public async previewFingerprint(identity: any): Promise<string> {
     const inetOrgPerson = inetOrgPersonDto.initForFingerprint(identity.inetOrgPerson);
 
     const additionalFields = omit(identity.additionalFields, ['validations']);
@@ -230,13 +231,13 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     }
   }
 
-  protected async checkMail(identity,data): Promise<boolean> {
+  protected async checkMail(identity, data): Promise<boolean> {
     let dataDup = 0;
     if (data.inetOrgPerson.hasOwnProperty('mail') && data.inetOrgPerson.mail !== '') {
       if (identity){
         const f: any = { '_id': { $ne: identity._id },'state':{$ne:IdentityState.DONT_SYNC},'deletedFlag':{$ne:true}, 'inetOrgPerson.mail': identity.inetOrgPerson.mail };
         dataDup = await this._model.countDocuments(f).exec()
-      }else{
+      } else {
         const f: any = { 'inetOrgPerson.mail': data.inetOrgPerson.mail };
         dataDup = await this._model.countDocuments(f).exec()
       }
@@ -249,12 +250,12 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     }
   }
 
-  protected async checkUid(identity,data): Promise<boolean> {
+  protected async checkUid(identity, data): Promise<boolean> {
     let dataDup = 0;
     if (identity){
       const f: any = { '_id': { $ne: identity._id } ,'state':{$ne:IdentityState.DONT_SYNC},'deletedFlag':{$ne:true},'inetOrgPerson.uid': identity.inetOrgPerson.uid };
       dataDup = await this._model.countDocuments(f).exec()
-    }else{
+    } else {
       const f: any = { 'inetOrgPerson.uid': data.inetOrgPerson.uid };
       dataDup = await this._model.countDocuments(f).exec()
     }
diff --git a/src/management/identities/identities.module.ts b/src/management/identities/identities.module.ts
@@ -18,9 +18,9 @@ import { IdentitiesPhotoController } from '~/management/identities/identities-ph
 import { IdentitiesActivationController } from '~/management/identities/identities-activation.controller';
 import { IdentitiesActivationService } from '~/management/identities/identities-activation.service';
 import { IdentitiesDoublonController } from '~/management/identities/identities-doublon.controller';
-import {IdentitiesForcePasswordController} from "~/management/identities/identities-forcepassword.controller";
-import {IdentitiesForcepasswordService} from "~/management/identities/identities-forcepassword.service";
-import {SettingsModule} from "~/settings/settings.module";
+import { IdentitiesForcePasswordController } from "~/management/identities/identities-forcepassword.controller";
+import { IdentitiesForcepasswordService } from "~/management/identities/identities-forcepassword.service";
+import { SettingsModule } from "~/settings/settings.module";
 import { EnsureIdentitiesIndexMiddleware } from './_middlewares/ensure-identities-index.middleware';
 import { AgentsModule } from '~/core/agents/agents.module';
 
@@ -61,7 +61,7 @@ import { AgentsModule } from '~/core/agents/agents.module';
     IdentitiesActivationController,
     IdentitiesForcePasswordController
   ],
-  exports: [IdentitiesCrudService],
+  exports: [IdentitiesCrudService, IdentitiesUpsertService],
 })
 export class IdentitiesModule implements NestModule {
   public configure(consumer: MiddlewareConsumer) {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
`100`		`- protected async generateFingerprint<T extends AbstractSchema \| Document>(`
	`100`	`+`
	`101`	`+ public async generateFingerprint<T extends AbstractSchema \| Document>(`
`101`	`102`	`identity: Identities,`
`102`	`103`	`fingerprint?: string,`
`103`	`104`	`): Promise<ModifyResult<Query<T, T, any, T>>> {`
`@@ -136,7 +137,7 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {`
`136`	`137`	).join(',')}}`;
`137`	`138`	`}`
`138`	`139`
`139`		`- protected async previewFingerprint(identity: any): Promise<string> {`
	`140`	`+ public async previewFingerprint(identity: any): Promise<string> {`
`140`	`141`	`const inetOrgPerson = inetOrgPersonDto.initForFingerprint(identity.inetOrgPerson);`
`141`	`142`
`142`	`143`	`const additionalFields = omit(identity.additionalFields, ['validations']);`
`@@ -230,13 +231,13 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {`
`230`	`231`	`}`
`231`	`232`	`}`
`232`	`233`
`233`		`- protected async checkMail(identity,data): Promise<boolean> {`
	`234`	`+ protected async checkMail(identity, data): Promise<boolean> {`
`234`	`235`	`let dataDup = 0;`
`235`	`236`	`if (data.inetOrgPerson.hasOwnProperty('mail') && data.inetOrgPerson.mail !== '') {`
`236`	`237`	`if (identity){`
`237`	`238`	`const f: any = { '_id': { $ne: identity._id },'state':{$ne:IdentityState.DONT_SYNC},'deletedFlag':{$ne:true}, 'inetOrgPerson.mail': identity.inetOrgPerson.mail };`
`238`	`239`	`dataDup = await this._model.countDocuments(f).exec()`
`239`		`- }else{`
	`240`	`+ } else {`
`240`	`241`	`const f: any = { 'inetOrgPerson.mail': data.inetOrgPerson.mail };`
`241`	`242`	`dataDup = await this._model.countDocuments(f).exec()`
`242`	`243`	`}`
`@@ -249,12 +250,12 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {`
`249`	`250`	`}`
`250`	`251`	`}`
`251`	`252`
`252`		`- protected async checkUid(identity,data): Promise<boolean> {`
	`253`	`+ protected async checkUid(identity, data): Promise<boolean> {`
`253`	`254`	`let dataDup = 0;`
`254`	`255`	`if (identity){`
`255`	`256`	`const f: any = { '_id': { $ne: identity._id } ,'state':{$ne:IdentityState.DONT_SYNC},'deletedFlag':{$ne:true},'inetOrgPerson.uid': identity.inetOrgPerson.uid };`
`256`	`257`	`dataDup = await this._model.countDocuments(f).exec()`
`257`		`- }else{`
	`258`	`+ } else {`
`258`	`259`	`const f: any = { 'inetOrgPerson.uid': data.inetOrgPerson.uid };`
`259`	`260`	`dataDup = await this._model.countDocuments(f).exec()`
`260`	`261`	`}`