mirror of
https://github.com/GSA/notifications-api.git
synced 2026-08-19 05:58:53 -04:00
we don't need created_at here
This commit is contained in:
@@ -21,7 +21,7 @@ from app.models import (
|
|||||||
Rate,
|
Rate,
|
||||||
Service,
|
Service,
|
||||||
)
|
)
|
||||||
from app.utils import DATETIME_FORMAT, get_midnight_in_utc, utc_now
|
from app.utils import get_midnight_in_utc, utc_now
|
||||||
|
|
||||||
|
|
||||||
def fetch_sms_free_allowance_remainder_until_date(end_date):
|
def fetch_sms_free_allowance_remainder_until_date(end_date):
|
||||||
@@ -617,7 +617,6 @@ def fetch_sms_billing_for_organization(organization_id, financial_year):
|
|||||||
func.coalesce(sms_cost, 0).label("sms_cost"),
|
func.coalesce(sms_cost, 0).label("sms_cost"),
|
||||||
Service.active,
|
Service.active,
|
||||||
Service.restricted,
|
Service.restricted,
|
||||||
Service.created_at,
|
|
||||||
)
|
)
|
||||||
.select_from(Service)
|
.select_from(Service)
|
||||||
.outerjoin(
|
.outerjoin(
|
||||||
@@ -729,7 +728,6 @@ def fetch_usage_year_for_organization(organization_id, year, include_all_service
|
|||||||
"emails_sent": 0,
|
"emails_sent": 0,
|
||||||
"active": service.active,
|
"active": service.active,
|
||||||
"restricted": service.restricted,
|
"restricted": service.restricted,
|
||||||
"created_at": service.created_at.strftime(DATETIME_FORMAT),
|
|
||||||
}
|
}
|
||||||
sms_usages = fetch_sms_billing_for_organization(organization_id, year)
|
sms_usages = fetch_sms_billing_for_organization(organization_id, year)
|
||||||
email_usages = fetch_email_usage_for_organization(
|
email_usages = fetch_email_usage_for_organization(
|
||||||
@@ -747,7 +745,6 @@ def fetch_usage_year_for_organization(organization_id, year, include_all_service
|
|||||||
"emails_sent": 0,
|
"emails_sent": 0,
|
||||||
"active": usage.active,
|
"active": usage.active,
|
||||||
"restricted": usage.restricted,
|
"restricted": usage.restricted,
|
||||||
"created_at": usage.created_at.strftime(DATETIME_FORMAT),
|
|
||||||
}
|
}
|
||||||
for email_usage in email_usages:
|
for email_usage in email_usages:
|
||||||
service_with_usage[str(email_usage.service_id)][
|
service_with_usage[str(email_usage.service_id)][
|
||||||
|
|||||||
Reference in New Issue
Block a user