Force build for prd

.github/workflows/demo.yml

@@ -1,114 +0,0 @@
-name: Demo - Build & Deploy to Scaleway
-
-on:
-  push:
-    branches: [demo]
-
-env:
-  PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
-  NAMESPACE_ID_LECOFFRE: c992c042-bdb6-4974-becf-aa5039b9ec58
-  CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffredemovts5gdxg
-
-  IMAGE_NAME: back
-  CONTAINER_NAME: back
-
-jobs:
-  build-and-push-images-lecoffre:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-      - name: Copy SSH
-        run: cp ~/.ssh/id_rsa id_rsa
-      - name: Login to Scaleway Container Registry
-        uses: docker/login-action@v3
-        with:
-          username: nologin
-          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 }}
-      - 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
-        run: docker build -f Dockerfile-Cron . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/cron
-      - name: Push the Cron Image to Scaleway Container Registry
-        run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/cron
-  deploy-back-lecoffre:
-    needs: build-and-push-images-lecoffre
-    runs-on: ubuntu-latest
-    environment: demo
-    steps:
-      - name: Install CLI
-        uses: scaleway/action-scw@v0
-      - name: Get container ID
-        run: |
-          echo "CONTAINER_ID=$(scw container container list namespace-id=${{ env.NAMESPACE_ID_LECOFFRE }} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
-        env:
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
-      - name: Deploy the container based on the new image
-        run: |
-            env_string=""
-            while IFS= read -r line; do
-              if [[ "$line" == *"="* ]]; then
-                key=$(echo "$line" | cut -d '=' -f 1)
-                value=$(echo "$line" | cut -d '=' -f 2-)
-                if [[ -n "$key" ]]; then
-                  env_string+="environment-variables.$key=$value "
-                fi
-              fi
-            done <<< "$ENV_VARS"
-            env_string=$(echo $env_string | sed 's/ $//')
-            scw container container update ${{ env.CONTAINER_ID }} $env_string
-        env:
-          ENV_VARS: ${{ secrets.ENV }}
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
-  deploy-cron-lecoffre:
-    needs: build-and-push-images-lecoffre
-    runs-on: ubuntu-latest
-    environment: demo
-    steps:
-      - name: Install CLI
-        uses: scaleway/action-scw@v0
-      - name: Get container ID
-        run: |
-          echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID_LECOFFRE}} -o json | jq -r '.[] | select(.name == "cron") | .id')" >> $GITHUB_ENV
-        env:
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
-      - name: Deploy the container based on the new image
-        run: |
-            env_string=""
-            while IFS= read -r line; do
-              if [[ "$line" == *"="* ]]; then
-                key=$(echo "$line" | cut -d '=' -f 1)
-                value=$(echo "$line" | cut -d '=' -f 2-)
-                if [[ -n "$key" ]]; then
-                  env_string+="environment-variables.$key=$value "
-                fi
-              fi
-            done <<< "$ENV_VARS"
-            env_string=$(echo $env_string | sed 's/ $//')
-            scw container container update ${{ env.CONTAINER_ID }} $env_string       
-        env:
-          ENV_VARS: ${{ secrets.ENV }}
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
-

.github/workflows/prd.yml

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

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

src/app/api/notary/OfficeFolderAnchorsController.ts

@@ -163,25 +163,21 @@ export default class OfficeFoldersController extends ApiController {
 
 			const officeFolderFound: any = await this.officeFoldersService.getByUid(uid, query);
 
-			console.log(officeFolderFound);
-
 			if (!officeFolderFound) {
 				this.httpNotFoundRequest(response, "Office folder not found");
 				return;
 			}
 
-			if (officeFolderFound.folder_anchor) {
+			const officeFolderAnchorFound = OfficeFolderAnchor.hydrate<OfficeFolderAnchor>(officeFolderFound.folder_anchor, {
-				const officeFolderAnchorFound = OfficeFolderAnchor.hydrate<OfficeFolderAnchor>(officeFolderFound.folder_anchor, {
+				strategy: "excludeAll",
-					strategy: "excludeAll",
+			});
-				});
 
-				if (officeFolderAnchorFound) {
+			if (officeFolderAnchorFound) {
-					this.httpBadRequest(response, {
+				this.httpBadRequest(response, {
-						error: "Office folder already anchored",
+					error: "Office folder already anchored",
-						folder_anchor: officeFolderAnchorFound,
+					folder_anchor: officeFolderAnchorFound,
-					});
+				});
-					return;
+				return;
-				}
 			}
 
 			const officeFolder = OfficeFolder.hydrate<OfficeFolder>(officeFolderFound, { strategy: "excludeAll" });