GSA
diff --git a/‎app/clients/cloudwatch/aws_cloudwatch.py‎
Lines changed: 13 additions & 9 deletions b/‎app/clients/cloudwatch/aws_cloudwatch.py‎
Lines changed: 13 additions & 9 deletions
diff --git a/‎app/cloudfoundry_config.py‎
Lines changed: 2 additions & 2 deletions b/‎app/cloudfoundry_config.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/commands.py‎
Lines changed: 53 additions & 46 deletions b/‎app/commands.py‎
Lines changed: 53 additions & 46 deletions
diff --git a/‎app/dao/notifications_dao.py‎
Lines changed: 2 additions & 2 deletions b/‎app/dao/notifications_dao.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/notifications/validators.py‎
Lines changed: 3 additions & 2 deletions b/‎app/notifications/validators.py‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎app/organization/rest.py‎
Lines changed: 10 additions & 6 deletions b/‎app/organization/rest.py‎
Lines changed: 10 additions & 6 deletions
@@ -197,15 +197,19 @@ def check_delivery_receipts(self, start, end):
 
     def _get_receipts(self, log_group_name, start, end):
         event_set = set()
-        all_events = self._get_log(log_group_name, start, end)
-        for event in all_events:
-            try:
-                actual_event = self.event_to_db_format(event["message"])
-                event_set.add(json.dumps(actual_event))
-            except Exception:
-                current_app.logger.exception(
-                    f"Could not format delivery receipt {event} for db insert"
-                )
+        try:
+            all_events = self._get_log(log_group_name, start, end)
+            for event in all_events:
+                try:
+                    actual_event = self.event_to_db_format(event["message"])
+                    event_set.add(json.dumps(actual_event))
+                except Exception:
+                    current_app.logger.exception(
+                        f"Could not format delivery receipt {event} for db insert"
+                    )
+        except Exception as e:
+            current_app.logger.error(f"Could not find log group {log_group_name}")
+            raise e
         return event_set
 
     def _aws_value_or_default(self, event, top_level, second_level):
 
@@ -9,8 +9,8 @@ def __init__(self):
         self.s3_buckets = {bucket["name"]: bucket["credentials"] for bucket in buckets}
         self._empty_bucket_credentials = {
             "bucket": "",
-            "access_key_id": "",
-            "secret_access_key": "",
+            "access_key_id": "",  # nosec B105
+            "secret_access_key": "",  # nosec B105
             "region": "",
         }
 
 
@@ -8,7 +8,8 @@
 
 import click
 import flask
-from click_datetime import Datetime as click_dt
+
+# from click_datetime import Datetime as click_dt
 from faker import Faker
 from flask import current_app, json
 from sqlalchemy import and_, select, text, update
@@ -59,7 +60,8 @@
     TemplateHistory,
     User,
 )
-from app.utils import utc_now
+
+# from app.utils import utc_now
 from notifications_python_client.authentication import create_jwt_token
 from notifications_utils.recipients import RecipientCSV
 from notifications_utils.template import SMSMessageTemplate
@@ -260,50 +262,55 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
     file.close()
 
 
-@notify_command(name="archive-jobs-created-between-dates")
-@click.option(
-    "-s",
-    "--start_date",
-    required=True,
-    help="start date inclusive",
-    type=click_dt(format="%Y-%m-%d"),
-)
-@click.option(
-    "-e",
-    "--end_date",
-    required=True,
-    help="end date inclusive",
-    type=click_dt(format="%Y-%m-%d"),
-)
-def update_jobs_archived_flag(start_date, end_date):
-    current_app.logger.info(
-        f"Archiving jobs created between {start_date} to {end_date}"
-    )
-
-    process_date = start_date
-    total_updated = 0
-
-    while process_date < end_date:
-        start_time = utc_now()
-        sql = """update
-                    jobs set archived = true
-                where
-                    created_at >= (date :start + time '00:00:00')
-                    and created_at < (date :end + time '00:00:00')
-        """
-        result = db.session.execute(
-            text(sql), {"start": process_date, "end": process_date + timedelta(days=1)}
-        )
-        db.session.commit()
-        current_app.logger.info(
-            f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
-            f"{result.rowcount} jobs for {process_date}"
-        )
-
-        process_date += timedelta(days=1)
-
-        total_updated += result.rowcount
-    current_app.logger.info(f"Total archived jobs = {total_updated}")
+# TODO this is commented out because there is a conflict between
+# the version of wheel we need to be on (0.46.2 or greater) and
+# the click-datetime dependency, which insists wheel be 0.45.0 or lower.
+# So need to rewrite this command to not use click-datetime, or see
+# if the owners of click-datetime updated it (not as of 1/22/2026).
+# @notify_command(name="archive-jobs-created-between-dates")
+# @click.option(
+#     "-s",
+#     "--start_date",
+#     required=True,
+#     help="start date inclusive",
+#     type=click_dt(format="%Y-%m-%d"),
+# )
+# @click.option(
+#     "-e",
+#     "--end_date",
+#     required=True,
+#     help="end date inclusive",
+#     type=click_dt(format="%Y-%m-%d"),
+# )
+# def update_jobs_archived_flag(start_date, end_date):
+#     current_app.logger.info(
+#         f"Archiving jobs created between {start_date} to {end_date}"
+#     )
+
+#     process_date = start_date
+#     total_updated = 0
+
+#     while process_date < end_date:
+#         start_time = utc_now()
+#         sql = """update
+#                     jobs set archived = true
+#                 where
+#                     created_at >= (date :start + time '00:00:00')
+#                     and created_at < (date :end + time '00:00:00')
+#         """
+#         result = db.session.execute(
+#             text(sql), {"start": process_date, "end": process_date + timedelta(days=1)}
+#         )
+#         db.session.commit()
+#         current_app.logger.info(
+#             f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
+#             f"{result.rowcount} jobs for {process_date}"
+#         )
+
+#         process_date += timedelta(days=1)
+
+#         total_updated += result.rowcount
+#     current_app.logger.info(f"Total archived jobs = {total_updated}")
 
 
 @notify_command(name="populate-organizations-from-file")
 
@@ -308,8 +308,8 @@ def dao_get_notification_count_for_service(*, service_id):
 
 
 def dao_get_notification_count_for_service_message_ratio(service_id, current_year):
-    start_date = datetime(current_year, 6, 16)
-    end_date = datetime(current_year + 1, 6, 16)
+    start_date = datetime(current_year - 1, 6, 16)
+    end_date = datetime(current_year, 6, 16)
     stmt1 = (
         select(func.count())
         .select_from(Notification)
 
@@ -35,11 +35,12 @@ def check_service_over_total_message_limit(key_type, service):
     # For now we are using calendar year
     # Switch to using service agreement dates when the Agreement model is ready
     # If the service stat has never been set before, compute the remaining seconds for 2025
-    # and set it (all services) to expire on 12/31/2025.
+    # and set it (all services) to expire on 12/31/2026.
     if service_stats is None:
         now_et = datetime.now(ZoneInfo("America/New_York"))
+
         target_time = datetime(
-            2025, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
+            2026, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("America/New_York")
         )
         time_difference = target_time - now_et
         seconds_difference = int(time_difference.total_seconds())
 
@@ -180,7 +180,9 @@ def get_organization_dashboard(organization_id):
         organization_id, year, include_all_services=True
     )
 
-    service_ids = [service_data["service_id"] for service_data in services_with_usage.values()]
+    service_ids = [
+        service_data["service_id"] for service_data in services_with_usage.values()
+    ]
 
     if not service_ids:
         return jsonify(services=[]), 200
@@ -197,11 +199,13 @@ def get_organization_dashboard(organization_id):
     sorted_services = sorted(
         services_list,
         key=lambda s: (
-            0 if (s["active"] and not s["restricted"]) else
-            1 if (s["active"] and s["restricted"]) else
-            2,
-            s["service_name"].lower()
-        )
+            (
+                0
+                if (s["active"] and not s["restricted"])
+                else 1 if (s["active"] and s["restricted"]) else 2
+            ),
+            s["service_name"].lower(),
+        ),
     )
 
     return jsonify(services=sorted_services)