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

Merge pull request #1200 from alphagov/ken-refactor-inbound_numbers

Browse Source 
Refactor inbound numbers
This commit is contained in:
kentsanggds
2017-08-25 13:27:16 +01:00
committed by GitHub
parent 73d1154661 d99ab329eb
commit 549601a6df
5 changed files with 48 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/dao/services_dao.py
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):