Skip to content

Commit 03fdab9

Browse files
authored
add submission number column to form submissions export (#1032)
1 parent 4753f3e commit 03fdab9

File tree

5 files changed

+14
-0
lines changed

5 files changed

+14
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ private async Task<List<SubmissionModel>> GetSubmissions(Guid electionRoundId, G
128128
SUBMISSIONS AS (
129129
SELECT
130130
PSI."Id" AS "SubmissionId",
131+
1 as "SubmissionNumber",
131132
PSI."PollingStationInformationFormId" AS "FormId",
132133
'PSI' AS "FormType",
133134
PSI."PollingStationId",
@@ -193,6 +194,14 @@ AND PSIF."NumberOfQuestions" <> PSI."NumberOfQuestionsAnswered"
193194
UNION ALL
194195
SELECT
195196
FS."Id" AS "SubmissionId",
197+
ROW_NUMBER() OVER (
198+
PARTITION BY
199+
FS."PollingStationId",
200+
F."Id",
201+
FS."MonitoringObserverId"
202+
ORDER BY
203+
FS."CreatedAt"
204+
) AS "SubmissionNumber",
196205
F."Id" AS "FormId",
197206
F."FormType",
198207
FS."PollingStationId",
@@ -298,6 +307,7 @@ ORDER BY
298307
)
299308
SELECT
300309
S."SubmissionId",
310+
S."SubmissionNumber",
301311
S."FormId",
302312
S."FormType",
303313
S."TimeSubmitted",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ private FormSubmissionsDataTable(Guid formId, string defaultLanguage, IReadOnlyL
2020

2121
_header.AddRange([
2222
"SubmissionId",
23+
"SubmissionNumber",
2324
"TimeSubmitted",
2425
"FollowUpStatus",
2526
"Level1",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public FormSubmissionsDataTableGenerator ForSubmission(SubmissionModel submissio
4343
var row = new List<object>
4444
{
4545
submission.SubmissionId.ToString(),
46+
submission.SubmissionNumber,
4647
submission.TimeSubmitted.ToString("s"),
4748
submission.FollowUpStatus.Value,
4849
submission.Level1,

api/src/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/ReadModels/SubmissionModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ namespace Vote.Monitor.Hangfire.Jobs.Export.FormSubmissions.ReadModels;
99
public class SubmissionModel
1010
{
1111
public Guid SubmissionId { get; init; }
12+
public int SubmissionNumber { get; set; }
1213

1314
[JsonConverter(typeof(SmartEnumNameConverter<SubmissionFollowUpStatus, string>))]
1415
public SubmissionFollowUpStatus FollowUpStatus { get; set; }

api/tests/Vote.Monitor.Hangfire.UnitTests/Jobs/ExportData/FormSubmissionsDataTableGeneratorTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public class FormSubmissionsDataTableGeneratorTests
112112
private static readonly string[] _submissionColumns =
113113
[
114114
"SubmissionId",
115+
"SubmissionNumber",
115116
"TimeSubmitted",
116117
"FollowUpStatus",
117118
"Level1",

0 commit comments

Comments
 (0)