Merge pull request #4628 from bcgov/dev-RQ-4606

#4606 - Prevent saving processing requests to raw request table
bcgov · Oct 25, 2023 · 478d14a · 478d14a
2 parents 39822db + 342aa26
commit 478d14a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/request-management-api/request_api/resources/request.py b/request-management-api/request_api/resources/request.py
@@ -94,7 +94,9 @@ def post(requestid=None, actiontype=None):
             assigneelastname = requestdata['assigneelastname']
 
             if int(requestid) and str(requestid) != "-1" :
-                status = rawrequestservice().getstatus(updaterequest)       
+                status = rawrequestservice().getstatus(updaterequest)
+                if status not in ['Intake in Progress', 'Closed', 'Redirect', 'Peer Review']:
+                    raise ValueError('Invalid request state.')
                 result = rawrequestservice().saverawrequestversion(updaterequest,requestid,assigneegroup,assignee,status,AuthHelper.getuserid(),assigneefirstname,assigneemiddlename,assigneelastname, actiontype)                
                 assignee = ''
                 if(actiontype == 'assignee'):
@@ -109,8 +111,8 @@ def post(requestid=None, actiontype=None):
                     assignee = getassignee(assigneefirstname,assigneelastname,assigneegroup)
                     asyncio.ensure_future(eventservice().postevent(result.identifier,"rawrequest",AuthHelper.getuserid(),AuthHelper.getusername(),AuthHelper.isministrymember(),assignee))
                     return {'status': result.success, 'message':result.message,'id':result.identifier} , 200                
-        except ValueError:
-            return {'status': 500, 'message':INVALID_REQUEST_ID}, 500    
+        except ValueError as valuexception:
+            return {'status': 500, 'message':str(valuexception)}, 500
         except BusinessException as exception:            
             return {'status': exception.status_code, 'message':exception.message}, 500