fix: prevent duplicate fuel code expiry notification emails

backend/lcfs/scripts/tasks/fuel_code_expiry.py

@@ -117,6 +117,10 @@ async def notify_expiring_fuel_code(db_session: AsyncSession):
                 f"Marking {len(notified_fuel_code_ids)} fuel codes as notified"
             )
             await fuel_code_repo.mark_fuel_codes_notified(notified_fuel_code_ids)
+            # Commit so the notification timestamps are persisted — without this,
+            # the session closes uncommitted and the same codes are re-selected
+            # on the next scheduler run, causing duplicate emails.
+            await db_session.commit()
 
         logger.info(
             f"Sent fuel code expiry notifications to {success_count}/{total_emails} contacts"

backend/lcfs/scripts/tests/test_fuel_code_expiry.py

@@ -130,6 +130,9 @@ async def test_notify_expiring_fuel_code_success(
             notified_ids = mock_repo.mark_fuel_codes_notified.call_args[0][0]
             assert sorted(notified_ids) == [1, 2, 3]
 
+            # Verify the session is committed so notification timestamps persist
+            mock_db_session.commit.assert_called_once()
+
     @pytest.mark.anyio
     @patch(
         "lcfs.scripts.tasks.fuel_code_expiry.settings.feature_fuel_code_expiry_email",
@@ -222,6 +225,8 @@ async def test_notify_expiring_fuel_code_email_service_failure(
             assert result is False
             # No fuel codes should be marked as notified when all emails fail
             mock_repo.mark_fuel_codes_notified.assert_not_called()
+            # No commit should happen when no emails were sent
+            mock_db_session.commit.assert_not_called()
 
     @pytest.mark.anyio
     async def test_notify_expiring_fuel_code_partial_success(
@@ -262,6 +267,9 @@ async def test_notify_expiring_fuel_code_partial_success(
             # Only codes 1 and 3 (Company A) should be marked since that email succeeded
             assert sorted(notified_ids) == [1, 3]
 
+            # Verify commit is called to persist the notification timestamps
+            mock_db_session.commit.assert_called_once()
+
     @pytest.mark.anyio
     @patch(
         "lcfs.scripts.tasks.fuel_code_expiry.settings.feature_fuel_code_expiry_email",

backend/lcfs/web/api/fuel_code/repo.py

@@ -1209,8 +1209,9 @@ async def get_expiring_fuel_codes(self) -> List[FuelCode]:
         """
         query = (
             select(FuelCode)
+            .join(FuelCode.fuel_code_status)
             .options(
-                joinedload(FuelCode.fuel_code_status),
+                contains_eager(FuelCode.fuel_code_status),
                 joinedload(FuelCode.fuel_code_prefix),
             )
             .where(