Refactor validation logic for employeeNumbers in inetOrgPerson.part.ts

Author: tacxou

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

@@ -50,8 +50,9 @@ export class inetOrgPerson extends Document {
     validate: [
       {
         validator: (employeeNumbers: string[]) => {
-          console.log(employeeNumbers);
-          employeeNumbers.every((employeeNumber) => /[A-Za-z0-9_-]+/.test(employeeNumber));
+          if (!Array.isArray(employeeNumbers)) return false;
+
+          return employeeNumbers.every((employeeNumber) => /[A-Za-z0-9_-]+/.test(employeeNumber));
         },
         message: 'EmployeeNumber invalide.',
       },

src/management/identities/identities.controller.ts

@@ -14,7 +14,7 @@ import {
   UploadedFile,
   UseInterceptors,
 } from '@nestjs/common';
-import {ApiOperation, ApiParam, ApiResponse, ApiTags, PartialType} from '@nestjs/swagger';
+import { ApiOperation, ApiParam, ApiResponse, ApiTags, PartialType } from '@nestjs/swagger';
 import {
   FilterOptions,
   FilterSchema,
@@ -47,7 +47,7 @@ import { join } from 'node:path';
 import { omit } from 'radash';
 import { TransformersFilestorageService } from '~/core/filestorage/_services/transformers-filestorage.service';
 import { Public } from '~/_common/decorators/public.decorator';
-import {FusionDto} from "~/management/identities/_dto/fusion.dto";
+import { FusionDto } from "~/management/identities/_dto/fusion.dto";
 
 @ApiTags('management/identities')
 @Controller('identities')
@@ -91,10 +91,10 @@ export class IdentitiesController extends AbstractController {
       body.inetOrgPerson.employeeType = 'LOCAL';
     }
     if (!body.inetOrgPerson.cn) {
-      body.inetOrgPerson.cn = body.inetOrgPerson.sn.toUpperCase() + ' ' + body.inetOrgPerson.givenName;
+      body.inetOrgPerson.cn = `${(body.inetOrgPerson.sn || '').toUpperCase()} ${body.inetOrgPerson.givenName}`;
     }
     if (!body.inetOrgPerson.displayName) {
-      body.inetOrgPerson.displayName = body.inetOrgPerson.givenName + ' ' + body.inetOrgPerson.sn.toUpperCase();
+      body.inetOrgPerson.displayName = body.inetOrgPerson.givenName + ' ' + (body.inetOrgPerson.sn || '').toUpperCase();
     }
     const data = await this._service.create<Identities>(body);
     // If the state is TO_COMPLETE, the identity is created but additional fields are missing or invalid
@@ -361,7 +361,7 @@ export class IdentitiesController extends AbstractController {
     });
     await this.transformerService.transform(mime, res, data, stream, parent);
   }
-  
+
   @Get('duplicates')
   @ApiOperation({ summary: 'Renvoie la liste des doublons supposés' })
   public async getDoublons(@Res() res: Response): Promise<Response> {

src/migrations.service.ts

@@ -3,6 +3,55 @@ import { InjectModel } from '@nestjs/mongoose'
 import { readdir } from 'fs/promises'
 import { Model } from 'mongoose'
 import { glob } from 'glob'
+import readline from 'readline'
+
+let stdinBuffer = [];
+
+function hijackStdinWrite(loader) {
+  const originalStdinWrite = process.stdin.write;
+
+  process.stdin.write = (chunk, callback): boolean => {
+    stdinBuffer.push({ chunk, callback });
+    stopLoader(loader);
+    replayStdinBuffer();
+    startLoader(loader);
+
+    return true;
+  };
+}
+
+function restoreStdinWrite() {
+  delete process.stdin.write;
+}
+
+// Fonction pour rejouer les écritures dans stdin
+function replayStdinBuffer() {
+  while (stdinBuffer.length > 0) {
+    const { chunk, encoding, callback } = stdinBuffer.shift();
+    process.stdout.write(chunk, encoding, callback);
+  }
+}
+
+function startLoader(message) {
+  const spinnerFrames = ['-', '\\', '|', '/'];
+  let currentFrame = 0;
+
+  const loaderInterval = setInterval(() => {
+    readline.cursorTo(process.stdout, 0);
+    process.stdout.write(`${spinnerFrames[currentFrame]} ${message}`);
+    currentFrame = (currentFrame + 1) % spinnerFrames.length;
+  }, 100);
+
+  hijackStdinWrite(loaderInterval);
+
+  return loaderInterval;
+}
+
+function stopLoader(loaderInterval) {
+  clearInterval(loaderInterval);
+  readline.cursorTo(process.stdout, 0);
+  process.stdout.clearLine(0);
+}
 
 @Injectable()
 export class MigrationsService implements OnModuleInit {
@@ -13,9 +62,13 @@ export class MigrationsService implements OnModuleInit {
   }
 
   public async runMigrations() {
+    const loader = startLoader('Chargement en cours...');
+
     try {
       await this.loadMigrationsFiles()
     } catch { }
+
+    stopLoader(loader);
   }
 
   private async loadMigrationsFiles() {

src/migrations/1316027432511-employee-number.ts

@@ -1,13 +1,28 @@
+import { Logger } from "@nestjs/common"
+
 export default class EmployeeNumber1616027432511 {
   // public constructor(@InjectConnection() private connection: Connection) {
 
   // }
 
   public async up(): Promise<void> {
-    console.log('EmployeeNumber1616027432511 up')
+    Logger.log('EmployeeNumber1616027432511 up')
+
+    return new Promise((resolve) => {
+      const interval = setInterval(() => {
+        Logger.log('EmployeeNumber1616027432511 up in progress')
+      }, 1_000)
+
+      setTimeout(() => {
+        clearInterval(interval)
+        Logger.log('EmployeeNumber1616027432511 up done')
+
+        resolve()
+      }, 5_000)
+    })
   }
 
   public async down(): Promise<void> {
-    console.log('EmployeeNumber1616027432511 down')
+    Logger.log('EmployeeNumber1616027432511 down')
   }
 }