move deactivate functionality into one database transactions

this means that any errors will cause the entire thing to roll back

unfortunately, to do this we have to circumvent our regular code, which calls commit a lot, and lazily loads a lot of things, which will flush, and cause the version decorators to fail. so we have to write a lot of stuff by hand and re-select the service (even though it's already been queried) just to populate the api_keys and templates relationship on it
This commit is contained in:
Leo Hemsted
2016-11-10 17:07:02 +00:00
parent 17cf582502
commit 9ae6e14140
5 changed files with 33 additions and 20 deletions

View File

@@ -25,16 +25,14 @@ from app.dao.services_dao import (
dao_fetch_stats_for_service,
dao_fetch_todays_stats_for_service,
dao_fetch_weekly_historical_stats_for_service,
dao_fetch_todays_stats_for_all_services
dao_fetch_todays_stats_for_all_services,
dao_deactive_service
)
from app.dao.service_whitelist_dao import (
dao_fetch_service_whitelist,
dao_add_and_commit_whitelisted_contacts,
dao_remove_service_whitelist
)
from app.dao.templates_dao import (
dao_update_template
)
from app.dao import notifications_dao
from app.dao.provider_statistics_dao import get_fragment_count
from app.dao.users_dao import get_model_users
@@ -326,17 +324,7 @@ def deactivate_service(service_id):
# assume already inactive, don't change service name
return '', 204
service.active = False
service.name = '_archived_' + service.name
service.email_from = '_archived_' + service.email_from
dao_update_service(service)
for template in service.templates:
template.archived = True
dao_update_template(template)
for api_key in service.api_keys:
expire_api_key(service.id, api_key.id)
dao_deactive_service(service.id)
return '', 204