darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2023-11-03 07:10:06 -07:00
parent 16d4a1de6a 88b1f7ff78
commit 7d2dc776b9
17 changed files with 627 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/date_util.py
View File

@@ -60,7 +60,7 @@ def get_current_calendar_year_start_year():
def get_calendar_year_for_datetime(start_date):
if type(start_date) == date:
if isinstance(start_date, date):
start_date = datetime.combine(start_date, time.min)
year = int(start_date.strftime("%Y"))

5
app/dao/notifications_dao.py
View File

@@ -197,6 +197,11 @@ def dao_get_notification_count_for_job_id(*, job_id):
return Notification.query.filter_by(job_id=job_id).count()
def dao_get_notification_count_for_service(*, service_id):
notification_count = Notification.query.filter_by(service_id=service_id).count()
return notification_count
def get_notification_with_personalisation(service_id, notification_id, key_type):
filter_dict = {"service_id": service_id, "id": notification_id}
if key_type: