Expanded evidence and project endpoints coverage
This commit is contained in:
@@ -0,0 +1,31 @@
|
|||||||
|
using PostFundManagement.Application.Extensions;
|
||||||
|
using PostFundManagement.Application.Services.Projects;
|
||||||
|
using PostFundManagement.Domain.Abstractions;
|
||||||
|
using PostFundManagement.Domain.Extensions;
|
||||||
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
|
[ApiVersionTarget(1)]
|
||||||
|
public class GetActivityEndpoint : IEndpoint
|
||||||
|
{
|
||||||
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
|
{
|
||||||
|
builder.MapGet("api/projects/activities/{activityId}", async (string activityId,
|
||||||
|
ProjectService service, CancellationToken cancellationToken = default) =>
|
||||||
|
{
|
||||||
|
var result = await service.GetActivityAsync(activityId, cancellationToken);
|
||||||
|
|
||||||
|
return result.IsSuccess
|
||||||
|
? Results.Ok(result.Value)
|
||||||
|
: Results.NotFound();
|
||||||
|
})
|
||||||
|
.WithDescription("Gets a specific activity by it's id")
|
||||||
|
.WithName(typeof(GetActivityEndpoint).ToEndpointName())
|
||||||
|
.MapToApiVersion(new ApiVersion(1))
|
||||||
|
.Produces<Domain.Models.Activity>(StatusCodes.Status200OK)
|
||||||
|
.Produces(StatusCodes.Status404NotFound)
|
||||||
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
|
.WithTags(EndpointTags.Projects);
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-4
@@ -1,18 +1,18 @@
|
|||||||
using PostFundManagement.Application.Extensions;
|
using PostFundManagement.Application.Extensions;
|
||||||
using PostFundManagement.Application.Services.Evidence;
|
using PostFundManagement.Application.Services.Projects;
|
||||||
using PostFundManagement.Domain.Abstractions;
|
using PostFundManagement.Domain.Abstractions;
|
||||||
using PostFundManagement.Domain.Extensions;
|
using PostFundManagement.Domain.Extensions;
|
||||||
using PostFundManagement.Domain.Models;
|
using PostFundManagement.Domain.Models;
|
||||||
using PostFundManagement.Domain.Security;
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
namespace PostFundManagement.Api.Endpoints.Evidence;
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public class GetMilestoneEndpoint : IEndpoint
|
public class GetMilestoneEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapGet("api/evidence/milestones/{milestoneId}", async (string milestoneId, EvidenceService service,
|
builder.MapGet("api/projects/milestones/{milestoneId}", async (string milestoneId, ProjectService service,
|
||||||
CancellationToken cancellationToken = default) =>
|
CancellationToken cancellationToken = default) =>
|
||||||
{
|
{
|
||||||
var result = await service.GetMilestoneAsync(milestoneId, cancellationToken);
|
var result = await service.GetMilestoneAsync(milestoneId, cancellationToken);
|
||||||
@@ -27,7 +27,7 @@ public class GetMilestoneEndpoint : IEndpoint
|
|||||||
.Produces<Milestone>(StatusCodes.Status200OK)
|
.Produces<Milestone>(StatusCodes.Status200OK)
|
||||||
.Produces(StatusCodes.Status404NotFound)
|
.Produces(StatusCodes.Status404NotFound)
|
||||||
.Produces(StatusCodes.Status401Unauthorized)
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
.WithTags(EndpointTags.Evidence)
|
.WithTags(EndpointTags.Projects)
|
||||||
.CacheOutput();
|
.CacheOutput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+5
-5
@@ -1,20 +1,20 @@
|
|||||||
using PostFundManagement.Application.Extensions;
|
using PostFundManagement.Application.Extensions;
|
||||||
using PostFundManagement.Application.Services.Evidence;
|
using PostFundManagement.Application.Services.Projects;
|
||||||
using PostFundManagement.Domain;
|
using PostFundManagement.Domain;
|
||||||
using PostFundManagement.Domain.Abstractions;
|
using PostFundManagement.Domain.Abstractions;
|
||||||
using PostFundManagement.Domain.Extensions;
|
using PostFundManagement.Domain.Extensions;
|
||||||
using PostFundManagement.Domain.Models;
|
using PostFundManagement.Domain.Models;
|
||||||
using PostFundManagement.Domain.Security;
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
namespace PostFundManagement.Api.Endpoints.Evidence;
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public class GetMilestonesEndpoint : IEndpoint
|
public class GetMilestonesEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapGet("api/evidence/milestones/{page:int}/{pageSize:int}", async (EvidenceService service,
|
builder.MapGet("api/projects/milestones/{page:int}/{pageSize:int}", async (ProjectService service,
|
||||||
int page = 1, int pageSize = 10, CancellationToken cancellationToken = default) =>
|
int page = 1, int pageSize = 100, CancellationToken cancellationToken = default) =>
|
||||||
{
|
{
|
||||||
var result = await service.GetMilestonesAsync(Pagination.Create(page, pageSize), cancellationToken);
|
var result = await service.GetMilestonesAsync(Pagination.Create(page, pageSize), cancellationToken);
|
||||||
|
|
||||||
@@ -29,6 +29,6 @@ public class GetMilestonesEndpoint : IEndpoint
|
|||||||
.Produces<Milestone[]>(StatusCodes.Status200OK)
|
.Produces<Milestone[]>(StatusCodes.Status200OK)
|
||||||
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
|
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
|
||||||
.Produces(StatusCodes.Status401Unauthorized)
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
.WithTags(EndpointTags.Evidence);
|
.WithTags(EndpointTags.Projects);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-3
@@ -8,21 +8,21 @@ using PostFundManagement.Domain.Security;
|
|||||||
namespace PostFundManagement.Api.Endpoints.Projects;
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public class GetProjectByIdEndpoint : IEndpoint
|
public class GetProjectEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapGet("api/projects/{projectId}", async (string projectId, ProjectService service,
|
builder.MapGet("api/projects/{projectId}", async (string projectId, ProjectService service,
|
||||||
CancellationToken cancellationToken = default) =>
|
CancellationToken cancellationToken = default) =>
|
||||||
{
|
{
|
||||||
var result = await service.GetProjectByIdAsync(projectId, cancellationToken);
|
var result = await service.GetProjectAsync(projectId, cancellationToken);
|
||||||
|
|
||||||
return result.IsSuccess
|
return result.IsSuccess
|
||||||
? Results.Ok(result.Value)
|
? Results.Ok(result.Value)
|
||||||
: Results.NotFound();
|
: Results.NotFound();
|
||||||
})
|
})
|
||||||
.WithDescription("Get project by ID")
|
.WithDescription("Get project by ID")
|
||||||
.WithName(typeof(GetProjectByIdEndpoint).ToEndpointName())
|
.WithName(typeof(GetProjectEndpoint).ToEndpointName())
|
||||||
.MapToApiVersion(new ApiVersion(1))
|
.MapToApiVersion(new ApiVersion(1))
|
||||||
.Produces<Project[]>(StatusCodes.Status200OK)
|
.Produces<Project[]>(StatusCodes.Status200OK)
|
||||||
.Produces(StatusCodes.Status404NotFound)
|
.Produces(StatusCodes.Status404NotFound)
|
||||||
+4
-4
@@ -1,18 +1,18 @@
|
|||||||
using PostFundManagement.Application.Extensions;
|
using PostFundManagement.Application.Extensions;
|
||||||
using PostFundManagement.Application.Services.Evidence;
|
using PostFundManagement.Application.Services.Projects;
|
||||||
using PostFundManagement.Domain.Abstractions;
|
using PostFundManagement.Domain.Abstractions;
|
||||||
using PostFundManagement.Domain.Extensions;
|
using PostFundManagement.Domain.Extensions;
|
||||||
using PostFundManagement.Domain.Models;
|
using PostFundManagement.Domain.Models;
|
||||||
using PostFundManagement.Domain.Security;
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
namespace PostFundManagement.Api.Endpoints.Evidence;
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public class GetProjectIndicatorsEndpoint : IEndpoint
|
public class GetProjectIndicatorsEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapGet("api/evidence/indicators/project/{projectId}", async (string projectId, EvidenceService service,
|
builder.MapGet("api/projects/indicators/project/{projectId}", async (string projectId, ProjectService service,
|
||||||
CancellationToken cancellationToken = default) =>
|
CancellationToken cancellationToken = default) =>
|
||||||
{
|
{
|
||||||
var result = await service.GetProjectIndicatorsAsync(projectIdHash: projectId, cancellationToken);
|
var result = await service.GetProjectIndicatorsAsync(projectIdHash: projectId, cancellationToken);
|
||||||
@@ -27,6 +27,6 @@ public class GetProjectIndicatorsEndpoint : IEndpoint
|
|||||||
.Produces<Indicator[]>(StatusCodes.Status200OK)
|
.Produces<Indicator[]>(StatusCodes.Status200OK)
|
||||||
.Produces(StatusCodes.Status404NotFound)
|
.Produces(StatusCodes.Status404NotFound)
|
||||||
.Produces(StatusCodes.Status401Unauthorized)
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
.WithTags(EndpointTags.Evidence);
|
.WithTags(EndpointTags.Projects);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+6
-6
@@ -1,21 +1,21 @@
|
|||||||
using PostFundManagement.Application.Extensions;
|
using PostFundManagement.Application.Extensions;
|
||||||
using PostFundManagement.Application.Services.Evidence;
|
using PostFundManagement.Application.Services.Projects;
|
||||||
using PostFundManagement.Domain.Abstractions;
|
using PostFundManagement.Domain.Abstractions;
|
||||||
using PostFundManagement.Domain.Extensions;
|
using PostFundManagement.Domain.Extensions;
|
||||||
using PostFundManagement.Domain.Models;
|
using PostFundManagement.Domain.Models;
|
||||||
using PostFundManagement.Domain.Security;
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
namespace PostFundManagement.Api.Endpoints.Evidence;
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public class GetProjectMilestonesEndpoint : IEndpoint
|
public class GetProjectMilestonesEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapGet("api/evidence/milestones/project/{projectId}", async (string projectId,
|
builder.MapGet("api/projects/{projectId}/milestones", async (string projectId,
|
||||||
EvidenceService service, CancellationToken cancellationToken = default) =>
|
ProjectService service, CancellationToken cancellationToken = default) =>
|
||||||
{
|
{
|
||||||
var result = await service.GetMilestonesByProjectIdAsync(projectId, cancellationToken);
|
var result = await service.GetProjectMilestonesAsync(projectId, cancellationToken);
|
||||||
|
|
||||||
return result.IsSuccess
|
return result.IsSuccess
|
||||||
? Results.Ok(result.Value)
|
? Results.Ok(result.Value)
|
||||||
@@ -27,6 +27,6 @@ public class GetProjectMilestonesEndpoint : IEndpoint
|
|||||||
.Produces<Milestone[]>(StatusCodes.Status200OK)
|
.Produces<Milestone[]>(StatusCodes.Status200OK)
|
||||||
.Produces(StatusCodes.Status404NotFound)
|
.Produces(StatusCodes.Status404NotFound)
|
||||||
.Produces(StatusCodes.Status401Unauthorized)
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
.WithTags(EndpointTags.Evidence);
|
.WithTags(EndpointTags.Projects);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
using PostFundManagement.Application.Extensions;
|
||||||
|
using PostFundManagement.Application.Services.Projects;
|
||||||
|
using PostFundManagement.Domain.Abstractions;
|
||||||
|
using PostFundManagement.Domain.Extensions;
|
||||||
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
|
[ApiVersionTarget(1)]
|
||||||
|
public sealed class UpdateMilestoneEndpoint : IEndpoint
|
||||||
|
{
|
||||||
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
|
{
|
||||||
|
builder.MapPut("api/projects/milestone", async (UpdateMilestoneRequest request, ProjectService service,
|
||||||
|
HttpContext context, CancellationToken cancellationToken = default) =>
|
||||||
|
{
|
||||||
|
var result = await service.UpdateMilestoneAsync(request, context.GetUserId(), cancellationToken);
|
||||||
|
|
||||||
|
return result.IsSuccess
|
||||||
|
? Results.Ok()
|
||||||
|
: Results.BadRequest(result.Errors.ToProblems());
|
||||||
|
})
|
||||||
|
.WithDescription("Update project milestone details")
|
||||||
|
.WithName(typeof(UpdateMilestoneEndpoint).ToEndpointName())
|
||||||
|
.MapToApiVersion(new ApiVersion(1))
|
||||||
|
.Produces(StatusCodes.Status200OK)
|
||||||
|
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
|
||||||
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
|
.WithTags(EndpointTags.Projects);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using PostFundManagement.Application.Extensions;
|
using PostFundManagement.Application.Extensions;
|
||||||
using PostFundManagement.Application.Services.Projects;
|
using PostFundManagement.Application.Services.Projects;
|
||||||
using PostFundManagement.Domain.Abstractions;
|
using PostFundManagement.Domain.Abstractions;
|
||||||
using PostFundManagement.Domain.Extensions;
|
using PostFundManagement.Domain.Extensions;
|
||||||
@@ -7,20 +7,20 @@ using PostFundManagement.Domain.Security;
|
|||||||
namespace PostFundManagement.Api.Endpoints.Projects;
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public class UpdateProjectEndpoint : IEndpoint
|
public sealed class UpdateProjectEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapPost("api/projects/status", async (UpdateProjectStatusRequest request, HttpContext context,
|
builder.MapPut("api/projects", async (UpdateProjectRequest request,
|
||||||
ProjectService service, CancellationToken cancellationToken = default) =>
|
ProjectService service, HttpContext context, CancellationToken cancellationToken = default) =>
|
||||||
{
|
{
|
||||||
var result = await service.UpdateProjectStatusAsync(request, context.GetUserId(), cancellationToken);
|
var result = await service.UpdateProjectAsync(request, userId: context.GetUserId(), cancellationToken);
|
||||||
|
|
||||||
return result.IsSuccess
|
return result.IsSuccess
|
||||||
? Results.Ok()
|
? Results.Ok()
|
||||||
: Results.BadRequest(result.Errors.ToProblems());
|
: Results.BadRequest(result.Errors.ToProblems());
|
||||||
})
|
})
|
||||||
.WithDescription("Update project status (M04)")
|
.WithDescription("Update project details")
|
||||||
.WithName(typeof(UpdateProjectEndpoint).ToEndpointName())
|
.WithName(typeof(UpdateProjectEndpoint).ToEndpointName())
|
||||||
.MapToApiVersion(new ApiVersion(1))
|
.MapToApiVersion(new ApiVersion(1))
|
||||||
.Produces(StatusCodes.Status200OK)
|
.Produces(StatusCodes.Status200OK)
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
using PostFundManagement.Application.Extensions;
|
||||||
|
using PostFundManagement.Application.Services.Projects;
|
||||||
|
using PostFundManagement.Domain.Abstractions;
|
||||||
|
using PostFundManagement.Domain.Extensions;
|
||||||
|
using PostFundManagement.Domain.Security;
|
||||||
|
|
||||||
|
namespace PostFundManagement.Api.Endpoints.Projects;
|
||||||
|
|
||||||
|
[ApiVersionTarget(1)]
|
||||||
|
public class UpdateProjectStatusEndpoint : IEndpoint
|
||||||
|
{
|
||||||
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
|
{
|
||||||
|
builder.MapPut("api/projects/status", async (UpdateProjectStatusRequest request, HttpContext context,
|
||||||
|
ProjectService service, CancellationToken cancellationToken = default) =>
|
||||||
|
{
|
||||||
|
var result = await service.UpdateProjectStatusAsync(request, context.GetUserId(), cancellationToken);
|
||||||
|
|
||||||
|
return result.IsSuccess
|
||||||
|
? Results.Ok()
|
||||||
|
: Results.BadRequest(result.Errors.ToProblems());
|
||||||
|
})
|
||||||
|
.WithDescription("Update project status (M04)")
|
||||||
|
.WithName(typeof(UpdateProjectStatusEndpoint).ToEndpointName())
|
||||||
|
.MapToApiVersion(new ApiVersion(1))
|
||||||
|
.Produces(StatusCodes.Status200OK)
|
||||||
|
.Produces<Microsoft.AspNetCore.Mvc.ProblemDetails>(StatusCodes.Status400BadRequest)
|
||||||
|
.Produces(StatusCodes.Status401Unauthorized)
|
||||||
|
.WithTags(EndpointTags.Projects);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -83,50 +83,6 @@ public sealed class EvidenceService(IDbContextFactory<ApplicationDbContext> cont
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<Milestone[]>> GetMilestonesByProjectIdAsync(string projectIdHash, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var decodeResult = hashService.DecodeLongIdHash(projectIdHash);
|
|
||||||
|
|
||||||
if (decodeResult.IsFailed)
|
|
||||||
return Result.Fail(decodeResult.Errors);
|
|
||||||
|
|
||||||
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
|
||||||
|
|
||||||
var milestones = await context.Milestones.AsNoTracking()
|
|
||||||
.Where(m => m.ProjectId == decodeResult.Value)
|
|
||||||
.OrderBy(m => m.DueAt)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
return Result.Ok(milestones?.Select(i => i.Map()).ToArray() ?? []);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async ValueTask<Result<Milestone[]>> GetMilestonesAsync(Pagination pagination, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
|
||||||
|
|
||||||
var milestones = await context.Milestones.AsNoTracking()
|
|
||||||
.OrderByDescending(m => m.CreatedAt)
|
|
||||||
.Skip((pagination.Page - 1) * pagination.PageSize)
|
|
||||||
.Take(pagination.PageSize)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
return Result.Ok(milestones?.Select(i => i.Map()).ToArray() ?? []);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async ValueTask<Result<Indicator[]>> GetIndicatorsAsync(Pagination pagination, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<Indicator[]>> GetIndicatorsAsync(Pagination pagination, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -254,30 +210,6 @@ public sealed class EvidenceService(IDbContextFactory<ApplicationDbContext> cont
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Result<Milestone>> GetMilestoneAsync(string milestoneId, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var decodeResult = hashService.DecodeLongIdHash(milestoneId);
|
|
||||||
|
|
||||||
if (decodeResult.IsFailed)
|
|
||||||
return Result.Fail(decodeResult.Errors);
|
|
||||||
|
|
||||||
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
|
||||||
|
|
||||||
var milestone = await context.Milestones.AsNoTracking().FirstOrDefaultAsync(m => m.Id == decodeResult.Value, cancellationToken);
|
|
||||||
|
|
||||||
return milestone is not null
|
|
||||||
? Result.Ok(milestone.Map())
|
|
||||||
: Result.Fail("Failed to get specific milestone");
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async ValueTask<Result<Domain.Models.Evidence>> GetEvidenceAsync(string evidenceId, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<Domain.Models.Evidence>> GetEvidenceAsync(string evidenceId, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -350,28 +282,4 @@ public sealed class EvidenceService(IDbContextFactory<ApplicationDbContext> cont
|
|||||||
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Result<Indicator[]>> GetProjectIndicatorsAsync(string projectIdHash, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var decodeResult = hashService.DecodeLongIdHash(projectIdHash);
|
|
||||||
|
|
||||||
if (decodeResult.IsFailed)
|
|
||||||
return Result.Fail(decodeResult.Errors);
|
|
||||||
|
|
||||||
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
|
||||||
|
|
||||||
var evidences = await context.Indicators.AsNoTracking()
|
|
||||||
.Where(e => e.ProjectId == decodeResult.Value)
|
|
||||||
.OrderByDescending(o => o.Id)
|
|
||||||
.ToListAsync(cancellationToken);
|
|
||||||
|
|
||||||
return Result.Ok(evidences?.Select(e => e.Map()).ToArray() ?? []);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public sealed class ProjectService(IDbContextFactory<ApplicationDbContext> conte
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<Project>> GetProjectByIdAsync(string projectIdHash, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<Project>> GetProjectAsync(string projectIdHash, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -179,4 +179,171 @@ public sealed class ProjectService(IDbContextFactory<ApplicationDbContext> conte
|
|||||||
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<Milestone[]>> GetProjectMilestonesAsync(string projectIdHash, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var decodeResult = hashService.DecodeLongIdHash(projectIdHash);
|
||||||
|
|
||||||
|
if (decodeResult.IsFailed)
|
||||||
|
return Result.Fail(decodeResult.Errors);
|
||||||
|
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var milestones = await context.Milestones.AsNoTracking()
|
||||||
|
.Where(m => m.ProjectId == decodeResult.Value)
|
||||||
|
.OrderBy(m => m.DueAt)
|
||||||
|
.ToListAsync(cancellationToken);
|
||||||
|
|
||||||
|
return Result.Ok(milestones?.Select(i => i.Map()).ToArray() ?? []);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result<Indicator[]>> GetProjectIndicatorsAsync(string projectIdHash, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var decodeResult = hashService.DecodeLongIdHash(projectIdHash);
|
||||||
|
|
||||||
|
if (decodeResult.IsFailed)
|
||||||
|
return Result.Fail(decodeResult.Errors);
|
||||||
|
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var evidences = await context.Indicators.AsNoTracking()
|
||||||
|
.Where(e => e.ProjectId == decodeResult.Value)
|
||||||
|
.OrderByDescending(o => o.Id)
|
||||||
|
.ToListAsync(cancellationToken);
|
||||||
|
|
||||||
|
return Result.Ok(evidences?.Select(e => e.Map()).ToArray() ?? []);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result<Milestone>> GetMilestoneAsync(string milestoneIdHash, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var decodeResult = hashService.DecodeLongIdHash(milestoneIdHash);
|
||||||
|
|
||||||
|
if (decodeResult.IsFailed)
|
||||||
|
return Result.Fail(decodeResult.Errors);
|
||||||
|
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var milestone = await context.Milestones.AsNoTracking().FirstOrDefaultAsync(m => m.Id == decodeResult.Value, cancellationToken);
|
||||||
|
|
||||||
|
return milestone is not null
|
||||||
|
? Result.Ok(milestone.Map())
|
||||||
|
: Result.Fail("Failed to get specific milestone");
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<Milestone[]>> GetMilestonesAsync(Pagination pagination, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var milestones = await context.Milestones.AsNoTracking()
|
||||||
|
.OrderByDescending(m => m.CreatedAt)
|
||||||
|
.Skip((pagination.Page - 1) * pagination.PageSize)
|
||||||
|
.Take(pagination.PageSize)
|
||||||
|
.ToListAsync(cancellationToken);
|
||||||
|
|
||||||
|
return Result.Ok(milestones?.Select(i => i.Map()).ToArray() ?? []);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> UpdateMilestoneAsync(UpdateMilestoneRequest request, Guid userId, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var changedTotal = await context.Milestones.Where(m => m.Id == request.MilestoneId)
|
||||||
|
.ExecuteUpdateAsync(f => f
|
||||||
|
.SetProperty(u => u.Name, request.Name)
|
||||||
|
.SetProperty(u => u.DueAt, request.DueAt)
|
||||||
|
.SetProperty(u => u.Priority, request.Priority)
|
||||||
|
.SetProperty(u => u.Status, request.Status)
|
||||||
|
.SetProperty(u => u.UpdatedBy, userId)
|
||||||
|
.SetProperty(u => u.UpdatedAt, DateTime.UtcNow), cancellationToken);
|
||||||
|
|
||||||
|
return changedTotal > 0
|
||||||
|
? Result.Ok()
|
||||||
|
: Result.Fail("Failed to update milestone");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Result> UpdateProjectAsync(UpdateProjectRequest request, Guid userId, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var changedTotal = await context.Projects.Where(p => p.Id == request.ProjectId)
|
||||||
|
.ExecuteUpdateAsync(f => f
|
||||||
|
.SetProperty(u => u.Name, request.Name)
|
||||||
|
.SetProperty(u => u.Description, request.Description)
|
||||||
|
.SetProperty(u => u.StartedAt, request.StartedAt)
|
||||||
|
.SetProperty(u => u.EndedAt, request.EndedAt)
|
||||||
|
.SetProperty(u => u.UpdatedBy, userId)
|
||||||
|
.SetProperty(u => u.UpdatedAt, DateTime.UtcNow)
|
||||||
|
.SetProperty(u => u.Sector, request.Sector)
|
||||||
|
.SetProperty(u => u.ProjectType, request.ProjectType), cancellationToken);
|
||||||
|
|
||||||
|
return changedTotal > 0
|
||||||
|
? Result.Ok()
|
||||||
|
: Result.Fail("Failed to update project");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<Domain.Models.Activity>> GetActivityAsync(string activityIdHash, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var decodeResult = hashService.DecodeLongIdHash(activityIdHash);
|
||||||
|
|
||||||
|
if (decodeResult.IsFailed)
|
||||||
|
return Result.Fail(decodeResult.Errors);
|
||||||
|
|
||||||
|
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
|
||||||
|
|
||||||
|
var activity = await context.Activities.AsNoTracking().FirstOrDefaultAsync(a => a.Id == decodeResult.Value, cancellationToken);
|
||||||
|
|
||||||
|
return activity is not null
|
||||||
|
? Result.Ok(activity.Map())
|
||||||
|
: Result.Fail("Failed to get specific activity.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return Result.Fail(new Error(ex.Message).CausedBy(ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
namespace PostFundManagement.Application.Services.Projects;
|
namespace PostFundManagement.Application.Services.Projects;
|
||||||
|
|
||||||
|
public record UpdateProjectRequest(long ProjectId, string Name, string Description, DateTime StartedAt, DateTime? EndedAt, IndustrySector Sector, ProjectType ProjectType);
|
||||||
|
|
||||||
|
public record UpdateMilestoneRequest(long MilestoneId, DateTime DueAt, string Name, Priority Priority, ApprovalStatus Status);
|
||||||
|
|
||||||
public record UpdateProjectStatusRequest(long ProjectId, ApprovalStatus Status);
|
public record UpdateProjectStatusRequest(long ProjectId, ApprovalStatus Status);
|
||||||
|
|
||||||
public record CreateProjectRequest(long ProgrammeId, string Name, string Description, IndustrySector Sector, ProjectType ProjectType);
|
public record CreateProjectRequest(long ProgrammeId, string Name, string Description, IndustrySector Sector, ProjectType ProjectType);
|
||||||
|
|||||||
Reference in New Issue
Block a user