mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-18 06:01:44 -05:00
fix
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
from sqlalchemy import select
|
||||||
from sqlalchemy.dialects.postgresql import insert
|
from sqlalchemy.dialects.postgresql import insert
|
||||||
from sqlalchemy.sql.expression import case
|
from sqlalchemy.sql.expression import case
|
||||||
|
|
||||||
@@ -34,7 +35,7 @@ def insert_update_processing_time(processing_time):
|
|||||||
|
|
||||||
def get_processing_time_percentage_for_date_range(start_date, end_date):
|
def get_processing_time_percentage_for_date_range(start_date, end_date):
|
||||||
query = (
|
query = (
|
||||||
db.session.query(
|
select(
|
||||||
FactProcessingTime.local_date.cast(db.Text).label("date"),
|
FactProcessingTime.local_date.cast(db.Text).label("date"),
|
||||||
FactProcessingTime.messages_total,
|
FactProcessingTime.messages_total,
|
||||||
FactProcessingTime.messages_within_10_secs,
|
FactProcessingTime.messages_within_10_secs,
|
||||||
@@ -52,11 +53,11 @@ def get_processing_time_percentage_for_date_range(start_date, end_date):
|
|||||||
(FactProcessingTime.messages_total == 0, 100.0),
|
(FactProcessingTime.messages_total == 0, 100.0),
|
||||||
).label("percentage"),
|
).label("percentage"),
|
||||||
)
|
)
|
||||||
.filter(
|
.where(
|
||||||
FactProcessingTime.local_date >= start_date,
|
FactProcessingTime.local_date >= start_date,
|
||||||
FactProcessingTime.local_date <= end_date,
|
FactProcessingTime.local_date <= end_date,
|
||||||
)
|
)
|
||||||
.order_by(FactProcessingTime.local_date)
|
.order_by(FactProcessingTime.local_date)
|
||||||
)
|
)
|
||||||
|
|
||||||
return query.all()
|
return db.session.execute(query).scalars().all()
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ def test_insert_update_processing_time(notify_db_session):
|
|||||||
with freeze_time("2021-02-23 13:23:33"):
|
with freeze_time("2021-02-23 13:23:33"):
|
||||||
fact_processing_time_dao.insert_update_processing_time(data)
|
fact_processing_time_dao.insert_update_processing_time(data)
|
||||||
|
|
||||||
result = FactProcessingTime.query.all()
|
result = db.session.execute(select(FactProcessingTime)).scalars().all()
|
||||||
|
|
||||||
assert len(result) == 1
|
assert len(result) == 1
|
||||||
assert result[0].local_date == datetime(2021, 2, 22).date()
|
assert result[0].local_date == datetime(2021, 2, 22).date()
|
||||||
|
|||||||
Reference in New Issue
Block a user