darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make a model collection for services

Browse Source 
This is tidier than having a manual loop.
This commit is contained in:
Chris Hill-Scott
2021-09-27 15:20:56 +01:00
parent 9281ca7d50
commit cbbc58e649
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/service.py
View File

@@ -1,4 +1,5 @@
from flask import abort, current_app from flask import abort, current_app
from notifications_utils.serialised_model import SerialisedModelCollection
from werkzeug.utils import cached_property from werkzeug.utils import cached_property
from app.models import JSONModel from app.models import JSONModel
@@ -710,3 +711,7 @@ class Service(JSONModel):
@property @property
def contact_lists(self): def contact_lists(self):
return ContactLists(self.id) return ContactLists(self.id)
class Services(SerialisedModelCollection):
model = Service

6
app/models/user.py
View File

@@ -292,10 +292,8 @@ class User(JSONModel, UserMixin):
@property @property
def services(self): def services(self):
from app.models.service import Service from app.models.service import Services
return [ return Services(self.orgs_and_services['services'])
Service(service) for service in self.orgs_and_services['services']
]
@property @property
def services_with_organisation(self): def services_with_organisation(self):