From 3aea98c3151d68634d14b99633ed3b74df8cc37b Mon Sep 17 00:00:00 2001 From: Carlos Rivas Date: Thu, 22 Aug 2024 13:27:56 -0700 Subject: [PATCH] Added SMS message delete handler --- app.py | 20 +++++++++++++++----- flowsms.db | Bin 0 -> 40960 bytes service.py | 14 +++++++++++--- 3 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 flowsms.db diff --git a/app.py b/app.py index 53ebf1c..d8315f5 100644 --- a/app.py +++ b/app.py @@ -8,7 +8,12 @@ from fastapi.responses import JSONResponse from loggerino import timestamp_log_config from os import getenv from schemas import SMSMessage -from service import inbound_sms_handler, retrieve_sms_messages_by_phone_number +from service import ( + receive_sms_messages_handler, + retrieve_sms_messages_by_phone_number_handler, + delete_sms_message_by_uuid_handler +) +from uuid import UUID from uvicorn.config import LOGGING_CONFIG @@ -40,16 +45,21 @@ async def validate_ip(request: Request, call_next): @app.post("/sms-message", status_code=status.HTTP_200_OK) -async def receive_sms_message(message: SMSMessage): - inbound_sms_handler(message) +async def post_sms_message(message: SMSMessage): + receive_sms_messages_handler(message) -@app.get('/sms-message/{number}') +@app.get('/sms-message/{number}', status_code=status.HTTP_200_OK) def get_sms_messages_by_phone_number(number: str, cost: bool = False, metadata: bool = False): - contact = retrieve_sms_messages_by_phone_number(number, cost, metadata) + contact = retrieve_sms_messages_by_phone_number_handler(number, cost, metadata) return {'status': 'success', 'results': len(contact), 'response': contact} +@app.delete('/sms-message/{uuid}', status_code=status.HTTP_202_ACCEPTED) +def delete_sms_message_by_uuid(uuid: UUID): + delete_sms_message_by_uuid_handler(uuid) + + if __name__ == "__main__": uvicorn.run( app, host="0.0.0.0", port=8000, log_config=timestamp_log_config(LOGGING_CONFIG) diff --git a/flowsms.db b/flowsms.db new file mode 100644 index 0000000000000000000000000000000000000000..08fbe5b31205aeff6b6bcf253670450671fa5d70 GIT binary patch literal 40960 zcmeI*-)kGm9RTo^Wy`i=X-grPU_uuhs7=rI&X3)lNgrCpr(8lU`%baT9Tdd;TA!$X zxY9cG`f@1rDD6`@3WcNp$MxafN}>H9j=uNtXdn96*|p@HF0!{#8?@axc2vQ`PQ$l*%LN_00@8p2!H?xfB*=*Vu5GBSXo}b zd$;h(JBg4T(>00EA`z4O)%|9@c3k(4YYz_U-sD+ttGwFQ-u|OnbBo|@@9^l@J3Ki! zc*`rVcFk}oPEAXRPDcv$)7JT*;OteqSjdt3V_&1U`ZxOKT{`fa}3eB7utKk$B3 z|G?X7>+STdKRjyIAHQ>$KDYI}@@=nKe^|G#wO@Z?1v8y&m-6=BYH5A{Zoz5ywE6k) zXC3=Dc}tup{p@jTqTNE1weqvw((?N4+l62LAZsnvA13K_d8(DtXRd1@(e0o2l9p}{ z&pP6xnRMeKJ<;pyey1Y_Z>sQjmrLv4zkQW(D%C>i?aH%{7nj#JHVU7djQc^>PUGfU zn)1DD!>c<%Jm_~@z4NX#gPFcbf3kIEAJXlCQAxYso4Ip)*y?tN-h-o~gL>_7R-c-= zThg|H+n#;qy={AR`mvtc^_BL9%lA9g8C1WQ2xUL3w*Qp3ca}=)wT-KqYK)%tg{);t zqvJx>V9!1tcZKY=#xJ=r)nJ$PT-{)2ANG4@(k8QhTK&&?P7WWxcT)GZzFu>xP`plI z{7zbUyt25n@Sha7AMs45Xn&ckq`y!q_F8biaO?#Z5C8!X009sH0T2KI5C8!X009sH zf!9#rL1D46NenXq!ALL_a*Aop1PKM#IKotfA@xz@N7%P3+}>fjDUV_AOHd&00JNY0w4eaAOHd&00JNY0&k$eX0frFH#%@}{Qs5Xe)R^vK?oTH zKmY_l00ck)1V8`;KmY_l00cl_wm`MGx%#y!0Tov}OKa~t)xT8Vs{D5CpKI^i2e5zu z2!H?xfB*=900@8p2!Oy#2#oHORvVj*jg`F`!HRQ*{RlCGX&7>*X%tfxg+U-0ks-o9 z;y6SE)4X(LyC>}_3-lw?>0nCjbm#O2YWImmx`?>qb z?YiBU=;lxq1V8`;KmY_l00ck)1V8`;KmY{(Uj*(I8-=_ftWsJiZ!BpkEtEH?vzQjj z8(k@8g>r^D7Hk9D%NuV<&;M7d{Kj#A@9tLrT>VMqANBz(AOHd&00JNY0w4eaAOHd& z00OU2;Ivd~Y-}`$k?G_o@AtEqMo~Gp0YBE?rb4 zh$hA!vua5LN@&FG4P%%SrU>GZKV4DY!R?C`k<-O-MS*W8S>S-PP*a~!X~M`L6^FzS zyH2Jn$~!=wRZ;PxA|y2zm}4Y^fNBwN6h(@Meq^}Pp_bDXOI$~UC9!vIN zlAI0i@9o8%{;)gT9kieBis7DJ-5LKM@qVY@J5_ycwCS{;nt{=C6bF&f zD38hQzjwqF88c0zn1xwX{#tIRg6c^8a0X z4uH??EPzKh+RdRd5C8!X009sH0T2KI5C8!X009tqJp{7v+UJZwW%>WSQK2mVpEpvI V<^S_WPcHKRIU^cb{y%S&;op6dBjo@9 literal 0 HcmV?d00001 diff --git a/service.py b/service.py index 30fab8e..9502b80 100644 --- a/service.py +++ b/service.py @@ -2,10 +2,11 @@ from database import get_db from dtos import to_db, to_db_existing_contact from models import SMSContact, SMSMessage as SMSDBMessage from schemas import SMSMessage -from sqlalchemy.orm import joinedload, selectinload +from sqlalchemy.orm import selectinload +from uuid import UUID -def inbound_sms_handler(message: SMSMessage) -> None: +def receive_sms_messages_handler(message: SMSMessage) -> None: db = next(get_db()) payload = None @@ -22,7 +23,7 @@ def inbound_sms_handler(message: SMSMessage) -> None: db.refresh(payload) -def retrieve_sms_messages_by_phone_number(number: str, include_cost: bool, include_metadata: bool) -> SMSContact: +def retrieve_sms_messages_by_phone_number_handler(number: str, include_cost: bool, include_metadata: bool) -> SMSContact: db = next(get_db()) query = db.query(SMSContact).filter(SMSContact.phone_number == number) @@ -36,3 +37,10 @@ def retrieve_sms_messages_by_phone_number(number: str, include_cost: bool, inclu if response is not None: return response.messages return [] + + +def delete_sms_message_by_uuid_handler(uuid: UUID): + db = next(get_db()) + query = db.query(SMSDBMessage).filter(SMSDBMessage.id == uuid).delete() + db.commit() + print(query)