Fix attachments queries (#1041)

Author: idormenco

api/src/Feature.Form.Submissions/ListEntries/Endpoint.cs

@@ -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)

api/src/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/ExportFormSubmissionsJob.cs

@@ -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",