mirror of
https://github.com/GSA/notifications-api.git
synced 2026-01-20 01:21:49 -05:00
53b80b931f
"if you want something done right, then do it yourself"
The ORM was building a weird and inefficient query to get all the users
for a given organisation_id:
old query:
```sql
SELECT users.*
FROM users
WHERE (
EXISTS (
SELECT 1
FROM user_to_organisation, organisation
WHERE users.id = user_to_organisation.user_id AND
organisation.id = user_to_organisation.organisation_id AND
organisation.id = '63b9557c-22ea-42ac-bcba-edaa50e3ae51'
)
) AND
users.state = 'active'
ORDER BY users.created_at
```
Note the cross join on users_to_org and org, there are a lot of users in
organisations on preview, as one is added every functional test run.
Even though they're all filtered out and the query returns the correct
data, it still does the nested loop under the hood.
new query:
```sql
SELECT users.*
FROM users
JOIN user_to_organisation AS user_to_organisation_1 ON users.id = user_to_organisation_1.user_id
JOIN organisation ON organisation.id = user_to_organisation_1.organisation_id
WHERE organisation.id = '63b9557c-22ea-42ac-bcba-edaa50e3ae51' AND users.state = 'active' ORDER BY users.created_at;
```
Much more straightforward.
147 lines
4.0 KiB
Python
147 lines
4.0 KiB
Python
from sqlalchemy.sql.expression import func
|
|
|
|
from app import db
|
|
from app.dao.dao_utils import VersionOptions, transactional, version_class
|
|
from app.models import (
|
|
Organisation,
|
|
Domain,
|
|
InvitedOrganisationUser,
|
|
Service,
|
|
User
|
|
)
|
|
|
|
|
|
def dao_get_organisations():
|
|
return Organisation.query.order_by(
|
|
Organisation.active.desc(), Organisation.name.asc()
|
|
).all()
|
|
|
|
|
|
def dao_count_organisations_with_live_services():
|
|
return db.session.query(Organisation.id).join(Organisation.services).filter(
|
|
Service.active.is_(True),
|
|
Service.restricted.is_(False),
|
|
Service.count_as_live.is_(True),
|
|
).distinct().count()
|
|
|
|
|
|
def dao_get_organisation_services(organisation_id):
|
|
return Organisation.query.filter_by(
|
|
id=organisation_id
|
|
).one().services
|
|
|
|
|
|
def dao_get_organisation_live_services(organisation_id):
|
|
return Service.query.filter_by(
|
|
organisation_id=organisation_id,
|
|
restricted=False
|
|
).all()
|
|
|
|
|
|
def dao_get_organisation_by_id(organisation_id):
|
|
return Organisation.query.filter_by(id=organisation_id).one()
|
|
|
|
|
|
def dao_get_organisation_by_email_address(email_address):
|
|
|
|
email_address = email_address.lower().replace('.gsi.gov.uk', '.gov.uk')
|
|
|
|
for domain in Domain.query.order_by(func.char_length(Domain.domain).desc()).all():
|
|
|
|
if (
|
|
email_address.endswith("@{}".format(domain.domain)) or
|
|
email_address.endswith(".{}".format(domain.domain))
|
|
):
|
|
return Organisation.query.filter_by(id=domain.organisation_id).one()
|
|
|
|
return None
|
|
|
|
|
|
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', None)
|
|
|
|
num_updated = Organisation.query.filter_by(id=organisation_id).update(
|
|
kwargs
|
|
)
|
|
|
|
if isinstance(domains, list):
|
|
|
|
Domain.query.filter_by(organisation_id=organisation_id).delete()
|
|
|
|
db.session.bulk_save_objects([
|
|
Domain(domain=domain.lower(), organisation_id=organisation_id)
|
|
for domain in domains
|
|
])
|
|
|
|
organisation = Organisation.query.get(organisation_id)
|
|
|
|
if 'organisation_type' in kwargs:
|
|
_update_organisation_services(organisation, 'organisation_type', only_where_none=False)
|
|
|
|
if 'email_branding_id' in kwargs:
|
|
_update_organisation_services(organisation, 'email_branding')
|
|
|
|
if 'letter_branding_id' in kwargs:
|
|
_update_organisation_services(organisation, 'letter_branding')
|
|
|
|
return num_updated
|
|
|
|
|
|
@version_class(
|
|
VersionOptions(Service, must_write_history=False),
|
|
)
|
|
def _update_organisation_services(organisation, attribute, only_where_none=True):
|
|
for service in organisation.services:
|
|
if getattr(service, attribute) is None or not only_where_none:
|
|
setattr(service, attribute, getattr(organisation, attribute))
|
|
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()
|
|
|
|
service.organisation_id = organisation_id
|
|
service.organisation_type = organisation.organisation_type
|
|
service.crown = organisation.crown
|
|
|
|
db.session.add(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 db.session.query(
|
|
User
|
|
).join(
|
|
User.organisations
|
|
).filter(
|
|
Organisation.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
|