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.

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

18370 Fix list of outputs AGM extension #2291

Merged
merged 4 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions legal-api/report-templates/letterOfAgmExtension.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[[macros.html]]
<!DOCTYPE html>
<html lang="en">
<head>
<title>Letter of AGM Extension</title>
<meta charset="UTF-8">
<meta name="author" content="BC Registries and Online Services">
[[common/style.html]]
[[common/styleLetterOverride.html]]
</head>
<body>
</body>
</html>
1 change: 1 addition & 0 deletions legal-api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ PyPDF2==1.26.0
reportlab==3.6.12
html-sanitizer==1.9.3
git+https://github.com/bcgov/business-schemas.git@2.18.15#egg=registry_schemas

2 changes: 1 addition & 1 deletion legal-api/requirements/bcregistry-libraries.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
git+https://github.com/bcgov/business-schemas.git@2.18.14#egg=registry_schemas
git+https://github.com/bcgov/business-schemas.git@2.18.15#egg=registry_schemas
3 changes: 3 additions & 0 deletions legal-api/src/legal_api/core/filing.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class FilingTypes(str, Enum):
"""Render an Enum of all Filing Types."""

ADMIN_FREEZE = 'adminFreeze'
AGMEXTENSION = 'agmExtension'
AGMLOCATIONCHANGE = 'agmLocationChange'
ALTERATION = 'alteration'
AMALGAMATIONAPPLICATION = 'amalgamationApplication'
Expand Down Expand Up @@ -474,6 +475,7 @@ def get_document_list(business, # pylint: disable=too-many-locals disable=too-m
Filing.FilingTypes.REGISTRATION.value,
Filing.FilingTypes.CONSENTCONTINUATIONOUT.value,
Filing.FilingTypes.CONTINUATIONOUT.value,
Filing.FilingTypes.AGMEXTENSION.value,
Filing.FilingTypes.AGMLOCATIONCHANGE.value,
]
if filing.status == Filing.Status.PAID and \
Expand Down Expand Up @@ -508,6 +510,7 @@ def get_document_list(business, # pylint: disable=too-many-locals disable=too-m
no_legal_filings = [
Filing.FilingTypes.CONSENTCONTINUATIONOUT.value,
Filing.FilingTypes.CONTINUATIONOUT.value,
Filing.FilingTypes.AGMEXTENSION.value,
Filing.FilingTypes.AGMLOCATIONCHANGE.value,
]
if filing.filing_type not in no_legal_filings:
Expand Down
7 changes: 5 additions & 2 deletions legal-api/src/legal_api/core/meta/filing.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,16 @@ class FilingTitles(str, Enum):
'agmExtension': {
'name': 'agmExtension',
'title': 'AGM Extension',
'displayName': 'AGM Extension',
'displayName': 'Request for AGM Extension',
'codes': {
'BC': 'AGMDT',
'BEN': 'AGMDT',
'ULC': 'AGMDT',
'CC': 'AGMDT'
}
},
'additional': [
{'types': 'BC, BEN, CC, ULC', 'outputs': ['letterOfAgmExtension', ]},
],
},
'agmLocationChange': {
'name': 'agmLocationChange',
Expand Down
10 changes: 10 additions & 0 deletions legal-api/src/legal_api/reports/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ def _format_filing_json(self, filing): # pylint: disable=too-many-branches, too
self._format_transition_data(filing)
elif self._report_key == 'dissolution':
self._format_dissolution_data(filing)
elif self._report_key == 'letterOfAgmExtension':
self._format_agm_extension_data(filing)
elif self._report_key == 'letterOfAgmLocationChange':
self._format_agm_location_change_data(filing)
else:
Expand Down Expand Up @@ -583,6 +585,10 @@ def _format_consent_continuation_out_data(self, filing):
with suppress(KeyError):
self._format_address(filing['offices']['registeredOffice']['mailingAddress'])

def _format_agm_extension_data(self, filing):
# FUTURE: format logic for letter of agm extension
return

def _format_agm_location_change_data(self, filing):
filing['agm_year'] = self._filing.filing_json['filing'].get('agmLocationChange', {}).get('year', '')

Expand Down Expand Up @@ -1174,6 +1180,10 @@ class ReportMeta: # pylint: disable=too-few-public-methods
'filingDescription': 'Letter Of Consent',
'fileName': 'letterOfConsent'
},
'letterOfAgmExtension': {
'filingDescription': 'Letter Of AGM Extension',
'fileName': 'letterOfAgmExtension'
},
'letterOfAgmLocationChange': {
'filingDescription': 'Letter Of AGM Location Change',
'fileName': 'letterOfAgmLocationChange'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
from flask import current_app
from registry_schemas.example_data import (
ALTERATION_FILING_TEMPLATE,
AGM_EXTENSION,
AGM_LOCATION_CHANGE,
ANNUAL_REPORT,
CHANGE_OF_ADDRESS,
CHANGE_OF_DIRECTORS,
Expand Down Expand Up @@ -879,6 +881,44 @@ def test_unpaid_filing(session, client, jwt):
},
HTTPStatus.OK, '2017-10-01'
),
('ben_agmExtension_completed', 'BC7654321',
Business.LegalTypes.BCOMP.value, 'agmExtension', AGM_EXTENSION,
None, None, Filing.Status.COMPLETED,
{'documents': {
'letterOfAgmExtension': 'https://LEGAL_API_BASE_URL/api/v2/businesses/BC7654321/filings/documents/letterOfAgmExtension',
'receipt': f'{base_url}/api/v2/businesses/BC7654321/filings/1/documents/receipt'
}
},
HTTPStatus.OK, '2017-10-01'
),
('ben_agmLocationChange_paid', 'BC7654321',
Business.LegalTypes.BCOMP.value, 'agmExtension', AGM_EXTENSION,
None, None, Filing.Status.PAID,
{'documents': {
'receipt': f'{base_url}/api/v2/businesses/BC7654321/filings/1/documents/receipt'
}
},
HTTPStatus.OK, '2017-10-01'
),
('ben_agmLocationChange_completed', 'BC7654321',
Business.LegalTypes.BCOMP.value, 'agmLocationChange', AGM_LOCATION_CHANGE,
None, None, Filing.Status.COMPLETED,
{'documents': {
'letterOfAgmLocationChange': 'https://LEGAL_API_BASE_URL/api/v2/businesses/BC7654321/filings/documents/letterOfAgmLocationChange',
'receipt': f'{base_url}/api/v2/businesses/BC7654321/filings/1/documents/receipt'
}
},
HTTPStatus.OK, '2017-10-01'
),
('ben_agmLocationChange_paid', 'BC7654321',
Business.LegalTypes.BCOMP.value, 'agmLocationChange', AGM_LOCATION_CHANGE,
None, None, Filing.Status.PAID,
{'documents': {
'receipt': f'{base_url}/api/v2/businesses/BC7654321/filings/1/documents/receipt'
}
},
HTTPStatus.OK, '2017-10-01'
),
('ben_changeOfAddress', 'BC7654321', Business.LegalTypes.BCOMP.value,
'changeOfAddress', CHANGE_OF_ADDRESS, None, None, Filing.Status.COMPLETED,
{'documents': {'noticeOfArticles': f'{base_url}/api/v2/businesses/BC7654321/filings/1/documents/noticeOfArticles',
Expand Down
2 changes: 1 addition & 1 deletion legal-api/tests/unit/services/test_authorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class FilingKey(str, Enum):
'name': 'registrarsNotation'},
FilingKey.REGISTRARS_ORDER: {'displayName': "Registrar's Order", 'feeCode': 'NOFEE', 'name': 'registrarsOrder'},
FilingKey.SPECIAL_RESOLUTION: {'displayName': 'Special Resolution', 'feeCode': 'SPRLN', 'name': 'specialResolution'},
FilingKey.AGM_EXTENSION: {'displayName': 'AGM Extension', 'feeCode': 'AGMDT', 'name': 'agmExtension'},
FilingKey.AGM_EXTENSION: {'displayName': 'Request for AGM Extension', 'feeCode': 'AGMDT', 'name': 'agmExtension'},
FilingKey.AGM_LOCATION_CHANGE: {'displayName': 'AGM Location Change', 'feeCode': 'AGMLC', 'name': 'agmLocationChange'},
FilingKey.ALTERATION: {'displayName': 'Alteration', 'feeCode': 'ALTER', 'name': 'alteration'},
FilingKey.CONSENT_CONTINUATION_OUT: {'displayName': '6-Month Consent to Continue Out', 'feeCode': 'CONTO',
Expand Down
Loading