4nk/lecoffre-back
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into preprod
All checks were successful
Preprod - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 17s
Details
Preprod - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Details
Preprod - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
Details

Browse Source
This commit is contained in:
Sosthene 2025-08-03 22:17:38 +02:00
commit 000ed8b4b6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/api/idnot/UserController.ts
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;
}