diff --git a/api/src/Feature.Form.Submissions/GetByIdV2/Endpoint.cs b/api/src/Feature.Form.Submissions/GetByIdV2/Endpoint.cs index c164224d5..55d7bbe3e 100644 --- a/api/src/Feature.Form.Submissions/GetByIdV2/Endpoint.cs +++ b/api/src/Feature.Form.Submissions/GetByIdV2/Endpoint.cs @@ -31,10 +31,15 @@ public override async Task, 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", @@ -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")) @@ -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", diff --git a/api/src/Module.Answers/Models/FormSubmissionViewV2.cs b/api/src/Module.Answers/Models/FormSubmissionViewV2.cs index 72d4bf7c2..82870c746 100644 --- a/api/src/Module.Answers/Models/FormSubmissionViewV2.cs +++ b/api/src/Module.Answers/Models/FormSubmissionViewV2.cs @@ -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; @@ -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!;