diff --git a/app/models/service.py b/app/models/service.py index 659e3e8e9..ce77234c5 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -1,4 +1,5 @@ from flask import abort, current_app +from notifications_utils.serialised_model import SerialisedModelCollection from werkzeug.utils import cached_property from app.models import JSONModel @@ -710,3 +711,7 @@ class Service(JSONModel): @property def contact_lists(self): return ContactLists(self.id) + + +class Services(SerialisedModelCollection): + model = Service diff --git a/app/models/user.py b/app/models/user.py index 39dcd5d86..fe427fc54 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -292,10 +292,8 @@ class User(JSONModel, UserMixin): @property def services(self): - from app.models.service import Service - return [ - Service(service) for service in self.orgs_and_services['services'] - ] + from app.models.service import Services + return Services(self.orgs_and_services['services']) @property def services_with_organisation(self):