Added budget update

Added portfolio and programme value calculator endpoints
This commit is contained in:
2026-09-26 15:14:29 +02:00
parent 6be74e9a24
commit ed6e57ffa9
16 changed files with 2729 additions and 2 deletions
@@ -7,6 +7,12 @@ namespace PostFundManagement.Application.Abstractions.Services;
public interface IGovernanceService
{
[Log]
Task<Result<decimal>> GetProgrammeValueAsync(string programmeIdHash, CancellationToken cancellationToken = default);
[Log]
Task<Result<decimal>> GetPorfolioValueAsync(string portfolioIdHash, CancellationToken cancellationToken = default);
[Log]
[Audit]
Task<Result> UpdateInstrumentAsync(UpdateInstrumentRequest request, Guid userId, CancellationToken cancellationToken = default);
@@ -7,6 +7,10 @@ namespace PostFundManagement.Application.Abstractions.Services;
public interface IGrantsService
{
[Log]
[Audit]
Task<Result> UpdateBudgetAsync(UpdateBudgetRequest request, Guid userId, CancellationToken cancellationToken = default);
[Log]
Task<Result<Contract[]>> GetContractsAsync(Pagination pagination, CancellationToken cancellationToken = default);
@@ -355,4 +355,56 @@ public sealed class GovernanceCacheService(GovernanceService service, IDistribut
return Result.Ok(cached.FromJson<Portfolio[]>());
}));
public async Task<Result<decimal>> GetProgrammeValueAsync(string programmeIdHash, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<decimal>>>)(async () =>
{
if (!await featureManager.IsEnabledAsync(ServiceCachingFeature))
return await service.GetProgrammeValueAsync(programmeIdHash, cancellationToken);
var cacheKey = HashService.ToMd5Hash($"getprogrammevalue-{programmeIdHash}").Value;
var cached = await cache.GetStringAsync(cacheKey, cancellationToken);
if (string.IsNullOrWhiteSpace(cached))
{
var result = await service.GetProgrammeValueAsync(programmeIdHash, cancellationToken);
if (result.IsFailed) return result;
await cache.SetStringAsync(cacheKey, result.Value.ToString(), cacheOptions, cancellationToken);
return result.Value;
}
decimal.TryParse(cached, CultureInfo.InvariantCulture, out var value);
return Result.Ok(value);
}));
public async Task<Result<decimal>> GetPorfolioValueAsync(string portfolioIdHash, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<decimal>>>)(async () =>
{
if (!await featureManager.IsEnabledAsync(ServiceCachingFeature))
return await service.GetPorfolioValueAsync(portfolioIdHash, cancellationToken);
var cacheKey = HashService.ToMd5Hash($"getportfoliovalue-{portfolioIdHash}").Value;
var cached = await cache.GetStringAsync(cacheKey, cancellationToken);
if (string.IsNullOrWhiteSpace(cached))
{
var result = await service.GetPorfolioValueAsync(portfolioIdHash, cancellationToken);
if (result.IsFailed) return result;
await cache.SetStringAsync(cacheKey, result.Value.ToString(), cacheOptions, cancellationToken);
return result.Value;
}
decimal.TryParse(cached, CultureInfo.InvariantCulture, out var value);
return Result.Ok(value);
}));
}
@@ -485,4 +485,46 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
return Result.Ok(portfolios.Select(p => p.Map()).ToArray());
}));
public async Task<Result<decimal>> GetProgrammeValueAsync(string programmeIdHash, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<decimal>>>)(async () =>
{
var decodeResult = hashService.DecodeLongIdHash(programmeIdHash);
if (decodeResult.IsFailed)
return Result.Fail(IdDecodeError.Create()
.CausedBy(decodeResult.Errors));
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var value = await context.Budgets.AsNoTracking()
.Include(i => i.Project!.Programme)
.Where(v => v.Project!.Programme!.Id == decodeResult.Value &&
v.Project.Programme.Status == ApprovalStatus.Approved &&
v.Status == ApprovalStatus.Approved)
.SumAsync(v => v.Amount, cancellationToken);
return Result.Ok(value);
}));
public async Task<Result<decimal>> GetPorfolioValueAsync(string portfolioIdHash, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<decimal>>>)(async () =>
{
var decodeResult = hashService.DecodeLongIdHash(portfolioIdHash);
if (decodeResult.IsFailed)
return Result.Fail(IdDecodeError.Create()
.CausedBy(decodeResult.Errors));
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var value = await context.Budgets
.Include(i => i.Project!.Programme!.Portfolio)
.Where(v => v.Project!.Programme!.Portfolio!.Id == decodeResult.Value &&
v.Project.Programme.Status == ApprovalStatus.Approved &&
v.Status == ApprovalStatus.Approved)
.SumAsync(v => v.Amount, cancellationToken);
return Result.Ok(value);
}));
}
@@ -191,6 +191,9 @@ public sealed class GrantsCacheService(GrantsService service, IDistributedCache
return Result.Ok(cached!);
}));
public async Task<Result> UpdateBudgetAsync(UpdateBudgetRequest request, Guid userId, CancellationToken cancellationToken = default) =>
await service.UpdateBudgetAsync(request, userId, cancellationToken);
public async Task<Result> UpdateContractAsync(UpdateContractRequest request, CancellationToken cancellationToken = default) =>
await service.UpdateContractAsync(request, cancellationToken);
@@ -167,7 +167,8 @@ public sealed class GrantsService(IDbContextFactory<ApplicationDbContext> contex
Name = request.Name,
Amount = request.Amount,
CreatedBy = userId,
CreatedAt = DateTime.UtcNow
CreatedAt = DateTime.UtcNow,
Status = ApprovalStatus.Pending
};
context.Budgets.Add(budget);
@@ -273,4 +274,19 @@ public sealed class GrantsService(IDbContextFactory<ApplicationDbContext> contex
return Result.OkIf(changedTotal > 0, UpdateError.Create("Failed to update the contract."));
}));
public async Task<Result> UpdateBudgetAsync(UpdateBudgetRequest request, Guid userId, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result>>)(async () =>
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var changedTotal = await context.Budgets
.Where(f => f.Id == request.BudgetId)
.ExecuteUpdateAsync(f => f
.SetProperty(u => u.ApprovedBy, userId)
.SetProperty(u => u.UpdatedAt, DateTime.UtcNow)
.SetProperty(u => u.Status, request.Status), cancellationToken);
return Result.OkIf(changedTotal > 0, UpdateError.Create("Failed to update budget"));
}));
}
@@ -3,6 +3,8 @@ using static PostFundManagement.Domain.Extensions.Constants;
namespace PostFundManagement.Application.Services.Grants;
public sealed record UpdateBudgetRequest([Required] long BudgetId, [Required] ApprovalStatus Status);
public sealed record UpdateContractRequest([Required] long ContractId, [Required] ContractStatus Status);
public sealed record CreateAwardRequest([Required] long OrganisationId, [Required] long ProgrammeId, [Required] decimal Amount);