mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-03 01:41:05 -05:00
fix delete
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
from flask import current_app
|
from flask import current_app
|
||||||
from sqlalchemy import and_, desc, func, select
|
from sqlalchemy import and_, delete, desc, func, select
|
||||||
from sqlalchemy.dialects.postgresql import insert
|
from sqlalchemy.dialects.postgresql import insert
|
||||||
from sqlalchemy.orm import aliased
|
from sqlalchemy.orm import aliased
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ def _delete_inbound_sms(datetime_to_delete_from, query_filter):
|
|||||||
query_limit = 10000
|
query_limit = 10000
|
||||||
|
|
||||||
subquery = (
|
subquery = (
|
||||||
db.session.query(InboundSms.id)
|
select(InboundSms.id)
|
||||||
.filter(InboundSms.created_at < datetime_to_delete_from, *query_filter)
|
.filter(InboundSms.created_at < datetime_to_delete_from, *query_filter)
|
||||||
.limit(query_limit)
|
.limit(query_limit)
|
||||||
.subquery()
|
.subquery()
|
||||||
@@ -115,9 +115,9 @@ def _delete_inbound_sms(datetime_to_delete_from, query_filter):
|
|||||||
while number_deleted > 0:
|
while number_deleted > 0:
|
||||||
_insert_inbound_sms_history(subquery, query_limit=query_limit)
|
_insert_inbound_sms_history(subquery, query_limit=query_limit)
|
||||||
|
|
||||||
number_deleted = InboundSms.query.filter(InboundSms.id.in_(subquery)).delete(
|
stmt = delete(InboundSms).filter(InboundSms.id.in_(subquery))
|
||||||
synchronize_session="fetch"
|
number_deleted = db.session.execute(stmt).rowcount
|
||||||
)
|
db.session.commit()
|
||||||
deleted += number_deleted
|
deleted += number_deleted
|
||||||
|
|
||||||
return deleted
|
return deleted
|
||||||
|
|||||||
Reference in New Issue
Block a user