diff --git a/app/dao/fact_billing_dao.py b/app/dao/fact_billing_dao.py index 93dca2d61..3878b1f45 100644 --- a/app/dao/fact_billing_dao.py +++ b/app/dao/fact_billing_dao.py @@ -186,6 +186,7 @@ def fetch_letter_line_items_for_all_services(start_date, end_date): @statsd(namespace="dao") def fetch_billing_totals_for_year(service_id, year): + print("fetch_billing_totals_for_year", year) year_start_date, year_end_date = get_financial_year(year) """ Billing for email: only record the total number of emails. diff --git a/app/dao/organisation_dao.py b/app/dao/organisation_dao.py index f9757664f..8dc4e3bc0 100644 --- a/app/dao/organisation_dao.py +++ b/app/dao/organisation_dao.py @@ -17,7 +17,7 @@ def dao_get_organisations(): ).all() -def dao_count_organsations_with_live_services(): +def dao_count_organisations_with_live_services(): return db.session.query(Organisation.id).join(Organisation.services).filter( Service.active.is_(True), Service.restricted.is_(False), diff --git a/app/status/healthcheck.py b/app/status/healthcheck.py index 4b248ae26..49f80980e 100644 --- a/app/status/healthcheck.py +++ b/app/status/healthcheck.py @@ -6,7 +6,7 @@ from flask import ( from app import db, version from app.dao.services_dao import dao_count_live_services -from app.dao.organisation_dao import dao_count_organsations_with_live_services +from app.dao.organisation_dao import dao_count_organisations_with_live_services status = Blueprint('status', __name__) @@ -28,7 +28,7 @@ def show_status(): @status.route('/_status/live-service-and-organisation-counts') def live_service_and_organisation_counts(): return jsonify( - organisations=dao_count_organsations_with_live_services(), + organisations=dao_count_organisations_with_live_services(), services=dao_count_live_services(), ), 200