Eli 615 : fix - multi campaign target collision (#593)

* ELI-615 | campaign having recent - active start_date supersedes the others sharing same best-status

* ELI-615 | more linting

* ELI-615 | revert commit

* ELI-615 | wip

* ELI-615 | wip

* ELI-615 | wip

* Bump werkzeug from 3.1.5 to 3.1.6

Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.5...3.1.6)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-version: 3.1.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updated not_member_of operator to NotMemberOf (#594)

* Added vulture to workflows (#585)

* Added vulture to workflows

* Added new make commands and added to project

* Added updated lockfile

* Minimal config with no errors

* Corrected vulture commands

* Generating new lock file

* ELI-615 | modified iterations_result to iteration result

* ELI-615 | fix - naming issues | handle stop iter exception

* ELI-615 | campaign_configs - fixture updated | test case fixed

* ELI-615 | fix flaky tests do to fixture scope

* ELI-615 | fix flaky tests - removed best status test

* ELI-615 | used raw campagin config for tests using iteration dates

* ELI-615 | fix - campaign group is used correctly

* ELI-615 | fix test_campaigns_grouped_by_condition_name_filters_correctly

* ELI-615 | fix tests

* ELI-615 | linting

* ELI-615 | renamed best_iteration_result to iteration_result_summary

* ELI-615 | add more test cases - it tests

* ELI-615 | test commit - try git leaks ignore

* ELI-615 | incorporated review comments

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: oneeb-nhs <258801025+oneeb-nhs@users.noreply.github.com>
Co-authored-by: Robert Bailiff <rob.bailiff1@nhs.net>

Author: 4 people

.gitleaksignore

@@ -1,4 +1,5 @@
 # SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore
 
 cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37
+
 bf0c77098978c450d8570b38fb480fbb8d6a0628:.github/instructions/*.instructions.md:stripe-access-token:140

src/eligibility_signposting_api/services/processors/campaign_evaluator.py

@@ -31,7 +31,7 @@ def get_campaign_with_latest_iteration(self, active_campaigns: list[CampaignConf
 
         for cc in active_campaigns:
             try:
-                valid_items.append((cc.current_iteration.iteration_datetime, cc))
+                valid_items.append((cc.current_iteration.iteration_date, cc))
             except StopIteration:
                 logger.info(
                     "Skipping campaign ID %s as no active iteration was found.",
@@ -41,15 +41,13 @@ def get_campaign_with_latest_iteration(self, active_campaigns: list[CampaignConf
         if not valid_items:
             latest_campaign = None
         else:
-            max_date_time = max(item[0] for item in valid_items)
-            cc_with_max_iteration_date: list[CampaignConfig] = [
-                item[1] for item in valid_items if item[0] == max_date_time
-            ]
+            max_date = max(item[0] for item in valid_items)
+            cc_with_max_iteration_date: list[CampaignConfig] = [item[1] for item in valid_items if item[0] == max_date]
             if len(cc_with_max_iteration_date) > 1:
                 err_msg = (
                     f"Ambiguous result: '{len(cc_with_max_iteration_date)}' active iterations "
                     f"for target {cc_with_max_iteration_date[0].target} "
-                    f"found for datetime '{max_date_time}' "
+                    f"found for date '{max_date}' "
                     f"across campaign(s) {[cc.id for cc in cc_with_max_iteration_date]}"
                 )
                 raise ValueError(err_msg)

tests/integration/in_process/test_eligibility_endpoint.py

@@ -33,15 +33,15 @@
 from tests.integration.conftest import UNIQUE_CONSUMER_HEADER
 
 
-def today() -> date:
+def today():
     return datetime.now(UTC).date()
 
 
-def yesterday() -> date:
+def yesterday():
     return datetime.now(UTC).date() - timedelta(days=1)
 
 
-def tomorrow() -> date:
+def tomorrow():
     return datetime.now(UTC).date() + timedelta(days=1)
 
 
@@ -1532,10 +1532,11 @@ def test_if_multiple_active_iterations_with_same_iteration_datetime_for_the_same
                 )
             ),
         )
+
         err_msg = (
             "Ambiguous result: '2' active iterations "
             "for target RSV "
-            f"found for datetime '{previous_day} 00:00:00+00:00' "
+            f"found for date '{previous_day}' "
             "across campaign(s) ['RSV_campaign_id_1', 'RSV_campaign_id_2']"
         )
         assert any(err_msg in message for message in caplog.messages), (