feat: ajout du stockage des jobs effectués

.infra/ansible/deploy.yml

@@ -81,13 +81,11 @@
 
     - name: "Installation du cron d'anonymisation des utilisateurs"
       ansible.builtin.cron:
-        name: "Anonymisation des utilisateurs"
+        name: "anonymize-users"
         minute: "0"
         hour: "2"
         weekday: "1"
-        job: "/opt/app/scripts/anonymise-users.sh"
-        user: "root"
-        cron_file: "anonymize-users"
+        job: "sudo /opt/app/scripts/anonymize-users.sh"
 
     - name: "Verification des certificats SSL"
       shell:

.infra/files/scripts/anonymise-users.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-/opt/app/tools/docker-compose.sh run --rm --no-deps server yarn cli anonymiseUsers
+/opt/app/tools/docker-compose.sh run --rm --no-deps server yarn cli anonymizeUsers

server/package.json

@@ -16,6 +16,7 @@
     "dev": "tsup-node --env.TSUP_WATCH true",
     "build": "tsup-node --env.NODE_ENV production",
     "typecheck": "NODE_OPTIONS='--max-old-space-size=8192' tsc --noEmit",
+    "kysely": "npx kysely-codegen --schema public --out-file=./src/db/schema.ts --dialect postgres && yarn prettier:fix",
     "generate:seed": "./seed/generate-seed.sh"
   },
   "dependencies": {

server/seed/generate-seed.sh

@@ -33,6 +33,7 @@ echo ""
 
 pg_dump $DB_URL --format=custom --data-only \
   --exclude-table='public."changeLog"' \
+  --exclude-table='public."job"' \
   --exclude-table='public."changementStatut"' \
   --exclude-table='public."demande"' \
   --exclude-table='public."intention"' \

server/src/commands.product.ts

@@ -7,7 +7,8 @@ import { PERMISSIONS } from "shared";
 import { z } from "zod";
 
 import { basepath } from "./basepath";
-import { anonymiseUsers } from "./modules/core/usecases/anonymiseUsers/anonymiseUsers.usecase";
+import { createJob } from "./modules/core/queries/createJob";
+import { anonymizeUsers } from "./modules/core/usecases/anonymizeUsers/anonymizeUsers.usecase";
 import { createUser } from "./modules/core/usecases/createUser/createUser.usecase";
 import type { LineTypes } from "./modules/import/repositories/rawData.repository";
 import { Schemas } from "./modules/import/repositories/rawData.repository";
@@ -93,10 +94,11 @@ export function productCommands(cli: Command) {
           console.log(`${user.email} failed`, (e as Error).message);
         }
       }
+      await createJob({ name: "importUsers" });
     });
 
   cli
-    .command("create-user")
+    .command("createUser")
     .requiredOption("--email <string>")
     .requiredOption("--firstname <string>")
     .requiredOption("--lastname <string>")
@@ -105,6 +107,7 @@ export function productCommands(cli: Command) {
     .action(
       async (options: { email: string; firstname: string; lastname: string; role: Role; codeRegion?: string }) => {
         await createUser({ body: options });
+        await createJob({ name: "createUser" });
       }
     );
 
@@ -280,6 +283,7 @@ export function productCommands(cli: Command) {
           }
         }
       }
+      await createJob({ name: "importFiles", sub: filename });
     });
 
   cli
@@ -314,14 +318,16 @@ export function productCommands(cli: Command) {
         }
       }
       await refreshViews();
+      await createJob({ name: "importTables", sub: usecaseName });
     });
 
   cli.command("refreshViews").action(async () => {
     await refreshViews();
   });
 
   cli.command("importIJ").action(async () => {
-    await importIJData();
+    await importIJData().then();
+    await createJob({ name: "importIJ" });
   });
 
   cli
@@ -341,6 +347,7 @@ export function productCommands(cli: Command) {
         }
       }
       await refreshViews();
+      await createJob({ name: "importFormations", sub: usecaseName });
     });
 
   cli
@@ -361,19 +368,22 @@ export function productCommands(cli: Command) {
           await usecase();
         }
       }
+      await createJob({ name: "importTensionFranceTravail", sub: usecaseName });
     });
 
   cli
     .command("importPositionsQuadrant")
     .description("Calcul des positions quadrants")
     .action(async () => {
       await importPositionsQuadrant();
+      await createJob({ name: "importPositionsQuadrant" });
     });
 
   cli
-    .command("anonymiseUsers")
+    .command("anonymizeUsers")
     .description("Anonymisation des users inactifs depuis 2 ans")
     .action(async () => {
-      await anonymiseUsers();
+      await anonymizeUsers();
+      await createJob({ name: "anonymizeUsers" });
     });
 }

server/src/db/schema.ts

@@ -572,6 +572,12 @@ export interface IntentionAccessLog {
   updatedAt: Timestamp | null;
 }
 
+export interface Job {
+  name: string | null;
+  sub: string | null;
+  createdAt: Generated<Timestamp | null>;
+}
+
 export interface LatestDemandeIntentionNonMaterializedView {
   isIntention: boolean | null;
   numero: string | null;
@@ -939,6 +945,7 @@ export interface DB {
   indicateurSortie: IndicateurSortie;
   intention: Intention;
   intentionAccessLog: IntentionAccessLog;
+  job: Job;
   latestDemandeIntentionNonMaterializedView: LatestDemandeIntentionNonMaterializedView;
   latestDemandeNonMaterializedView: LatestDemandeNonMaterializedView;
   latestIntentionNonMaterializedView: LatestIntentionNonMaterializedView;

server/src/migrations/index.ts

@@ -98,6 +98,7 @@ import * as migration_1733743141284 from "./migration_1733743141284";
 import * as migration_1734527074984 from "./migration_1734527074984";
 import * as migration_1734527078957 from "./migration_1734527078957";
 import * as migration_1734618351550 from "./migration_1734618351550";
+import * as migration_1734620499618 from "./migration_1734620499618";
 
 type Migration = {
   up: (db: Kysely<any>) => Promise<void>;
@@ -203,4 +204,5 @@ export const migrations: Migrations = {
   migration_1734527074984,
   migration_1734527078957,
   migration_1734618351550,
+  migration_1734620499618,
 };

server/src/migrations/migration_1734620499618.ts

@@ -0,0 +1,15 @@
+import type { Kysely } from "kysely";
+import { sql } from "kysely";
+
+export const up = async (db: Kysely<unknown>) => {
+  await db.schema
+    .createTable("job")
+    .addColumn("name", "varchar")
+    .addColumn("sub", "varchar")
+    .addColumn("createdAt", "timestamptz", (c) => c.defaultTo(sql`NOW()`))
+    .execute();
+};
+
+export const down = async (db: Kysely<unknown>) => {
+  await db.schema.dropTable("job").execute();
+};

server/src/modules/core/queries/createJob.ts

@@ -0,0 +1,5 @@
+import { getKbdClient } from "@/db/db";
+
+export const createJob = async ({ name, sub }: { name: string; sub?: string }) => {
+  return getKbdClient().insertInto("job").values({ name, sub }).execute();
+};

server/src/modules/core/usecases/anonymiseUsers/anonymiseUsers.dep.ts → server/src/modules/core/usecases/anonymizeUsers/anonymizeUsers.dep.ts

@@ -2,7 +2,7 @@ import { sql } from "kysely";
 
 import { getKbdClient } from "@/db/db";
 
-export const countUsersToAnonymiseQuery = async () =>
+export const countUsersToAnonymizeQuery = async () =>
   await getKbdClient()
     .selectFrom("user")
     .select((eb) =>
@@ -22,7 +22,7 @@ export const countUsersToAnonymiseQuery = async () =>
     )
     .executeTakeFirstOrThrow();
 
-export const anonymiseUsersQuery = async () => {
+export const anonymizeUsersQuery = async () => {
   await sql`
     UPDATE ${sql.table("user")}
     SET

server/src/modules/core/usecases/anonymizeUsers/anonymizeUsers.usecase.ts

@@ -0,0 +1,18 @@
+// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
+import { inject } from "injecti";
+
+import logger from "@/services/logger";
+
+import { anonymizeUsersQuery, countUsersToAnonymizeQuery } from "./anonymizeUsers.dep";
+
+export const [anonymizeUsers, anonymizeUsersFactory] = inject(
+  {
+    anonymizeUsersQuery,
+    countUsersToAnonymizeQuery,
+  },
+  (deps) => async () => {
+    const { count: nbOfUsers } = await deps.countUsersToAnonymizeQuery();
+    logger.info(`Nombre d'utilisateurs à anonymizer : ${nbOfUsers}`);
+    await deps.anonymizeUsersQuery();
+  }
+);