Merge pull request #6061 from bcgov/release/FOIMOD-release22.3-to-main

Release 22.3: DEV <> MAIN (Observation Fixes)

Author: Aman-Hundal

forms-flow-web/src/components/FOI/FOIRequest/FOIRequestHeader/index.js

@@ -308,7 +308,7 @@ const FOIRequestHeader = React.memo(
                   fullWidth
                   required
                   disabled={disableHeaderInput}
-                  error={selectedAssignedTo.toLowerCase().includes("unassigned") || (requestDetails?.currentState?.toLowerCase() === StateEnum.unopened.name.toLowerCase() && requestDetails?.sourceOfSubmission === "onlineform" && requestDetails?.assignedGroup === "Intake Team")}
+                  error={selectedAssignedTo.toLowerCase().includes("unassigned")}
                 >
                   {menuItems}
                 </TextField>

forms-flow-web/src/components/FOI/FOIRequest/utils.js

@@ -392,7 +392,6 @@ export const checkValidationError = (
       !requiredRequestDescriptionValues.ispiiredacted) ||
     // !!validation.helperTextValue ||
     assignedToValue.toLowerCase().includes("unassigned") ||
-    (assignedToValue === "Intake Team|Intake Team" && currentrequestStatus.toLowerCase() === StateEnum.unopened.name.toLowerCase() && sourceOfSubmission === "onlineform") || 
     requiredRequestDetailsValues.requestType.toLowerCase().includes("select") ||
     requiredRequestDetailsValues.receivedMode
       .toLowerCase()

request-management-api/request_api/models/FOIRawRequests.py

@@ -78,14 +78,15 @@ def saverawrequest(cls, _requestrawdata, sourceofsubmission, ispiiredacted, user
         db.session.add(newrawrequest)
         if not axisrequestid:
             db.session.flush() # Force insert to generate PK, but do not commit yet
-            bcgovcode = _requestrawdata.get('selectedMinistries')[0].get('code')
-            programarea = ProgramArea.getprogramarea(bcgovcode)
-            iaocode = programarea['iaocode']
-            newaxisrequestid = cls.generaterequestid(newrawrequest.requestid, iaocode, newrawrequest.isconsultflag)
-            updated_rawdata = copy.deepcopy(_requestrawdata)
-            updated_rawdata["axisRequestId"] = newaxisrequestid
-            newrawrequest.axisrequestid = newaxisrequestid
-            newrawrequest.requestrawdata = updated_rawdata
+            bcgovcode = cls.getbcgovcodefromrawdata(_requestrawdata)
+            if bcgovcode:
+                programarea = ProgramArea.getprogramarea(bcgovcode)
+                iaocode = programarea['iaocode']
+                newaxisrequestid = cls.generaterequestid(newrawrequest.requestid, iaocode, newrawrequest.isconsultflag)
+                updated_rawdata = copy.deepcopy(_requestrawdata)
+                updated_rawdata["axisRequestId"] = newaxisrequestid
+                newrawrequest.axisrequestid = newaxisrequestid
+                newrawrequest.requestrawdata = updated_rawdata
         db.session.commit()               
         return DefaultMethodResult(True,'Request added',newrawrequest.requestid)
 
@@ -112,6 +113,16 @@ def saverawrequestversion(cls,_requestrawdata,requestid,assigneegroup,assignee,s
             linkedrequests = _requestrawdata["linkedRequests"] if 'linkedRequests' in _requestrawdata  else None 
             isconsultflag = _requestrawdata["isconsultflag"] if 'isconsultflag' in _requestrawdata  else False
 
+            if not axisrequestid:
+                bcgovcode = cls.getbcgovcodefromrawdata(_requestrawdata)
+                if bcgovcode:
+                    programarea = ProgramArea.getprogramarea(bcgovcode)
+                    iaocode = programarea['iaocode']
+                    axisrequestid = cls.generaterequestid(request.requestid, iaocode, isconsultflag)
+                    updated_rawdata = copy.deepcopy(_requestrawdata)
+                    updated_rawdata["axisRequestId"] = axisrequestid
+                    _requestrawdata = updated_rawdata
+
             _version = request.version+1           
             insertstmt =(
                 insert(FOIRawRequest).
@@ -1229,6 +1240,26 @@ def getpotentialactionedmatches(cls, request):
             db.session.close()
         return requests
 
+    @classmethod
+    def getbcgovcodefromrawdata(cls, requestrawdata: dict) -> str | None:
+        if not isinstance(requestrawdata, dict):
+            return None
+        # For onlineform submissions
+        # ministry = requestrawdata.get("ministry")
+        # if isinstance(ministry, dict):
+        #     selected = ministry.get("selectedMinistry")
+        #     if isinstance(selected, list) and selected:
+        #         code = selected[0].get("code")
+        #         if isinstance(code, str):
+        #             return code
+
+        selected = requestrawdata.get("selectedMinistries")
+        if isinstance(selected, list) and selected:
+            code = selected[0].get("code")
+            if isinstance(code, str):
+                return code
+        return None
+
 
 
 class FOIRawRequestSchema(ma.Schema):