darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-02 17:48:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 1006-new-api-failed-and-delivered-messages-7-days

Browse Source
This commit is contained in:
Anastasia Gradova
2024-06-05 11:47:55 -06:00
parent 41f2416216 8544a29e34
commit 227b9a3fc9
99 changed files with 1476 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/dao/services_dao.py
View File

@@ -1,5 +1,5 @@
import uuid
from datetime import datetime, timedelta
from datetime import timedelta
from flask import current_app
from sqlalchemy import Float, cast, select
@@ -44,6 +44,7 @@ from app.utils import (
escape_special_characters,
get_archived_db_column_value,
get_midnight_in_utc,
utc_now,
)
@@ -252,7 +253,7 @@ def dao_archive_service(service_id):
for api_key in service.api_keys:
if not api_key.expiry_date:
api_key.expiry_date = datetime.utcnow()
api_key.expiry_date = utc_now()
def dao_fetch_service_by_id_and_user(service_id, user_id):
@@ -404,7 +405,7 @@ def delete_service_and_all_associated_db_objects(service):
def dao_fetch_todays_stats_for_service(service_id):
today = datetime.utcnow().date()
today = utc_now().date()
start_date = get_midnight_in_utc(today)
return (
db.session.query(
@@ -481,7 +482,7 @@ def dao_fetch_stats_for_service_from_day_for_user(service_id, day, user_id):
def dao_fetch_todays_stats_for_all_services(
include_from_test_key=True, only_active=True
):
today = datetime.utcnow().date()
today = utc_now().date()
start_date = get_midnight_in_utc(today)
end_date = get_midnight_in_utc(today + timedelta(days=1))
@@ -544,7 +545,7 @@ def dao_suspend_service(service_id):
for api_key in service.api_keys:
if not api_key.expiry_date:
api_key.expiry_date = datetime.utcnow()
api_key.expiry_date = utc_now()
service.active = False