Refactored Communications and Evidence endpoints

This commit is contained in:
2026-08-28 17:21:41 +02:00
parent e5205f8443
commit b288450cbb
33 changed files with 607 additions and 304 deletions
@@ -1,8 +1,7 @@
using PostFundManagement.Domain;
using PostFundManagement.Application.Evidence;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Infrastructure.Database;
namespace PostFundManagement.Api.Endpoints.Evidence;
@@ -11,8 +10,7 @@ public class UploadEvidenceFilesEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapPost("api/evidence/files", async (HttpRequest request, ClaimsPrincipal principal, IDbContextFactory<ApplicationDbContext> contextFactory,
[FromKeyedServices(Constants.EvidenceS3SettingsSection)] IS3Service s3Service, CancellationToken cancellationToken = default) =>
builder.MapPost("api/evidence/files", async (HttpRequest request, ClaimsPrincipal principal, EvidenceService service, CancellationToken cancellationToken = default) =>
{
var sidClaim = principal.FindFirst("sid")?.Value ?? principal.FindFirst(ClaimTypes.Sid)?.Value;
@@ -28,41 +26,10 @@ public class UploadEvidenceFilesEndpoint : IEndpoint
if (file == null || file.Length == 0)
return Results.BadRequest("No file uploaded or file is empty.");
_ = long.TryParse(form["projectId"], out var projectId);
_ = long.TryParse(form["milestoneId"], out var milestoneId);
_ = long.TryParse(form["indicatorId"], out var indicatorId);
_ = long.TryParse(form["activityId"], out var activityId);
_ = Enum.TryParse<EvidenceType>(form["type"], out var type);
var result = await service.UploadEvidenceFileAsync(userId, form, file, cancellationToken);
using var stream = file.OpenReadStream();
var uploadResult = await s3Service.UploadFileAsync(file.FileName, stream, file.ContentType, cancellationToken);
if (uploadResult.IsFailed)
return Results.BadRequest(uploadResult.Errors.FirstOrDefault()?.Message ?? "File upload failed.");
var documentUrl = uploadResult.Value;
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var evidence = new Domain.Entities.Evidence
{
ProjectId = projectId,
MilestoneId = milestoneId,
IndicatorId = indicatorId,
ActivityId = activityId,
CreatedBy = userId,
CreatedAt = DateTime.UtcNow,
Version = 1,
Type = type,
DocumentUrl = documentUrl,
Status = ApprovalStatus.Pending
};
context.Evidences.Add(evidence);
return await context.SaveChangesAsync(cancellationToken) > 0
? Results.Created($"api/evidence/files/{evidence.Id}", evidence)
return result.IsSuccess
? Results.Created()
: Results.BadRequest("Evidence upload failed");
})
.RequireAuthorization()
@@ -70,7 +37,7 @@ public class UploadEvidenceFilesEndpoint : IEndpoint
.WithDescription("Upload supporting evidence file to S3 and register metadata (M14)")
.WithName(typeof(UploadEvidenceFilesEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<PostFundManagement.Domain.Entities.Evidence>(StatusCodes.Status201Created)
.Produces(StatusCodes.Status200OK)
.Produces(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);