Refactored model and dao

app/dao/inbound_numbers_dao.py

@@ -16,13 +16,7 @@ def dao_get_inbound_number_for_service(service_id):
 
 
 @transactional
-def dao_allocate_inbound_number_to_service(service_id):
-    available_numbers = InboundNumber.query.filter(
-        InboundNumber.active, InboundNumber.service_id.is_(None)).all()
+def dao_set_inbound_number_to_service(service_id, inbound_number):
+    inbound_number.service_id = service_id
 
-    if len(available_numbers) > 0:
-        available_numbers[0].service_id = service_id
-
-        db.session.add(available_numbers[0])
-    else:
-        raise IndexError('No inbound numbers available')
+    db.session.add(inbound_number)

app/models.py

@@ -254,11 +254,11 @@ class InboundNumber(db.Model):
     created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow, nullable=False)
 
     def serialize(self):
-        serialized = {
+        return {
             "id": str(self.id),
             "number": self.number,
             "provider": self.provider,
-            "service_id": self.service_id,
+            "service_id": str(self.service_id),
             "active": self.active,
             "created_at": self.created_at.strftime(DATETIME_FORMAT),
         }