Merge branch 'staging' into preprod

src/app/api/idnot/UserController.ts

@@ -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;
 				}