darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor code

Browse Source
This commit is contained in:
Ken Tsang
2017-08-11 17:28:16 +01:00
parent d2a618cf0a
commit 22956b7427
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/dao/inbound_numbers_dao.py
View File

@@ -21,6 +21,7 @@ def dao_get_inbound_number(inbound_number_id):
@transactional
def dao_set_inbound_number_to_service(service_id, inbound_number):
print('set: {}'.format(inbound_number.id))
inbound_number.service_id = service_id
db.session.add(inbound_number)

12
app/inbound_number/rest.py
View File

@@ -20,21 +20,21 @@ register_errors(inbound_number_blueprint)
def get_inbound_numbers():
inbound_numbers = [i.serialize() for i in dao_get_inbound_numbers()]
return jsonify(data=inbound_numbers)
return jsonify(data=inbound_numbers if inbound_numbers else None)
@inbound_number_blueprint.route('/available', methods=['GET'])
def get_inbound_numbers_available():
def get_next_available_inbound_numbers():
inbound_numbers = [i.serialize() for i in dao_get_available_inbound_numbers()]
return jsonify(data=inbound_numbers)
return jsonify(data=inbound_numbers[0] if len(inbound_numbers) else [])
@inbound_number_blueprint.route('/service/<uuid:service_id>', methods=['GET'])
def get_inbound_number_for_service(service_id):
inbound_number = dao_get_inbound_number_for_service(service_id)
return jsonify(data=inbound_number.serialize())
return jsonify(data=inbound_number.serialize() if inbound_number else None)
@inbound_number_blueprint.route('/<uuid:inbound_number_id>/service/<uuid:service_id>', methods=['POST'])
@@ -47,12 +47,12 @@ def post_set_inbound_number_for_service(inbound_number_id, service_id):
if inbound_number.service_id:
raise InvalidRequest('Inbound number already assigned', status_code=400)
dao_set_inbound_number_to_service(service_id, inbound_number_id)
dao_set_inbound_number_to_service(service_id, inbound_number)
return '', 204
@inbound_number_blueprint.route('/service/<uuid:inbound_number_id>/on', methods=['POST'])
@inbound_number_blueprint.route('/<uuid:inbound_number_id>/on', methods=['POST'])
def post_set_inbound_number_on(inbound_number_id):
dao_set_inbound_number_active_flag(inbound_number_id, active=True)
return '', 204