From f5d8cf53be47eeaa050bab4e80bb68a64153f338 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Jan 2026 09:22:03 -0800 Subject: [PATCH 1/3] fix message ratio --- app/cloudfoundry_config.py | 4 ++-- app/dao/notifications_dao.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/cloudfoundry_config.py b/app/cloudfoundry_config.py index 0af4ac63c..602ee98fd 100644 --- a/app/cloudfoundry_config.py +++ b/app/cloudfoundry_config.py @@ -9,8 +9,8 @@ class CloudfoundryConfig: self.s3_buckets = {bucket["name"]: bucket["credentials"] for bucket in buckets} self._empty_bucket_credentials = { "bucket": "", - "access_key_id": "", # nosec B105 - "secret_access_key": "", # nosec B105 + "access_key_id": "", # nosec B105 + "secret_access_key": "", # nosec B105 "region": "", } diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 3588e9000..04d79d7f4 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -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, 1) + end_date = datetime(current_year + 1, 1, 1) stmt1 = ( select(func.count()) .select_from(Notification) From 51bfd2eab030bd789dfb7e3c0d3defd3cc76c1f9 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Jan 2026 09:23:16 -0800 Subject: [PATCH 2/3] fix message ratio --- app/dao/notifications_dao.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 04d79d7f4..e32312073 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -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, 1, 1) - end_date = datetime(current_year + 1, 1, 1) + start_date = datetime(current_year - 1, 6, 16) + end_date = datetime(current_year, 6, 16) stmt1 = ( select(func.count()) .select_from(Notification) From c2e6d7e070c1e6838464c46e730e9e29a5ed207c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Jan 2026 09:52:26 -0800 Subject: [PATCH 3/3] update jaraco-context due to pip-audit --- poetry.lock | 16 ++++++++++------ pyproject.toml | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3aacb3004..245864084 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2221,19 +2221,23 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-ena [[package]] name = "jaraco-context" -version = "6.0.1" +version = "6.1.0" description = "Useful decorators and context managers" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main", "dev"] files = [ - {file = "jaraco.context-6.0.1-py3-none-any.whl", hash = "sha256:f797fc481b490edb305122c9181830a3a5b76d84ef6d1aef2fb9b47ab956f9e4"}, - {file = "jaraco_context-6.0.1.tar.gz", hash = "sha256:9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3"}, + {file = "jaraco_context-6.1.0-py3-none-any.whl", hash = "sha256:a43b5ed85815223d0d3cfdb6d7ca0d2bc8946f28f30b6f3216bda070f68badda"}, + {file = "jaraco_context-6.1.0.tar.gz", hash = "sha256:129a341b0a85a7db7879e22acd66902fda67882db771754574338898b2d5d86f"}, ] [package.extras] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\""] +cover = ["pytest-cov"] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -test = ["portend", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\""] +enabler = ["pytest-enabler (>=3.4)"] +test = ["jaraco.test (>=5.6.0)", "portend", "pytest (>=6,!=8.1.*)"] +type = ["mypy (<1.19) ; platform_python_implementation == \"PyPy\"", "pytest-mypy (>=1.0.1)"] [[package]] name = "jaraco-functools" @@ -5993,4 +5997,4 @@ cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and pyt [metadata] lock-version = "2.1" python-versions = "^3.13.2" -content-hash = "a98b696883903201a92f35481844ed84e831f868032d8d9f603a9c9db6fa5b1e" +content-hash = "783ed054878d8b7ab75acc2b6b8d6aec966b09c4a04f848107b4e4d433b80e04" diff --git a/pyproject.toml b/pyproject.toml index aab87bd58..6f9649819 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -82,6 +82,7 @@ aiohttp = "^3.13.3" pytest = "^9.0.2" filelock = ">=3.20.3" pyasn1 = ">=0.6.2" +jaraco-context = ">=6.1.0" [tool.poetry.group.dev.dependencies]