darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set org_type of a service when adding/updating org org type

Browse Source 
The organisation_type of a service should match the organisation_type of
the service's organisation (if there is one). This changes
dao_update_organisation and dao_add_service_to_organisation to set the
organisation_type of any services when adding / updating an org.
This commit is contained in:
Katie Smith
2019-07-04 14:48:16 +01:00
parent 86f14563d0
commit 1671221642
2 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/dao/organisation_dao.py
View File

@@ -1,7 +1,7 @@
from sqlalchemy.sql.expression import func
from app import db
from app.dao.dao_utils import transactional
from app.dao.dao_utils import transactional, version_class
from app.models import (
Organisation,
Domain,
@@ -77,18 +77,31 @@ def dao_update_organisation(organisation_id, **kwargs):
for domain in domains
])
db.session.commit()
if 'organisation_type' in kwargs:
organisation = Organisation.query.get(organisation_id)
if organisation.services:
_update_org_type_for_organisation_services(organisation)
return num_updated
@version_class(Service)
def _update_org_type_for_organisation_services(organisation):
for service in organisation.services:
service.organisation_type = organisation.organisation_type
db.session.add(service)
@transactional
@version_class(Service)
def dao_add_service_to_organisation(service, organisation_id):
organisation = Organisation.query.filter_by(
id=organisation_id
).one()
organisation.services.append(service)
service.organisation_type = organisation.organisation_type
db.session.add(service)
def dao_get_invited_organisation_user(user_id):