syn with other PR

bcgov · Apr 11, 2024 · f73b8db · f73b8db
1 parent 08fa7a5
commit f73b8db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/legal-api/src/legal_api/reports/report.py b/legal-api/src/legal_api/reports/report.py
@@ -315,7 +315,7 @@ def _set_completing_party(self, filing):
             self._filing.id, datetime.utcnow(), EntityRole.RoleTypes.completing_party.name
         )
         if completing_party_role:
-            filing["completingParty"] = completing_party_role[0].json
+            filing["completingParty"] = completing_party_role[0].related_entity.party_json
             with suppress(KeyError):
                 self._format_address(filing["completingParty"]["deliveryAddress"])
             with suppress(KeyError):

diff --git a/legal-api/src/legal_api/services/business_details_version.py b/legal-api/src/legal_api/services/business_details_version.py
@@ -226,14 +226,14 @@ def get_business_revision_obj(filing, business) -> any:
         business_revision = business
 
         # The history table has the old revisions, not the current one.
-        if business_revision and business_revision.change_filing_id != filing.id:
+        if business_revision and business_revision.change_filing_id > filing.id:
             business_version = (
                 history_cls(LegalEntity) if business_revision.is_legal_entity else history_cls(AlternateName)
             )
 
             business_revision = (
                 db.session.query(business_version)
-                .filter(business_version.change_filing_id == filing.id)
+                .filter(business_version.change_filing_id <= filing.id)
                 .filter(business_version.id == business.id)
                 .first()
             )
@@ -819,8 +819,6 @@ def resolution_json(resolution_revision) -> dict:
     @staticmethod
     def business_revision_json(business_revision, business_json):
         """Return the business revision as a json object."""
-        if not business_revision:
-            return business_json
 
         if business_revision.is_legal_entity:
             business_json["hasRestrictions"] = business_revision.restriction_ind

diff --git a/python/common/business-registry-model/src/business_model/models/entity_role.py b/python/common/business-registry-model/src/business_model/models/entity_role.py
@@ -294,7 +294,7 @@ def get_entity_roles_by_filing(filing_id: int, end_date: datetime = None, role:
         """Return the parties that match the filter conditions."""
         entity_roles = (
             db.session.query(EntityRole)
-            .filter(EntityRole.filing_id == filing_id)
+            .filter(EntityRole.filing_id <= filing_id)
             .filter(cast(EntityRole.appointment_date, Date) <= end_date)
             .filter(
                 or_(