Skip to content

Include form details in form submission GetByIdV2. #1088

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
Sep 21, 2026
Merged

Include form details in form submission GetByIdV2. #1088

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
15 changes: 15 additions & 0 deletions api/src/Feature.Form.Submissions/GetByIdV2/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,15 @@ public override async Task<Results<Ok<FormSubmissionViewV2>, NotFound>> ExecuteA
var sql = """
WITH submissions AS
(SELECT psi."Id" AS "SubmissionId",
'PSI' AS "FormType",
'PSI' AS "FormCode",
psif."Name" AS "FormName",
psi."PollingStationId",
psi."MonitoringObserverId",
psi."Answers",
psif."Questions" AS "Questions",
psif."DefaultLanguage" AS "DefaultLanguage",
psif."Languages" AS "Languages",
psif."Id" AS "FormId",
psi."FollowUpStatus" as "FollowUpStatus",
'[]'::jsonb AS "Attachments",
Expand All @@ -51,10 +56,15 @@ WITH submissions AS
UNION ALL
SELECT
fs."Id" AS "SubmissionId",
f."FormType" AS "FormType",
f."Code" AS "FormCode",
f."Name" AS "FormName",
fs."PollingStationId",
fs."MonitoringObserverId",
fs."Answers",
f."Questions",
f."DefaultLanguage",
f."Languages",
f."Id" AS "FormId",
fs."FollowUpStatus",
COALESCE((select jsonb_agg(jsonb_build_object('QuestionId', "QuestionId", 'FileName', "FileName", 'MimeType', "MimeType", 'FilePath', "FilePath", 'UploadedFileName', "UploadedFileName", 'TimeSubmitted', "LastUpdatedAt"))
Expand Down Expand Up @@ -89,6 +99,11 @@ UNION ALL
SELECT s."SubmissionId",
s."FormId",
s."TimeSubmitted",
s."FormCode",
s."FormName",
s."FormType",
s."DefaultLanguage",
s."Languages",
ps."Id" AS "PollingStationId",
ps."Level1",
ps."Level2",
Expand Down
6 changes: 6 additions & 0 deletions api/src/Module.Answers/Models/FormSubmissionViewV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Module.Forms.Models;
using Vote.Monitor.Core.Models;
using Vote.Monitor.Domain.Entities.FormBase;
using Vote.Monitor.Domain.Entities.FormSubmissionAggregate;

namespace Module.Answers.Models;
Expand All @@ -9,6 +10,11 @@ public record FormSubmissionViewV2
public Guid SubmissionId { get; init; }
public DateTime TimeSubmitted { get; init; }
public Guid FormId { get; init; }
public string FormCode { get; init; } = null!;
public string DefaultLanguage { get; init; } = null!;
public string[] Languages { get; init; } = [];
public FormType FormType { get; init; } = null!;
public TranslatedString FormName { get; init; } = null!;

public SubmissionFollowUpStatus FollowUpStatus { get; init; } = null!;

Expand Down
Loading