22681 remove notes ar filer (#2986)

* 22681_remove_notes_ar_filer * update get eligibility process * fix lint issue
bcgov · Sep 16, 2024 · db1e540 · db1e540
1 parent 966b90c
commit db1e540
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/queue_services/entity-filer/src/entity_filer/filing_processors/annual_report.py b/queue_services/entity-filer/src/entity_filer/filing_processors/annual_report.py
@@ -49,11 +49,14 @@ def process(business: Business, filing: Dict, filing_meta: FilingMeta, flag_on):
     if flag_on and business.in_dissolution:
         eligibility, _ = InvoluntaryDissolutionService.check_business_eligibility(
             business.identifier,
-            InvoluntaryDissolutionService.EligibilityFilters(exclude_in_dissolution=False)
+            InvoluntaryDissolutionService.EligibilityFilters(
+                    exclude_in_dissolution=False, exclude_future_effective_filing=True
+                )
             )
         if not eligibility:
             batch_processing, _ = InvoluntaryDissolutionService.get_in_dissolution_batch_processing(business.id)
             batch_processing.status = BatchProcessing.BatchProcessingStatus.WITHDRAWN.value
+            batch_processing.notes = 'Moved back into good standing'
             batch_processing.last_modified = datetime.datetime.utcnow()
 
     # save the annual report date to the filing meta info

diff --git a/queue_services/entity-filer/tests/unit/filing_processors/test_annual_report.py b/queue_services/entity-filer/tests/unit/filing_processors/test_annual_report.py
@@ -60,8 +60,8 @@ def test_process_ar_filing_involuntary_dissolution(app, session, test_name, flag
     now = datetime.datetime.utcnow()
     if eligibility:
         # setup ar_date to """INTERVAL '26 MONTHS'"" to make the businees is eligibility
-        ar_date = datetime.date(year=now.year-3, month=now.month-1, day=now.day)
-        agm_date = datetime.date(year=now.year-3, month=now.month-2, day=now.day)
+        ar_date = datetime.date(year=now.year-4, month=now.month-1, day=now.day)
+        agm_date = datetime.date(year=now.year-4, month=now.month-2, day=now.day)
     else:
         ar_date = datetime.date(year=now.year, month=now.month-1, day=now.day)
         agm_date = datetime.date(year=now.year, month=now.month-2, day=now.day)
@@ -81,6 +81,7 @@ def test_process_ar_filing_involuntary_dissolution(app, session, test_name, flag
         # check it out
         if flag_on and in_dissolution and not eligibility:
             assert batch_processing.status == BatchProcessing.BatchProcessingStatus.WITHDRAWN.value
+            assert batch_processing.notes == 'Moved back into good standing'
         else:
             if in_dissolution:
                 assert batch_processing.status == BatchProcessing.BatchProcessingStatus.PROCESSING.value