Merge pull request #93 from IntersectMBO/qa

From Qa to Pre prod
IntersectMBO · Feb 5, 2025 · 8528268 · 8528268
2 parents 333ab8d + 7972734
commit 8528268
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/.github/workflows/publish-to-npm.yaml b/.github/workflows/publish-to-npm.yaml
@@ -22,12 +22,25 @@ jobs:
           registry-url: "https://registry.npmjs.org"
           scope: "@intersect.mbo"
 
+      - name: Authenticate with Scoped NPM
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          registry-url: "https://registry.npmjs.org"
+          scope: "@intersect.mbo"
+        run: |
+          npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN
+          npm config set scope "@intersect.mbo"
+          npm whoami
+
+      - name: Check NPM Authentication
+        run: npm whoami
+
       - name: Install dependencies
         run: npm ci
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_OPTIONS: --max_old_space_size=8192
 
       - name: Publish to npm
-        run: npm publish
+        run: npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_OPTIONS: --max_old_space_size=8192
diff --git a/backend/src/api/proposal/controllers/proposal.js b/backend/src/api/proposal/controllers/proposal.js
@@ -20,8 +20,8 @@ module.exports = createCoreController(
   "api::proposal.proposal",
   ({ strapi }) => ({
     async find(ctx) {
-      const sanitizedQueryParams = ctx.query
-
+
+      const sanitizedQueryParams = ctx.query;
       if (!sanitizedQueryParams.filters) {
         sanitizedQueryParams.filters = {};
       }
@@ -31,10 +31,11 @@ module.exports = createCoreController(
       }
 
       /////GOV ACTION TYPE///////////
+
       const hasGovActionTypeIDFilter = sanitizedQueryParams.filters["$and"]?.find(
         (elem) => elem?.hasOwnProperty("gov_action_type_id")
       );
-
+      
       if (hasGovActionTypeIDFilter) {
         const hasGovActionTypeIDFilterInSanitize =
           sanitizedQueryParams?.filters["$and"]?.some((elem) =>
@@ -47,7 +48,6 @@ module.exports = createCoreController(
         }
       }
       //////////////////////////
-
       /////PROPOSAL NAME///////////
       const hasPropNameFilter = ctx?.query?.filters["$and"]?.find((elem) =>
         elem?.hasOwnProperty("prop_name")
@@ -64,7 +64,6 @@ module.exports = createCoreController(
         }
       }
       //////////////////////////////
-
       /////PROPOSAL SUBMITTED///////////
       const hasPropSubmitedFilter = ctx?.query?.filters["$and"]?.find((elem) =>
         elem?.hasOwnProperty("prop_submitted")
@@ -96,7 +95,6 @@ module.exports = createCoreController(
         }
       }
       //////////////////////////////
-
       /////PROPOSAL ID///////////
       const hasPropIdFilter = ctx?.query?.filters["$and"]?.find((elem) =>
         elem?.hasOwnProperty("prop_id")
@@ -122,17 +120,14 @@ module.exports = createCoreController(
         });
       }
       //////////////////////////////
-
       /////IS DRAFT///////////
       const hasIsDraftFilter = ctx?.query?.filters["$and"]?.find((elem) =>
         elem?.hasOwnProperty("is_draft")
       );
-
       if (hasIsDraftFilter) {
-        if (!ctx?.state?.user) {
-          return ctx.badRequest(null, "User is required");
-        }
-
+         if (!ctx?.state?.user) {
+           return ctx.badRequest(null, "User is required");
+         }
         const hasIsDraftFilterInSanitize = sanitizedQueryParams?.filters[
           "$and"
         ]?.some((elem) => elem?.hasOwnProperty("is_draft"));
@@ -142,6 +137,14 @@ module.exports = createCoreController(
             user_id: ctx?.state?.user?.id,
           });
         }
+        const hasUserFilterInSanitize = sanitizedQueryParams?.filters[
+          "$and"
+        ]?.some((elem) => elem?.hasOwnProperty("user_id"));
+        if(!hasUserFilterInSanitize){
+          sanitizedQueryParams.filters["$and"].push({
+            user_id: ctx?.state?.user?.id,
+          })
+        };
       } else {
         sanitizedQueryParams.filters["$and"].push({
           is_draft: false,
@@ -176,7 +179,7 @@ module.exports = createCoreController(
         proposal.content = transformedProposalContent?.data;
         proposalsList.push(proposal);
       }
-
+console.log(JSON.stringify(sanitizedQueryParams), "params");
       return this.transformResponse(proposalsList, { pagination });
     },
     async findOne(ctx) {