32158 next annual report date fix (#4020)

Author: vysakh-menon-aot

legal-api/src/legal_api/models/business.py

@@ -336,9 +336,9 @@ def business_legal_name(self):
     def next_anniversary(self):
         """Retrieve the next anniversary date for which an AR filing is due."""
         _founding_date = LegislationDatetime.as_legislation_timezone(self.founding_date)
-        next_ar_year = (self.last_ar_year if self.last_ar_year else self.founding_date.year) + 1
+        next_ar_year = (self.last_ar_year if self.last_ar_year else _founding_date.year) + 1
         no_of_years_to_add = next_ar_year - _founding_date.year
-        return _founding_date + datedelta.datedelta(years=no_of_years_to_add)
+        return LegislationDatetime.as_utc_timezone(_founding_date + datedelta.datedelta(years=no_of_years_to_add))
 
     @property
     def next_annual_tr_due_datetime(self) -> datetime:

legal-api/tests/unit/models/test_business.py

@@ -359,7 +359,7 @@ def test_business_json(session):
         'naicsKey': None,
         'naicsCode': None,
         'naicsDescription': None,
-        'nextAnnualReport': '1971-12-31T16:00:00-08:00',
+        'nextAnnualReport': '1971-01-01T00:00:00+00:00',
         'hasRestrictions': True,
         'arMinDate': '1971-01-01',
         'arMaxDate': '1972-04-30',

legal-api/tests/unit/resources/v2/test_business_filings/test_filings.py

@@ -496,8 +496,8 @@ def test_post_only_validate_ar(session, client, jwt):
 
     ar = copy.deepcopy(ANNUAL_REPORT)
     annual_report_date = datetime(datetime.utcnow().year, 2, 20).date()
-    if annual_report_date > datetime.utcnow().date():
-        annual_report_date = datetime.utcnow().date()
+    if annual_report_date > LegislationDatetime.now().date():
+        annual_report_date = LegislationDatetime.now().date()
     ar['filing']['annualReport']['annualReportDate'] = annual_report_date.isoformat()
     ar['filing']['annualReport']['annualGeneralMeetingDate'] = datetime.utcnow().date().isoformat()
 
@@ -519,8 +519,8 @@ def test_post_validate_ar_using_last_ar_date(session, client, jwt):
                      )
     ar = copy.deepcopy(ANNUAL_REPORT)
     annual_report_date = datetime(datetime.utcnow().year, 2, 20).date()
-    if annual_report_date > datetime.utcnow().date():
-        annual_report_date = datetime.utcnow().date()
+    if annual_report_date > LegislationDatetime.now().date():
+        annual_report_date = LegislationDatetime.now().date()
     ar['filing']['annualReport']['annualReportDate'] = annual_report_date.isoformat()
     ar['filing']['annualReport']['annualGeneralMeetingDate'] = datetime.utcnow().date().isoformat()
 
@@ -590,8 +590,8 @@ def test_post_validate_ar_valid_routing_slip(session, client, jwt):
 
     ar = copy.deepcopy(ANNUAL_REPORT)
     annual_report_date = datetime(datetime.utcnow().year, 2, 20).date()
-    if annual_report_date > datetime.utcnow().date():
-        annual_report_date = datetime.utcnow().date()
+    if annual_report_date > LegislationDatetime.now().date():
+        annual_report_date = LegislationDatetime.now().date()
     ar['filing']['annualReport']['annualReportDate'] = annual_report_date.isoformat()
     ar['filing']['annualReport']['annualGeneralMeetingDate'] = datetime.utcnow().date().isoformat()
     ar['filing']['header']['routingSlipNumber'] = '123131332'
@@ -743,8 +743,8 @@ def test_post_valid_ar_failed_payment(monkeypatch, session, client, jwt):
     factory_business_mailing_address(business)
     ar = copy.deepcopy(ANNUAL_REPORT)
     annual_report_date = datetime(datetime.utcnow().year, 2, 20).date()
-    if annual_report_date > datetime.utcnow().date():
-        annual_report_date = datetime.utcnow().date()
+    if annual_report_date > LegislationDatetime.now().date():
+        annual_report_date = LegislationDatetime.now().date()
     ar['filing']['annualReport']['annualReportDate'] = annual_report_date.isoformat()
     ar['filing']['annualReport']['annualGeneralMeetingDate'] = datetime.utcnow().date().isoformat()
     ar['filing']['business']['identifier'] = 'CP7654321'
@@ -1256,8 +1256,8 @@ def test_file_ar_no_agm_coop(session, client, jwt):
     factory_business_mailing_address(business)
     ar = copy.deepcopy(ANNUAL_REPORT)
     annual_report_date = datetime(datetime.utcnow().year, 2, 20).date()
-    if annual_report_date > datetime.utcnow().date():
-        annual_report_date = datetime.utcnow().date()
+    if annual_report_date > LegislationDatetime.now().date():
+        annual_report_date = LegislationDatetime.now().date()
     ar['filing']['annualReport']['annualReportDate'] = annual_report_date.isoformat()
     ar['filing']['header']['date'] = datetime.utcnow().date().isoformat()
     ar['filing']['annualReport']['annualGeneralMeetingDate'] = None

python/common/business-registry-model/.devcontainer/Dockerfile

@@ -1,7 +1,8 @@
-FROM mcr.microsoft.com/devcontainers/python:1-3.11-bookworm
+FROM mcr.microsoft.com/devcontainers/python:dev-3.13-bookworm
 
 
 RUN \
+    rm -f /etc/apt/sources.list.d/yarn.list && \
     apt update && apt install bash-completion -y && \
     pip install pre-commit && \
     curl -sSL https://install.python-poetry.org | POETRY_HOME=/home/vscode/.local python3 -
@@ -19,4 +20,4 @@ RUN  \
     echo '    . /etc/bash_completion' >> /home/vscode/.bashrc && \
     echo 'fi' >> /home/vscode/.bashrc && \
     echo >> /home/vscode/.bashrc && \
-    echo '. <(poetry completions)' >> /home/vscode/.bashrc
+    echo '. <(poetry completions)' >> /home/vscode/.bashrc

python/common/business-registry-model/poetry.lock

@@ -1,12 +1,12 @@
 [project]
 name = "business-model"
-version = "3.3.15"
+version = "3.3.16"
 description = ""
 authors = [
     {name = "thor",email = "1042854+thorwolpert@users.noreply.github.com"}
 ]
 readme = "README.md"
-requires-python = ">=3.9,<4"
+requires-python = ">=3.13,<3.14"
 dependencies = [
     "sql-versioning @ git+https://github.com/bcgov/lear.git@main#subdirectory=python/common/sql-versioning-alt",
     "registry-schemas @ git+https://github.com/bcgov/business-schemas.git@2.18.56",