32060 - Add cover page for QS's transfer of ownership registration (#2284)

* 32060 - add cover page for qs transfer of ownership registration

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>

* fix linting

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>

---------

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>

Author: chenhongjing

mhr-api/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mhr-api"
-version = "2.1.6"
+version = "2.1.7"
 description = ""
 authors = ["dlovett <doug@daxiom.com>"]
 license = "BSD 3"

mhr-api/src/mhr_api/reports/v2/report.py

@@ -64,6 +64,16 @@ def get_pdf(self, report_type=None):
             return self.get_registration_cover_pdf()
         if self._report_key == ReportTypes.MHR_REGISTRATION_STAFF:
             return self.get_registration_staff_pdf()
+
+        add_cover = self._report_key == ReportTypes.MHR_TRANSFER
+
+        # Generate the cover page for specific non-staff reports
+        if add_cover:
+            logger.debug("Generate cover letter for specific non-staff report")
+            cover_content, cover_status, cover_headers = self.get_registration_cover_pdf()
+            if cover_status != HTTPStatus.OK:
+                return cover_content, cover_status, cover_headers
+
         logger.debug("Account {0} report type {1} setting up report data.".format(self._account_id, self._report_key))
         data = self._setup_report_data()
         url = current_app.config.get("REPORT_SVC_URL") + SINGLE_URI
@@ -85,6 +95,14 @@ def get_pdf(self, report_type=None):
                 "Account {0} response status: {1} error: {2}.".format(self._account_id, response.status_code, content)
             )
             return jsonify(message=content), response.status_code, None
+
+        # Merge the cover letter and registration reports if applicable.
+        if add_cover:
+            files = []
+            files.append(cover_content)
+            files.append(response.content)
+            return Report.batch_merge(files)
+
         return response.content, response.status_code, {"Content-Type": "application/pdf"}
 
     def get_search_pdf(self):
@@ -136,27 +154,33 @@ def get_search_pdf(self):
     def get_registration_cover_pdf(self):
         """Render a registration cover letter report."""
         logger.debug(f"Account {self._account_id} setting up reg cover report data.")
-        self._report_key = ReportTypes.MHR_REGISTRATION_COVER
-        data = self._setup_report_data()
-        url = current_app.config.get("REPORT_SVC_URL") + SINGLE_URI
-        meta_data = report_utils.get_report_meta_data(self._report_key)
-        files = report_utils.get_report_files(data, self._report_key, False)
-        headers = Report.get_headers()
-        response_cover = requests.post(url=url, headers=headers, data=meta_data, files=files, timeout=1800.0)
-        logger.debug(
-            "Account {0} report type {1} response status: {2}.".format(
-                self._account_id, self._report_key, response_cover.status_code
-            )
-        )
-        if response_cover.status_code != HTTPStatus.OK:
-            content = ResourceErrorCodes.REPORT_ERR + ": " + response_cover.content.decode("ascii")
-            logger.error(
-                "Account {0} response status: {1} error: {2}.".format(
-                    self._account_id, response_cover.status_code, content
+        original_report_key = self._report_key
+        original_report_data = copy.deepcopy(self._report_data)
+        try:
+            self._report_key = ReportTypes.MHR_REGISTRATION_COVER
+            data = self._setup_report_data()
+            url = current_app.config.get("REPORT_SVC_URL") + SINGLE_URI
+            meta_data = report_utils.get_report_meta_data(self._report_key)
+            files = report_utils.get_report_files(data, self._report_key, False)
+            headers = Report.get_headers()
+            response_cover = requests.post(url=url, headers=headers, data=meta_data, files=files, timeout=1800.0)
+            logger.debug(
+                "Account {0} report type {1} response status: {2}.".format(
+                    self._account_id, self._report_key, response_cover.status_code
                 )
             )
-            return jsonify(message=content), response_cover.status_code, None
-        return response_cover.content, response_cover.status_code, {"Content-Type": "application/pdf"}
+            if response_cover.status_code != HTTPStatus.OK:
+                content = ResourceErrorCodes.REPORT_ERR + ": " + response_cover.content.decode("ascii")
+                logger.error(
+                    "Account {0} response status: {1} error: {2}.".format(
+                        self._account_id, response_cover.status_code, content
+                    )
+                )
+                return jsonify(message=content), response_cover.status_code, None
+            return response_cover.content, response_cover.status_code, {"Content-Type": "application/pdf"}
+        finally:
+            self._report_key = original_report_key
+            self._report_data = original_report_data
 
     def get_registration_staff_pdf(self):
         """Render a staff MH registration report with cover letter."""

mhr-api/src/mhr_api/resources/v1/pay_callback.py

@@ -309,7 +309,9 @@ def queue_transfer(draft: MhrDraft, current_reg: MhrRegistration, new_reg: MhrRe
     queue_report(new_reg, draft, response_json, ReportTypes.MHR_TRANSFER, current_json)
 
 
-def complete_registration(draft: MhrDraft, base_reg: MhrRegistration, request_json: dict, invoice_id: str):
+def complete_registration(
+    draft: MhrDraft, base_reg: MhrRegistration, request_json: dict, invoice_id: str
+):  # pylint: disable=too-many-statements
     """Process the registration based on the payload status and draft registration type."""
     invoice_id: str = draft.user_id
     try: