Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

19043 foreign_corp_num to foreign_identifier #2430

Merged
merged 2 commits into from
Jan 31, 2024
Merged

19043 foreign_corp_num to foreign_identifier #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09ad6c9
19043 foreign_corp_num to foreign_identifier
vysakh-menon-aot Jan 31, 2024
0e9be47
no message
vysakh-menon-aot Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion queue_services/entity-filer/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ urllib3==1.26.11
minio==7.0.2
PyPDF2==1.26.0
reportlab==3.6.12
git+https://github.com/bcgov/business-schemas.git@2.18.18#egg=registry_schemas
git+https://github.com/bcgov/business-schemas.git@2.18.19#egg=registry_schemas
git+https://github.com/bcgov/lear.git#egg=legal_api&subdirectory=legal-api
git+https://github.com/bcgov/lear.git#egg=entity_queue_common&subdirectory=queue_services/common
2 changes: 1 addition & 1 deletion queue_services/entity-filer/requirements/bcregistry-libraries.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
git+https://github.com/bcgov/business-schemas.git@2.18.18#egg=registry_schemas
git+https://github.com/bcgov/business-schemas.git@2.18.19#egg=registry_schemas
git+https://github.com/bcgov/lear.git#egg=legal_api&subdirectory=legal-api
git+https://github.com/bcgov/lear.git#egg=entity_queue_common&subdirectory=queue_services/common
14 changes: 6 additions & 8 deletions queue_services/entity-filer/src/entity_filer/filing_processors/amalgamation_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,16 @@ def create_amalgamating_businesses(amalgamation_filing: Dict, amalgamation: Amal
for amalgamating_business_json in amalgamating_businesses_json:
amalgamating_business = AmalgamatingBusiness()
amalgamating_business.role = amalgamating_business_json.get('role')
if ((identifier := amalgamating_business_json.get('identifier')) and
(business := Business.find_by_identifier(identifier))):
amalgamating_business.business_id = business.id
dissolve_amalgamating_business(business, filing_rec)
else:
amalgamating_business.foreign_corp_num = amalgamating_business_json.get('corpNumber')
identifier = amalgamating_business_json.get('identifier')
if foreign_jurisdiction := amalgamating_business_json.get('foreignJurisdiction'):
amalgamating_business.foreign_identifier = identifier
amalgamating_business.foreign_name = amalgamating_business_json.get('legalName')

foreign_jurisdiction = amalgamating_business_json.get('foreignJurisdiction')
amalgamating_business.foreign_jurisdiction = foreign_jurisdiction.get('country').upper()
if region := foreign_jurisdiction.get('region'):
amalgamating_business.foreign_jurisdiction_region = region.upper()
elif business := Business.find_by_identifier(identifier):
amalgamating_business.business_id = business.id
dissolve_amalgamating_business(business, filing_rec)

amalgamation.amalgamating_businesses.append(amalgamating_business)

Expand Down
Loading