Merge pull request #4651 from alphagov/ris-update-billing-from-bulk-session

`create_or_update_ft_billing_for_day`: use bulk session to fetch billing data

Author: risicle

app/celery/reporting_tasks.py

@@ -3,7 +3,7 @@
 from flask import current_app
 from notifications_utils.timezones import convert_utc_to_bst
 
-from app import notify_celery, redis_store
+from app import db, notify_celery, redis_store
 from app.config import QueueNames
 from app.constants import EMAIL_TYPE, LETTER_TYPE, SMS_TYPE, CacheKeys
 from app.cronitor import cronitor
@@ -74,7 +74,7 @@ def create_or_update_ft_billing_for_day(process_day: str):
     )
 
     start = datetime.utcnow()
-    billing_data = fetch_billing_data_for_day(process_day=process_date)
+    billing_data = fetch_billing_data_for_day(process_day=process_date, session=db.session_bulk)
     end = datetime.utcnow()
 
     base_params = {

app/dao/fact_billing_dao.py

@@ -499,7 +499,7 @@ def delete_billing_data_for_day(process_day: date, service_ids=None):
     return FactBilling.query.filter(*filters).delete()
 
 
-def fetch_billing_data_for_day(process_day: date, service_ids=None, check_permissions=False):
+def fetch_billing_data_for_day(process_day: date, service_ids=None, check_permissions=False, session=db.session):
     start_date = get_london_midnight_in_utc(process_day)
     end_date = get_london_midnight_in_utc(process_day + timedelta(days=1))
     extra = {"start_time": start_date, "end_time": end_date}
@@ -513,16 +513,17 @@ def fetch_billing_data_for_day(process_day: date, service_ids=None, check_permis
             end_date=end_date,
             service_ids=service_ids,
             check_permissions=check_permissions,
+            session=session,
         )
         billing_data += partial_billing_data
 
     return billing_data
 
 
-def _query_for_billing_data(notification_type, start_date, end_date, service_ids, check_permissions):
-    base_query = db.session.query(NotificationAllTimeView).join(
-        Service, NotificationAllTimeView.service_id == Service.id
-    )
+def _query_for_billing_data(
+    notification_type, start_date, end_date, service_ids, check_permissions, session=db.session
+):
+    base_query = session.query(NotificationAllTimeView).join(Service, NotificationAllTimeView.service_id == Service.id)
 
     if check_permissions:
         base_query = base_query.join(