Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 36 additions & 14 deletions api/src/Feature.Statistics/GetPollingStationStats/Endpoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
using Feature.Statistics.Options;
using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Options;
using Vote.Monitor.Core.Models;
using Vote.Monitor.Core.Services.Security;
using Vote.Monitor.Domain.ConnectionFactory;
using ZiggyCreatures.Caching.Fusion;

namespace Feature.Statistics.GetPollingStationStats;

public class Endpoint(
IAuthorizationService authorizationService,
ICurrentUserRoleProvider userRoleProvider,
INpgsqlConnectionFactory dbConnectionFactory,
IFusionCache cache,
IOptions<StatisticsFeatureOptions> options) : Endpoint<Request, Results<Ok<Response>, NotFound>>
Expand All @@ -23,37 +26,56 @@ public override void Configure()
DontAutoTag();
Options(x => x.WithTags("statistics", "polling-stations"));
Summary(s => { s.Summary = "Overview statistics for a specific polling station"; });
Policies(PolicyNames.NgoAdminsOnly);
Policies(PolicyNames.AdminsOnly);
}

public override async Task<Results<Ok<Response>, NotFound>> ExecuteAsync(Request req, CancellationToken ct)
{
var authorizationResult =
await authorizationService.AuthorizeAsync(User, new MonitoringNgoAdminRequirement(req.ElectionRoundId));
if (!authorizationResult.Succeeded)
var isPlatformAdmin = userRoleProvider.IsPlatformAdmin();

if (!isPlatformAdmin)
{
return TypedResults.NotFound();
var authorizationResult =
await authorizationService.AuthorizeAsync(User, new MonitoringNgoAdminRequirement(req.ElectionRoundId));
if (!authorizationResult.Succeeded || !req.NgoId.HasValue || req.NgoId == Guid.Empty)
{
return TypedResults.NotFound();
}
}

var cacheKey =
$"polling-station-stats-{req.ElectionRoundId}-{req.NgoId}-{req.PollingStationId}-{req.DataSource}";
var dataSource = req.DataSource ?? DataSource.Ngo;

var cacheKey = isPlatformAdmin
? $"polling-station-stats-{req.ElectionRoundId}-all-{req.PollingStationId}"
: $"polling-station-stats-{req.ElectionRoundId}-{req.NgoId}-{req.PollingStationId}-{dataSource}";

var response = await cache.GetOrSetAsync(
cacheKey,
async _ => await GetStatisticsAsync(req, ct),
async _ => await GetStatisticsAsync(req, isPlatformAdmin, dataSource, ct),
cacheOptions => cacheOptions.SetDuration(TimeSpan.FromMinutes(_options.CacheDurationInMinutes)),
token: ct);

return TypedResults.Ok(response);
}

private async Task<Response> GetStatisticsAsync(Request req, CancellationToken ct)
private async Task<Response> GetStatisticsAsync(Request req, bool isPlatformAdmin, DataSource dataSource,
CancellationToken ct)
{
const string sql =
"""
var availableObserversSql = isPlatformAdmin
? """
SELECT MO."Id" AS "MonitoringObserverId"
FROM "MonitoringObservers" MO
WHERE MO."ElectionRoundId" = @electionRoundId
"""
: """
SELECT "MonitoringObserverId"
FROM "GetAvailableMonitoringObservers"(@electionRoundId, @ngoId, @dataSource)
""";

var sql =
$"""
WITH "AvailableObservers" AS (
SELECT "MonitoringObserverId"
FROM "GetAvailableMonitoringObservers"(@electionRoundId, @ngoId, @dataSource)
{availableObserversSql}
)
SELECT
(
Expand Down Expand Up @@ -151,7 +173,7 @@ SELECT COUNT(*)
electionRoundId = req.ElectionRoundId,
ngoId = req.NgoId,
pollingStationId = req.PollingStationId,
dataSource = req.DataSource.ToString()
dataSource = dataSource.Value
};

using var dbConnection = await dbConnectionFactory.GetOpenConnectionAsync(ct);
Expand Down
6 changes: 3 additions & 3 deletions api/src/Feature.Statistics/GetPollingStationStats/Request.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ public class Request
{
public Guid ElectionRoundId { get; set; }

[FromClaim(ApplicationClaimTypes.NgoId)]
public Guid NgoId { get; set; }
[FromClaim(ApplicationClaimTypes.NgoId, IsRequired = false)]
public Guid? NgoId { get; set; }

public Guid PollingStationId { get; set; }

[QueryParam]
public DataSource DataSource { get; set; } = DataSource.Ngo;
public DataSource? DataSource { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ public class Validator : Validator<Request>
public Validator()
{
RuleFor(x => x.ElectionRoundId).NotEmpty();
RuleFor(x => x.NgoId).NotEmpty();
RuleFor(x => x.PollingStationId).NotEmpty();
RuleFor(x => x.DataSource).NotEmpty();
}
}
Loading