darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-22 08:21:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor permissions dao - removed custom query filter

Browse Source 
Removed permissions rest - not being used.
This commit is contained in:
Rebecca Law
2016-06-15 16:32:52 +01:00
parent 2fab40a1a5
commit f8262b13c1
8 changed files with 33 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/dao/permissions_dao.py
View File

@@ -32,30 +32,6 @@ class PermissionDAO(DAOClass):
class Meta:
model = Permission
# TODO rework this as last filter wins, whereas what is needed is
# append to filter so that semantics are 'and'
def get_query(self, filter_by_dict=None):
if filter_by_dict is None:
filter_by_dict = MultiDict()
else:
filter_by_dict = MultiDict(filter_by_dict)
query = self.Meta.model.query
if 'id' in filter_by_dict:
query = query.filter(Permission.id.in_(filter_by_dict.getlist('id')))
if 'service' in filter_by_dict:
service_ids = filter_by_dict.getlist('service')
if len(service_ids) == 1:
query.filter_by(service=Service.query.get(service_ids[0]))
# TODO the join method for multiple services
if 'user' in filter_by_dict:
user_ids = filter_by_dict.getlist('user')
if len(user_ids) == 1:
query = query.filter_by(user=User.query.get(user_ids[0]))
# TODO the join method for multiple users
if 'permission' in filter_by_dict:
query = query.filter(Permission.permission.in_(filter_by_dict.getlist('permission')))
return query
def add_default_service_permissions_for_user(self, user, service):
for name in default_service_permissions:
permission = Permission(permission=name, user=user, service=service)
@@ -82,5 +58,8 @@ class PermissionDAO(DAOClass):
if _commit:
db.session.commit()
def get_permissions_by_user_id(self, user_id):
return self.Meta.model.query.filter_by(user_id=user_id).all()
permission_dao = PermissionDAO()