Refactored code to use inbound_number.number

- Removed filter on sms_sender for `dao_fetch_services_by_inbound_number`
This commit is contained in:
Ken Tsang
2017-08-23 13:03:52 +01:00
parent fb2623962f
commit d99ab329eb
4 changed files with 46 additions and 73 deletions

View File

@@ -1,7 +1,7 @@
import uuid
from datetime import date, datetime, timedelta
from sqlalchemy import asc, func, or_
from sqlalchemy import asc, func
from sqlalchemy.orm import joinedload
from flask import current_app
@@ -66,24 +66,18 @@ def dao_fetch_service_by_id(service_id, only_active=False):
return query.one()
############
# refactor this when API only uses inbound_numbers and not sms_sender
############
def dao_fetch_services_by_sms_sender(sms_sender):
def dao_fetch_service_by_inbound_number(number):
inbound_number = InboundNumber.query.filter(
InboundNumber.number == sms_sender,
InboundNumber.number == number,
InboundNumber.active
).first()
if not inbound_number:
return []
return None
return Service.query.filter(
or_(
Service.sms_sender == sms_sender,
Service.id == inbound_number.service_id
)
).all()
Service.id == inbound_number.service_id
).first()
def dao_fetch_service_by_id_with_api_keys(service_id, only_active=False):