Test marshal merge to test 12.0

request-management-api/migrations/versions/3e8203b24730_create_operatingteamemails_table.py

@@ -32,8 +32,8 @@ def upgrade():
 
     op.execute('''INSERT INTO public."OperatingTeamEmails" (teamid, email_address)
                     VALUES
-                        ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Central and Economy Team'), 'IAOCentralTeam@gov.bc.ca'),
-                        ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Community and Health Team'), 'FOI.SocialEducationTeam@gov.bc.ca'),
+                        ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Central and Economy Team'), 'IAO.CentralAndEconomyTeam@gov.bc.ca'),
+                        ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Community and Health Team'), 'IAO.CommunityandHealthTeam@gov.bc.ca'),
                         ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Resource and Justice Team'), '[email protected]'),
                         ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Children and Family Team'), '[email protected]'),
                         ((SELECT teamid FROM public."OperatingTeams" WHERE name = 'Children and Education Team'), '[email protected]'),

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

@@ -49,11 +49,7 @@ def getapplicantcorrespondencesrawrequests(cls, requestid):
                         created_at, createdby, sentcorrespondencemessage, parentapplicantcorrespondenceid, sentby, sent_at,
                          isdraft, isdeleted, isresponse, response_at, israwrequest
                          from "FOIApplicantCorrespondencesRawRequests" rawcorr 
-                        where foirawrequest_id = (
-							SELECT foirawrequestid FROM public."FOIRequests"
-							WHERE foirequestid = :requestid
-							ORDER BY foirequestid ASC, version DESC limit 1)
-                            OR
+                        where 
                             foirawrequest_id = :requestid
                     order by applicantcorrespondenceid desc, version desc""" 
             rs = db.session.execute(text(sql), {'requestid': requestid})

request-management-api/request_api/resources/applicantcorrespondence.py

@@ -76,7 +76,10 @@ class FOIFlowApplicantCorrespondence(Resource):
     @auth.hasusertype('iao')
     def get(requestid, ministryrequestid):
         try:
-            rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
+            if ministryrequestid == 'None':
+                rawrequestid = requestid
+            else:
+                rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
             correspondencelogs = applicantcorrespondenceservice().getapplicantcorrespondencelogs(ministryrequestid, rawrequestid)
             return json.dumps(correspondencelogs) , 200
         except BusinessException:
@@ -90,13 +93,15 @@ def get(requestid, ministryrequestid):
     def post(requestid, ministryrequestid):
         try:
             requestjson = request.get_json()
-            applicantcorrespondencelog = FOIApplicantCorrespondenceSchema().load(data=requestjson) 
-            rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
-            result = communicationwrapperservice().send_email(rawrequestid, ministryrequestid, applicantcorrespondencelog)
-            return {'status': result.success, 'message':result.message,'id':result.identifier} , 200
+            applicantcorrespondencelog = FOIApplicantCorrespondenceSchema().load(data=requestjson)
+            if ministryrequestid == 'None':
+                rawrequestid = requestid
+            else:
+                rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
+            result = communicationwrapperservice().send_email(requestid, rawrequestid, ministryrequestid, applicantcorrespondencelog)
+            return {'status': result['success'], 'message': result['message'], 'id': result['identifier']}, 200
         except BusinessException:
-            return "Error happened while saving  applicant correspondence log" , 500 
-
+            return "Error happened while saving applicant correspondence log", 500
 
 
 @cors_preflight('POST,OPTIONS')
@@ -111,7 +116,10 @@ def post(requestid, ministryrequestid):
         try:
             requestjson = request.get_json()
             correspondenceschemaobj = FOIApplicantCorrespondenceSchema().load(data=requestjson)
-            rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
+            if ministryrequestid == 'None':
+                rawrequestid = requestid
+            else:
+                rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
             if ministryrequestid != 'None' or "israwrequest" in correspondenceschemaobj and correspondenceschemaobj["israwrequest"] == False:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(rawrequestid, ministryrequestid, correspondenceschemaobj, AuthHelper.getuserid(), True)
             elif ministryrequestid == 'None' or "israwrequest" in correspondenceschemaobj and correspondenceschemaobj["israwrequest"] == True:
@@ -132,7 +140,10 @@ class FOIFlowApplicantCorrespondenceDraft(Resource):
     def post(requestid, ministryrequestid):
         try:
             requestjson = request.get_json()
-            rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
+            if ministryrequestid == 'None':
+                rawrequestid = requestid
+            else:
+                rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
             applicantcorrespondencelog = FOIApplicantCorrespondenceSchema().load(data=requestjson) 
             if ministryrequestid == 'None' or "israwrequest" in applicantcorrespondencelog and applicantcorrespondencelog["israwrequest"] == True:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestid, applicantcorrespondencelog, AuthHelper.getuserid(), True)
@@ -154,12 +165,15 @@ class FOIFlowApplicantCorrespondenceDraft(Resource):
     def post(ministryrequestid, rawrequestid, correspondenceid):
         try:
             requestjson = request.get_json()
-            rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
+            if ministryrequestid == 'None':
+                rawrequestidforrequest = rawrequestid
+            else:
+                rawrequestidforrequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             if ministryrequestid == 'None' or "israwrequest" in requestjson and requestjson["israwrequest"] == True:
-                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidfromfoirequest, correspondenceid, AuthHelper.getuserid())
+                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidforrequest, correspondenceid, AuthHelper.getuserid())
                 return {'status': rawresult.success, 'message':rawresult.message,'id':rawresult.identifier} , 200
             else:
-                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidfromfoirequest, correspondenceid, AuthHelper.getuserid())
+                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidforrequest, correspondenceid, AuthHelper.getuserid())
                 ministryresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelogministry(ministryrequestid, correspondenceid, AuthHelper.getuserid())
             if rawresult.success == True and ministryresult.success == True:
                return {'status': ministryresult.success, 'message':ministryresult.message,'id':ministryresult.identifier} , 200      
@@ -178,9 +192,12 @@ class FOIFlowApplicantCorrespondenceEmail(Resource):
     def post(ministryrequestid, rawrequestid):
         try:
             requestjson = request.get_json()
-            rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
+            if ministryrequestid == 'None':
+                rawrequestidforrequest = rawrequestid
+            else:
+                rawrequestidforrequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             correspondenceemail = FOIApplicantCorrespondenceEmailSchema().load(data=requestjson) 
-            result = correspondenceemailservice().savecorrespondenceemail(ministryrequestid, rawrequestidfromfoirequest, correspondenceemail, AuthHelper.getuserid())
+            result = correspondenceemailservice().savecorrespondenceemail(ministryrequestid, rawrequestidforrequest, correspondenceemail, AuthHelper.getuserid())
 
             return {'status': result.success, 'message':result.message,'id':result.identifier} , 200      
         except BusinessException:
@@ -192,8 +209,11 @@ def post(ministryrequestid, rawrequestid):
     @auth.require
     def get(ministryrequestid, rawrequestid):
         try:
-            rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
-            correspondenceemails = correspondenceemailservice().getcorrespondenceemails(ministryrequestid, rawrequestidfromfoirequest)
+            if ministryrequestid == 'None':
+                rawrequestidforrequest = rawrequestid
+            else:
+                rawrequestidforrequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
+            correspondenceemails = correspondenceemailservice().getcorrespondenceemails(ministryrequestid, rawrequestidforrequest)
             return json.dumps(correspondenceemails) , 200
         except BusinessException:
             return "Unable to retrieve correspondence emails" , 500    
@@ -209,12 +229,15 @@ class FOIFlowApplicantCorrespondenceResponse(Resource):
     def post(ministryrequestid, rawrequestid):
         try:
             requestjson = request.get_json()
-            rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
+            if ministryrequestid == 'None':
+                rawrequestidforrequest = rawrequestid
+            else:
+                rawrequestidforrequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             correspondenceemail = FOIApplicantCorrespondenceResponseSchema().load(data=requestjson) 
             if ministryrequestid == 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == True:
-                result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestidfromfoirequest, correspondenceemail, AuthHelper.getuserid())
+                result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestidforrequest, correspondenceemail, AuthHelper.getuserid())
             else:
-                result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(rawrequestidfromfoirequest, ministryrequestid, correspondenceemail, AuthHelper.getuserid())
+                result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(rawrequestidforrequest, ministryrequestid, correspondenceemail, AuthHelper.getuserid())
 
             return {'status': result.success, 'message':result.message,'id':result.identifier} , 200      
         except BusinessException:
@@ -231,11 +254,14 @@ class FOIFlowApplicantCorrespondenceEditResponse(Resource):
     @auth.require
     def post(ministryrequestid, rawrequestid):
         try:
-            rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
+            if ministryrequestid == 'None':
+                rawrequestidforrequest = rawrequestid
+            else:
+                rawrequestidforrequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             requestjson = request.get_json()
             correspondenceemail = FOIApplicantCorrespondenceEditResponseSchema().load(data=requestjson) 
             if ministryrequestid == 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == True:
-                result = applicantcorrespondenceservice().editapplicantcorrespondencelogforrawrequest(rawrequestidfromfoirequest, correspondenceemail, AuthHelper.getuserid())
+                result = applicantcorrespondenceservice().editapplicantcorrespondencelogforrawrequest(rawrequestidforrequest, correspondenceemail, AuthHelper.getuserid())
             elif ministryrequestid != 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == False:
                 result = applicantcorrespondenceservice().editapplicantcorrespondencelogforministry(ministryrequestid, correspondenceemail, AuthHelper.getuserid())
 
@@ -254,12 +280,15 @@ class FOIFlowApplicantCorrespondenceResponse(Resource):
     def post(ministryrequestid, rawrequestid, correspondenceid):
         try:
             requestjson = request.get_json()
-            rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
+            if ministryrequestid == 'None':
+                rawrequestidforrequest = rawrequestid
+            else:
+                rawrequestidforrequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             if ministryrequestid == 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == True:
-                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidfromfoirequest, correspondenceid, AuthHelper.getuserid())
+                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidforrequest, correspondenceid, AuthHelper.getuserid())
                 return {'status': rawresult.success, 'message':rawresult.message,'id':rawresult.identifier} , 200
             else:
-                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidfromfoirequest, correspondenceid, AuthHelper.getuserid())
+                rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidforrequest, correspondenceid, AuthHelper.getuserid())
                 ministryresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelogministry(ministryrequestid, correspondenceid, AuthHelper.getuserid())
             if rawresult.success == True and ministryresult.success == True:
                return {'status': ministryresult.success, 'message':ministryresult.message,'id':ministryresult.identifier} , 200   

request-management-api/request_api/services/applicantcorrespondence/applicantcorrespondencelog.py

@@ -28,7 +28,8 @@ def gettemplatebyid(self, templateid):
         """ Returns the active applicant correspondence templates
         """
         return ApplicationCorrespondenceTemplate.get_template_by_id(templateid)
-
+
+
     def getapplicantcorrespondencelogs(self,ministryrequestid, rawrequestid):
         """ Returns the active applicant correspondence logs
         """

request-management-api/request_api/services/communicationwrapperservice.py

@@ -16,43 +16,44 @@
 
 class communicationwrapperservice:
     """ FOI communication wrapper service
-
     """
-
-    def send_email(self,requestid, ministryrequestid, applicantcorrespondencelog):
+
+    def send_email(self, requestid, rawrequestid, ministryrequestid, applicantcorrespondencelog):
+        # Save correspondence log based on request type
         if ministryrequestid == 'None' or ministryrequestid is None or ("israwrequest" in applicantcorrespondencelog and applicantcorrespondencelog["israwrequest"]) is True:
-            result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(requestid, applicantcorrespondencelog, AuthHelper.getuserid())
+            result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestid, applicantcorrespondencelog, AuthHelper.getuserid())
         else:
             result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(requestid, ministryrequestid, applicantcorrespondencelog, AuthHelper.getuserid())
+
         if result.success == True:
             # raw requests should never be fee emails so they would only get handled by else statement
-            if self.__is_fee_processing(applicantcorrespondencelog["templateid"]) == True:
-                return self.__handle_fee_email(requestid, ministryrequestid, applicantcorrespondencelog)
+            # Handle fee processing templates
+            if self.__is_fee_processing(applicantcorrespondencelog["templateid"]):
+                return self.__handle_fee_email(requestid, ministryrequestid, result, applicantcorrespondencelog)
+            # Handle non-fee templates - Send email for non-fee templates with email recipients
             else:
                 if "emails" in applicantcorrespondencelog and len(applicantcorrespondencelog["emails"]) > 0:
                     template = applicantcorrespondenceservice().gettemplatebyid(applicantcorrespondencelog["templateid"])
                     return communicationemailservice().send(template, applicantcorrespondencelog)
-                return result
-
 
 
-
-
-    def __handle_fee_email(self,requestid, ministryrequestid, applicantcorrespondencelog):
-        if cfrfeeservice().getactivepayment(requestid, ministryrequestid) != None:
+    def __handle_fee_email(self, requestid, ministryrequestid, result, applicantcorrespondencelog):
+        if cfrfeeservice().getactivepayment(requestid, ministryrequestid) is not None:
             requestservice().postfeeeventtoworkflow(requestid, ministryrequestid, "CANCELLED")
-            _attributes = applicantcorrespondencelog["attributes"][0] if "attributes" in applicantcorrespondencelog else None
-            _paymentexpirydate =  _attributes["paymentExpiryDate"] if _attributes is not None and "paymentExpiryDate" in _attributes else None
-            if _paymentexpirydate not in (None, ""):
-                paymentservice().createpayment(requestid, ministryrequestid, _attributes, AuthHelper.getuserid())
-        return requestservice().postcorrespondenceeventtoworkflow(requestid, ministryrequestid, result.identifier, applicantcorrespondencelog['attributes'], applicantcorrespondencelog['templateid'])
+        _attributes = applicantcorrespondencelog["attributes"][0] if "attributes" in applicantcorrespondencelog else None
+        _paymentexpirydate =  _attributes["paymentExpiryDate"] if _attributes is not None and "paymentExpiryDate" in _attributes else None
+        if _paymentexpirydate not in (None, ""):
+            paymentservice().createpayment(requestid, ministryrequestid, _attributes, AuthHelper.getuserid())            
+        requestservice().postcorrespondenceeventtoworkflow(requestid, ministryrequestid, result.identifier, applicantcorrespondencelog['attributes'], applicantcorrespondencelog['templateid'])
+        return {"success" : True, "message": "Sent successfully", "identifier": -1}  
+
 
     def __is_fee_processing(self, templateid):
-        if applicantcorrespondenceservice().gettemplatebyid(templateid) in ['PAYONLINE','PAYOUTSTANDING']:
+        if applicantcorrespondenceservice().gettemplatebyid(templateid).name in ['PAYONLINE','PAYOUTSTANDING']:
             return True
         return False
 
 class CommuniationType(Enum):
     """Communication types."""
     FEE_PROCESSING = 'FEE_PROCESSING'
-    GENERAL = 'GENERAL'        
+    GENERAL = 'GENERAL'