fix: cronjob notification architecture refactoring

SocialGouv · Dec 2, 2024 · b318049 · b318049
1 parent 7969c21
commit b318049
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 23 deletions.
diff --git a/.kontinuous/env/preprod/templates/notification.cronjob.yaml b/.kontinuous/env/preprod/templates/notification.cronjob.yaml
@@ -17,7 +17,7 @@ spec:
           containers:
             - name: notification
               image: "{{ or .Values.registry .Values.global.registry }}/{{ .Values.global.imageProject }}/{{ .Values.global.imageRepository }}/app:{{ .Values.global.imageTag }}"
-              command: ["yarn", "cron-job"]
+              command: ["yarn", "cron-job-notifications"]
               resources:
                 requests:
                   cpu: 200m

diff --git a/webapp/CHANGELOG.md b/webapp/CHANGELOG.md
@@ -1,16 +1,14 @@
 # [0.72.0](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.71.3...v0.72.0) (2024-11-29)
 
-
 ### Features
 
-* obiz hook article update integration ([b56c08a](https://github.com/SocialGouv/carte-jeune-engage/commit/b56c08a36b575a16846854ab883212e859dd4474))
+- obiz hook article update integration ([b56c08a](https://github.com/SocialGouv/carte-jeune-engage/commit/b56c08a36b575a16846854ab883212e859dd4474))
 
 ## [0.71.3](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.71.2...v0.71.3) (2024-11-29)
 
-
 ### Bug Fixes
 
-* obiz JSON interpretation ([95525e7](https://github.com/SocialGouv/carte-jeune-engage/commit/95525e741c323dc40a4d7e783eb8bafbf1b44a65))
+- obiz JSON interpretation ([95525e7](https://github.com/SocialGouv/carte-jeune-engage/commit/95525e741c323dc40a4d7e783eb8bafbf1b44a65))
 
 ## [0.71.2](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.71.1...v0.71.2) (2024-11-29)
 

diff --git a/webapp/package.json b/webapp/package.json
@@ -9,7 +9,7 @@
     "seed:dev": "PAYLOAD_DROP_DATABASE=true tsx ./src/payload/seed/index.ts",
     "seed:prod": "tsx ./src/payload/seed/index.ts",
     "seed:forms": "tsx ./src/payload/seed/forms/index.ts",
-    "cron-job": "tsx ./src/notifications/index.ts",
+    "cron-job-notifications": "tsx ./src/cronjobs/notifications/index.ts",
     "payload": "PAYLOAD_CONFIG_PATH=./src/payload/payload.config.ts payload",
     "format": "prettier --write .",
     "lint": "next lint"

diff --git a/webapp/src/notifications/index.ts → webapp/src/cronjobs/notifications/index.ts b/webapp/src/notifications/index.ts → webapp/src/cronjobs/notifications/index.ts
diff --git a/...pp/src/notifications/newOfferAvailable.ts → ...onjobs/notifications/newOfferAvailable.ts b/...pp/src/notifications/newOfferAvailable.ts → ...onjobs/notifications/newOfferAvailable.ts
@@ -1,7 +1,7 @@
-import { OfferIncluded } from "../server/api/routers/offer";
-import { getPayloadClient } from "../payload/payloadClient";
-import { sendPushNotification } from "../utils/sendPushNotification";
-import { getBaseUrl } from "../utils/tools";
+import { OfferIncluded } from "../../server/api/routers/offer";
+import { getPayloadClient } from "../../payload/payloadClient";
+import { sendPushNotification } from "../../utils/sendPushNotification";
+import { getBaseUrl } from "../../utils/tools";
 
 const slug = "new-offer-available";
 

diff --git a/webapp/src/notifications/reminderAuchan.ts → .../cronjobs/notifications/reminderAuchan.ts b/webapp/src/notifications/reminderAuchan.ts → .../cronjobs/notifications/reminderAuchan.ts
@@ -2,10 +2,10 @@ import {
   getBaseUrl,
   isNbOfDaysToEndOfTheMonth,
   payloadWhereOfferIsValid,
-} from "../utils/tools";
-import { getPayloadClient } from "../payload/payloadClient";
-import { sendPushNotification } from "../utils/sendPushNotification";
-import { Offer } from "../payload/payload-types";
+} from "../../utils/tools";
+import { getPayloadClient } from "../../payload/payloadClient";
+import { sendPushNotification } from "../../utils/sendPushNotification";
+import { Offer } from "../../payload/payload-types";
 
 const slug = "reminder-auchan";
 

diff --git a/...c/notifications/reminderOfferActivated.ts → ...s/notifications/reminderOfferActivated.ts b/...c/notifications/reminderOfferActivated.ts → ...s/notifications/reminderOfferActivated.ts
@@ -1,7 +1,7 @@
-import { CouponIncluded } from "../server/api/routers/coupon";
-import { getPayloadClient } from "../payload/payloadClient";
-import { sendPushNotification } from "../utils/sendPushNotification";
-import { getBaseUrl, dateDiffInDays } from "../utils/tools";
+import { CouponIncluded } from "../../server/api/routers/coupon";
+import { getPayloadClient } from "../../payload/payloadClient";
+import { sendPushNotification } from "../../utils/sendPushNotification";
+import { getBaseUrl, dateDiffInDays } from "../../utils/tools";
 
 const slug = "reminder-offer-activated";
 

diff --git a/...fications/reminderOfferUserPreferences.ts → ...fications/reminderOfferUserPreferences.ts b/...fications/reminderOfferUserPreferences.ts → ...fications/reminderOfferUserPreferences.ts
@@ -1,7 +1,7 @@
-import { OfferIncluded } from "../server/api/routers/offer";
-import { getPayloadClient } from "../payload/payloadClient";
-import { sendPushNotification } from "../utils/sendPushNotification";
-import { getBaseUrl, payloadWhereOfferIsValid } from "../utils/tools";
+import { OfferIncluded } from "../../server/api/routers/offer";
+import { getPayloadClient } from "../../payload/payloadClient";
+import { sendPushNotification } from "../../utils/sendPushNotification";
+import { getBaseUrl, payloadWhereOfferIsValid } from "../../utils/tools";
 
 const slug = "reminder-offer-user-preferences";
 

diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json
@@ -33,7 +33,7 @@
     "**/*.tsx",
     "**/*.cjs",
     ".next/types/**/*.ts",
-    "src/notifications/re"
+    "src/cronjobs/notifications/re"
   ],
   "exclude": ["node_modules", "public/sw.js"]
 }