20327 Fix error occurred when testing filer on GCP for registration -…

… part 2 (bcgov#2560) * 20327-fix3 Signed-off-by: Hongjing Chen <[email protected]> * update Signed-off-by: Hongjing Chen <[email protected]> * remove saving party Signed-off-by: Hongjing Chen <[email protected]> * replace transaction_id with completion_date to trigger filing status update Signed-off-by: Hongjing Chen <[email protected]> * fix as per failed unit tests Signed-off-by: Hongjing Chen <[email protected]> --------- Signed-off-by: Hongjing Chen <[email protected]>
PaulGarewal · Apr 3, 2024 · c485659 · c485659
1 parent abc2743
commit c485659
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/legal-api/src/legal_api/models/filing.py b/legal-api/src/legal_api/models/filing.py
@@ -1069,7 +1069,7 @@ def receive_before_change(mapper, connection, target):  # pylint: disable=unused
     # changes are part of the class and are not externalized
     if filing.filing_type == "lear_epoch":
         filing._status = Filing.Status.EPOCH.value  # pylint: disable=protected-access
-    elif filing.transaction_id:
+    elif filing.completion_date:
         filing._status = Filing.Status.COMPLETED.value  # pylint: disable=protected-access
     elif filing.payment_completion_date or filing.source == Filing.Source.COLIN.value:
         filing._status = Filing.Status.PAID.value  # pylint: disable=protected-access

diff --git a/python/common/business-registry-model/src/business_model/models/filing.py b/python/common/business-registry-model/src/business_model/models/filing.py
@@ -1063,7 +1063,7 @@ def receive_before_change(mapper, connection, target):  # pylint: disable=unused
     # changes are part of the class and are not externalized
     if filing.filing_type == "lear_epoch":
         filing._status = Filing.Status.EPOCH.value  # pylint: disable=protected-access
-    elif filing.transaction_id:
+    elif filing.completion_date:
         filing._status = Filing.Status.COMPLETED.value  # pylint: disable=protected-access
     elif filing.payment_completion_date or filing.source == Filing.Source.COLIN.value:
         filing._status = Filing.Status.PAID.value  # pylint: disable=protected-access

diff --git a/queue_services/entity-filer/poetry.lock b/queue_services/entity-filer/poetry.lock
diff --git a/queue_services/entity-filer/src/entity_filer/filing_processors/filing_components/parties.py b/queue_services/entity-filer/src/entity_filer/filing_processors/filing_components/parties.py
@@ -137,6 +137,7 @@ def merge_all_parties(legal_entity: LegalEntity, filing: Filing, parties: dict)
         ) or (
             (not party_identifier)
             and (party_id := party_dict.get("officer", {}).get("id"))
+            and (isinstance(party_id, int) or party_id.isnumeric())
             and ((party_le := LegalEntity.find_by_id(party_id)) or (party_le := ColinEntity.find_by_id(party_id)))
         ):
             existing_party = True
@@ -422,7 +423,6 @@ def create_entity_with_addresses(party_dict) -> LegalEntity:
         else:
             new_party.delivery_address = delivery_address
 
-        new_party.save()
     return new_party
 
 
@@ -481,6 +481,7 @@ def get_or_create_party(party_dict: dict, filing: Filing):
     ) or (
         (not party_identifier)
         and (party_id := party_dict.get("officer", {}).get("id"))
+        and (isinstance(party_id, int) or party_id.isnumeric())
         and ((party_le := LegalEntity.find_by_id(party_id)) or (party_le := ColinEntity.find_by_id(party_id)))
     ):
         existing_party = True