Rename database management functions.

Rename @transactional to @autocommit.
Rename nested_transaction to tranaction.

app/dao/annual_billing_dao.py

@@ -1,12 +1,12 @@
 from flask import current_app
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.dao.date_util import get_current_financial_year_start_year
 from app.models import AnnualBilling
 
 
-@transactional
+@autocommit
 def dao_create_or_update_annual_billing_for_year(service_id, free_sms_fragment_limit, financial_year_start):
     result = dao_get_free_sms_fragment_limit_for_year(service_id, financial_year_start)
 
@@ -25,7 +25,7 @@ def dao_get_annual_billing(service_id):
     ).order_by(AnnualBilling.financial_year_start).all()
 
 
-@transactional
+@autocommit
 def dao_update_annual_billing_for_future_years(service_id, free_sms_fragment_limit, financial_year_start):
     AnnualBilling.query.filter(
         AnnualBilling.service_id == service_id,

app/dao/api_key_dao.py

@@ -4,11 +4,11 @@ from datetime import datetime, timedelta
 from sqlalchemy import func, or_
 
 from app import db
-from app.dao.dao_utils import transactional, version_class
+from app.dao.dao_utils import autocommit, version_class
 from app.models import ApiKey
 
 
-@transactional
+@autocommit
 @version_class(ApiKey)
 def save_model_api_key(api_key):
     if not api_key.id:
@@ -17,7 +17,7 @@ def save_model_api_key(api_key):
     db.session.add(api_key)
 
 
-@transactional
+@autocommit
 @version_class(ApiKey)
 def expire_api_key(service_id, api_key_id):
     api_key = ApiKey.query.filter_by(id=api_key_id, service_id=service_id).one()

app/dao/broadcast_message_dao.py

@@ -1,7 +1,7 @@
 import uuid
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import (
     BroadcastEvent,
     BroadcastMessage,
@@ -43,7 +43,7 @@ def get_earlier_events_for_broadcast_event(broadcast_event_id):
     ).all()
 
 
-@transactional
+@autocommit
 def create_broadcast_provider_message(broadcast_event, provider):
     broadcast_provider_message_id = uuid.uuid4()
     provider_message = BroadcastProviderMessage(
@@ -63,6 +63,6 @@ def create_broadcast_provider_message(broadcast_event, provider):
     return provider_message
 
 
-@transactional
+@autocommit
 def update_broadcast_provider_message_status(broadcast_provider_message, *, status):
     broadcast_provider_message.status = status

app/dao/broadcast_service_dao.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from flask import current_app
 
 from app import db
-from app.dao.dao_utils import transactional, version_class
+from app.dao.dao_utils import autocommit, version_class
 from app.models import (
     BROADCAST_TYPE,
     EMAIL_AUTH_TYPE,
@@ -14,7 +14,7 @@ from app.models import (
 )
 
 
-@transactional
+@autocommit
 @version_class(Service)
 def set_broadcast_service_type(service, service_mode, broadcast_channel, provider_restriction):
     insert_or_update_service_broadcast_settings(

app/dao/complaint_dao.py

@@ -4,12 +4,12 @@ from flask import current_app
 from sqlalchemy import desc
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import Complaint
 from app.utils import get_london_midnight_in_utc
 
 
-@transactional
+@autocommit
 def save_complaint(complaint):
     db.session.add(complaint)
 

app/dao/daily_sorted_letter_dao.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from sqlalchemy.dialects.postgresql import insert
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import DailySortedLetter
 
 
@@ -13,7 +13,7 @@ def dao_get_daily_sorted_letter_by_billing_day(billing_day):
     ).first()
 
 
-@transactional
+@autocommit
 def dao_create_or_update_daily_sorted_letter(new_daily_sorted_letter):
     '''
     This uses the Postgres upsert to avoid race conditions when two threads try and insert

app/dao/dao_utils.py

@@ -6,7 +6,7 @@ from app import db
 from app.history_meta import create_history
 
 
-def transactional(func):
+def autocommit(func):
     @wraps(func)
     def commit_or_rollback(*args, **kwargs):
         try:
@@ -23,7 +23,7 @@ def transactional(func):
 
 
 @contextmanager
-def nested_transaction():
+def transaction():
     try:
         db.session.begin_nested()
         yield
@@ -93,7 +93,7 @@ def dao_rollback():
     db.session.rollback()
 
 
-@transactional
+@autocommit
 def dao_save_object(obj):
     # add/update object in db
     db.session.add(obj)

app/dao/email_branding_dao.py

@@ -1,5 +1,5 @@
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import EmailBranding
 
 
@@ -15,12 +15,12 @@ def dao_get_email_branding_by_name(email_branding_name):
     return EmailBranding.query.filter_by(name=email_branding_name).first()
 
 
-@transactional
+@autocommit
 def dao_create_email_branding(email_branding):
     db.session.add(email_branding)
 
 
-@transactional
+@autocommit
 def dao_update_email_branding(email_branding, **kwargs):
     for key, value in kwargs.items():
         setattr(email_branding, key, value or None)

app/dao/fact_notification_status_dao.py

@@ -8,7 +8,7 @@ from sqlalchemy.sql.expression import extract, literal
 from sqlalchemy.types import DateTime, Integer
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import (
     KEY_TYPE_TEST,
     NOTIFICATION_CANCELLED,
@@ -83,7 +83,7 @@ def query_for_fact_status_data(table, start_date, end_date, notification_type, s
     return query.all()
 
 
-@transactional
+@autocommit
 def update_fact_notification_status(data, process_day, notification_type):
     table = FactNotificationStatus.__table__
     FactNotificationStatus.query.filter(

app/dao/fact_processing_time_dao.py

@@ -3,11 +3,11 @@ from datetime import datetime
 from sqlalchemy.dialects.postgresql import insert
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import FactProcessingTime
 
 
-@transactional
+@autocommit
 def insert_update_processing_time(processing_time):
     '''
     This uses the Postgres upsert to avoid race conditions when two threads try and insert

app/dao/inbound_numbers_dao.py

@@ -1,5 +1,5 @@
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import InboundNumber
 
 
@@ -19,13 +19,13 @@ def dao_get_inbound_number(inbound_number_id):
     return InboundNumber.query.filter(InboundNumber.id == inbound_number_id).first()
 
 
-@transactional
+@autocommit
 def dao_set_inbound_number_to_service(service_id, inbound_number):
     inbound_number.service_id = service_id
     db.session.add(inbound_number)
 
 
-@transactional
+@autocommit
 def dao_set_inbound_number_active_flag(service_id, active):
     inbound_number = InboundNumber.query.filter(InboundNumber.service_id == service_id).first()
     inbound_number.active = active
@@ -33,7 +33,7 @@ def dao_set_inbound_number_active_flag(service_id, active):
     db.session.add(inbound_number)
 
 
-@transactional
+@autocommit
 def dao_allocate_number_for_service(service_id, inbound_number_id):
     updated = InboundNumber.query.filter_by(
         id=inbound_number_id,

app/dao/inbound_sms_dao.py

@@ -4,7 +4,7 @@ from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.orm import aliased
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import (
     SMS_TYPE,
     InboundSms,
@@ -15,7 +15,7 @@ from app.models import (
 from app.utils import midnight_n_days_ago
 
 
-@transactional
+@autocommit
 def dao_create_inbound_sms(inbound_sms):
     db.session.add(inbound_sms)
 
@@ -113,7 +113,7 @@ def _delete_inbound_sms(datetime_to_delete_from, query_filter):
     return deleted
 
 
-@transactional
+@autocommit
 def delete_inbound_sms_older_than_retention():
     current_app.logger.info('Deleting inbound sms for services with flexible data retention')
 

app/dao/jobs_dao.py

@@ -9,7 +9,7 @@ from notifications_utils.letter_timings import (
 from sqlalchemy import and_, asc, desc, func
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.dao.templates_dao import dao_get_template_by_id
 from app.models import (
     JOB_STATUS_CANCELLED,
@@ -183,7 +183,7 @@ def dao_get_jobs_older_than_data_retention(notification_types):
     return jobs
 
 
-@transactional
+@autocommit
 def dao_cancel_letter_job(job):
     number_of_notifications_cancelled = Notification.query.filter(
         Notification.job_id == job.id

app/dao/letter_branding_dao.py

@@ -1,5 +1,5 @@
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import LetterBranding
 
 
@@ -15,12 +15,12 @@ def dao_get_all_letter_branding():
     return LetterBranding.query.order_by(LetterBranding.name).all()
 
 
-@transactional
+@autocommit
 def dao_create_letter_branding(letter_branding):
     db.session.add(letter_branding)
 
 
-@transactional
+@autocommit
 def dao_update_letter_branding(letter_branding_id, **kwargs):
     letter_branding = LetterBranding.query.get(letter_branding_id)
     for key, value in kwargs.items():

app/dao/notifications_dao.py

@@ -25,7 +25,7 @@ from app import create_uuid, db
 from app.clients.sms.firetext import (
     get_message_status_and_reason_from_firetext_code,
 )
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.letters.utils import LetterPDFNotFound, find_letter_pdf_in_s3
 from app.models import (
     EMAIL_TYPE,
@@ -79,7 +79,7 @@ def dao_get_last_date_template_was_used(template_id, service_id):
     return last_date
 
 
-@transactional
+@autocommit
 def dao_create_notification(notification):
     if not notification.id:
         # need to populate defaulted fields before we create the notification history object
@@ -123,7 +123,7 @@ def _update_notification_status(notification, status, detailed_status_code=None)
     return notification
 
 
-@transactional
+@autocommit
 def update_notification_status_by_id(notification_id, status, sent_by=None, detailed_status_code=None):
     notification = Notification.query.with_for_update().filter(Notification.id == notification_id).first()
 
@@ -159,7 +159,7 @@ def update_notification_status_by_id(notification_id, status, sent_by=None, deta
     )
 
 
-@transactional
+@autocommit
 def update_notification_status_by_reference(reference, status):
     # this is used to update letters and emails
     notification = Notification.query.filter(Notification.reference == reference).first()
@@ -181,7 +181,7 @@ def update_notification_status_by_reference(reference, status):
     )
 
 
-@transactional
+@autocommit
 def dao_update_notification(notification):
     notification.updated_at = datetime.utcnow()
     db.session.add(notification)
@@ -339,7 +339,7 @@ def delete_notifications_older_than_retention_by_type(notification_type, qry_lim
     return deleted
 
 
-@transactional
+@autocommit
 def insert_notification_history_delete_notifications(
     notification_type, service_id, timestamp_to_delete_backwards_from, qry_limit=50000
 ):
@@ -459,7 +459,7 @@ def _delete_letters_from_s3(
                 "Could not delete S3 object for letter: {}".format(letter.id))
 
 
-@transactional
+@autocommit
 def dao_delete_notifications_by_id(notification_id):
     db.session.query(Notification).filter(
         Notification.id == notification_id
@@ -569,7 +569,7 @@ def is_delivery_slow_for_providers(
     return slow_providers
 
 
-@transactional
+@autocommit
 def dao_update_notifications_by_reference(references, update_dict):
     updated_count = Notification.query.filter(
         Notification.reference.in_(references)

app/dao/organisation_dao.py

@@ -1,7 +1,7 @@
 from sqlalchemy.sql.expression import func
 
 from app import db
-from app.dao.dao_utils import VersionOptions, transactional, version_class
+from app.dao.dao_utils import VersionOptions, autocommit, version_class
 from app.models import Domain, Organisation, Service, User
 
 
@@ -55,12 +55,12 @@ def dao_get_organisation_by_service_id(service_id):
     return Organisation.query.join(Organisation.services).filter_by(id=service_id).first()
 
 
-@transactional
+@autocommit
 def dao_create_organisation(organisation):
     db.session.add(organisation)
 
 
-@transactional
+@autocommit
 def dao_update_organisation(organisation_id, **kwargs):
 
     domains = kwargs.pop('domains', None)
@@ -105,7 +105,7 @@ def _update_organisation_services(organisation, attribute, only_where_none=True)
         db.session.add(service)
 
 
-@transactional
+@autocommit
 @version_class(Service)
 def dao_add_service_to_organisation(service, organisation_id):
     organisation = Organisation.query.filter_by(
@@ -130,7 +130,7 @@ def dao_get_users_for_organisation(organisation_id):
     ).order_by(User.created_at).all()
 
 
-@transactional
+@autocommit
 def dao_add_user_to_organisation(organisation_id, user_id):
     organisation = dao_get_organisation_by_id(organisation_id)
     user = User.query.filter_by(id=user_id).one()

app/dao/provider_details_dao.py

@@ -5,7 +5,7 @@ from notifications_utils.timezones import convert_utc_to_bst
 from sqlalchemy import asc, desc, func
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import (
     SMS_TYPE,
     FactBilling,
@@ -75,7 +75,7 @@ def _get_sms_providers_for_update(time_threshold):
     return q
 
 
-@transactional
+@autocommit
 def dao_reduce_sms_provider_priority(identifier, *, time_threshold):
     """
     Will reduce a chosen sms provider's priority, and increase the other provider's priority by 10 points each.
@@ -101,7 +101,7 @@ def dao_reduce_sms_provider_priority(identifier, *, time_threshold):
     _adjust_provider_priority(increased_provider, increased_provider_priority)
 
 
-@transactional
+@autocommit
 def dao_adjust_provider_priority_back_to_resting_points():
     """
     Provided that neither SMS provider has been modified in the last hour, move both providers by 10 percentage points
@@ -135,7 +135,7 @@ def get_provider_details_by_notification_type(notification_type, supports_intern
     return ProviderDetails.query.filter(*filters).order_by(asc(ProviderDetails.priority)).all()
 
 
-@transactional
+@autocommit
 def dao_update_provider_details(provider_details):
     _update_provider_details_without_commit(provider_details)
 

app/dao/provider_rates_dao.py

@@ -1,9 +1,9 @@
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import ProviderDetails, ProviderRates
 
 
-@transactional
+@autocommit
 def create_provider_rates(provider_identifier, valid_from, rate):
     provider = ProviderDetails.query.filter_by(identifier=provider_identifier).one()
 

app/dao/returned_letters_dao.py

@@ -4,7 +4,7 @@ from sqlalchemy import desc, func
 from sqlalchemy.dialects.postgresql import insert
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import (
     Job,
     Notification,
@@ -28,7 +28,7 @@ def _get_notification_ids_for_references(references):
     return notification_ids + notification_history_ids
 
 
-@transactional
+@autocommit
 def insert_or_update_returned_letters(references):
     data = _get_notification_ids_for_references(references)
     for row in data:

app/dao/service_callback_api_dao.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from app import create_uuid, db
-from app.dao.dao_utils import transactional, version_class
+from app.dao.dao_utils import autocommit, version_class
 from app.models import (
     COMPLAINT_CALLBACK_TYPE,
     DELIVERY_STATUS_CALLBACK_TYPE,
@@ -9,7 +9,7 @@ from app.models import (
 )
 
 
-@transactional
+@autocommit
 @version_class(ServiceCallbackApi)
 def save_service_callback_api(service_callback_api):
     service_callback_api.id = create_uuid()
@@ -17,7 +17,7 @@ def save_service_callback_api(service_callback_api):
     db.session.add(service_callback_api)
 
 
-@transactional
+@autocommit
 @version_class(ServiceCallbackApi)
 def reset_service_callback_api(service_callback_api, updated_by_id, url=None, bearer_token=None):
     if url:
@@ -48,6 +48,6 @@ def get_service_complaint_callback_api_for_service(service_id):
     ).first()
 
 
-@transactional
+@autocommit
 def delete_service_callback_api(service_callback_api):
     db.session.delete(service_callback_api)

app/dao/service_data_retention_dao.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import ServiceDataRetention
 
 
@@ -28,7 +28,7 @@ def fetch_service_data_retention_by_notification_type(service_id, notification_t
     return data_retention_list
 
 
-@transactional
+@autocommit
 def insert_service_data_retention(service_id, notification_type, days_of_retention):
     new_data_retention = ServiceDataRetention(service_id=service_id,
                                               notification_type=notification_type,
@@ -38,7 +38,7 @@ def insert_service_data_retention(service_id, notification_type, days_of_retenti
     return new_data_retention
 
 
-@transactional
+@autocommit
 def update_service_data_retention(service_data_retention_id, service_id, days_of_retention):
     updated_count = ServiceDataRetention.query.filter(
         ServiceDataRetention.id == service_data_retention_id,

app/dao/service_email_reply_to_dao.py

@@ -1,7 +1,7 @@
 from sqlalchemy import desc
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.errors import InvalidRequest
 from app.exceptions import ArchiveValidationError
 from app.models import ServiceEmailReplyTo
@@ -28,7 +28,7 @@ def dao_get_reply_to_by_id(service_id, reply_to_id):
     return reply_to
 
 
-@transactional
+@autocommit
 def add_reply_to_email_address_for_service(service_id, email_address, is_default):
     old_default = _get_existing_default(service_id)
     if is_default:
@@ -41,7 +41,7 @@ def add_reply_to_email_address_for_service(service_id, email_address, is_default
     return new_reply_to
 
 
-@transactional
+@autocommit
 def update_reply_to_email_address(service_id, reply_to_id, email_address, is_default):
     old_default = _get_existing_default(service_id)
     if is_default:
@@ -57,7 +57,7 @@ def update_reply_to_email_address(service_id, reply_to_id, email_address, is_def
     return reply_to_update
 
 
-@transactional
+@autocommit
 def archive_reply_to_email_address(service_id, reply_to_id):
     reply_to_archive = ServiceEmailReplyTo.query.filter_by(
         id=reply_to_id,

app/dao/service_inbound_api_dao.py

@@ -1,11 +1,11 @@
 from datetime import datetime
 
 from app import create_uuid, db
-from app.dao.dao_utils import transactional, version_class
+from app.dao.dao_utils import autocommit, version_class
 from app.models import ServiceInboundApi
 
 
-@transactional
+@autocommit
 @version_class(ServiceInboundApi)
 def save_service_inbound_api(service_inbound_api):
     service_inbound_api.id = create_uuid()
@@ -13,7 +13,7 @@ def save_service_inbound_api(service_inbound_api):
     db.session.add(service_inbound_api)
 
 
-@transactional
+@autocommit
 @version_class(ServiceInboundApi)
 def reset_service_inbound_api(service_inbound_api, updated_by_id, url=None, bearer_token=None):
     if url:
@@ -35,6 +35,6 @@ def get_service_inbound_api_for_service(service_id):
     return ServiceInboundApi.query.filter_by(service_id=service_id).first()
 
 
-@transactional
+@autocommit
 def delete_service_inbound_api(service_inbound_api):
     db.session.delete(service_inbound_api)

app/dao/service_letter_contact_dao.py

@@ -1,7 +1,7 @@
 from sqlalchemy import desc
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import ServiceLetterContact, Template
 
 
@@ -30,7 +30,7 @@ def dao_get_letter_contact_by_id(service_id, letter_contact_id):
     return letter_contact
 
 
-@transactional
+@autocommit
 def add_letter_contact_for_service(service_id, contact_block, is_default):
     old_default = _get_existing_default(service_id)
     if is_default:
@@ -45,7 +45,7 @@ def add_letter_contact_for_service(service_id, contact_block, is_default):
     return new_letter_contact
 
 
-@transactional
+@autocommit
 def update_letter_contact(service_id, letter_contact_id, contact_block, is_default):
     old_default = _get_existing_default(service_id)
     # if we want to make this the default, ensure there are no other existing defaults
@@ -59,7 +59,7 @@ def update_letter_contact(service_id, letter_contact_id, contact_block, is_defau
     return letter_contact_update
 
 
-@transactional
+@autocommit
 def archive_letter_contact(service_id, letter_contact_id):
     letter_contact_to_archive = ServiceLetterContact.query.filter_by(
         id=letter_contact_id,

app/dao/service_permissions_dao.py

@@ -1,5 +1,5 @@
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import ServicePermission
 
 
@@ -8,7 +8,7 @@ def dao_fetch_service_permissions(service_id):
         ServicePermission.service_id == service_id).all()
 
 
-@transactional
+@autocommit
 def dao_add_service_permission(service_id, permission):
     service_permission = ServicePermission(service_id=service_id, permission=permission)
     db.session.add(service_permission)

app/dao/service_sms_sender_dao.py

@@ -1,7 +1,7 @@
 from sqlalchemy import desc
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.exceptions import ArchiveValidationError
 from app.models import ServiceSmsSender
 
@@ -32,7 +32,7 @@ def dao_get_sms_senders_by_service_id(service_id):
     ).order_by(desc(ServiceSmsSender.is_default)).all()
 
 
-@transactional
+@autocommit
 def dao_add_sms_sender_for_service(service_id, sms_sender, is_default, inbound_number_id=None):
     old_default = _get_existing_default(service_id=service_id)
     if is_default:
@@ -51,7 +51,7 @@ def dao_add_sms_sender_for_service(service_id, sms_sender, is_default, inbound_n
     return new_sms_sender
 
 
-@transactional
+@autocommit
 def dao_update_service_sms_sender(service_id, service_sms_sender_id, is_default, sms_sender=None):
     old_default = _get_existing_default(service_id)
     if is_default:
@@ -68,7 +68,7 @@ def dao_update_service_sms_sender(service_id, service_sms_sender_id, is_default,
     return sms_sender_to_update
 
 
-@transactional
+@autocommit
 def update_existing_sms_sender_with_inbound_number(service_sms_sender, sms_sender, inbound_number_id):
     service_sms_sender.sms_sender = sms_sender
     service_sms_sender.inbound_number_id = inbound_number_id
@@ -76,7 +76,7 @@ def update_existing_sms_sender_with_inbound_number(service_sms_sender, sms_sende
     return service_sms_sender
 
 
-@transactional
+@autocommit
 def archive_sms_sender(service_id, sms_sender_id):
     sms_sender_to_archive = ServiceSmsSender.query.filter_by(
         id=sms_sender_id,

app/dao/service_user_dao.py

@@ -1,6 +1,6 @@
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import ServiceUser, User
 
 
@@ -21,6 +21,6 @@ def dao_get_service_users_by_user_id(user_id):
     return ServiceUser.query.filter_by(user_id=user_id).all()
 
 
-@transactional
+@autocommit
 def dao_update_service_user(service_user):
     db.session.add(service_user)

app/dao/services_dao.py

@@ -7,7 +7,7 @@ from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import and_, asc, case, func
 
 from app import db
-from app.dao.dao_utils import VersionOptions, transactional, version_class
+from app.dao.dao_utils import VersionOptions, autocommit, version_class
 from app.dao.date_util import get_current_financial_year
 from app.dao.email_branding_dao import dao_get_email_branding_by_name
 from app.dao.letter_branding_dao import dao_get_letter_branding_by_name
@@ -247,7 +247,7 @@ def dao_fetch_all_services_created_by_user(user_id):
     return query.all()
 
 
-@transactional
+@autocommit
 @version_class(
     VersionOptions(ApiKey, must_write_history=False),
     VersionOptions(Service),
@@ -284,7 +284,7 @@ def dao_fetch_service_by_id_and_user(service_id, user_id):
     ).one()
 
 
-@transactional
+@autocommit
 @version_class(Service)
 def dao_create_service(
     service,
@@ -338,7 +338,7 @@ def dao_create_service(
     db.session.add(service)
 
 
-@transactional
+@autocommit
 @version_class(Service)
 def dao_update_service(service):
     db.session.add(service)
@@ -507,7 +507,7 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, only_act
     return query.all()
 
 
-@transactional
+@autocommit
 @version_class(
     VersionOptions(ApiKey, must_write_history=False),
     VersionOptions(Service),
@@ -526,7 +526,7 @@ def dao_suspend_service(service_id):
     service.active = False
 
 
-@transactional
+@autocommit
 @version_class(Service)
 def dao_resume_service(service_id):
     service = Service.query.get(service_id)

app/dao/template_folder_dao.py

@@ -1,5 +1,5 @@
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.models import TemplateFolder
 
 
@@ -14,16 +14,16 @@ def dao_get_valid_template_folders_by_id(folder_ids):
     return TemplateFolder.query.filter(TemplateFolder.id.in_(folder_ids)).all()
 
 
-@transactional
+@autocommit
 def dao_create_template_folder(template_folder):
     db.session.add(template_folder)
 
 
-@transactional
+@autocommit
 def dao_update_template_folder(template_folder):
     db.session.add(template_folder)
 
 
-@transactional
+@autocommit
 def dao_delete_template_folder(template_folder):
     db.session.delete(template_folder)

app/dao/templates_dao.py

@@ -5,7 +5,7 @@ from flask import current_app
 from sqlalchemy import asc, desc
 
 from app import db
-from app.dao.dao_utils import VersionOptions, transactional, version_class
+from app.dao.dao_utils import VersionOptions, autocommit, version_class
 from app.dao.users_dao import get_user_by_id
 from app.models import (
     LETTER_TYPE,
@@ -16,7 +16,7 @@ from app.models import (
 )
 
 
-@transactional
+@autocommit
 @version_class(
     VersionOptions(Template, history_class=TemplateHistory)
 )
@@ -38,7 +38,7 @@ def dao_create_template(template):
     db.session.add(template)
 
 
-@transactional
+@autocommit
 @version_class(
     VersionOptions(Template, history_class=TemplateHistory)
 )
@@ -49,7 +49,7 @@ def dao_update_template(template):
     db.session.add(template)
 
 
-@transactional
+@autocommit
 def dao_update_template_reply_to(template_id, reply_to):
     Template.query.filter_by(id=template_id).update(
         {"service_letter_contact_id": reply_to,
@@ -81,7 +81,7 @@ def dao_update_template_reply_to(template_id, reply_to):
     return template
 
 
-@transactional
+@autocommit
 def dao_redact_template(template, user_id):
     template.template_redacted.redact_personalisation = True
     template.template_redacted.updated_at = datetime.utcnow()

app/dao/users_dao.py

@@ -6,7 +6,7 @@ from sqlalchemy import func
 from sqlalchemy.orm import joinedload
 
 from app import db
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.dao.permissions_dao import permission_dao
 from app.dao.service_user_dao import dao_get_service_users_by_user_id
 from app.errors import InvalidRequest
@@ -146,7 +146,7 @@ def get_user_and_accounts(user_id):
     ).one()
 
 
-@transactional
+@autocommit
 def dao_archive_user(user):
     if not user_can_be_archived(user):
         msg = "User can’t be removed from a service - check all services have another team member with manage_settings"

app/organisation/rest.py

@@ -4,7 +4,7 @@ from sqlalchemy.exc import IntegrityError
 
 from app.config import QueueNames
 from app.dao.annual_billing_dao import set_default_free_allowance_for_service
-from app.dao.dao_utils import nested_transaction
+from app.dao.dao_utils import transaction
 from app.dao.fact_billing_dao import fetch_usage_year_for_organisation
 from app.dao.organisation_dao import (
     dao_add_service_to_organisation,
@@ -120,7 +120,7 @@ def link_service_to_organisation(organisation_id):
     service = dao_fetch_service_by_id(data['service_id'])
     service.organisation = None
 
-    with nested_transaction():
+    with transaction():
         dao_add_service_to_organisation(service, organisation_id)
         set_default_free_allowance_for_service(service, year_start=None)
 

app/service/rest.py

@@ -18,7 +18,7 @@ from app.dao.api_key_dao import (
     save_model_api_key,
 )
 from app.dao.broadcast_service_dao import set_broadcast_service_type
-from app.dao.dao_utils import dao_rollback, nested_transaction
+from app.dao.dao_utils import dao_rollback, transaction
 from app.dao.date_util import get_financial_year
 from app.dao.fact_notification_status_dao import (
     fetch_monthly_template_usage_for_service,
@@ -254,7 +254,7 @@ def create_service():
     # unpack valid json into service object
     valid_service = Service.from_json(data)
 
-    with nested_transaction():
+    with transaction():
         dao_create_service(valid_service, user)
         set_default_free_allowance_for_service(service=valid_service, year_start=None)
 

app/template_folder/rest.py

@@ -2,7 +2,7 @@ from flask import Blueprint, current_app, jsonify, request
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
 
-from app.dao.dao_utils import transactional
+from app.dao.dao_utils import autocommit
 from app.dao.service_user_dao import (
     dao_get_active_service_users,
     dao_get_service_user,
@@ -104,7 +104,7 @@ def delete_template_folder(service_id, template_folder_id):
 
 @template_folder_blueprint.route('/contents', methods=['POST'])
 @template_folder_blueprint.route('/<uuid:target_template_folder_id>/contents', methods=['POST'])
-@transactional
+@autocommit
 def move_to_template_folder(service_id, target_template_folder_id=None):
     data = request.get_json()