Refactor code

app/dao/inbound_numbers_dao.py

@@ -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)
 

app/inbound_number/rest.py

@@ -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

tests/app/inbound_number/test_rest.py

@@ -21,6 +21,16 @@ def test_rest_get_inbound_numbers(admin_request, sample_inbound_numbers):
     assert result['data'] == [i.serialize() for i in sample_inbound_numbers]
 
 
+def test_rest_get_next_available_inbound_numbers(admin_request, sample_service):
+    create_inbound_number(number='1', provider='mmg', active=False, service_id=sample_service.id)
+    next_available_inbound_number = create_inbound_number(number='2', provider='mmg', active=True)
+    create_inbound_number(number='3', provider='firetext', active=True)
+
+    result = admin_request.get('inbound_number.get_next_available_inbound_numbers')
+
+    assert result['data'] == next_available_inbound_number.serialize()
+
+
 def test_rest_get_inbound_number(admin_request, notify_db_session, sample_service):
     inbound_number = create_inbound_number(number='1', provider='mmg', active=False, service_id=sample_service.id)
 
@@ -31,6 +41,25 @@ def test_rest_get_inbound_number(admin_request, notify_db_session, sample_servic
     assert result['data'] == inbound_number.serialize()
 
 
+def test_rest_set_number_to_service(
+        admin_request, notify_db_session, sample_service):
+    service = create_service(service_name='test service 1')
+    inbound_number = create_inbound_number(number='1', provider='mmg', active=True)
+
+    result = admin_request.post(
+        'inbound_number.post_set_inbound_number_for_service',
+        _expected_status=204,
+        inbound_number_id=inbound_number.id,
+        service_id=service.id
+    )
+
+    inbound_number_from_db = dao_get_inbound_number_for_service(service.id)
+
+    assert inbound_number_from_db.active
+    assert inbound_number_from_db.id == inbound_number.id
+    assert inbound_number_from_db.number == inbound_number.number
+
+
 def test_rest_set_number_to_several_services_returns_400(
         admin_request, notify_db_session, sample_service):
     service_1 = create_service(service_name='test service 1')