darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2008 from GSA/2007-bug-total-messages-sms-sent-always-zero

Browse Source 
2007 - bug - total messages sms sent always zero
This commit is contained in:
Steven Reilly
2024-10-09 10:26:20 -04:00
committed by GitHub
parent c89a6089a0 5adcfae5d8
commit 338fbfc407
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/utils/time.py
View File

@@ -9,9 +9,8 @@ from app.utils.csv import get_user_preferred_timezone
def get_current_financial_year(): def get_current_financial_year():
preferred_tz = pytz.timezone(get_user_preferred_timezone()) preferred_tz = pytz.timezone(get_user_preferred_timezone())
now = datetime.now(preferred_tz) now = datetime.now(preferred_tz)
current_month = int(now.strftime("%-m"))
current_year = int(now.strftime("%Y")) current_year = int(now.strftime("%Y"))
return current_year if current_month < 10 else current_year + 1 return current_year
def is_less_than_days_ago(date_from_db, number_of_days): def is_less_than_days_ago(date_from_db, number_of_days):

2
tests/app/main/views/organizations/test_organizations.py
View File

@@ -610,7 +610,7 @@ def test_organization_services_links_to_downloadable_report(
assert link_to_report.attrs["href"] == url_for( assert link_to_report.attrs["href"] == url_for(
".download_organization_usage_report", ".download_organization_usage_report",
org_id=ORGANISATION_ID, org_id=ORGANISATION_ID,
selected_year=2022, selected_year=2021,
) )

16
tests/app/utils/test_time.py
View File

@@ -1,7 +1,7 @@
import pytest import pytest
from freezegun import freeze_time from freezegun import freeze_time
from app.utils.time import get_current_financial_year, is_less_than_days_ago from app.utils.time import is_less_than_days_ago
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -15,17 +15,3 @@ from app.utils.time import get_current_financial_year, is_less_than_days_ago
@freeze_time("2020-02-14T12:00:00") @freeze_time("2020-02-14T12:00:00")
def test_is_less_than_days_ago(date_from_db, expected_result): def test_is_less_than_days_ago(date_from_db, expected_result):
assert is_less_than_days_ago(date_from_db, 90) == expected_result assert is_less_than_days_ago(date_from_db, 90) == expected_result
@pytest.mark.parametrize(
("datetime_string", "financial_year"),
[
("2021-01-01T00:00:00+00:00", 2021), # Start of 2021
("2021-04-01T03:59:59+00:00", 2021), # One minute before midnight (BST)
("2021-10-01T04:05:00+00:00", 2022), # Midnight (BST)
("2021-12-12T12:12:12+01:00", 2022), # Later in the year
],
)
def test_get_financial_year(datetime_string, financial_year):
with freeze_time(datetime_string):
assert get_current_financial_year() == financial_year