fix report generation 2

betagouv · Feb 5, 2025 · 046a1e9 · 046a1e9
1 parent db43e6f
commit 046a1e9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 25 deletions.
diff --git a/process/package.json b/process/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "migrate": "prisma migrate dev --name init",
     "generate": "prisma generate",
-    "build": "prisma generate && tsc",
+    "build": "prisma generate && tsc --build --clean",
     "dev": "nodemon",
     "stop": "pm2 stop process",
     "start-dev": "ts-node src/index.ts",

diff --git a/process/src/index.ts b/process/src/index.ts
@@ -313,12 +313,11 @@ const leboncoinJob = new CronJob(
 
 // Every first Tuesday of the month at 10:00 AM
 const reportJob = new CronJob(
-  // "0 10 * * 2",
-  "16 14 * * *",
+  "0 10 * * 2",
   async () => {
     // if not the first Tuesday of the month, return
-    // const date = new Date();
-    // if (date.getDay() !== 2 || date.getDate() > 7) return;
+    const date = new Date();
+    if (date.getDay() !== 2 || date.getDate() > 7) return;
 
     runnings.report = true;
     const checkInId = Sentry.captureCheckIn({

diff --git a/process/src/jobs/report/generate/index.ts b/process/src/jobs/report/generate/index.ts
@@ -76,7 +76,7 @@ export const generateReport = async (publisher: Publisher, year: number, month:
   }
 };
 
-export const generate = async (year: number, month: number) => {
+export const generateReports = async (year: number, month: number) => {
   const publishers = await PublisherModel.find({ automated_report: true });
   let count = 0;
   const errors = [] as { id: string; name: string; error: string }[];

diff --git a/process/src/jobs/report/index.ts b/process/src/jobs/report/index.ts
@@ -1,8 +1,8 @@
 import { SLACK_PRODUCT_CHANNEL_ID } from "../../config";
 import { captureException } from "../../error";
 import { postMessage } from "../../services/slack";
-import { generate } from "./generate";
-import { send } from "./send";
+import { generateReports } from "./generate";
+import { sendReports } from "./send";
 
 const handler = async () => {
   const start = new Date();
@@ -12,29 +12,29 @@ const handler = async () => {
     const year = month === 11 ? new Date().getFullYear() - 1 : new Date().getFullYear();
 
     console.log(`[Report] Generating report for ${year}-${month}`);
-    const generationRes = await generate(year, month);
+    const generationRes = await generateReports(year, month);
     console.log(`[Report] Generated ${generationRes.count} report with ${generationRes.errors.length} errors`);
     if (generationRes.errors.length > 0) {
       console.error(`[Report] Errors`, JSON.stringify(generationRes.errors, null, 2));
       captureException(`Report generation with failure`, `Errors while genrating report`);
     }
 
-    // console.log(`[Report] Sending report for ${year}-${month}`);
-    // const sendingRes = await send(year, month);
-    // console.log(`[Report] Sent ${sendingRes.count} report, ${sendingRes.skipped.length} skipped and ${sendingRes.errors.length} errors`);
-    // if (sendingRes.errors.length > 0) {
-    //   console.error(`[Report] Errors`, JSON.stringify(sendingRes.errors, null, 2));
-    //   captureException(`Report sending with failure`, `Errors while sending report`);
-    // }
-    // console.log(`[Report] Sending slack message for ${year}-${month}`);
+    console.log(`[Report] Sending report for ${year}-${month}`);
+    const sendingRes = await sendReports(year, month);
+    console.log(`[Report] Sent ${sendingRes.count} report, ${sendingRes.skipped.length} skipped and ${sendingRes.errors.length} errors`);
+    if (sendingRes.errors.length > 0) {
+      console.error(`[Report] Errors`, JSON.stringify(sendingRes.errors, null, 2));
+      captureException(`Report sending with failure`, `Errors while sending report`);
+    }
+    console.log(`[Report] Sending slack message for ${year}-${month}`);
 
-    // await postMessage(
-    //   {
-    //     title: `Rapports d'impact du ${month + 1 < 10 ? `0${month + 1}` : month + 1}/${year} générés et envoyés`,
-    //     text: `Rapport générés: ${generationRes.count}, emails envoyés: ${sendingRes.count}, non envoyés: ${sendingRes.skipped.length}, erreurs: ${generationRes.errors.length + sendingRes.errors.length}\n\nListe des rapports d'impact du mois [ici](https://app.api-engagement.beta.gouv.fr/admin-report?month=${month}&year=${year})`,
-    //   },
-    //   SLACK_PRODUCT_CHANNEL_ID,
-    // );
+    await postMessage(
+      {
+        title: `Rapports d'impact du ${month + 1 < 10 ? `0${month + 1}` : month + 1}/${year} générés et envoyés`,
+        text: `Rapport générés: ${generationRes.count}, emails envoyés: ${sendingRes.count}, non envoyés: ${sendingRes.skipped.length}, erreurs: ${generationRes.errors.length + sendingRes.errors.length}\n\nListe des rapports d'impact du mois [ici](https://app.api-engagement.beta.gouv.fr/admin-report?month=${month}&year=${year})`,
+      },
+      SLACK_PRODUCT_CHANNEL_ID,
+    );
   } catch (error: any) {
     console.error(error);
     captureException(`Report generation failed`, `${error.message} while generating report`);

diff --git a/process/src/jobs/report/send.ts b/process/src/jobs/report/send.ts
@@ -50,7 +50,7 @@ const sendReport = async (report: Report) => {
   }
 };
 
-export const send = async (year: number, month: number) => {
+export const sendReports = async (year: number, month: number) => {
   const publishers = await PublisherModel.find({ automated_report: true });
   const users = await UserModel.find({});