conco/FictionArchive
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

[FA-misc] Mass transit overhaul, needs testing and review

Browse Source
This commit is contained in:
gamer147
2026-01-21 23:16:31 -05:00
parent 055ef33666
commit f88f340d0a
97 changed files with 1150 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
FictionArchive.Service.ReportingService/Dockerfile Normal file
View File

@@ -0,0 +1,23 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 8080
EXPOSE 8081
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["FictionArchive.Service.ReportingService/FictionArchive.Service.ReportingService.csproj", "FictionArchive.Service.ReportingService/"]
RUN dotnet restore "FictionArchive.Service.ReportingService/FictionArchive.Service.ReportingService.csproj"
COPY . .
WORKDIR "/src/FictionArchive.Service.ReportingService"
RUN dotnet build "./FictionArchive.Service.ReportingService.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./FictionArchive.Service.ReportingService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "FictionArchive.Service.ReportingService.dll"]

20
FictionArchive.Service.ReportingService/FictionArchive.Service.ReportingService.csproj Normal file
View File

@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FictionArchive.Service.Shared\FictionArchive.Service.Shared.csproj" />
</ItemGroup>
</Project>

15
FictionArchive.Service.ReportingService/GraphQL/Mutation.cs Normal file
View File

@@ -0,0 +1,15 @@
using HotChocolate;
using HotChocolate.Authorization;
namespace FictionArchive.Service.ReportingService.GraphQL;
public class Mutation
{
/// <summary>
/// Placeholder mutation for GraphQL schema requirements.
/// The ReportingService is primarily read-only, consuming events from other services.
/// </summary>
[Authorize(Roles = ["admin"])]
[GraphQLDescription("Placeholder mutation. ReportingService is primarily read-only.")]
public bool Ping() => true;
}

52
FictionArchive.Service.ReportingService/GraphQL/Query.cs Normal file
View File

@@ -0,0 +1,52 @@
using System.Text.Json;
using FictionArchive.Service.ReportingService.Models.Database;
using FictionArchive.Service.ReportingService.Models.DTOs;
using FictionArchive.Service.ReportingService.Services;
using HotChocolate;
using HotChocolate.Data;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.ReportingService.GraphQL;
public class Query
{
[UseProjection]
[UseFiltering]
[UseSorting]
[GraphQLName("reportingJobs")]
public IQueryable<Job> GetReportingJobs(ReportingServiceDbContext dbContext)
=> dbContext.Jobs.Include(j => j.History);
[GraphQLName("reportingJob")]
public async Task<JobDto?> GetReportingJob(Guid id, ReportingServiceDbContext dbContext)
{
var job = await dbContext.Jobs
.Include(j => j.History.OrderBy(h => h.Timestamp))
.FirstOrDefaultAsync(j => j.Id == id);
if (job == null) return null;
return new JobDto
{
Id = job.Id,
JobType = job.JobType,
Status = job.Status,
CurrentStep = job.CurrentStep,
ErrorMessage = job.ErrorMessage,
Metadata = job.Metadata != null
? JsonSerializer.Deserialize<Dictionary<string, object>>(job.Metadata.RootElement.GetRawText())
: null,
History = job.History.Select(h => new JobHistoryEntryDto
{
FromState = h.FromState,
ToState = h.ToState,
Message = h.Message,
Error = h.Error,
Timestamp = h.Timestamp
}).ToList(),
CreatedTime = job.CreatedTime,
UpdatedTime = job.UpdatedTime,
CompletedTime = job.CompletedTime
};
}
}

17
FictionArchive.Service.ReportingService/Models/DTOs/JobDto.cs Normal file
View File

@@ -0,0 +1,17 @@
using NodaTime;
namespace FictionArchive.Service.ReportingService.Models.DTOs;
public class JobDto
{
public Guid Id { get; set; }
public required string JobType { get; set; }
public required string Status { get; set; }
public string? CurrentStep { get; set; }
public string? ErrorMessage { get; set; }
public Dictionary<string, object>? Metadata { get; set; }
public List<JobHistoryEntryDto> History { get; set; } = new();
public Instant CreatedTime { get; set; }
public Instant UpdatedTime { get; set; }
public Instant? CompletedTime { get; set; }
}

12
FictionArchive.Service.ReportingService/Models/DTOs/JobHistoryEntryDto.cs Normal file
View File

@@ -0,0 +1,12 @@
using NodaTime;
namespace FictionArchive.Service.ReportingService.Models.DTOs;
public class JobHistoryEntryDto
{
public required string FromState { get; set; }
public required string ToState { get; set; }
public string? Message { get; set; }
public string? Error { get; set; }
public Instant Timestamp { get; set; }
}

19
FictionArchive.Service.ReportingService/Models/Database/Job.cs Normal file
View File

@@ -0,0 +1,19 @@
using System.Text.Json;
using NodaTime;
namespace FictionArchive.Service.ReportingService.Models.Database;
public class Job
{
public Guid Id { get; set; }
public required string JobType { get; set; }
public required string Status { get; set; }
public string? CurrentStep { get; set; }
public string? ErrorMessage { get; set; }
public JsonDocument? Metadata { get; set; }
public Instant CreatedTime { get; set; }
public Instant UpdatedTime { get; set; }
public Instant? CompletedTime { get; set; }
public ICollection<JobHistoryEntry> History { get; set; } = new List<JobHistoryEntry>();
}

16
FictionArchive.Service.ReportingService/Models/Database/JobHistoryEntry.cs Normal file
View File

@@ -0,0 +1,16 @@
using NodaTime;
namespace FictionArchive.Service.ReportingService.Models.Database;
public class JobHistoryEntry
{
public int Id { get; set; }
public Guid JobId { get; set; }
public required string FromState { get; set; }
public required string ToState { get; set; }
public string? Message { get; set; }
public string? Error { get; set; }
public Instant Timestamp { get; set; }
public Job Job { get; set; } = null!;
}

76
FictionArchive.Service.ReportingService/Program.cs Normal file
View File

@@ -0,0 +1,76 @@
using FictionArchive.Common.Extensions;
using FictionArchive.Service.ReportingService.GraphQL;
using FictionArchive.Service.ReportingService.Services;
using FictionArchive.Service.ReportingService.Services.Consumers;
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.MassTransit;
namespace FictionArchive.Service.ReportingService;
public class Program
{
public static void Main(string[] args)
{
var builder = WebApplication.CreateBuilder(args);
var isSchemaExport = SchemaExportDetector.IsSchemaExportMode(args);
builder.AddLocalAppsettings();
builder.Services.AddHealthChecks();
#region Database
builder.Services.RegisterDbContext<ReportingServiceDbContext>(
builder.Configuration.GetConnectionString("DefaultConnection")!,
skipInfrastructure: isSchemaExport);
#endregion
#region MassTransit
if (!isSchemaExport)
{
builder.Services.AddFictionArchiveMassTransit<ReportingServiceDbContext>(
builder.Configuration,
x =>
{
x.AddConsumer<JobStateChangedEventConsumer>();
});
}
#endregion
#region GraphQL
builder.Services.AddDefaultGraphQl<Query, Mutation>()
.AddAuthorization();
#endregion
// Authentication & Authorization
builder.Services.AddOidcAuthentication(builder.Configuration);
builder.Services.AddFictionArchiveAuthorization();
var app = builder.Build();
if (!isSchemaExport)
{
using var scope = app.Services.CreateScope();
var dbContext = scope.ServiceProvider.GetRequiredService<ReportingServiceDbContext>();
dbContext.UpdateDatabase();
}
app.UseHttpsRedirection();
app.MapHealthChecks("/healthz");
app.UseAuthentication();
app.UseAuthorization();
app.MapGraphQL();
app.RunWithGraphQLCommands(args);
}
}

39
FictionArchive.Service.ReportingService/Properties/launchSettings.json Normal file
View File

@@ -0,0 +1,39 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:45320",
"sslPort": 44320
}
},
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5180",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "graphql",
"applicationUrl": "https://localhost:7320;http://localhost:5180",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

74
FictionArchive.Service.ReportingService/Services/Consumers/JobStateChangedEventConsumer.cs Normal file
View File

@@ -0,0 +1,74 @@
using System.Text.Json;
using FictionArchive.Service.ReportingService.Models.Database;
using FictionArchive.Service.Shared.MassTransit.Contracts;
using MassTransit;
namespace FictionArchive.Service.ReportingService.Services.Consumers;
public class JobStateChangedEventConsumer : IConsumer<JobStateChangedEvent>
{
private readonly ReportingServiceDbContext _dbContext;
private readonly ILogger<JobStateChangedEventConsumer> _logger;
public JobStateChangedEventConsumer(
ReportingServiceDbContext dbContext,
ILogger<JobStateChangedEventConsumer> logger)
{
_dbContext = dbContext;
_logger = logger;
}
public async Task Consume(ConsumeContext<JobStateChangedEvent> context)
{
var @event = context.Message;
var job = await _dbContext.Jobs.FindAsync(@event.JobId);
if (job == null)
{
job = new Job
{
Id = @event.JobId,
JobType = @event.JobType,
Status = @event.ToState,
CreatedTime = @event.Timestamp,
UpdatedTime = @event.Timestamp,
Metadata = @event.Metadata != null
? JsonSerializer.SerializeToDocument(@event.Metadata)
: null
};
_dbContext.Jobs.Add(job);
}
else
{
job.Status = @event.ToState;
job.UpdatedTime = @event.Timestamp;
if (@event.Error != null)
{
job.ErrorMessage = @event.Error;
}
if (@event.ToState is "Completed" or "Failed")
{
job.CompletedTime = @event.Timestamp;
}
}
var historyEntry = new JobHistoryEntry
{
JobId = @event.JobId,
FromState = @event.FromState,
ToState = @event.ToState,
Message = @event.Message,
Error = @event.Error,
Timestamp = @event.Timestamp
};
_dbContext.JobHistoryEntries.Add(historyEntry);
await _dbContext.SaveChangesAsync();
_logger.LogDebug("Recorded job state change: {JobId} {FromState} -> {ToState}",
@event.JobId, @event.FromState, @event.ToState);
}
}

36
FictionArchive.Service.ReportingService/Services/ReportingServiceDbContext.cs Normal file
View File

@@ -0,0 +1,36 @@
using FictionArchive.Service.ReportingService.Models.Database;
using FictionArchive.Service.Shared.Services.Database;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.ReportingService.Services;
public class ReportingServiceDbContext : FictionArchiveDbContext
{
public ReportingServiceDbContext(DbContextOptions options, ILogger<ReportingServiceDbContext> logger)
: base(options, logger) { }
public DbSet<Job> Jobs => Set<Job>();
public DbSet<JobHistoryEntry> JobHistoryEntries => Set<JobHistoryEntry>();
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
modelBuilder.Entity<Job>(entity =>
{
entity.HasKey(e => e.Id);
entity.HasIndex(e => e.JobType);
entity.HasIndex(e => e.Status);
entity.HasIndex(e => e.CreatedTime);
});
modelBuilder.Entity<JobHistoryEntry>(entity =>
{
entity.HasKey(e => e.Id);
entity.HasOne(e => e.Job)
.WithMany(j => j.History)
.HasForeignKey(e => e.JobId)
.OnDelete(DeleteBehavior.Cascade);
});
}
}

8
FictionArchive.Service.ReportingService/appsettings.Development.json Normal file
View File

@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

28
FictionArchive.Service.ReportingService/appsettings.json Normal file
View File

@@ -0,0 +1,28 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"ConnectionStrings": {
"DefaultConnection": "Host=localhost;Database=FictionArchive_ReportingService;Username=postgres;password=postgres"
},
"RabbitMQ": {
"Host": "localhost",
"VirtualHost": "/",
"Username": "guest",
"Password": "guest"
},
"OIDC": {
"Authority": "https://auth.orfl.xyz/application/o/fiction-archive/",
"ClientId": "ldi5IpEidq2WW0Ka1lehVskb2SOBjnYRaZCpEyBh",
"Audience": "ldi5IpEidq2WW0Ka1lehVskb2SOBjnYRaZCpEyBh",
"ValidIssuer": "https://auth.orfl.xyz/application/o/fiction-archive/",
"ValidateIssuer": true,
"ValidateAudience": true,
"ValidateLifetime": true,
"ValidateIssuerSigningKey": true
},
"AllowedHosts": "*"
}

6
FictionArchive.Service.ReportingService/subgraph-config.json Normal file
View File

@@ -0,0 +1,6 @@
{
"subgraph": "Reporting",
"http": {
"baseAddress": "http://localhost:5180/graphql"
}
}