2981 - add israwrequest to differentiate raw and ministry correspondence

forms-flow-web/src/apiManager/services/FOI/foiCorrespondenceServices.js

@@ -160,6 +160,7 @@ export const editDraftCorrespondence = (
 
 export const deleteDraftCorrespondence = (
   correspondenceid,
+  israwrequest,
   ministryId,
   requestId,
   dispatch,
@@ -177,7 +178,7 @@ export const deleteDraftCorrespondence = (
 
   );
   apiUrl = replaceUrl(apiUrl,"<rawrequestid>",requestId);
-  httpPOSTRequest(apiUrl,{})
+  httpPOSTRequest(apiUrl,{israwrequest: israwrequest})
     .then((res) => {
       if (res.data) {
         if (callback) {
@@ -199,6 +200,7 @@ export const deleteDraftCorrespondence = (
 
 export const deleteResponseCorrespondence = (
   correspondenceid,
+  israwrequest,
   ministryId,
   requestId,
   dispatch,
@@ -216,7 +218,7 @@ export const deleteResponseCorrespondence = (
 
   );
   apiUrl = replaceUrl(apiUrl,"<rawrequestid>",requestId);
-  httpPOSTRequest(apiUrl,{})
+  httpPOSTRequest(apiUrl,{israwrequest: israwrequest})
     .then((res) => {
       if (res.data) {
         if (callback) {

forms-flow-web/src/components/FOI/customComponents/ContactApplicant/CommunicationStructure.jsx

@@ -239,7 +239,7 @@ const CommunicationStructure = ({correspondence, currentIndex,
       const { requestDetails, requestExtensions, responsePackagePdfStitchStatus, cfrFeeData } = templateVariableInfo
       let variables = getTemplateVariables(requestDetails,requestExtensions, responsePackagePdfStitchStatus, cfrFeeData, template)
       variables = variables.filter(variable => {
-        const includedVariables = ["{{firstName}}", "{{lastName}}"]
+        const includedVariables = ["{{firstName}}", "{{lastName}}", "{{address}}"]
         return includedVariables.includes(variable.name)
       })
       for (let variable of variables) {

forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx

@@ -87,7 +87,6 @@ export const ContactApplicant = ({
   const [confirmationFor, setConfirmationFor] = useState("");
   const [confirmationTitle, setConfirmationTitle] = useState("");
   const [confirmationMessage, setConfirmationMessage] = useState("");
-  const [draftCorrespondence, setDraftCorrespondence] = useState <any> ({});
   const [selectedCorrespondence, setSelectedCorrespondence] = useState <any> ({});
   const [currentResponseDate, setCurrentResponseDate] = useState <any> ("");
   const [extension, setExtension] = useState("");
@@ -114,7 +113,7 @@ export const ContactApplicant = ({
     setEditMode(false);
     setFiles([]);
     setEditorValue("");
-    setDraftCorrespondence({});
+    setSelectedCorrespondence({});
     setSelectedEmails([]);
     setCurrentTemplate(0);
 
@@ -137,7 +136,7 @@ export const ContactApplicant = ({
     setEditMode(false);
     setFiles([]);
     setEditorValue("");
-    setDraftCorrespondence({});
+    setSelectedCorrespondence({});
     setCorrespondenceId(null);
     setSelectedEmails([]);
     setCurrentTemplate(0);
@@ -146,7 +145,7 @@ export const ContactApplicant = ({
   const handleConfirmationClose = () => {     
     setConfirmationFor("");
     setConfirmationMessage("");
-    setDraftCorrespondence({});
+    setSelectedCorrespondence({});
     setOpenConfirmationModal(false);
   }
 
@@ -409,6 +408,7 @@ export const ContactApplicant = ({
     }
     const templateId = currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null;
     const type = (templateId && [1, 2].includes(templateId)) ? "CFRFee" : "";
+    let israwrequest = selectedCorrespondence.israwrequest || false;
     let data = {
       templateid: currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null,
       correspondenceid:correspondenceId,
@@ -424,7 +424,8 @@ export const ContactApplicant = ({
         "paymentExpiryDate": dueDateCalculation(new Date(), PAYMENT_EXPIRY_DAYS),
         "axisRequestId": requestNumber
       }],
-      assignedGroupEmail: requestDetails.assignedGroupEmail
+      assignedGroupEmail: requestDetails.assignedGroupEmail,
+      israwrequest: israwrequest
     };
     saveEmailCorrespondence(
       data,
@@ -464,6 +465,7 @@ export const ContactApplicant = ({
     }
     const templateId = currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null;
     const type = (templateId && [1, 2].includes(templateId)) ? "CFRFee" : "";
+    let israwrequest = selectedCorrespondence.israwrequest || false;
     let data = {
       templateid: currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null,
       correspondencemessagejson: JSON.stringify({
@@ -473,7 +475,8 @@ export const ContactApplicant = ({
       }),
       foiministryrequest_id: ministryId,
       attachments: attachments,
-      emails: selectedEmails
+      emails: selectedEmails,
+      israwrequest: israwrequest
     };
     saveDraftCorrespondence(
       data,
@@ -503,6 +506,7 @@ export const ContactApplicant = ({
     }
     const templateId = currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null;
     const type = (templateId && [1, 2].includes(templateId)) ? "CFRFee" : "";
+    let israwrequest = selectedCorrespondence.israwrequest || false;
     let data = {
       templateid: currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null,
       correspondenceid:correspondenceId,
@@ -517,7 +521,8 @@ export const ContactApplicant = ({
       attributes: [{ 
         "paymentExpiryDate": dueDateCalculation(new Date(), PAYMENT_EXPIRY_DAYS),
         "axisRequestId": requestNumber
-      }]
+      }],
+      israwrequest: israwrequest
     };
     saveEmailCorrespondence(
       data,
@@ -561,8 +566,10 @@ export const ContactApplicant = ({
         changeCorrespondenceFilter("log");
         dispatch(fetchApplicantCorrespondence(requestId, ministryId));
       }
+      let israwrequest = ministryId ? false : true;
       let data = {
-        attachments: responseattachments
+        attachments: responseattachments,
+        israwrequest: israwrequest
       };
       saveCorrespondenceResponse(
         data,
@@ -601,6 +608,7 @@ export const ContactApplicant = ({
   const [correspondenceId, setCorrespondenceId] = useState(null);
 
   const editDraft = async (i : any) => {
+    setSelectedCorrespondence(i);
     setEditMode(true);
     setShowEditor(true);
     setEditorValue(i.text);
@@ -616,7 +624,7 @@ export const ContactApplicant = ({
   };
 
   const deleteDraft = (i : any) => {
-    setDraftCorrespondence(i);
+    setSelectedCorrespondence(i);
     setOpenConfirmationModal(true);
     setConfirmationFor("delete-draft")
     setConfirmationTitle("Delete Draft")
@@ -625,8 +633,8 @@ export const ContactApplicant = ({
 
 
   const deleteDraftAction = async () => {
-    if (draftCorrespondence) {
-    setCorrespondenceId(draftCorrespondence.applicantcorrespondenceid);
+    if (selectedCorrespondence) {
+    setCorrespondenceId(selectedCorrespondence.applicantcorrespondenceid);
     setDisablePreview(true);
     setPreviewModal(false);
     let callback = (_res: string) => {
@@ -643,7 +651,7 @@ export const ContactApplicant = ({
       });
       dispatch(fetchApplicantCorrespondence(requestId, ministryId));
     }
-    deleteDraftCorrespondence(draftCorrespondence.applicantcorrespondenceid,ministryId,requestId,
+    deleteDraftCorrespondence(selectedCorrespondence.applicantcorrespondenceid, selectedCorrespondence.israwrequest, ministryId,requestId,
       dispatch,
       callback,
       (errorMessage: string) => {
@@ -693,7 +701,7 @@ export const ContactApplicant = ({
         });
         dispatch(fetchApplicantCorrespondence(requestId, ministryId));
       }
-      deleteResponseCorrespondence(selectedCorrespondence.applicantcorrespondenceid,ministryId,requestId,
+      deleteResponseCorrespondence(selectedCorrespondence.applicantcorrespondenceid,selectedCorrespondence.israwrequest, ministryId,requestId,
         dispatch,
         callback,
         (errorMessage: string) => {
@@ -735,6 +743,7 @@ export const ContactApplicant = ({
     }
     const templateId = currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null;
     const type = (templateId && [1, 2].includes(templateId)) ? "CFRFee" : "";
+    let israwrequest = selectedCorrespondence.israwrequest || false;
     let data = {
       correspondenceid:correspondenceId,
       templateid: currentTemplate ? templates[currentTemplate as keyof typeof templates].templateid : null,
@@ -745,7 +754,8 @@ export const ContactApplicant = ({
       }),
       foiministryrequest_id: ministryId,
       attachments: attachments,
-      emails: selectedEmails
+      emails: selectedEmails,
+      israwrequest: israwrequest
     };
     editDraftCorrespondence(
       data,
@@ -773,7 +783,7 @@ export const ContactApplicant = ({
 
     if (updateAttachment.filename !== newFilename) {
       editCorrespondenceResponse(
-        { filename: newFilename, correspondenceattachmentid: correspondenceAttachmentId, correspondenceid: correspondenceId }, 
+        { filename: newFilename, correspondenceattachmentid: correspondenceAttachmentId, correspondenceid: correspondenceId, israwrequest: selectedCorrespondence.israwrequest }, 
         ministryId, 
         requestId, 
         dispatch,
@@ -789,7 +799,7 @@ export const ContactApplicant = ({
   const handleChangeResponseDate = (newDate: string) => {
     setModal(false);
     editCorrespondenceResponse(
-      {responsedate: newDate, correspondenceid: selectedCorrespondence.applicantcorrespondenceid}, 
+      {responsedate: newDate, correspondenceid: selectedCorrespondence.applicantcorrespondenceid, israwrequest: selectedCorrespondence.israwrequest}, 
       ministryId, 
       requestId, 
       dispatch, 

request-management-api/migrations/versions/0982b9dca5f2_create_raw_request_correspondence_tables.py

@@ -39,6 +39,7 @@ def upgrade():
     sa.Column('isdraft', sa.Boolean(), nullable=True),  
     sa.Column('isdeleted', sa.Boolean(), nullable=True),  
     sa.Column('isresponse', sa.Boolean(), nullable=True),  
+    sa.Column('israwrequest', sa.Boolean(), nullable=True, server_default=sa.true()),
 
     sa.ForeignKeyConstraint(['foirawrequest_id', 'foirawrequestversion_id'], ['FOIRawRequests.requestid', 'FOIRawRequests.version']),
     sa.PrimaryKeyConstraint('applicantcorrespondenceid', 'version'),

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

@@ -47,7 +47,7 @@ def getapplicantcorrespondencesrawrequests(cls, requestid):
         try:
             sql = """select distinct on (applicantcorrespondenceid) applicantcorrespondenceid, templateid , correspondencemessagejson , version, 
                         created_at, createdby, sentcorrespondencemessage, parentapplicantcorrespondenceid, sentby, sent_at,
-                         isdraft, isdeleted, isresponse, response_at
+                         isdraft, isdeleted, isresponse, response_at, israwrequest
                          from "FOIApplicantCorrespondencesRawRequests" rawcorr 
                         where foirawrequest_id = (
 							SELECT foirawrequestid FROM public."FOIRequests"
@@ -64,7 +64,7 @@ def getapplicantcorrespondencesrawrequests(cls, requestid):
                                             "created_at": row["created_at"], "createdby": row["createdby"], 
                                             "sentcorrespondencemessage": row["sentcorrespondencemessage"], "parentapplicantcorrespondenceid": row["parentapplicantcorrespondenceid"],
                                             "sent_at": row["sent_at"], "sentby": row["sentby"],
-                                            "isdraft": row["isdraft"], "isresponse": row["isresponse"], "response_at": row["response_at"]})
+                                            "isdraft": row["isdraft"], "isresponse": row["isresponse"], "response_at": row["response_at"], "israwrequest": row["israwrequest"]})
         except Exception as ex:
             logging.error(ex)
             raise ex
@@ -144,5 +144,5 @@ def deleteapplicantcorrespondence(cls, rawrequestid, correspondenceid,userid)->D
 
 class FOIApplicantCorrespondenceRawRequestSchema(ma.Schema):
     class Meta:
-        fields = ('applicantcorrespondenceid', 'version', 'parentapplicantcorrespondenceid', 'templateid','correspondencemessagejson','foirawrequest_id','foirawrequestversion_id','created_at','createdby','attachments','sentcorrespondencemessage','sent_at','sentby', 'isdraft', 'isdeleted', 'isresponse', 'response_at')
+        fields = ('applicantcorrespondenceid', 'version', 'parentapplicantcorrespondenceid', 'templateid','correspondencemessagejson','foirawrequest_id','foirawrequestversion_id','created_at','createdby','attachments','sentcorrespondencemessage','sent_at','sentby', 'isdraft', 'isdeleted', 'isresponse', 'response_at', 'israwrequest')
 

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

@@ -110,12 +110,11 @@ class FOIFlowApplicantCorrespondenceDraft(Resource):
     def post(requestid, ministryrequestid):
         try:
             requestjson = request.get_json()
+            correspondenceschemaobj = FOIApplicantCorrespondenceSchema().load(data=requestjson)
             rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
-            if ministryrequestid != 'None':
-                correspondenceschemaobj = FOIApplicantCorrespondenceSchema().load(data=requestjson)
+            if ministryrequestid != 'None' or "israwrequest" in correspondenceschemaobj and correspondenceschemaobj["israwrequest"] == False:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(rawrequestid, ministryrequestid, correspondenceschemaobj, AuthHelper.getuserid(), True)
-            elif ministryrequestid == 'None':
-                correspondenceschemaobj = FOIApplicantCorrespondenceSchema().load(data=requestjson)
+            elif ministryrequestid == 'None' or "israwrequest" in correspondenceschemaobj and correspondenceschemaobj["israwrequest"] == True:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestid, correspondenceschemaobj, AuthHelper.getuserid(), True)
             if result.success == True:
                return {'status': result.success, 'message':result.message,'id':result.identifier} , 200      
@@ -135,7 +134,7 @@ def post(requestid, ministryrequestid):
             requestjson = request.get_json()
             rawrequestid = requestservice().getrawrequestidbyfoirequestid(requestid)
             applicantcorrespondencelog = FOIApplicantCorrespondenceSchema().load(data=requestjson) 
-            if ministryrequestid == 'None':
+            if ministryrequestid == 'None' or "israwrequest" in applicantcorrespondencelog and applicantcorrespondencelog["israwrequest"] == True:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestid, applicantcorrespondencelog, AuthHelper.getuserid(), True)
             else:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(rawrequestid, ministryrequestid, applicantcorrespondencelog, AuthHelper.getuserid(), True)
@@ -154,8 +153,9 @@ class FOIFlowApplicantCorrespondenceDraft(Resource):
     @auth.require
     def post(ministryrequestid, rawrequestid, correspondenceid):
         try:
+            requestjson = request.get_json()
             rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
-            if ministryrequestid == 'None':
+            if ministryrequestid == 'None' or "israwrequest" in requestjson and requestjson["israwrequest"] == True:
                 rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidfromfoirequest, correspondenceid, AuthHelper.getuserid())
                 return {'status': rawresult.success, 'message':rawresult.message,'id':rawresult.identifier} , 200
             else:
@@ -211,7 +211,7 @@ def post(ministryrequestid, rawrequestid):
             requestjson = request.get_json()
             rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             correspondenceemail = FOIApplicantCorrespondenceResponseSchema().load(data=requestjson) 
-            if ministryrequestid == 'None':
+            if ministryrequestid == 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == True:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelogforrawrequest(rawrequestidfromfoirequest, correspondenceemail, AuthHelper.getuserid())
             else:
                 result = applicantcorrespondenceservice().saveapplicantcorrespondencelog(rawrequestidfromfoirequest, ministryrequestid, correspondenceemail, AuthHelper.getuserid())
@@ -234,9 +234,9 @@ def post(ministryrequestid, rawrequestid):
             rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
             requestjson = request.get_json()
             correspondenceemail = FOIApplicantCorrespondenceEditResponseSchema().load(data=requestjson) 
-            if ministryrequestid == 'None':
+            if ministryrequestid == 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == True:
                 result = applicantcorrespondenceservice().editapplicantcorrespondencelogforrawrequest(rawrequestidfromfoirequest, correspondenceemail, AuthHelper.getuserid())
-            elif ministryrequestid != 'None':
+            elif ministryrequestid != 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == False:
                 result = applicantcorrespondenceservice().editapplicantcorrespondencelogforministry(ministryrequestid, correspondenceemail, AuthHelper.getuserid())
 
             return {'status': result.success, 'message':result.message,'id':result.identifier} , 200      
@@ -253,8 +253,9 @@ class FOIFlowApplicantCorrespondenceResponse(Resource):
     @auth.require
     def post(ministryrequestid, rawrequestid, correspondenceid):
         try:
+            requestjson = request.get_json()
             rawrequestidfromfoirequest = requestservice().getrawrequestidbyfoirequestid(rawrequestid)
-            if ministryrequestid == 'None':
+            if ministryrequestid == 'None' or 'israwrequest' in requestjson and requestjson['israwrequest'] == True:
                 rawresult = applicantcorrespondenceservice().deleteapplicantcorrespondencelograwrequest(rawrequestidfromfoirequest, correspondenceid, AuthHelper.getuserid())
                 return {'status': rawresult.success, 'message':rawresult.message,'id':rawresult.identifier} , 200
             else:

request-management-api/request_api/schemas/foiapplicantcorrespondencelog.py

@@ -27,6 +27,7 @@ class Meta:  # pylint: disable=too-few-public-methods
         data_key="attributes",
         required=False,
     )
+    israwrequest = fields.Bool(data_key="israwrequest",required=False,allow_none=True)
 
 
 class FOIApplicantCorrespondenceEmailSchema(Schema):