From 86efcba7a33507c2a38d1740bda424981071085e Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Mon, 22 May 2017 11:33:24 +0100 Subject: [PATCH] Updated service DAO and API end points --- app/schemas.py | 4 ++++ tests/app/dao/test_services_dao.py | 1 + 2 files changed, 5 insertions(+) diff --git a/app/schemas.py b/app/schemas.py index ff4f83a95..cae2135f4 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -25,7 +25,11 @@ from notifications_utils.recipients import ( from app import ma from app import models +<<<<<<< HEAD from app.models import ServicePermission, INTERNATIONAL_SMS_TYPE, SMS_TYPE, LETTER_TYPE, EMAIL_TYPE +======= +from app.models import ServicePermission +>>>>>>> Updated service DAO and API end points from app.dao.permissions_dao import permission_dao from app.dao.service_permissions_dao import dao_fetch_service_permissions from app.utils import get_template_instance diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index b7b3176dd..98d9f2f36 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -11,6 +11,7 @@ from app.dao.services_dao import ( dao_create_service, dao_add_user_to_service, dao_remove_user_from_service, + dao_remove_service_permission as dao_services_remove_service_permission, dao_fetch_all_services, dao_fetch_service_by_id, dao_fetch_all_services_by_user,