Merge branch 'test-marshal' into dev-marshal

bcgov · May 10, 2024 · 4e8b946 · 4e8b946
2 parents afad6ea + 2fc26d6
commit 4e8b946
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/forms-flow-web/src/components/FOI/Dashboard/utils.js b/forms-flow-web/src/components/FOI/Dashboard/utils.js
@@ -5,6 +5,7 @@ import {
   calculateDaysRemaining,
 } from "../../../helper/FOI/helper";
 import { StateEnum } from "../../../constants/FOI/statusEnum";
+import { MinistryNeedsLANPages, RequestTypes } from "../../../constants/FOI/enum";
 import Chip from "@mui/material/Chip";
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faFlag } from '@fortawesome/free-solid-svg-icons'; 
@@ -295,12 +296,14 @@ export const pagecountcellTooltipRender = (params) => {
   const recordspagecount = params.row.recordspagecount;
   const requestpagecount = params.row.requestpagecount;
   const lanpagecount = params.row.axislanpagecount;
+  const bcgovcode = params.row.bcgovcode;
+  const requestType = params.row.requestType;
   let toolTipText = "";
   if (requestpagecount > 0 || lanpagecount > 0) {
     if (requestpagecount > 0) {
       toolTipText += `AXIS pages: ${axispagecount} \n Mod pages: ${recordspagecount} \n`;
     }
-    if (lanpagecount > 0) {
+    if (MinistryNeedsLANPages.includes(bcgovcode?.toUpperCase()) && requestType?.toLowerCase() === RequestTypes.personal) {
       toolTipText += `LAN pages: ${lanpagecount} \n`;
     }
   }

diff --git a/forms-flow-web/src/constants/FOI/enum.js b/forms-flow-web/src/constants/FOI/enum.js
@@ -162,6 +162,16 @@ const MinistryNeedsScanning = [
   "MSD"
 ]
 
+const MinistryNeedsLANPages = [
+  "CFD",
+  "MCF"
+]
+
+const RequestTypes = Object.freeze({
+  general: "general",
+  personal: "personal"
+});
+
 const MCFPopularSections = 23
 const MSDPopularSections = 11
 
@@ -206,4 +216,6 @@ MSDPopularSections,
 RecordsDownloadList,
 RecordDownloadCategory,
 RecordDownloadStatus,
+MinistryNeedsLANPages,
+RequestTypes
 };
diff --git a/...job/syncaxispagedetails/restart-pods.yaml → ...tes/cronjob/restartpods/restart-pods.yaml b/...job/syncaxispagedetails/restart-pods.yaml → ...tes/cronjob/restartpods/restart-pods.yaml
diff --git a/request-management-api/request_api/schemas/foiaxissync.py b/request-management-api/request_api/schemas/foiaxissync.py
@@ -7,7 +7,7 @@ class Meta:  # pylint: disable=too-few-public-methods
         """Exclude unknown fields in the deserialized output."""
 
         unknown = EXCLUDE    
-    bcgovcode = fields.Str(data_key="bcgovcode",allow_none=False) 
+    iaocode = fields.Str(data_key="iaocode",allow_none=False) 
     requesttype = fields.Str(data_key="requesttype",allow_none=False)     
 
 class FOIRequestAxisSyncSchema(Schema):

diff --git a/request-management-api/request_api/services/external/axissyncservice.py b/request-management-api/request_api/services/external/axissyncservice.py
@@ -17,11 +17,11 @@ class axissyncservice:
 
     def syncpagecounts(self, axispgmrequests): 
         for entry in axispgmrequests:
-            self.__syncpagecounts(entry["bcgovcode"], entry["requesttype"])
+            self.__syncpagecounts(entry["iaocode"], entry["requesttype"])
         return DefaultMethodResult(True,'Batch execution completed', axispgmrequests)
 
-    def __syncpagecounts(self, bcgovcode, requesttype):
-        programeara = programareaservice().getprogramareabyiaocode(bcgovcode)
+    def __syncpagecounts(self, iaocode, requesttype):
+        programeara = programareaservice().getprogramareabyiaocode(iaocode)
         requests = FOIMinistryRequest.getrequest_by_pgmarea_type(programeara['programareaid'], requesttype)
         for batch in list(more_itertools.batched(requests, self.AXIS_SYNC_BATCHSIZE)):
             batchrequest = list(batch)
@@ -35,7 +35,7 @@ def __syncpagecounts(self, bcgovcode, requesttype):
                     print("batch update failed for ids=", axisids)
             else:
                 print("axis page response is empty for ids=", axisids) 
-        return DefaultMethodResult(True,'Batch execution completed for bcgovcode=%s | requesttype=%s', bcgovcode, requesttype)       
+        return DefaultMethodResult(True,'Batch execution completed for iaocode=%s | requesttype=%s', iaocode, requesttype)       
 
 
     def axis_getpageinfo(self, axis_payload):
@@ -65,8 +65,8 @@ def updatepagecount(self, requests, axisresponse):
             axisrequestid = entry["axisrequestid"]
             entry["updatedby"] = 'System'
             entry["updated_at"] = datetime2.now()
-            entry["axispagecount"] = axisresponse[axisrequestid] if axisrequestid in axisresponse else entry["axispagecount"]
-            entry["axislanpagecount"] = axisresponse[axisrequestid] if axisrequestid in axisresponse else entry["axislanpagecount"]
+            entry["axispagecount"] = axisresponse[axisrequestid]["requestpagepount"] if axisrequestid in axisresponse else entry["axispagecount"]
+            entry["axislanpagecount"] = axisresponse[axisrequestid]["lanpagepount"] if axisrequestid in axisresponse else entry["axislanpagecount"]
         return requests