mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-22 16:31:15 -05:00
d7e03e00d3
Currently we have - a thing in the database called an ‘organisation’ which we don’t use - the idea of an organisation which we derive from the user’s email address and is used to set the default branding for their service and determine whether they’ve signed the MOU We should make these two things into one thing, by storing everything we know about an organisation against that organisation in the database. This will be much less laborious than storing it in a YAML file that needs a deploy every time it’s updated. An organisation can now have: - domains which we can use to automatically associate services with it (eg anyone whose email address ends in `dwp.gsi.gov.uk` gets services they create associated to the DWP organisation) - default letter branding for any new services - default email branding for any new services
86 lines
2.1 KiB
Python
86 lines
2.1 KiB
Python
from app import db
|
|
from app.dao.dao_utils import transactional
|
|
from app.models import (
|
|
Organisation,
|
|
Domain,
|
|
InvitedOrganisationUser,
|
|
User
|
|
)
|
|
|
|
|
|
def dao_get_organisations():
|
|
return Organisation.query.order_by(
|
|
Organisation.active.desc(), Organisation.name.asc()
|
|
).all()
|
|
|
|
|
|
def dao_get_organisation_services(organisation_id):
|
|
return Organisation.query.filter_by(
|
|
id=organisation_id
|
|
).one().services
|
|
|
|
|
|
def dao_get_organisation_by_id(organisation_id):
|
|
return Organisation.query.filter_by(id=organisation_id).one()
|
|
|
|
|
|
def dao_get_organisation_by_service_id(service_id):
|
|
return Organisation.query.join(Organisation.services).filter_by(id=service_id).first()
|
|
|
|
|
|
@transactional
|
|
def dao_create_organisation(organisation):
|
|
db.session.add(organisation)
|
|
|
|
|
|
@transactional
|
|
def dao_update_organisation(organisation_id, **kwargs):
|
|
|
|
domains = kwargs.pop('domains', [])
|
|
|
|
organisation = Organisation.query.filter_by(id=organisation_id).update(
|
|
kwargs
|
|
)
|
|
|
|
if domains:
|
|
|
|
Domain.query.filter_by(organisation_id=organisation_id).delete()
|
|
|
|
db.session.bulk_save_objects([
|
|
Domain(domain=domain, organisation_id=organisation_id)
|
|
for domain in domains
|
|
])
|
|
|
|
db.session.commit()
|
|
|
|
return organisation
|
|
|
|
|
|
@transactional
|
|
def dao_add_service_to_organisation(service, organisation_id):
|
|
organisation = Organisation.query.filter_by(
|
|
id=organisation_id
|
|
).one()
|
|
|
|
organisation.services.append(service)
|
|
|
|
|
|
def dao_get_invited_organisation_user(user_id):
|
|
return InvitedOrganisationUser.query.filter_by(id=user_id).one()
|
|
|
|
|
|
def dao_get_users_for_organisation(organisation_id):
|
|
return User.query.filter(
|
|
User.organisations.any(id=organisation_id),
|
|
User.state == 'active'
|
|
).order_by(User.created_at).all()
|
|
|
|
|
|
@transactional
|
|
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()
|
|
user.organisations.append(organisation)
|
|
db.session.add(organisation)
|
|
return user
|