From bfb2ec070146fdd3cf4aa9f6b91bb66deb252a48 Mon Sep 17 00:00:00 2001 From: argush3 Date: Mon, 18 Mar 2024 07:54:43 -0700 Subject: [PATCH] Fix GET filing document list issue & amalgamation related error --- legal-api/src/legal_api/models/legal_entity.py | 16 +++++++++------- .../business_filings/business_documents.py | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/legal-api/src/legal_api/models/legal_entity.py b/legal-api/src/legal_api/models/legal_entity.py index b0ffe37a3f..81167ab316 100644 --- a/legal-api/src/legal_api/models/legal_entity.py +++ b/legal-api/src/legal_api/models/legal_entity.py @@ -482,13 +482,15 @@ def _extend_json(self, d): if self.fiscal_year_end_date: d["fiscalYearEndDate"] = datetime.date(self.fiscal_year_end_date).isoformat() if self.state_filing_id: - if self.state == LegalEntity.State.HISTORICAL and ( - amalgamating_business := self.amalgamating_businesses.one_or_none() - ): - amalgamation = Amalgamation.find_by_id(amalgamating_business.amalgamation_id) - d["amalgamatedInto"] = amalgamation.json() - else: - d["stateFiling"] = f"{base_url}/{self.identifier}/filings/{self.state_filing_id}" + # TODO: revert once amalgamation tables and migration scripts have been run + # if self.state == LegalEntity.State.HISTORICAL and ( + # amalgamating_business := self.amalgamating_businesses.one_or_none() + # ): + # amalgamation = Amalgamation.find_by_id(amalgamating_business.amalgamation_id) + # d["amalgamatedInto"] = amalgamation.json() + # else: + # d["stateFiling"] = f"{base_url}/{self.identifier}/filings/{self.state_filing_id}" + d["stateFiling"] = f"{base_url}/{self.identifier}/filings/{self.state_filing_id}" if self.start_date: d["startDate"] = LegislationDatetime.format_as_legislation_date(self.start_date) diff --git a/legal-api/src/legal_api/resources/v2/business/business_filings/business_documents.py b/legal-api/src/legal_api/resources/v2/business/business_filings/business_documents.py index 635fb00d2b..14a48c1aba 100644 --- a/legal-api/src/legal_api/resources/v2/business/business_filings/business_documents.py +++ b/legal-api/src/legal_api/resources/v2/business/business_filings/business_documents.py @@ -73,7 +73,7 @@ def get_documents(identifier: str, filing_id: int, legal_filing_name: str = None HTTPStatus.NOT_FOUND, ) - if not (filing := Filing.get(identifier, filing_id)): + if not (filing := Filing.get(identifier, business, filing_id)): return ( jsonify( message=get_error_message(