Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Adds activity_id filter to answers dates query to fix problem with dataviz calendar (M2-8215) #1680

Draft
wants to merge 13 commits into
base: develop
Choose a base branch
from
+142 −3
Draft

fix: Adds activity_id filter to answers dates query to fix problem with dataviz calendar (M2-8215) #1680

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3b7a2cb
filter: add activity_id filter to answers query and update filter sch…
Dec 10, 2024
400a0c6
fix: change schema query to make more appropriate
Dec 10, 2024
41debc8
fix: update activity_id filter to support activity or flowid
Dec 10, 2024
cd6af87
fix: improving logic for querying flux or activity id
Dec 10, 2024
6e3483b
fix: ignoring ruff error 501 in lines
Dec 11, 2024
588d2a7
fix: adds ruff ignore rules for long lines
Dec 11, 2024
d1ca4d3
fix: changing activity_or_flow_id to str to fix the query
Dec 11, 2024
e57a58f
fix: adding missing param to the test
Dec 12, 2024
8a205f9
fix: adding missing answer or flow id arg to test
Dec 12, 2024
7bda73f
fix: adding missing answer or flow id arg to test to arbitrary test
Dec 12, 2024
4a605a3
fix: adds more answer tests to cover flow id on activityOrFlowId field
Dec 13, 2024
c9e5a35
fix: enhance query logic to filter answers by flow history id to fix …
Dec 26, 2024
58a3baa
fix: ensure flow_history_id is checked before filtering versions in a…
Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/apps/answers/crud/answers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,13 @@ async def get_respondents_submit_dates(
query = query.where(func.date(AnswerSchema.created_at) >= filters.from_date)
query = query.where(func.date(AnswerSchema.created_at) <= filters.to_date)
query = query.where(AnswerSchema.applet_id == applet_id)
query = query.where(
or_(
AnswerSchema.id_from_history_id(AnswerSchema.activity_history_id) == str(filters.activity_or_flow_id),
AnswerSchema.id_from_history_id(AnswerSchema.flow_history_id) == str(filters.activity_or_flow_id),
),
)

rcmerlo marked this conversation as resolved.
Show resolved Hide resolved
rcmerlo marked this conversation as resolved.
Show resolved Hide resolved
if filters.respondent_id:
query = query.where(AnswerSchema.respondent_id == filters.respondent_id)
if filters.target_subject_id:
Expand Down
1 change: 1 addition & 0 deletions src/apps/answers/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class AppletSubmissionsFilter(BaseQueryParams):
class AppletSubmitDateFilter(BaseQueryParams):
respondent_id: uuid.UUID | None
target_subject_id: uuid.UUID | None
activity_or_flow_id: uuid.UUID | None
from_date: datetime.date
to_date: datetime.date

Expand Down
Loading