Merge pull request #164 from Libertech-FR/dependabot/npm_and_yarn/lodash-4.18.1

chore(deps): bump lodash from 4.17.23 to 4.18.1
#165 correction of cron

Author: alainabbas

…on/identities-init-invitation-expire.yml …defaults/cron/identities-init-expire.ymlapps/api/defaults/cron/identities-init-invitation-expire.yml renamed to apps/api/defaults/cron/identities-init-expire.yml apps/api/defaults/cron/identities-init-invitation-expire.yml renamed to apps/api/defaults/cron/identities-init-expire.yml

@@ -1,7 +1,7 @@
 tasks:
-  - name: "identities-init-invitation-expire"
+  - name: "identities-init-expire"
     description: "Expiration des invitations d'initialisation de compte"
     enabled: true
     schedule: "1 * * * *"  # Tous les jours à 08:00
-    handler: "identities-init-invitation-expire"
+    handler: "identities-init-expire"
     options:

apps/api/src/core/cron/_functions/cron-command-options.function.ts

@@ -8,6 +8,15 @@ function getHandlerDescriptor(handler: string) {
   return getCronConsoleHandlers().find((entry) => entry.handler === handler);
 }
 
+/**
+ * Mots de la commande console d'un handler : utilise `command` déclaré via @CronConsoleHandler,
+ * sinon (handler non déclaré) découpe l'identifiant sur les tirets.
+ */
+export function resolveCronConsoleCommandWords(handler: string): string[] {
+  const descriptor = getHandlerDescriptor(handler);
+  return (descriptor?.command || handler.replace(/-/g, ' ')).split(/\s+/).filter(Boolean);
+}
+
 export function resolveCronConsoleArgumentFlag(argument: CronConsoleHandlerArgument): string {
   return argument.flag || `--${argument.name}`;
 }

apps/api/src/core/cron/cron-hooks.service.ts

@@ -9,7 +9,7 @@ import { loadcronTasks } from './_functions/load-cron-tasks.function';
 import { ConfigService } from '@nestjs/config';
 import { createHandlerLogger } from '~/_common/functions/handler-logger';
 import { resolveConfigVariables } from '~/_common/functions/resolve-config-variables.function';
-import { buildCronCommandArgs } from './_functions/cron-command-options.function';
+import { buildCronCommandArgs, resolveCronConsoleCommandWords } from './_functions/cron-command-options.function';
 
 @Injectable()
 export class CronHooksService {
@@ -177,7 +177,9 @@ export class CronHooksService {
     }
 
     // Supprimer les jobs qui ne sont plus dans les tâches désirées
-    for (const [name, job] of existingJobs) {
+    // Itère sur une copie : getCronJobs() renvoie la Map interne du registre, et un delete + add
+    // sur la même clé la replace en fin de Map, ce qui la ferait revisiter indéfiniment.
+    for (const [name, job] of Array.from(existingJobs)) {
       if (!name.startsWith('cron-task-')) continue;
 
       const desired = desiredTasks.get(name);
@@ -301,7 +303,7 @@ export class CronHooksService {
     const { positionalArgs, flagArgs } = buildCronCommandArgs(handler, resolvedOptions);
 
     const cmd = 'yarn';
-    const cmdArgs = ['run', 'console', ...handler.split('-'), ...positionalArgs, ...flagArgs];
+    const cmdArgs = ['run', 'console', ...resolveCronConsoleCommandWords(handler), ...positionalArgs, ...flagArgs];
 
     const handlerLogger = createHandlerLogger(this.configService, name);
     this.logger.log(`Spawning command: ${cmd} ${cmdArgs.join(' ')}`);

apps/api/src/management/identities/identities.command.ts

@@ -331,7 +331,7 @@ type IdentitiesInitExpireOptions = {
 };
 
 @CronConsoleHandler({
-  handler: 'identities-init-invitation-expire',
+  handler: 'identities-init-expire',
   command: 'identities init expire',
   label: "Expiration des invitations d'initialisation de compte",
   arguments: [

apps/web/package.json

@@ -46,7 +46,7 @@
     "fast-password-entropy": "^1.1.1",
     "hibp": "^15.0.1",
     "highlight.js": "^11.11.1",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "lodash-es": "^4.17.23",
     "moment": "^2.30.1",
     "monaco-editor": "^0.53.0",

yarn.lock

@@ -13036,10 +13036,10 @@ lodash@4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.23:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+lodash@^4.17.15, lodash@^4.17.21, lodash@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 log-symbols@^4.1.0:
   version "4.1.0"