Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
d7907420fe | ||
![]() |
b8935b32ab | ||
![]() |
000ed8b4b6 | ||
![]() |
f4645fc14a | ||
![]() |
7f52b2c5af | ||
![]() |
473d055777 | ||
![]() |
30e05b353d |
2
.github/workflows/prd.yml
vendored
2
.github/workflows/prd.yml
vendored
@ -35,7 +35,7 @@ jobs:
|
|||||||
password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
|
password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
|
||||||
registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
|
registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
|
||||||
- name: Build the Back Image
|
- 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
|
- name: Push the Back Image to Scaleway Container Registry
|
||||||
run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
|
run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
|
||||||
- name: Build the Cron Image
|
- name: Build the Cron Image
|
||||||
|
@ -112,7 +112,9 @@ export default class UserController extends ApiController {
|
|||||||
});
|
});
|
||||||
if (!manageSubscriptionRules[0]) return;
|
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;
|
isSubscribed = true;
|
||||||
}
|
}
|
||||||
@ -173,7 +175,9 @@ export default class UserController extends ApiController {
|
|||||||
});
|
});
|
||||||
if (!manageSubscriptionRules[0]) return;
|
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;
|
isSubscribed = true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user