Compare commits

...

7 Commits
demo ... main

Author SHA1 Message Date
Sosthene
d7907420fe Force build for prd
All checks were successful
Prod - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 3m4s
Prod - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Prod - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-08-03 23:06:57 +02:00
Sosthene
b8935b32ab Merge branch 'preprod'
All checks were successful
Prod - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 17s
Prod - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Prod - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-08-03 22:19:08 +02:00
Sosthene
000ed8b4b6 Merge branch 'staging' into preprod
All checks were successful
Preprod - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 17s
Preprod - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Preprod - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-08-03 22:17:38 +02:00
Sosthene
f4645fc14a Merge branch 'legacy_dev' into staging
All checks were successful
Staging - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 23s
Staging - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Staging - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-08-03 22:16:42 +02:00
Sosthene
7f52b2c5af [fix] Don't overwrite existing rules if admin is not subscribed
All checks were successful
Test - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 1m55s
Test - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 4s
Test - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-08-03 22:14:27 +02:00
Sosthene
473d055777 Merge branch 'staging' into preprod
All checks were successful
Preprod - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 18s
Preprod - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Preprod - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 7s
2025-07-30 16:16:33 +02:00
Sosthene
30e05b353d Merge branch 'legacy_dev' into staging
All checks were successful
Staging - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 18s
Staging - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 4s
Staging - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-07-30 15:41:32 +02:00
2 changed files with 7 additions and 3 deletions

View File

@ -35,7 +35,7 @@ jobs:
password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
- name: Build the Back Image
run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
run: docker build --no-cache . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
- name: Push the Back Image to Scaleway Container Registry
run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
- name: Build the Cron Image

View File

@ -112,7 +112,9 @@ export default class UserController extends ApiController {
});
if (!manageSubscriptionRules[0]) return;
payload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
// Merge subscription rules with existing rules instead of replacing them
const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
payload.rules = [...new Set([...payload.rules, ...subscriptionRules])];
isSubscribed = true;
}
@ -173,7 +175,9 @@ export default class UserController extends ApiController {
});
if (!manageSubscriptionRules[0]) return;
newUserPayload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
// Merge subscription rules with existing rules instead of replacing them
const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || [];
newUserPayload.rules = [...new Set([...newUserPayload.rules, ...subscriptionRules])];
isSubscribed = true;
}