ifritechnologies/pfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored endpoints to use services

Browse Source
This commit is contained in:
hermes
2026-08-30 14:24:13 +02:00
parent b288450cbb
commit f51b1feb4b
78 changed files with 1494 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs
+7 -8
View File
@@ -1,8 +1,8 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Domain.Models;
namespace PostFundManagement.Api.Endpoints.Evidence;
@@ -11,21 +11,20 @@ public class CreateIndicatorEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapPost("api/evidence/indicators", async (CreateIndicatorRequest request, ClaimsPrincipal principal,
builder.MapPost("api/evidence/indicators", async (CreateIndicatorRequest request, HttpContext context,
EvidenceService service, CancellationToken cancellationToken = default) =>
{
var result = await service.CreateIndicatorAsync(request, principal, cancellationToken);
var result = await service.CreateIndicatorAsync(request, context.GetUserId(), cancellationToken);
return result.IsSuccess
? Results.Created($"api/evidence/indicators/{result.Value.Id}", result.Value.Indicator)
: Results.BadRequest(result.Errors.ToProblems("Failed to create indicator"));
? Results.Ok()
: Results.BadRequest(result.Errors.ToProblems());
})
.RequireAuthorization()
.WithDescription("Define indicators and baselines/targets (M08)")
.WithName(typeof(CreateIndicatorEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Indicator>(StatusCodes.Status201Created)
.Produces(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status200OK)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}
PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs
+7 -8
View File
@@ -1,8 +1,8 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Domain.Models;
namespace PostFundManagement.Api.Endpoints.Evidence;
@@ -11,21 +11,20 @@ public class CreateMilestoneEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapPost("api/evidence/milestones", async (CreateMilestoneRequest request, ClaimsPrincipal principal,
builder.MapPost("api/evidence/milestones", async (CreateMilestoneRequest request, HttpContext context,
EvidenceService service, CancellationToken cancellationToken = default) =>
{
var result = await service.CreateMilestoneAsync(request, principal, cancellationToken);
var result = await service.CreateMilestoneAsync(request, context.GetUserId(), cancellationToken);
return result.IsSuccess
? Results.Created($"api/evidence/milestones/{result.Value.Id}", result.Value.Milestone)
: Results.BadRequest(result.Errors.ToProblems("Failed to create a new milestone"));
? Results.Ok()
: Results.BadRequest(result.Errors.ToProblems());
})
.RequireAuthorization()
.WithDescription("Define contractual milestones (M07)")
.WithName(typeof(CreateMilestoneRequest).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Milestone>(StatusCodes.Status201Created)
.Produces(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status200OK)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}
PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs
+10 -6
View File
@@ -1,4 +1,6 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
@@ -10,20 +12,22 @@ public class GetEvidenceFilesEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapGet("api/evidence/files/{page:int}/{pageSize:int}", async (EvidenceService service, int page = 1, int pageSize = 100, CancellationToken cancellationToken = default) =>
builder.MapGet("api/evidence/files/{page:int}/{pageSize:int}", async (EvidenceService service,
int page = 1, int pageSize = 100, CancellationToken cancellationToken = default) =>
{
var result = await service.GetEvidenceFilesAsync(new Domain.Pagination(page, pageSize), cancellationToken);
var result = await service.GetEvidenceFilesAsync(Pagination.Create(page, pageSize), cancellationToken);
return result.IsSuccess
? Results.Ok(result.Value)
: Results.BadRequest(result.Errors.ToProblems("Failed to get evidence"));
})
.RequireAuthorization()
: Results.BadRequest(result.Errors.ToProblems());
})
.WithDescription("Get a list of all uploaded evidence files metadata")
.WithName(typeof(GetEvidenceFilesEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Domain.Models.Evidence[]>(StatusCodes.Status200OK)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
.WithTags(EndpointTags.Evidence)
.CacheOutput();
}
}
PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs
+8 -5
View File
@@ -1,4 +1,6 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
@@ -11,19 +13,20 @@ public class GetIndicatorsEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapGet("api/evidence/indicators/{page:int}/{pageSize:int}", async (EvidenceService service, int page = 1, int pageSize = 100, CancellationToken cancellationToken = default) =>
builder.MapGet("api/evidence/indicators/{page:int}/{pageSize:int}", async (EvidenceService service,
int page = 1, int pageSize = 100, CancellationToken cancellationToken = default) =>
{
var result = await service.GetIndicatorsAsync(new Domain.Pagination { Page = page, PageSize = pageSize }, cancellationToken);
var result = await service.GetIndicatorsAsync(Pagination.Create(page, pageSize), cancellationToken);
return result.IsSuccess
? Results.Ok(result.Value)
: Results.BadRequest(result.Errors.ToProblems("Failed to get indicators"));
})
.RequireAuthorization()
: Results.BadRequest(result.Errors.ToProblems());
})
.WithDescription("Get a list of indicators")
.WithName(typeof(GetIndicatorsEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Indicator[]>(StatusCodes.Status200OK)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}
PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs
+6 -3
View File
@@ -1,8 +1,10 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Models;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Domain.Models;
namespace PostFundManagement.Api.Endpoints.Evidence;
@@ -14,17 +16,18 @@ public class GetMilestonesEndpoint : IEndpoint
builder.MapGet("api/evidence/milestones/{page:int}/{pageSize:int}", async (EvidenceService service,
int page = 1, int pageSize = 10, CancellationToken cancellationToken = default) =>
{
var result = await service.GetMilestonesAsync(new Domain.Pagination { Page = page, PageSize = pageSize }, cancellationToken);
var result = await service.GetMilestonesAsync(Pagination.Create(page, pageSize), cancellationToken);
return result.IsSuccess
? Results.Ok(result.Value)
: Results.BadRequest(result.Errors.ToProblems("Failed to fetch milestones"));
: Results.BadRequest(result.Errors.ToProblems());
})
.RequireAuthorization()
.WithDescription("Get a list of all milestones")
.WithName(typeof(GetMilestonesEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Milestone[]>(StatusCodes.Status200OK)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}
PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs
+4 -4
View File
@@ -1,8 +1,9 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Configuration.Entities;
using PostFundManagement.Domain.Models;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Application.Extensions;
namespace PostFundManagement.Api.Endpoints.Evidence;
@@ -11,7 +12,7 @@ public class GetProjectMilestonesEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapGet("api/evidence/milestones/project/{projectId:long}", async (long projectId,
builder.MapGet("api/evidence/milestones/project/{projectId}", async (string projectId,
EvidenceService service, CancellationToken cancellationToken = default) =>
{
var result = await service.GetMilestonesByProjectIdAsync(projectId, cancellationToken);
@@ -20,13 +21,12 @@ public class GetProjectMilestonesEndpoint : IEndpoint
? Results.Ok(result.Value)
: Results.NotFound();
})
.RequireAuthorization()
.WithDescription("Get a list of milestones for a project")
.WithName(typeof(GetProjectMilestonesEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Milestone[]>(StatusCodes.Status200OK)
.Produces(StatusCodes.Status401Unauthorized)
.Produces(StatusCodes.Status404NotFound)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}
}
PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs
+8 -8
View File
@@ -1,4 +1,5 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
@@ -10,21 +11,20 @@ public class RecordIndicatorAmountEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapPost("api/evidence/indicators/{id:string}/actuals/{actualAmount:decimal}", async (string id, decimal actualAmount,
ClaimsPrincipal principal, EvidenceService service, CancellationToken cancellationToken = default) =>
builder.MapPost("api/evidence/indicators/{indicatorId}/actuals/{actualAmount:decimal}", async (string indicatorId, decimal actualAmount,
HttpContext context, EvidenceService service, CancellationToken cancellationToken = default) =>
{
var result = await service.RecordIndicatorActualAmountAsync(id, actualAmount, principal, cancellationToken);
var result = await service.RecordIndicatorActualAmountAsync(indicatorId, actualAmount, context.GetUserId(), cancellationToken);
return result.IsSuccess
? Results.Ok()
: Results.BadRequest("Failed to record actual amount");
? Results.Ok()
: Results.BadRequest(result.Errors.ToProblems());
})
.RequireAuthorization()
.WithDescription("Record actual values for indicators (M08)")
.WithName(typeof(RecordIndicatorAmountEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces<Domain.Entities.Indicator>(StatusCodes.Status200OK)
.Produces(StatusCodes.Status404NotFound)
.Produces(StatusCodes.Status200OK)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}
PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs
+7 -8
View File
@@ -1,4 +1,5 @@
using PostFundManagement.Application.Evidence;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Api;
using PostFundManagement.Domain.Extensions;
@@ -10,12 +11,10 @@ public class UploadEvidenceFilesEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapPost("api/evidence/files", async (HttpRequest request, ClaimsPrincipal principal, EvidenceService service, CancellationToken cancellationToken = default) =>
builder.MapPost("api/evidence/files", async (HttpRequest request, EvidenceService service,
CancellationToken cancellationToken = default) =>
{
var sidClaim = principal.FindFirst("sid")?.Value ?? principal.FindFirst(ClaimTypes.Sid)?.Value;
if (!Guid.TryParse(sidClaim, out var userId))
return Results.BadRequest("Missing or invalid 'sid' claim.");
var userId = request.HttpContext.GetUserId();
if (!request.HasFormContentType)
return Results.BadRequest("Request must be a multipart form.");
@@ -29,8 +28,8 @@ public class UploadEvidenceFilesEndpoint : IEndpoint
var result = await service.UploadEvidenceFileAsync(userId, form, file, cancellationToken);
return result.IsSuccess
? Results.Created()
: Results.BadRequest("Evidence upload failed");
? Results.Ok()
: Results.BadRequest(result.Errors.ToProblems());
})
.RequireAuthorization()
.DisableAntiforgery()
@@ -38,7 +37,7 @@ public class UploadEvidenceFilesEndpoint : IEndpoint
.WithName(typeof(UploadEvidenceFilesEndpoint).ToEndpointName())
.MapToApiVersion(new ApiVersion(1))
.Produces(StatusCodes.Status200OK)
.Produces(StatusCodes.Status400BadRequest)
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
.Produces(StatusCodes.Status401Unauthorized)
.WithTags(EndpointTags.Evidence);
}