fix for nextstatename check

bcgov · Nov 15, 2023 · 3718696 · 3718696
1 parent 9961af5
commit 3718696
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/request-management-api/request_api/services/requestservice.py b/request-management-api/request_api/services/requestservice.py
@@ -62,9 +62,15 @@ def saverequest(
         )
 
     def saverequestversion(self, foirequestschema, foirequestid, ministryid, userid):
-        nextstatename = FOIRequestStatus.getrequeststatusname(
+        nextstate = FOIRequestStatus.getrequeststatusname(
             foirequestschema["requeststatusid"]
         )
+        nextstatename = (
+            nextstate.get("name")
+            if isinstance(nextstatename, dict)
+            and nextstatename.get("name") not in (None, "")
+            else ""
+        )
         rev_foirequestschema = self.updateduedate(
             foirequestid,
             ministryid,
@@ -280,9 +286,8 @@ def __skipduedatecalculation(
         if (
             currentstatus not in (None, "")
             and currentstatus == StateName.onhold.value
-            and isinstance(nextstatename, dict)
-            and nextstatename.get("name") not in (None, "")
-            and currentstatus == nextstatename.get("name")
+            and nextstatename not in (None, "")
+            and currentstatus == nextstatename
         ):
             return True
         if previousoffholddate not in (None, ""):