darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 06:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor schema

Browse Source
This commit is contained in:
Ken Tsang
2017-05-26 15:27:49 +01:00
parent 263adac805
commit 56e9faab2e
1 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/schemas.py
View File

@@ -184,31 +184,13 @@ class ServiceSchema(BaseSchema):
override_flag = False override_flag = False
def service_permissions(self, service): def service_permissions(self, service):
permissions = [] permissions = [p.permission for p in service.permissions]
str_permissions = []
perms = dao_fetch_service_permissions(service.id)
for p in perms:
permission = {
"service_id": service.id,
"permission": p.permission
}
permissions.append(permission)
str_permissions.append(p.permission)
def deprecate_convert_flags_to_permissions(): def deprecate_convert_flags_to_permissions():
def convert_flags(flag, notify_type): def convert_flags(flag, permission):
if flag and notify_type not in str_permissions: if flag and permission not in permissions:
permission = {
"service_id": service.id,
"permission": notify_type
}
permissions.append(permission) permissions.append(permission)
elif flag is False and notify_type in str_permissions: elif flag is False and permission in permissions:
permission = {
"service_id": service.id,
"permission": notify_type
}
permissions.remove(permission) permissions.remove(permission)
convert_flags(service.can_send_international_sms, INTERNATIONAL_SMS_TYPE) convert_flags(service.can_send_international_sms, INTERNATIONAL_SMS_TYPE)
@@ -254,14 +236,13 @@ class ServiceSchema(BaseSchema):
if isinstance(in_data, dict) and 'permissions' in in_data: if isinstance(in_data, dict) and 'permissions' in in_data:
str_permissions = in_data['permissions'] str_permissions = in_data['permissions']
permissions = [] permissions = []
for p in in_data['permissions']: for p in str_permissions:
permission = ServicePermission(service_id=in_data["id"], permission=p) permission = ServicePermission(service_id=in_data["id"], permission=p)
permissions.append(permission) permissions.append(permission)
in_data['permissions'] = permissions
def deprecate_override_flags(): def deprecate_override_flags():
in_data['can_send_letters'] = LETTER_TYPE in [p.permission for p in permissions] in_data['can_send_letters'] = LETTER_TYPE in str_permissions
in_data['can_send_international_sms'] = INTERNATIONAL_SMS_TYPE in [p.permission for p in permissions] in_data['can_send_international_sms'] = INTERNATIONAL_SMS_TYPE in str_permissions
def deprecate_convert_flags_to_permissions(): def deprecate_convert_flags_to_permissions():
def convert_flags(flag, notify_type): def convert_flags(flag, notify_type):
@@ -280,12 +261,7 @@ class ServiceSchema(BaseSchema):
deprecate_override_flags() deprecate_override_flags()
else: else:
deprecate_convert_flags_to_permissions() deprecate_convert_flags_to_permissions()
in_data['permissions'] = permissions
@post_dump
def format_as_string_array(self, in_data):
if isinstance(in_data, dict) and 'permissions' in in_data:
in_data['permissions'] = [p.get("permission") for p in in_data['permissions']]
return in_data
def set_override_flag(self, flag): def set_override_flag(self, flag):
self.override_flag = flag self.override_flag = flag