Skip to content

Fix attachments queries #1041

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

Merged
idormenco merged 1 commit into from
Dec 6, 2025
Merged

Fix attachments queries #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions api/src/Feature.Form.Submissions/ListEntries/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@ form_submissions AS (SELECT fs."Id"
fs."NumberOfFlaggedAnswers",
(SELECT COUNT(1)
FROM "Attachments" A
WHERE A."FormId" = fs."FormId"
AND a."MonitoringObserverId" = fs."MonitoringObserverId"
AND fs."PollingStationId" = A."PollingStationId"
WHERE a."MonitoringObserverId" = FS."MonitoringObserverId"
AND (
(A."FormId" = FS."FormId" AND FS."PollingStationId" = A."PollingStationId") -- backwards compatibility
OR A."SubmissionId" = FS."Id"
)
AND A."IsDeleted" = false
AND A."IsCompleted" = true) AS "MediaFilesCount",
(SELECT COUNT(1)
Expand Down
7 changes: 4 additions & 3 deletions api/src/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/ExportFormSubmissionsJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,10 @@ ORDER BY
"Attachments" A
WHERE
A."ElectionRoundId" = @ELECTIONROUNDID
AND A."FormId" = FS."FormId"
AND A."MonitoringObserverId" = FS."MonitoringObserverId"
AND FS."PollingStationId" = A."PollingStationId"
AND (
(A."FormId" = FS."FormId" AND FS."PollingStationId" = A."PollingStationId") -- backwards compatibility
OR A."SubmissionId" = FS."Id"
)
),
'[]'::JSONB
) AS "Attachments",
Expand Down
Loading