Merge pull request #3501 from bcgov/NDT-483-GCPE-report-does-not-incl…

…ude-all-projects-for-CCBC fix: filtering for ccbc gcpe report
bcgov · Aug 27, 2024 · 521367d · 521367d
2 parents 572b335 + 1ff409b
commit 521367d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.186.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.186.0...v1.186.1) (2024-08-27)
+
+### Bug Fixes
+
+- analyst status to show in report correctly ([657bf9f](https://github.com/bcgov/CONN-CCBC-portal/commit/657bf9fc1818644ec2c8d409d8283bfa86b8aa2a))
+- filtering for ccbc gcpe report ([dcd2b52](https://github.com/bcgov/CONN-CCBC-portal/commit/dcd2b52ea8f43a82a259cdbfa76cd7e87d05e03e))
+
 # [1.186.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.185.0...v1.186.0) (2024-08-27)
 
 ### Bug Fixes

diff --git a/app/backend/lib/reporting/gcpe.ts b/app/backend/lib/reporting/gcpe.ts
@@ -33,7 +33,7 @@ const getCbcDataQuery = `
 const getCcbcQuery = `
     query getCcbc {
       allApplications(
-        filter: {status: {in: ["conditionally_approved", "approved", "on_hold", "closed", "recommendation", "complete"]}}
+        filter: {analystStatus: {in: ["conditionally_approved", "approved", "on_hold", "closed", "recommendation", "complete"]}}
       ) {
         edges {
           node {
@@ -119,6 +119,7 @@ const getCcbcQuery = `
             package
             projectName
             status
+            analystStatus
             intakeNumber
             organizationName
           }
@@ -337,7 +338,7 @@ const generateExcelData = async (
       // federal funding source
       { value: 'ISED-UBF Core' },
       // status
-      { value: convertStatus(node?.status) },
+      { value: convertStatus(node?.analystStatus) },
       // project milestone complete percent
       {
         value:

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -648,3 +648,4 @@ tables/cbc_add_fk_update_constraint 2024-07-11T20:32:11Z Rafael Solorzano <61289
 @1.185.0 2024-08-26T22:26:30Z CCBC Service Account <[email protected]> # release v1.185.0
 mutations/edit_cbc_project_communities 2024-08-21T15:16:56Z Anthony Bushara <[email protected]> # Add and delete project communities to a cbc project
 @1.186.0 2024-08-27T20:55:46Z CCBC Service Account <[email protected]> # release v1.186.0
+@1.186.1 2024-08-27T22:52:17Z CCBC Service Account <[email protected]> # release v1.186.1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.186.0",
+  "version": "1.186.1",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <[email protected]>",