Skip to content

Commit 2b0fb11

Browse files
aapelivclaude
andcommitted
Backend/moderation: drop redundant Reference.is_deleted filters
Migration 0151 maps is_deleted=True to UMS visibility=hidden, so the Reference.is_deleted == False filters in ListReferences and get_num_references are now redundant. Drop them and rely on UMS visibility instead. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent b4076b1 commit 2b0fb11

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

app/backend/src/couchers/servicers/api.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
MeetupStatus,
3333
Message,
3434
ModerationObjectType,
35+
ModerationState,
36+
ModerationVisibility,
3537
Notification,
3638
NotificationDeliveryType,
3739
ParkingDetails,
@@ -1014,8 +1016,9 @@ def response_rate_to_pb(response_rate: UserResponseRate | None) -> dict[str, goo
10141016
def get_num_references(session: Session, user_ids: Iterable[int]) -> dict[int, int]:
10151017
query = (
10161018
select(Reference.to_user_id, func.count(Reference.id))
1019+
.join(ModerationState, ModerationState.id == Reference.moderation_state_id)
1020+
.where(ModerationState.visibility == ModerationVisibility.visible)
10171021
.where(Reference.to_user_id.in_(user_ids))
1018-
.where(Reference.is_deleted == False)
10191022
.join(User, User.id == Reference.from_user_id)
10201023
.where(User.is_visible)
10211024
.group_by(Reference.to_user_id)

app/backend/src/couchers/servicers/references.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,7 @@ def ListReferences(
179179

180180
to_users = aliased(User)
181181
from_users = aliased(User)
182-
statement = select(Reference).where(Reference.is_deleted == False)
183-
statement = where_moderated_content_visible(statement, context, Reference, is_list_operation=True)
182+
statement = where_moderated_content_visible(select(Reference), context, Reference, is_list_operation=True)
184183
if request.from_user_id:
185184
# join the to_users, because only interested if the recipient is visible
186185
statement = (

0 commit comments

Comments
 (0)