version-0.1 (#1)

Squash and merge of version-0.1

Co-authored-by: James Wampler <james@wamp.dev>
Co-committed-by: James Wampler <james@wamp.dev>

src/api/MicCheck.Api/Audit/AuditLogQueryService.cs

@@ -5,28 +5,28 @@ namespace MicCheck.Api.Audit;
 
 public class AuditLogQueryService(MicCheckDbContext db)
 {
-    public async Task<(int Total, IReadOnlyList<AuditLog> Items)> ListByOrganizationAsync(
+    public async Task<(int Total, IReadOnlyList<AuditLogResponse> Items)> ListByOrganizationAsync(
         int organizationId, AuditLogFilter filter, CancellationToken ct = default)
     {
         var query = db.AuditLogs.Where(l => l.OrganizationId == organizationId);
         return await ApplyFilterAndPageAsync(query, filter, ct);
     }
 
-    public async Task<(int Total, IReadOnlyList<AuditLog> Items)> ListByProjectAsync(
+    public async Task<(int Total, IReadOnlyList<AuditLogResponse> Items)> ListByProjectAsync(
         int projectId, AuditLogFilter filter, CancellationToken ct = default)
     {
         var query = db.AuditLogs.Where(l => l.ProjectId == projectId);
         return await ApplyFilterAndPageAsync(query, filter, ct);
     }
 
-    public async Task<(int Total, IReadOnlyList<AuditLog> Items)> ListByEnvironmentAsync(
+    public async Task<(int Total, IReadOnlyList<AuditLogResponse> Items)> ListByEnvironmentAsync(
         int environmentId, AuditLogFilter filter, CancellationToken ct = default)
     {
         var query = db.AuditLogs.Where(l => l.EnvironmentId == environmentId);
         return await ApplyFilterAndPageAsync(query, filter, ct);
     }
 
-    private static async Task<(int Total, IReadOnlyList<AuditLog> Items)> ApplyFilterAndPageAsync(
+    private async Task<(int Total, IReadOnlyList<AuditLogResponse> Items)> ApplyFilterAndPageAsync(
         IQueryable<AuditLog> query, AuditLogFilter filter, CancellationToken ct)
     {
         if (filter.From.HasValue)
@@ -46,10 +46,21 @@ public class AuditLogQueryService(MicCheckDbContext db)
 
         var total = await query.CountAsync(ct);
         var pageSize = Math.Clamp(filter.PageSize, 1, 100);
+
         var items = await query
             .OrderByDescending(l => l.CreatedAt)
             .Skip((filter.Page - 1) * pageSize)
             .Take(pageSize)
+            .GroupJoin(
+                db.Users,
+                log => log.ActorUserId,
+                user => (int?)user.Id,
+                (log, users) => new { log, users })
+            .SelectMany(
+                x => x.users.DefaultIfEmpty(),
+                (x, user) => AuditLogResponse.From(
+                    x.log,
+                    user != null ? user.FirstName + " " + user.LastName : null))
             .ToListAsync(ct);
 
         return (total, items);

src/api/MicCheck.Api/Audit/AuditLogResponse.cs

@@ -10,10 +10,11 @@ public record AuditLogResponse(
     int? ProjectId,
     int? EnvironmentId,
     int? ActorUserId,
+    string? ActorUserName,
     DateTimeOffset CreatedAt
 )
 {
-    public static AuditLogResponse From(AuditLog log) => new(
+    public static AuditLogResponse From(AuditLog log, string? actorUserName = null) => new(
         log.Id,
         log.ResourceType,
         log.ResourceId,
@@ -23,5 +24,6 @@ public record AuditLogResponse(
         log.ProjectId,
         log.EnvironmentId,
         log.ActorUserId,
+        actorUserName,
         log.CreatedAt);
 }

src/api/MicCheck.Api/Audit/AuditLogsController.cs

@@ -1,59 +1,59 @@
-using MicCheck.Api.Authorization;
-using MicCheck.Api.Common;
-using MicCheck.Api.Environments;
-using MicCheck.Api.Projects;
-using MicCheck.Api.Organizations;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.RateLimiting;
-
-namespace MicCheck.Api.Audit;
-
-[ApiController]
-[Authorize(Policy = AuthorizationPolicies.AdminApiAccess)]
-[EnableRateLimiting("AdminApi")]
-public class AuditLogsController(
-    AuditLogQueryService auditLogQueryService,
-    OrganizationService organizationService,
-    ProjectService projectService,
-    EnvironmentService environmentService) : ControllerBase
-{
-    [HttpGet("api/v1/organisations/{id}/audit-logs")]
-    public async Task<ActionResult<PaginatedResponse<AuditLogResponse>>> ListByOrganization(
-        int id,
-        [FromQuery] AuditLogFilter filter,
-        CancellationToken ct)
-    {
-        var org = await organizationService.FindByIdAsync(id, ct);
-        if (org is null) return NotFound();
-
-        var (total, logs) = await auditLogQueryService.ListByOrganizationAsync(id, filter, ct);
-        return Ok(new PaginatedResponse<AuditLogResponse>(total, null, null, logs.Select(AuditLogResponse.From).ToList()));
-    }
-
-    [HttpGet("api/v1/projects/{projectId}/audit-logs")]
-    public async Task<ActionResult<PaginatedResponse<AuditLogResponse>>> ListByProject(
-        int projectId,
-        [FromQuery] AuditLogFilter filter,
-        CancellationToken ct)
-    {
-        var project = await projectService.FindByIdAsync(projectId, ct);
-        if (project is null) return NotFound();
-
-        var (total, logs) = await auditLogQueryService.ListByProjectAsync(projectId, filter, ct);
-        return Ok(new PaginatedResponse<AuditLogResponse>(total, null, null, logs.Select(AuditLogResponse.From).ToList()));
-    }
-
-    [HttpGet("api/v1/environments/{apiKey}/audit-logs")]
-    public async Task<ActionResult<PaginatedResponse<AuditLogResponse>>> ListByEnvironment(
-        string apiKey,
-        [FromQuery] AuditLogFilter filter,
-        CancellationToken ct)
-    {
-        var environment = await environmentService.FindByApiKeyAsync(apiKey, ct);
-        if (environment is null) return NotFound();
-
-        var (total, logs) = await auditLogQueryService.ListByEnvironmentAsync(environment.Id, filter, ct);
-        return Ok(new PaginatedResponse<AuditLogResponse>(total, null, null, logs.Select(AuditLogResponse.From).ToList()));
-    }
-}
+using MicCheck.Api.Common.Security.Authorization;
+using MicCheck.Api.Common;
+using MicCheck.Api.Environments;
+using MicCheck.Api.Projects;
+using MicCheck.Api.Organizations;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.RateLimiting;
+
+namespace MicCheck.Api.Audit;
+
+[ApiController]
+[Authorize(Policy = AuthorizationPolicies.AdminApiAccess)]
+[EnableRateLimiting("AdminApi")]
+public class AuditLogsController(
+    AuditLogQueryService auditLogQueryService,
+    OrganizationService organizationService,
+    ProjectService projectService,
+    EnvironmentService environmentService) : ControllerBase
+{
+    [HttpGet("api/v1/organisation/{id}/audit-logs")]
+    public async Task<ActionResult<PaginatedResponse<AuditLogResponse>>> ListByOrganization(
+        int id,
+        [FromQuery] AuditLogFilter filter,
+        CancellationToken ct)
+    {
+        var org = await organizationService.FindByIdAsync(id, ct);
+        if (org is null) return NotFound();
+
+        var (total, logs) = await auditLogQueryService.ListByOrganizationAsync(id, filter, ct);
+        return Ok(new PaginatedResponse<AuditLogResponse>(total, null, null, logs.ToList()));
+    }
+
+    [HttpGet("api/v1/project/{projectId}/audit-logs")]
+    public async Task<ActionResult<PaginatedResponse<AuditLogResponse>>> ListByProject(
+        int projectId,
+        [FromQuery] AuditLogFilter filter,
+        CancellationToken ct)
+    {
+        var project = await projectService.FindByIdAsync(projectId, ct);
+        if (project is null) return NotFound();
+
+        var (total, logs) = await auditLogQueryService.ListByProjectAsync(projectId, filter, ct);
+        return Ok(new PaginatedResponse<AuditLogResponse>(total, null, null, logs.ToList()));
+    }
+
+    [HttpGet("api/v1/environment/{apiKey}/audit-logs")]
+    public async Task<ActionResult<PaginatedResponse<AuditLogResponse>>> ListByEnvironment(
+        string apiKey,
+        [FromQuery] AuditLogFilter filter,
+        CancellationToken ct)
+    {
+        var environment = await environmentService.FindByApiKeyAsync(apiKey, ct);
+        if (environment is null) return NotFound();
+
+        var (total, logs) = await auditLogQueryService.ListByEnvironmentAsync(environment.Id, filter, ct);
+        return Ok(new PaginatedResponse<AuditLogResponse>(total, null, null, logs.ToList()));
+    }
+}