Skip to content

Commit cd6af87

Browse files
author
Ramir Mesquita
committed
fix: improving logic for querying flux or activity id
1 parent 41debc8 commit cd6af87

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/apps/answers/crud/answers.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,13 @@ async def get_respondents_submit_dates(
235235
query = query.where(func.date(AnswerSchema.created_at) <= filters.to_date)
236236
query = query.where(AnswerSchema.applet_id == applet_id)
237237
query = query.where(
238-
or_(
239-
AnswerSchema.id_from_history_id(AnswerSchema.activity_history_id) == str(filters.activity_or_flow_id),
240-
AnswerSchema.id_from_history_id(AnswerSchema.flow_history_id) == str(filters.activity_or_flow_id),
241-
),
238+
case(
239+
(
240+
AnswerSchema.flow_history_id.isnot(None),
241+
AnswerSchema.id_from_history_id(AnswerSchema.flow_history_id) == str(filters.activity_or_flow_id),
242+
),
243+
else_=AnswerSchema.id_from_history_id(AnswerSchema.activity_history_id) == str(filters.activity_or_flow_id),
244+
)
242245
)
243246

244247
if filters.respondent_id:

0 commit comments

Comments
 (0)