Skip to content

allow multiple form submission #995

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 13 commits into from
Sep 18, 2025
Merged

allow multiple form submission #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6ea7039
Add AllowMultipleFormSubmission flag
idormenco Aug 14, 2025
0ba0b04
Add created at timestamp for form submissions
idormenco Sep 1, 2025
6d9205c
Rework notes
idormenco Sep 1, 2025
5a19b5b
Rework attachments
idormenco Sep 1, 2025
5ce352c
Rework queries
idormenco Sep 4, 2025
e7e7deb
fix selects
idormenco Sep 4, 2025
039b0e1
Fix selects
idormenco Sep 4, 2025
b811768
Add missing endpoints
idormenco Sep 7, 2025
8ffab70
Add missing endpoints
idormenco Sep 7, 2025
d3ba246
Update appsettings.Development.json
idormenco Sep 7, 2025
371e51b
Merge branch 'feature/add-AllowMultipleFormSubmission-flag' of https:…
idormenco Sep 7, 2025
e4dc5da
Update appsettings.Development.json
idormenco Sep 7, 2025
2b2a944
Update Endpoint.cs
idormenco Sep 8, 2025
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
180 changes: 90 additions & 90 deletions api/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,92 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300"/>
<PackageVersion Include="AWSSDK.S3" Version="3.7.307.15"/>
<PackageVersion Include="AWSSDK.SimpleEmail" Version="3.7.300.74"/>
<PackageVersion Include="AWSSDK.Core" Version="3.7.303.14" />
<PackageVersion Include="Ardalis.SmartEnum" Version="8.0.0"/>
<PackageVersion Include="Ardalis.SmartEnum.Dapper" Version="7.0.0"/>
<PackageVersion Include="Ardalis.SmartEnum.EFCore" Version="8.0.0"/>
<PackageVersion Include="Ardalis.SmartEnum.SystemTextJson" Version="8.0.0"/>
<PackageVersion Include="Ardalis.Specification" Version="8.0.0"/>
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0"/>
<PackageVersion Include="AspNetCore.HealthChecks.Hangfire" Version="8.0.1"/>
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.1"/>
<PackageVersion Include="CsvHelper" Version="31.0.3"/>
<PackageVersion Include="Dapper" Version="2.1.35"/>
<PackageVersion Include="EFCore.BulkExtensions.PostgreSql" Version="8.0.4"/>
<PackageVersion Include="FastEndpoints" Version="5.24.0"/>
<PackageVersion Include="FastEndpoints.Attributes" Version="5.24.0"/>
<PackageVersion Include="FastEndpoints.Security" Version="5.24.0"/>
<PackageVersion Include="FastEndpoints.Swagger" Version="5.24.0"/>
<PackageVersion Include="FirebaseAdmin" Version="2.4.1"/>
<PackageVersion Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.0.0"/>
<PackageVersion Include="Hangfire" Version="1.8.12"/>
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.12"/>
<PackageVersion Include="Hangfire.Core" Version="1.8.12"/>
<PackageVersion Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1"/>
<PackageVersion Include="Hangfire.PostgreSql" Version="1.20.8"/>
<PackageVersion Include="HtmlSanitizer" Version="8.1.870"/>
<PackageVersion Include="Humanizer" Version="2.14.1"/>
<PackageVersion Include="MailKit" Version="4.5.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.4"/>
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2"/>
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5"/>
<PackageVersion Include="NPOI" Version="2.7.0"/>
<PackageVersion Include="Npgsql" Version="8.0.4"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8"/>
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0"/>
<PackageVersion Include="PolyJson" Version="1.4.0"/>
<PackageVersion Include="Refit" Version="8.0.0"/>
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0"/>
<PackageVersion Include="Sentry" Version="4.12.1"/>
<PackageVersion Include="Sentry.AspNetCore" Version="4.4.0"/>
<PackageVersion Include="Sentry.OpenTelemetry" Version="4.12.1"/>
<PackageVersion Include="Sentry.Serilog" Version="4.12.1"/>
<PackageVersion Include="Serilog" Version="4.0.2"/>
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0"/>
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4"/>
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0"/>

<PackageVersion Include="Bogus" Version="35.5.0"/>
<PackageVersion Include="FastEndpoints.Testing" Version="5.24.0"/>
<PackageVersion Include="FluentAssertions" Version="6.12.0"/>
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.31.0"/>
<PackageVersion Include="FluentAssertions.Json" Version="6.1.0"/>
<PackageVersion Include="FluentValidation" Version="11.9.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10"/>
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
<PackageVersion Include="NSubstitute" Version="5.1.0"/>
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17"/>
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0"/>
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0"/>
<PackageVersion Include="Respawn" Version="6.2.1"/>
<PackageVersion Include="Serilog.Sinks.NUnit" Version="1.0.3"/>
<PackageVersion Include="Testcontainers.MsSql" Version="4.0.0"/>
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0"/>
<PackageVersion Include="Xunit.Priority" Version="1.1.6"/>
<PackageVersion Include="coverlet.collector" Version="6.0.2"/>
<PackageVersion Include="nunit" Version="4.2.2"/>
<PackageVersion Include="xunit" Version="2.7.1"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.8"/>
</ItemGroup>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.307.15" />
<PackageVersion Include="AWSSDK.SimpleEmail" Version="3.7.300.74" />
<PackageVersion Include="AWSSDK.Core" Version="3.7.303.14" />
<PackageVersion Include="Ardalis.SmartEnum" Version="8.0.0" />
<PackageVersion Include="Ardalis.SmartEnum.Dapper" Version="7.0.0" />
<PackageVersion Include="Ardalis.SmartEnum.EFCore" Version="8.0.0" />
<PackageVersion Include="Ardalis.SmartEnum.SystemTextJson" Version="8.0.0" />
<PackageVersion Include="Ardalis.Specification" Version="8.0.0" />
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Hangfire" Version="8.0.1" />
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.1" />
<PackageVersion Include="CsvHelper" Version="31.0.3" />
<PackageVersion Include="Dapper" Version="2.1.35" />
<PackageVersion Include="EFCore.BulkExtensions.PostgreSql" Version="8.0.4" />
<PackageVersion Include="FastEndpoints" Version="5.24.0" />
<PackageVersion Include="FastEndpoints.Attributes" Version="5.24.0" />
<PackageVersion Include="FastEndpoints.Security" Version="5.24.0" />
<PackageVersion Include="FastEndpoints.Swagger" Version="5.24.0" />
<PackageVersion Include="FirebaseAdmin" Version="2.4.1" />
<PackageVersion Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.0.0" />
<PackageVersion Include="Hangfire" Version="1.8.12" />
<PackageVersion Include="Hangfire.AspNetCore" Version="1.8.12" />
<PackageVersion Include="Hangfire.Core" Version="1.8.12" />
<PackageVersion Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1" />
<PackageVersion Include="Hangfire.PostgreSql" Version="1.20.8" />
<PackageVersion Include="HtmlSanitizer" Version="8.1.870" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="MailKit" Version="4.5.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageVersion Include="Minio" Version="6.0.3" />
<PackageVersion Include="NPOI" Version="2.7.0" />
<PackageVersion Include="Npgsql" Version="8.0.4" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
<PackageVersion Include="PolyJson" Version="1.4.0" />
<PackageVersion Include="Refit" Version="8.0.0" />
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
<PackageVersion Include="Sentry" Version="4.12.1" />
<PackageVersion Include="Sentry.AspNetCore" Version="4.4.0" />
<PackageVersion Include="Sentry.OpenTelemetry" Version="4.12.1" />
<PackageVersion Include="Sentry.Serilog" Version="4.12.1" />
<PackageVersion Include="Serilog" Version="4.0.2" />
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Bogus" Version="35.5.0" />
<PackageVersion Include="FastEndpoints.Testing" Version="5.24.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.31.0" />
<PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
<PackageVersion Include="FluentValidation" Version="11.9.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="Respawn" Version="6.2.1" />
<PackageVersion Include="Serilog.Sinks.NUnit" Version="1.0.3" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.0.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0" />
<PackageVersion Include="Xunit.Priority" Version="1.1.6" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="xunit" Version="2.7.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.8" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions api/src/Feature.Attachments/AttachmentModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
namespace Feature.Attachments;

[Obsolete("Will be removed in future version")]

public record AttachmentModel
{
public required Guid Id { get; init; }
Expand Down
13 changes: 13 additions & 0 deletions api/src/Feature.Attachments/AttachmentModelV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Feature.Attachments;

public record AttachmentModelV2
{
public required Guid Id { get; init; }
public required Guid ElectionRoundId { get; init; }
public Guid SubmissionId { get; init; }
public required Guid QuestionId { get; init; }
public required string FileName { get; init; } = string.Empty;
public required string MimeType { get; init; } = string.Empty;
public required string PresignedUrl { get; init; } = string.Empty;
public required int UrlValidityInSeconds { get; init; }
}
33 changes: 16 additions & 17 deletions api/src/Feature.Attachments/Delete/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
using Authorization.Policies.Requirements;
using Feature.Attachments.Specifications;
using Microsoft.AspNetCore.Authorization;

namespace Feature.Attachments.Delete;

public class Endpoint : Endpoint<Request, Results<NoContent, NotFound, BadRequest<ProblemDetails>>>
public class Endpoint(
IAuthorizationService authorizationService,
IRepository<AttachmentAggregate> repository)
: Endpoint<Request, Results<NoContent, NotFound, BadRequest<ProblemDetails>>>
{
private readonly IAuthorizationService _authorizationService;
private readonly IRepository<AttachmentAggregate> _repository;

public Endpoint(IAuthorizationService authorizationService,
IRepository<AttachmentAggregate> repository)
{
_repository = repository;
_authorizationService = authorizationService;
}

public override void Configure()
{
Delete("/api/election-rounds/{electionRoundId}/attachments/{id}");
DontAutoTag();
Options(x => x.WithTags("attachments", "mobile"));
Summary(s => {
Summary(s =>
{
s.Summary = "Deletes an attachment";
});
}

public override async Task<Results<NoContent, NotFound, BadRequest<ProblemDetails>>> ExecuteAsync(Request req, CancellationToken ct)
public override async Task<Results<NoContent, NotFound, BadRequest<ProblemDetails>>> ExecuteAsync(Request req,
CancellationToken ct)
{
var authorizationResult = await _authorizationService.AuthorizeAsync(User, new MonitoringObserverRequirement(req.ElectionRoundId));
var authorizationResult =
await authorizationService.AuthorizeAsync(User, new MonitoringObserverRequirement(req.ElectionRoundId));
if (!authorizationResult.Succeeded)
{
return TypedResults.NotFound();
}

var attachment = await _repository.GetByIdAsync(req.Id, ct);
var specification = new GetAttachmentByIdSpecification(req.ElectionRoundId, req.ObserverId, req.Id);
var attachment = await repository.FirstOrDefaultAsync(specification, ct);

if (attachment is null)
{
return TypedResults.NotFound();
}

attachment.Delete();

await _repository.UpdateAsync(attachment, ct);
await repository.UpdateAsync(attachment, ct);

return TypedResults.NoContent();
}
}
5 changes: 4 additions & 1 deletion api/src/Feature.Attachments/Get/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Authorization.Policies.Requirements;
using Feature.Attachments.Specifications;
using Microsoft.AspNetCore.Authorization;
using Vote.Monitor.Core.Services.FileStorage.Contracts;

Expand Down Expand Up @@ -29,7 +30,9 @@ public override async Task<Results<Ok<AttachmentModel>, BadRequest<ProblemDetail
return TypedResults.NotFound();
}

var attachment = await repository.GetByIdAsync(req.Id, ct);
var specification = new GetAttachmentByIdSpecification(req.ElectionRoundId, req.ObserverId, req.Id);
var attachment = await repository.FirstOrDefaultAsync(specification, ct);

if (attachment is null)
{
return TypedResults.NotFound();
Expand Down
55 changes: 55 additions & 0 deletions api/src/Feature.Attachments/GetV2/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
using Authorization.Policies.Requirements;
using Feature.Attachments.Specifications;
using Microsoft.AspNetCore.Authorization;
using Vote.Monitor.Core.Services.FileStorage.Contracts;

namespace Feature.Attachments.GetV2;

public class Endpoint(
IAuthorizationService authorizationService,
IReadRepository<AttachmentAggregate> repository,
IFileStorageService fileStorageService)
: Endpoint<Request, Results<Ok<AttachmentModelV2>, BadRequest<ProblemDetails>, NotFound>>
{
public override void Configure()
{
Get("/api/election-rounds/{electionRoundId}/form-submissions/{submissionId}/attachments/{id}");
DontAutoTag();
Options(x => x.WithTags("attachments", "mobile"));
Summary(s => {
s.Summary = "Gets an attachment";
s.Description = "Gets an attachment with freshly generated presigned url";
});
}

public override async Task<Results<Ok<AttachmentModelV2>, BadRequest<ProblemDetails>, NotFound>> ExecuteAsync(Request req, CancellationToken ct)
{
var authorizationResult = await authorizationService.AuthorizeAsync(User, new MonitoringObserverRequirement(req.ElectionRoundId));
if (!authorizationResult.Succeeded)
{
return TypedResults.NotFound();
}

var specification = new GetAttachmentByIdSpecification(req.ElectionRoundId, req.ObserverId, req.Id);
var attachment = await repository.FirstOrDefaultAsync(specification, ct);

if (attachment is null)
{
return TypedResults.NotFound();
}

var presignedUrl = await fileStorageService.GetPresignedUrlAsync(attachment.FilePath, attachment.UploadedFileName);

return TypedResults.Ok(new AttachmentModelV2
{
Id = attachment.Id,
ElectionRoundId = req.ElectionRoundId,
FileName = attachment.FileName,
PresignedUrl = (presignedUrl as GetPresignedUrlResult.Ok)?.Url ?? string.Empty,
MimeType = attachment.MimeType,
UrlValidityInSeconds = (presignedUrl as GetPresignedUrlResult.Ok)?.UrlValidityInSeconds ?? 0,
SubmissionId = attachment.SubmissionId,
QuestionId = attachment.QuestionId
});
}
}
15 changes: 15 additions & 0 deletions api/src/Feature.Attachments/GetV2/Request.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using Vote.Monitor.Core.Security;

namespace Feature.Attachments.GetV2;

public class Request
{
public Guid ElectionRoundId { get; set; }

public Guid SubmissionId { get; set; }

[FromClaim(ApplicationClaimTypes.UserId)]
public Guid ObserverId { get; set; }

public Guid Id { get; set; }
}
12 changes: 12 additions & 0 deletions api/src/Feature.Attachments/GetV2/Validator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Feature.Attachments.GetV2;

public class Validator : Validator<Request>
{
public Validator()
{
RuleFor(x => x.ElectionRoundId).NotEmpty();
RuleFor(x => x.SubmissionId).NotEmpty();
RuleFor(x => x.ObserverId).NotEmpty();
RuleFor(x => x.Id).NotEmpty();
}
}
Loading
Loading