fix: sync goals on calendar load

SocialGouv · May 7, 2024 · 53c1732 · 53c1732
1 parent 539427f
commit 53c1732
Show file tree

Hide file tree

Showing 7 changed files with 258 additions and 29 deletions.
diff --git a/api/package.json b/api/package.json
@@ -9,6 +9,7 @@
     "sync-goals-badges": "cross-env NODE_ENV=development && node ./src/scripts/sync-goal-badges.js ",
     "sync-goals-drinks": "cross-env NODE_ENV=development && node ./src/scripts/sync-drinks-badges.js ",
     "sync-goals": "cross-env NODE_ENV=development && node ./src/scripts/sync-goals.js ",
+    "sync-goal": "cross-env NODE_ENV=development && node ./src/scripts/sync-goal.js ",
     "dev-cron": "nodemon ./src/cronjobs.js ",
     "create-migration": "cross-env NODE_ENV=development npx prisma migrate dev --name",
     "start": "NODE_ENV=production npx prisma migrate deploy && NODE_ENV=production node ./src/server.js",

diff --git a/api/src/controllers/consommation.js b/api/src/controllers/consommation.js
@@ -4,8 +4,8 @@ const { catchErrors } = require("../middlewares/errors");
 const router = express.Router();
 const prisma = require("../prisma");
 const { getBadgeCatalog } = require("../utils/badges");
-const { syncBadgesWithGoals } = require("../utils/goals");
-const { checksConsecutiveDays, syncBadgesWithConsos } = require("../utils/drinks");
+const { syncGoalsWithConsos } = require("../utils/goals");
+const { checksConsecutiveDays, syncDrinkBadgesWithConsos } = require("../utils/drinks");
 
 router.post(
   "/init",
@@ -68,7 +68,7 @@ router.post(
       skipDuplicates: true,
     });
 
-    await syncBadgesWithConsos(matomoId);
+    await syncDrinkBadgesWithConsos(matomoId);
 
     return res.status(200).send({ ok: true });
   })
@@ -104,20 +104,21 @@ router.post(
         await prisma.consommation.delete({ where: { id: conso_id } });
       }
     } else {
-      await prisma.consommation.upsert({
+      const consoDB = await prisma.consommation.upsert({
         where: { id: conso_id },
         update: conso,
         create: { ...conso, id: conso_id },
       });
+      console.log("conso upserted", consoDB._id);
     }
 
     /* 2. SIDE EFFECTS */
 
     // note: the `date` can be ANY date, not just today,
     // because the user can update a conso from any date
-    await syncBadgesWithGoals(matomoId, date);
+    await syncGoalsWithConsos(matomoId, date);
 
-    const drinksBadgeToShow = await syncBadgesWithConsos(matomoId);
+    const drinksBadgeToShow = await syncDrinkBadgesWithConsos(matomoId);
 
     if (drinksBadgeToShow) {
       const allBadges = await prisma.badge.findMany({ where: { userId: user.id } });

diff --git a/api/src/controllers/goal.js b/api/src/controllers/goal.js
@@ -4,6 +4,7 @@ const dayjs = require("dayjs");
 const prisma = require("../prisma");
 const { grabBadgeFromCatalog, getBadgeCatalog } = require("../utils/badges");
 const { GoalStatus } = require("@prisma/client");
+const { syncAllGoalsWithConsos, syncBadgesWithGoals } = require("../utils/goals");
 const router = express.Router();
 
 router.post(
@@ -117,24 +118,33 @@ router.get(
     });
 
     if (user.goal_isSetup) {
+      let currentGoal = {
+        id: `${user.id}_${dayjs().startOf("week").format("YYYY-MM-DD")}`,
+        userId: user.id,
+        date: dayjs().startOf("week").format("YYYY-MM-DD"),
+        daysWithGoalNoDrink: user.goal_daysWithGoalNoDrink,
+        dosesByDrinkingDay: user.goal_dosesByDrinkingDay,
+        dosesPerWeek: user.goal_dosesPerWeek,
+        status: GoalStatus.InProgress,
+      };
       // if pas de goal pour cette semaine, on le crée
-      const thisWeekGoal = await prisma.goal.findFirst({
-        where: { userId: user.id, date: dayjs().startOf("week").format("YYYY-MM-DD") },
+      let thisWeekGoal = await prisma.goal.findFirst({
+        where: { id: currentGoal.id },
       });
       if (!thisWeekGoal) {
-        await prisma.goal.create({
-          data: {
-            id: `${user.id}_${dayjs().startOf("week").format("YYYY-MM-DD")}`,
-            userId: user.id,
-            date: dayjs().startOf("week").format("YYYY-MM-DD"),
-            daysWithGoalNoDrink: user.goal_daysWithGoalNoDrink,
-            dosesByDrinkingDay: user.goal_dosesByDrinkingDay,
-            dosesPerWeek: user.goal_dosesPerWeek,
-            status: GoalStatus.InProgress,
-          },
+        thisWeekGoal = await prisma.goal.upsert({
+          where: { id: currentGoal.id },
+          create: currentGoal,
+          data: currentGoal,
         });
       }
     }
+
+    await syncAllGoalsWithConsos(matomoId, true);
+
+    // TODO: uncomment this line when the notifications for goals sync is sent
+    // await syncBadgesWithGoals(matomoId, true);
+
     const goals = await prisma.goal.findMany({
       where: { userId: user.id },
       orderBy: { date: "desc" },

diff --git a/api/src/scripts/sync-goal.js b/api/src/scripts/sync-goal.js
@@ -0,0 +1,7 @@
+require("dotenv").config({ path: "./.env" });
+
+const dayjs = require("dayjs");
+const prisma = require("../prisma");
+const { syncAllGoalsWithConsos } = require("../utils/goals");
+
+syncAllGoalsWithConsos("any matomo id", true, true);
diff --git a/api/src/scripts/sync-goals.js b/api/src/scripts/sync-goals.js
@@ -20,8 +20,8 @@ async function syncBadges(fixGoals = false, debug = false) {
         orderBy: { date: "desc" },
       },
     },
-    take: 1000,
-    skip: 1100,
+    take: 100,
+    // skip: 1100,
   });
   console.log("USERS", users.length);
   let usersWithFuckedUpGoals = {};
@@ -65,7 +65,7 @@ async function syncBadges(fixGoals = false, debug = false) {
     }
     usersWithMoreOrLessSuccessThanExpected[user.matomo_id] = 0;
     for (const [startOfWeek, weekConsos] of Object.entries(startOfWeeksForDrinks)) {
-      if (debug) console.log("CHECKING GOAL", user.id, startOfWeek, oldestGoalDate);
+      // if (debug) console.log("CHECKING GOAL", user.id, startOfWeek, oldestGoalDate);
       if (oldestGoalDate && startOfWeek < oldestGoalDate) {
         continue;
       }
@@ -102,15 +102,15 @@ async function syncBadges(fixGoals = false, debug = false) {
       const goalCheck = await checkCurrentWeekGoal(goal, weekConsos);
 
       if (goal.status === "InProgress" && goalCheck.status === null && !goalCheck.weekIsFilledWithConsos) {
-        if (debug) console.log("GOAL IN PROGRESS", user.id, startOfWeek);
+        // if (debug) console.log("GOAL IN PROGRESS", user.id, startOfWeek);
         continue;
       }
       if (goal.status === "Failure" && goalCheck.status === "Failure") {
-        if (debug) console.log("GOAL FAILURE", user.id, startOfWeek);
+        // if (debug) console.log("GOAL FAILURE", user.id, startOfWeek);
         continue;
       }
       if (goal.status === "Success" && goalCheck.status === "Success") {
-        if (debug) console.log("GOAL SUCCESS", user.id, startOfWeek);
+        // if (debug) console.log("GOAL SUCCESS", user.id, startOfWeek);
         continue;
       }
       usersWithFuckedUpGoals[user.matomo_id] = true;
@@ -241,4 +241,4 @@ async function syncBadges(fixGoals = false, debug = false) {
   });
 }
 
-syncBadges(true, true);
+syncBadges(false, true);
diff --git a/api/src/utils/drinks.js b/api/src/utils/drinks.js
@@ -11,7 +11,7 @@ dayjs.extend(utc);
 dayjs.locale("fr");
 dayjs.extend(weekday);
 
-async function syncBadgesWithConsos(matomoId) {
+async function syncDrinkBadgesWithConsos(matomoId) {
   if (!matomoId) return null;
   const user = await prisma.user.findUnique({ where: { matomo_id: matomoId } });
   if (!user) return null;
@@ -234,7 +234,7 @@ function countMaxConsecutiveDays(allConsos) {
 }
 
 module.exports = {
-  syncBadgesWithConsos,
+  syncDrinkBadgesWithConsos,
   getBadgeCorrespondingToConsecutiveDays,
   getStarsCorrespondingToConsecutiveDays,
   countConsecutiveDays,