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

[FA-misc] Initial MassTransit implementation seems to work

Browse Source
This commit is contained in:
gamer147
2026-01-26 17:08:13 -05:00
parent e7435435c1
commit 579e05b853
96 changed files with 845 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
FictionArchive.Service.AuthenticationService/Controllers/AuthenticationWebhookController.cs
View File

@@ -1,36 +0,0 @@
using FictionArchive.Service.AuthenticationService.Models.Requests;
using FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
using FictionArchive.Service.Shared.Services.EventBus;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
namespace FictionArchive.Service.AuthenticationService.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class AuthenticationWebhookController : ControllerBase
{
private readonly IEventBus _eventBus;
public AuthenticationWebhookController(IEventBus eventBus)
{
_eventBus = eventBus;
}
[HttpPost(nameof(UserRegistered))]
public async Task<ActionResult> UserRegistered([FromBody] UserRegisteredWebhookPayload payload)
{
var authUserAddedEvent = new AuthUserAddedEvent
{
OAuthProviderId = payload.OAuthProviderId,
InviterOAuthProviderId = payload.InviterOAuthProviderId,
EventUserEmail = payload.EventUserEmail,
EventUserUsername = payload.EventUserUsername
};
await _eventBus.Publish(authUserAddedEvent);
return Ok();
}
}
}

23
FictionArchive.Service.AuthenticationService/Dockerfile
View File

@@ -1,23 +0,0 @@
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.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj", "FictionArchive.Service.AuthenticationService/"]
RUN dotnet restore "FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj"
COPY . .
WORKDIR "/src/FictionArchive.Service.AuthenticationService"
RUN dotnet build "./FictionArchive.Service.AuthenticationService.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./FictionArchive.Service.AuthenticationService.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.AuthenticationService.dll"]

29
FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj
View File

@@ -1,29 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
</ItemGroup>
<ItemGroup>
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FictionArchive.Service.Shared\FictionArchive.Service.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Controllers\" />
</ItemGroup>
</Project>

6
FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.http
View File

@@ -1,6 +0,0 @@
@FictionArchive.Service.AuthenticationService_HostAddress = http://localhost:5091
GET {{FictionArchive.Service.AuthenticationService_HostAddress}}/weatherforecast/
Accept: application/json
###

16
FictionArchive.Service.AuthenticationService/Models/IntegrationEvents/AuthUserAddedEvent.cs
View File

@@ -1,16 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
public class AuthUserAddedEvent : IIntegrationEvent
{
public string OAuthProviderId { get; set; }
public string InviterOAuthProviderId { get; set; }
// The email of the user that created the event
public string EventUserEmail { get; set; }
// The username of the user that created the event
public string EventUserUsername { get; set; }
}

17
FictionArchive.Service.AuthenticationService/Models/Requests/UserRegisteredWebhookPayload.cs
View File

@@ -1,17 +0,0 @@
namespace FictionArchive.Service.AuthenticationService.Models.Requests;
public class UserRegisteredWebhookPayload
{
// The body of the notification message
public string Body { get; set; }
public string OAuthProviderId { get; set; }
public string InviterOAuthProviderId { get; set; }
// The email of the user that created the event
public string EventUserEmail { get; set; }
// The username of the user that created the event
public string EventUserUsername { get; set; }
}

49
FictionArchive.Service.AuthenticationService/Program.cs
View File

@@ -1,49 +0,0 @@
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
namespace FictionArchive.Service.AuthenticationService;
public class Program
{
public static void Main(string[] args)
{
var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
builder.Services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
#region Event Bus
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
});
#endregion
builder.Services.AddHealthChecks();
var app = builder.Build();
// Configure the HTTP request pipeline.
if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
}
app.UseHttpsRedirection();
app.MapHealthChecks("/healthz");
app.UseAuthorization();
app.MapControllers();
app.Run();
}
}

41
FictionArchive.Service.AuthenticationService/Properties/launchSettings.json
View File

@@ -1,41 +0,0 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:23522",
"sslPort": 44397
}
},
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5091",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7223;http://localhost:5091",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

8
FictionArchive.Service.AuthenticationService/appsettings.Development.json
View File

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

13
FictionArchive.Service.AuthenticationService/appsettings.json
View File

@@ -1,13 +0,0 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"RabbitMQ": {
"ConnectionString": "amqp://localhost",
"ClientIdentifier": "AuthenticationService"
},
"AllowedHosts": "*"
}

74
FictionArchive.Service.FileService/Consumers/FileUploadRequestCreatedConsumer.cs Normal file
View File

@@ -0,0 +1,74 @@
using Amazon.S3;
using Amazon.S3.Model;
using FictionArchive.Common.Enums;
using FictionArchive.Service.FileService.Contracts;
using FictionArchive.Service.FileService.Models;
using FictionArchive.Service.Shared.Contracts.Events;
using MassTransit;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace FictionArchive.Service.FileService.Consumers;
public class FileUploadRequestCreatedConsumer : IConsumer<IFileUploadRequestCreated>
{
private readonly ILogger<FileUploadRequestCreatedConsumer> _logger;
private readonly AmazonS3Client _amazonS3Client;
private readonly IPublishEndpoint _publishEndpoint;
private readonly S3Configuration _s3Configuration;
private readonly ProxyConfiguration _proxyConfiguration;
public FileUploadRequestCreatedConsumer(
ILogger<FileUploadRequestCreatedConsumer> logger,
AmazonS3Client amazonS3Client,
IPublishEndpoint publishEndpoint,
IOptions<S3Configuration> s3Configuration,
IOptions<ProxyConfiguration> proxyConfiguration)
{
_logger = logger;
_amazonS3Client = amazonS3Client;
_publishEndpoint = publishEndpoint;
_s3Configuration = s3Configuration.Value;
_proxyConfiguration = proxyConfiguration.Value;
}
public async Task Consume(ConsumeContext<IFileUploadRequestCreated> context)
{
var message = context.Message;
var putObjectRequest = new PutObjectRequest
{
BucketName = _s3Configuration.Bucket,
Key = message.FilePath
};
using var memoryStream = new MemoryStream(message.FileData);
putObjectRequest.InputStream = memoryStream;
var s3Response = await _amazonS3Client.PutObjectAsync(putObjectRequest);
if (s3Response.HttpStatusCode != System.Net.HttpStatusCode.OK)
{
_logger.LogError("Failed to upload file {FilePath} to S3", message.FilePath);
await _publishEndpoint.Publish<IFileUploadRequestStatusUpdate>(
new FileUploadRequestStatusUpdate(
RequestId: message.RequestId,
Status: RequestStatus.Failed,
FileAccessUrl: null,
ErrorMessage: "An error occurred while uploading file to S3."));
return;
}
var fileAccessUrl = _proxyConfiguration.BaseUrl + "/" + message.FilePath;
_logger.LogInformation("Successfully uploaded file {FilePath} to S3", message.FilePath);
await _publishEndpoint.Publish<IFileUploadRequestStatusUpdate>(
new FileUploadRequestStatusUpdate(
RequestId: message.RequestId,
Status: RequestStatus.Success,
FileAccessUrl: fileAccessUrl,
ErrorMessage: null));
}
}

10
FictionArchive.Service.FileService/Contracts/FileUploadRequestStatusUpdate.cs Normal file
View File

@@ -0,0 +1,10 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.FileService.Contracts;
public record FileUploadRequestStatusUpdate(
Guid RequestId,
RequestStatus Status,
string? FileAccessUrl,
string? ErrorMessage) : IFileUploadRequestStatusUpdate;

10
FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs
View File

@@ -1,10 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.FileService.Models.IntegrationEvents;
public class FileUploadRequestCreatedEvent : IIntegrationEvent
{
public Guid RequestId { get; set; }
public string FilePath { get; set; }
public byte[] FileData { get; set; }
}

22
FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs
View File

@@ -1,22 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.FileService.Models.IntegrationEvents;
public class FileUploadRequestStatusUpdateEvent : IIntegrationEvent
{
public Guid RequestId { get; set; }
public RequestStatus Status { get; set; }
#region Success
public string? FileAccessUrl { get; set; }
#endregion
#region Failure
public string? ErrorMessage { get; set; }
#endregion
}

17
FictionArchive.Service.FileService/Program.cs
View File

@@ -1,11 +1,9 @@
using Amazon.Runtime;
using Amazon.S3;
using FictionArchive.Common.Extensions;
using FictionArchive.Service.FileService.Consumers;
using FictionArchive.Service.FileService.Models;
using FictionArchive.Service.FileService.Models.IntegrationEvents;
using FictionArchive.Service.FileService.Services.EventHandlers;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using Microsoft.Extensions.Options;
namespace FictionArchive.Service.FileService;
@@ -24,13 +22,14 @@ public class Program
builder.Services.AddHealthChecks();
#region Event Bus
#region MassTransit
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
})
.Subscribe<FileUploadRequestCreatedEvent, FileUploadRequestCreatedEventHandler>();
builder.Services.AddFictionArchiveMassTransit(
builder.Configuration,
x =>
{
x.AddConsumer<FileUploadRequestCreatedConsumer>();
});
#endregion

58
FictionArchive.Service.FileService/Services/EventHandlers/FileUploadRequestCreatedEventHandler.cs
View File

@@ -1,58 +0,0 @@
using Amazon.S3;
using Amazon.S3.Model;
using FictionArchive.Common.Enums;
using FictionArchive.Service.FileService.Models;
using FictionArchive.Service.FileService.Models.IntegrationEvents;
using FictionArchive.Service.Shared.Services.EventBus;
using Microsoft.Extensions.Options;
namespace FictionArchive.Service.FileService.Services.EventHandlers;
public class FileUploadRequestCreatedEventHandler : IIntegrationEventHandler<FileUploadRequestCreatedEvent>
{
private readonly ILogger<FileUploadRequestCreatedEventHandler> _logger;
private readonly AmazonS3Client _amazonS3Client;
private readonly IEventBus _eventBus;
private readonly S3Configuration _s3Configuration;
private readonly ProxyConfiguration _proxyConfiguration;
public FileUploadRequestCreatedEventHandler(ILogger<FileUploadRequestCreatedEventHandler> logger, AmazonS3Client amazonS3Client, IEventBus eventBus, IOptions<S3Configuration> s3Configuration, IOptions<ProxyConfiguration> proxyConfiguration)
{
_logger = logger;
_amazonS3Client = amazonS3Client;
_eventBus = eventBus;
_proxyConfiguration = proxyConfiguration.Value;
_s3Configuration = s3Configuration.Value;
}
public async Task Handle(FileUploadRequestCreatedEvent @event)
{
var putObjectRequest = new PutObjectRequest();
putObjectRequest.BucketName = _s3Configuration.Bucket;
putObjectRequest.Key = @event.FilePath;
putObjectRequest.UseChunkEncoding = false; // Needed to avoid an error with Garage
using MemoryStream memoryStream = new MemoryStream(@event.FileData);
putObjectRequest.InputStream = memoryStream;
var s3Response = await _amazonS3Client.PutObjectAsync(putObjectRequest);
if (s3Response.HttpStatusCode != System.Net.HttpStatusCode.OK)
{
_logger.LogError("An error occurred while uploading file to S3. Response code: {responsecode}", s3Response.HttpStatusCode);
await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
{
RequestId = @event.RequestId,
Status = RequestStatus.Failed,
ErrorMessage = "An error occurred while uploading file to S3."
});
return;
}
await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
{
Status = RequestStatus.Success,
RequestId = @event.RequestId,
FileAccessUrl = _proxyConfiguration.BaseUrl + "/" + @event.FilePath
});
}
}

3
FictionArchive.Service.FileService/appsettings.json
View File

@@ -2,7 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
}
},
"ProxyConfiguration": {

36
FictionArchive.Service.NovelService.Tests/NovelUpdateServiceTests.cs
View File

@@ -1,5 +1,4 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.FileService.IntegrationEvents;
using FictionArchive.Service.NovelService.Models.Configuration;
using FictionArchive.Service.NovelService.Models.Enums;
using FictionArchive.Service.NovelService.Models.Images;
@@ -8,9 +7,10 @@ using FictionArchive.Service.NovelService.Models.Novels;
using FictionArchive.Service.NovelService.Models.SourceAdapters;
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.NovelService.Services.SourceAdapters;
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.Shared.Contracts.Events;
using FluentAssertions;
using HtmlAgilityPack;
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
@@ -72,7 +72,7 @@ public class NovelUpdateServiceTests
private static NovelUpdateService CreateService(
NovelServiceDbContext dbContext,
ISourceAdapter adapter,
IEventBus eventBus,
IPublishEndpoint publishEndpoint,
string pendingImageUrl = "https://pending/placeholder.jpg")
{
var options = Options.Create(new NovelUpdateServiceConfiguration
@@ -80,7 +80,7 @@ public class NovelUpdateServiceTests
PendingImageUrl = pendingImageUrl
});
return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, eventBus, options);
return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, publishEndpoint, options);
}
[Fact]
@@ -102,13 +102,13 @@ public class NovelUpdateServiceTests
ImageData = new List<ImageData> { image1, image2 }
}));
var publishedEvents = new List<FileUploadRequestCreatedEvent>();
var eventBus = Substitute.For<IEventBus>();
eventBus.Publish(Arg.Do<FileUploadRequestCreatedEvent>(publishedEvents.Add)).Returns(Task.CompletedTask);
eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
var publishedEvents = new List<IFileUploadRequestCreated>();
var publishEndpoint = Substitute.For<IPublishEndpoint>();
publishEndpoint.Publish(Arg.Do<IFileUploadRequestCreated>(e => publishedEvents.Add(e)), Arg.Any<CancellationToken>())
.Returns(Task.CompletedTask);
var pendingImageUrl = "https://pending/placeholder.jpg";
var service = CreateService(dbContext, adapter, eventBus, pendingImageUrl);
var service = CreateService(dbContext, adapter, publishEndpoint, pendingImageUrl);
var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
@@ -151,11 +151,9 @@ public class NovelUpdateServiceTests
ImageData = new List<ImageData> { image }
}));
var eventBus = Substitute.For<IEventBus>();
eventBus.Publish(Arg.Any<FileUploadRequestCreatedEvent>()).Returns(Task.CompletedTask);
eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
var publishEndpoint = Substitute.For<IPublishEndpoint>();
var service = CreateService(dbContext, adapter, eventBus);
var service = CreateService(dbContext, adapter, publishEndpoint);
var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
@@ -186,8 +184,8 @@ public class NovelUpdateServiceTests
await dbContext.SaveChangesAsync();
var adapter = Substitute.For<ISourceAdapter>();
var eventBus = Substitute.For<IEventBus>();
var service = CreateService(dbContext, adapter, eventBus);
var publishEndpoint = Substitute.For<IPublishEndpoint>();
var service = CreateService(dbContext, adapter, publishEndpoint);
var newUrl = "https://cdn.example.com/uploaded/cover.jpg";
@@ -228,8 +226,8 @@ public class NovelUpdateServiceTests
await dbContext.SaveChangesAsync();
var adapter = Substitute.For<ISourceAdapter>();
var eventBus = Substitute.For<IEventBus>();
var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
var publishEndpoint = Substitute.For<IPublishEndpoint>();
var service = CreateService(dbContext, adapter, publishEndpoint, pendingUrl);
var newUrl = "https://cdn.example.com/uploaded/image.jpg";
@@ -277,8 +275,8 @@ public class NovelUpdateServiceTests
await dbContext.SaveChangesAsync();
var adapter = Substitute.For<ISourceAdapter>();
var eventBus = Substitute.For<IEventBus>();
var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
var publishEndpoint = Substitute.For<IPublishEndpoint>();
var service = CreateService(dbContext, adapter, publishEndpoint, pendingUrl);
var newUrl = "https://cdn.example.com/uploaded/img1.jpg";

26
FictionArchive.Service.NovelService/Consumers/ChapterPullRequestedConsumer.cs Normal file
View File

@@ -0,0 +1,26 @@
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.Shared.Contracts.Events;
using MassTransit;
using Microsoft.Extensions.Logging;
namespace FictionArchive.Service.NovelService.Consumers;
public class ChapterPullRequestedConsumer : IConsumer<IChapterPullRequested>
{
private readonly ILogger<ChapterPullRequestedConsumer> _logger;
private readonly NovelUpdateService _novelUpdateService;
public ChapterPullRequestedConsumer(
ILogger<ChapterPullRequestedConsumer> logger,
NovelUpdateService novelUpdateService)
{
_logger = logger;
_novelUpdateService = novelUpdateService;
}
public async Task Consume(ConsumeContext<IChapterPullRequested> context)
{
var message = context.Message;
await _novelUpdateService.PullChapterContents(message.NovelId, message.VolumeId, message.ChapterOrder);
}
}

47
FictionArchive.Service.NovelService/Consumers/FileUploadRequestStatusUpdateConsumer.cs Normal file
View File

@@ -0,0 +1,47 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.Shared.Contracts.Events;
using MassTransit;
using Microsoft.Extensions.Logging;
namespace FictionArchive.Service.NovelService.Consumers;
public class FileUploadRequestStatusUpdateConsumer : IConsumer<IFileUploadRequestStatusUpdate>
{
private readonly ILogger<FileUploadRequestStatusUpdateConsumer> _logger;
private readonly NovelServiceDbContext _dbContext;
private readonly NovelUpdateService _novelUpdateService;
public FileUploadRequestStatusUpdateConsumer(
ILogger<FileUploadRequestStatusUpdateConsumer> logger,
NovelServiceDbContext dbContext,
NovelUpdateService novelUpdateService)
{
_logger = logger;
_dbContext = dbContext;
_novelUpdateService = novelUpdateService;
}
public async Task Consume(ConsumeContext<IFileUploadRequestStatusUpdate> context)
{
var message = context.Message;
var image = await _dbContext.Images.FindAsync(message.RequestId);
if (image == null)
{
// Not a request we care about.
return;
}
if (message.Status == RequestStatus.Failed)
{
_logger.LogError("Image upload failed for image with id {imageId}", image.Id);
return;
}
else if (message.Status == RequestStatus.Success)
{
_logger.LogInformation("Image upload succeeded for image with id {imageId}", image.Id);
await _novelUpdateService.UpdateImage(image.Id, message.FileAccessUrl);
}
}
}

26
FictionArchive.Service.NovelService/Consumers/NovelUpdateRequestedConsumer.cs Normal file
View File

@@ -0,0 +1,26 @@
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.Shared.Contracts.Events;
using MassTransit;
using Microsoft.Extensions.Logging;
namespace FictionArchive.Service.NovelService.Consumers;
public class NovelUpdateRequestedConsumer : IConsumer<INovelUpdateRequested>
{
private readonly ILogger<NovelUpdateRequestedConsumer> _logger;
private readonly NovelUpdateService _novelUpdateService;
public NovelUpdateRequestedConsumer(
ILogger<NovelUpdateRequestedConsumer> logger,
NovelUpdateService novelUpdateService)
{
_logger = logger;
_novelUpdateService = novelUpdateService;
}
public async Task Consume(ConsumeContext<INovelUpdateRequested> context)
{
var message = context.Message;
await _novelUpdateService.ImportNovel(message.NovelUrl);
}
}

48
FictionArchive.Service.NovelService/Consumers/TranslationRequestCompletedConsumer.cs Normal file
View File

@@ -0,0 +1,48 @@
using FictionArchive.Service.NovelService.Models.Localization;
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.Shared.Contracts.Events;
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
namespace FictionArchive.Service.NovelService.Consumers;
public class TranslationRequestCompletedConsumer : IConsumer<ITranslationRequestCompleted>
{
private readonly ILogger<TranslationRequestCompletedConsumer> _logger;
private readonly NovelServiceDbContext _dbContext;
public TranslationRequestCompletedConsumer(
ILogger<TranslationRequestCompletedConsumer> logger,
NovelServiceDbContext dbContext)
{
_logger = logger;
_dbContext = dbContext;
}
public async Task Consume(ConsumeContext<ITranslationRequestCompleted> context)
{
var message = context.Message;
var localizationRequest = await _dbContext.LocalizationRequests
.Include(r => r.KeyRequestedForTranslation)
.ThenInclude(lk => lk.Texts)
.FirstOrDefaultAsync(lk => lk.Id == message.TranslationRequestId);
if (localizationRequest == null)
{
// Not one of our requests, discard it
return;
}
localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText
{
Language = localizationRequest.TranslateTo,
Text = message.TranslatedText,
TranslationEngine = localizationRequest.Engine
});
_dbContext.LocalizationRequests.Remove(localizationRequest);
await _dbContext.SaveChangesAsync();
}
}

11
FictionArchive.Service.NovelService/Contracts/ChapterCreated.cs Normal file
View File

@@ -0,0 +1,11 @@
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.NovelService.Contracts;
public record ChapterCreated(
uint ChapterId,
uint NovelId,
uint VolumeId,
uint VolumeOrder,
uint ChapterOrder,
string ChapterTitle) : IChapterCreated;

8
FictionArchive.Service.NovelService/Contracts/ChapterPullRequested.cs Normal file
View File

@@ -0,0 +1,8 @@
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.NovelService.Contracts;
public record ChapterPullRequested(
uint NovelId,
uint VolumeId,
uint ChapterOrder) : IChapterPullRequested;

8
FictionArchive.Service.NovelService/Contracts/FileUploadRequestCreated.cs Normal file
View File

@@ -0,0 +1,8 @@
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.NovelService.Contracts;
public record FileUploadRequestCreated(
Guid RequestId,
string FilePath,
byte[] FileData) : IFileUploadRequestCreated;

11
FictionArchive.Service.NovelService/Contracts/NovelCreated.cs Normal file
View File

@@ -0,0 +1,11 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.NovelService.Contracts;
public record NovelCreated(
uint NovelId,
string Title,
Language OriginalLanguage,
string Source,
string AuthorName) : INovelCreated;

6
FictionArchive.Service.NovelService/Contracts/NovelUpdateRequested.cs Normal file
View File

@@ -0,0 +1,6 @@
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.NovelService.Contracts;
public record NovelUpdateRequested(
string NovelUrl) : INovelUpdateRequested;

11
FictionArchive.Service.NovelService/Contracts/TranslationRequestCreated.cs Normal file
View File

@@ -0,0 +1,11 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.NovelService.Contracts;
public record TranslationRequestCreated(
Guid TranslationRequestId,
Language From,
Language To,
string Body,
string TranslationEngineKey) : ITranslationRequestCreated;

7
FictionArchive.Service.NovelService/GraphQL/Mutation.cs
View File

@@ -1,11 +1,10 @@
using FictionArchive.Service.NovelService.Contracts;
using FictionArchive.Service.NovelService.Models.Enums;
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.NovelService.Models.Localization;
using FictionArchive.Service.NovelService.Models.Novels;
using FictionArchive.Service.NovelService.Models.SourceAdapters;
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.NovelService.Services.SourceAdapters;
using FictionArchive.Service.Shared.Services.EventBus;
using HotChocolate.Authorization;
using HotChocolate.Types;
using Microsoft.EntityFrameworkCore;
@@ -15,13 +14,13 @@ namespace FictionArchive.Service.NovelService.GraphQL;
public class Mutation
{
[Authorize]
public async Task<NovelUpdateRequestedEvent> ImportNovel(string novelUrl, NovelUpdateService service)
public async Task<NovelUpdateRequested> ImportNovel(string novelUrl, NovelUpdateService service)
{
return await service.QueueNovelImport(novelUrl);
}
[Authorize]
public async Task<ChapterPullRequestedEvent> FetchChapterContents(
public async Task<ChapterPullRequested> FetchChapterContents(
uint novelId,
uint volumeId,
uint chapterOrder,

13
FictionArchive.Service.NovelService/Models/IntegrationEvents/ChapterCreatedEvent.cs
View File

@@ -1,13 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class ChapterCreatedEvent : IIntegrationEvent
{
public required uint ChapterId { get; init; }
public required uint NovelId { get; init; }
public required uint VolumeId { get; init; }
public required int VolumeOrder { get; init; }
public required uint ChapterOrder { get; init; }
public required string ChapterTitle { get; init; }
}

10
FictionArchive.Service.NovelService/Models/IntegrationEvents/ChapterPullRequestedEvent.cs
View File

@@ -1,10 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class ChapterPullRequestedEvent : IIntegrationEvent
{
public uint NovelId { get; set; }
public uint VolumeId { get; set; }
public uint ChapterOrder { get; set; }
}

10
FictionArchive.Service.NovelService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs
View File

@@ -1,10 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.FileService.IntegrationEvents;
public class FileUploadRequestCreatedEvent : IIntegrationEvent
{
public Guid RequestId { get; set; }
public string FilePath { get; set; }
public byte[] FileData { get; set; }
}

22
FictionArchive.Service.NovelService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs
View File

@@ -1,22 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class FileUploadRequestStatusUpdateEvent : IIntegrationEvent
{
public Guid RequestId { get; set; }
public RequestStatus Status { get; set; }
#region Success
public string? FileAccessUrl { get; set; }
#endregion
#region Failure
public string? ErrorMessage { get; set; }
#endregion
}

13
FictionArchive.Service.NovelService/Models/IntegrationEvents/NovelCreatedEvent.cs
View File

@@ -1,13 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class NovelCreatedEvent : IIntegrationEvent
{
public required uint NovelId { get; init; }
public required string Title { get; init; }
public required Language OriginalLanguage { get; init; }
public required string Source { get; init; }
public required string AuthorName { get; init; }
}

8
FictionArchive.Service.NovelService/Models/IntegrationEvents/NovelUpdateRequestedEvent.cs
View File

@@ -1,8 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class NovelUpdateRequestedEvent : IIntegrationEvent
{
public string NovelUrl { get; set; }
}

17
FictionArchive.Service.NovelService/Models/IntegrationEvents/TranslationRequestCompletedEvent.cs
View File

@@ -1,17 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class TranslationRequestCompletedEvent : IIntegrationEvent
{
/// <summary>
/// Maps this event back to a triggering request.
/// </summary>
public Guid? TranslationRequestId { get; set; }
/// <summary>
/// The resulting text.
/// </summary>
public string? TranslatedText { get; set; }
}

13
FictionArchive.Service.NovelService/Models/IntegrationEvents/TranslationRequestCreatedEvent.cs
View File

@@ -1,13 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
public class TranslationRequestCreatedEvent : IIntegrationEvent
{
public Guid TranslationRequestId { get; set; }
public Language From { get; set; }
public Language To { get; set; }
public string Body { get; set; }
public string TranslationEngineKey { get; set; }
}

23
FictionArchive.Service.NovelService/Program.cs
View File

@@ -1,14 +1,12 @@
using FictionArchive.Common.Extensions;
using FictionArchive.Service.NovelService.Consumers;
using FictionArchive.Service.NovelService.GraphQL;
using FictionArchive.Service.NovelService.Models.Configuration;
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.NovelService.Services;
using FictionArchive.Service.NovelService.Services.EventHandlers;
using FictionArchive.Service.NovelService.Services.SourceAdapters;
using FictionArchive.Service.NovelService.Services.SourceAdapters.Novelpia;
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using FictionArchive.Service.Shared.Services.GraphQL;
using Microsoft.EntityFrameworkCore;
@@ -25,18 +23,19 @@ public class Program
builder.Services.AddMemoryCache();
#region Event Bus
#region MassTransit
if (!isSchemaExport)
{
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
})
.Subscribe<TranslationRequestCompletedEvent, TranslationRequestCompletedEventHandler>()
.Subscribe<NovelUpdateRequestedEvent, NovelUpdateRequestedEventHandler>()
.Subscribe<ChapterPullRequestedEvent, ChapterPullRequestedEventHandler>()
.Subscribe<FileUploadRequestStatusUpdateEvent, FileUploadRequestStatusUpdateEventHandler>();
builder.Services.AddFictionArchiveMassTransit(
builder.Configuration,
x =>
{
x.AddConsumer<TranslationRequestCompletedConsumer>();
x.AddConsumer<FileUploadRequestStatusUpdateConsumer>();
x.AddConsumer<NovelUpdateRequestedConsumer>();
x.AddConsumer<ChapterPullRequestedConsumer>();
});
}
#endregion

19
FictionArchive.Service.NovelService/Services/EventHandlers/ChapterPullRequestedEventHandler.cs
View File

@@ -1,19 +0,0 @@
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Services.EventHandlers;
public class ChapterPullRequestedEventHandler : IIntegrationEventHandler<ChapterPullRequestedEvent>
{
private readonly NovelUpdateService _novelUpdateService;
public ChapterPullRequestedEventHandler(NovelUpdateService novelUpdateService)
{
_novelUpdateService = novelUpdateService;
}
public async Task Handle(ChapterPullRequestedEvent @event)
{
await _novelUpdateService.PullChapterContents(@event.NovelId, @event.VolumeId, @event.ChapterOrder);
}
}

39
FictionArchive.Service.NovelService/Services/EventHandlers/FileUploadRequestStatusUpdateEventHandler.cs
View File

@@ -1,39 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Services.EventHandlers;
public class FileUploadRequestStatusUpdateEventHandler : IIntegrationEventHandler<FileUploadRequestStatusUpdateEvent>
{
private readonly ILogger<FileUploadRequestStatusUpdateEventHandler> _logger;
private readonly NovelServiceDbContext _context;
private readonly NovelUpdateService _novelUpdateService;
public FileUploadRequestStatusUpdateEventHandler(ILogger<FileUploadRequestStatusUpdateEventHandler> logger, NovelServiceDbContext context, NovelUpdateService novelUpdateService)
{
_logger = logger;
_context = context;
_novelUpdateService = novelUpdateService;
}
public async Task Handle(FileUploadRequestStatusUpdateEvent @event)
{
var image = await _context.Images.FindAsync(@event.RequestId);
if (image == null)
{
// Not a request we care about.
return;
}
if (@event.Status == RequestStatus.Failed)
{
_logger.LogError("Image upload failed for image with id {imageId}", image.Id);
return;
}
else if (@event.Status == RequestStatus.Success)
{
_logger.LogInformation("Image upload succeeded for image with id {imageId}", image.Id);
await _novelUpdateService.UpdateImage(image.Id, @event.FileAccessUrl);
}
}
}

23
FictionArchive.Service.NovelService/Services/EventHandlers/NovelUpdateRequestedEventHandler.cs
View File

@@ -1,23 +0,0 @@
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.NovelService.Services.EventHandlers;
public class NovelUpdateRequestedEventHandler : IIntegrationEventHandler<NovelUpdateRequestedEvent>
{
private readonly ILogger<NovelUpdateRequestedEventHandler> _logger;
private readonly IEventBus _eventBus;
private readonly NovelUpdateService _novelUpdateService;
public NovelUpdateRequestedEventHandler(ILogger<NovelUpdateRequestedEventHandler> logger, IEventBus eventBus, NovelUpdateService novelUpdateService)
{
_logger = logger;
_eventBus = eventBus;
_novelUpdateService = novelUpdateService;
}
public async Task Handle(NovelUpdateRequestedEvent @event)
{
await _novelUpdateService.ImportNovel(@event.NovelUrl);
}
}

39
FictionArchive.Service.NovelService/Services/EventHandlers/TranslationRequestCompletedEventHandler.cs
View File

@@ -1,39 +0,0 @@
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.NovelService.Models.Localization;
using FictionArchive.Service.Shared.Services.EventBus;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.NovelService.Services.EventHandlers;
public class TranslationRequestCompletedEventHandler : IIntegrationEventHandler<TranslationRequestCompletedEvent>
{
private readonly ILogger<TranslationRequestCompletedEventHandler> _logger;
private readonly NovelServiceDbContext _dbContext;
public TranslationRequestCompletedEventHandler(ILogger<TranslationRequestCompletedEventHandler> logger, NovelServiceDbContext dbContext)
{
_logger = logger;
_dbContext = dbContext;
}
public async Task Handle(TranslationRequestCompletedEvent @event)
{
var localizationRequest = await _dbContext.LocalizationRequests.Include(r => r.KeyRequestedForTranslation)
.ThenInclude(lk => lk.Texts)
.FirstOrDefaultAsync(lk => lk.Id == @event.TranslationRequestId);
if (localizationRequest == null)
{
// Not one of our requests, discard it
return;
}
localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText()
{
Language = localizationRequest.TranslateTo,
Text = @event.TranslatedText,
TranslationEngine = localizationRequest.Engine
});
_dbContext.LocalizationRequests.Remove(localizationRequest);
await _dbContext.SaveChangesAsync();
}
}

95
FictionArchive.Service.NovelService/Services/NovelUpdateService.cs
View File

@@ -1,15 +1,15 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.FileService.IntegrationEvents;
using FictionArchive.Service.NovelService.Contracts;
using FictionArchive.Service.NovelService.Models.Configuration;
using FictionArchive.Service.NovelService.Models.Enums;
using FictionArchive.Service.NovelService.Models.Images;
using FictionArchive.Service.NovelService.Models.IntegrationEvents;
using FictionArchive.Service.NovelService.Models.Localization;
using FictionArchive.Service.NovelService.Models.Novels;
using FictionArchive.Service.NovelService.Models.SourceAdapters;
using FictionArchive.Service.NovelService.Services.SourceAdapters;
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.Shared.Contracts.Events;
using HtmlAgilityPack;
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
@@ -20,15 +20,15 @@ public class NovelUpdateService
private readonly NovelServiceDbContext _dbContext;
private readonly ILogger<NovelUpdateService> _logger;
private readonly IEnumerable<ISourceAdapter> _sourceAdapters;
private readonly IEventBus _eventBus;
private readonly IPublishEndpoint _publishEndpoint;
private readonly NovelUpdateServiceConfiguration _novelUpdateServiceConfiguration;
public NovelUpdateService(NovelServiceDbContext dbContext, ILogger<NovelUpdateService> logger, IEnumerable<ISourceAdapter> sourceAdapters, IEventBus eventBus, IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration)
public NovelUpdateService(NovelServiceDbContext dbContext, ILogger<NovelUpdateService> logger, IEnumerable<ISourceAdapter> sourceAdapters, IPublishEndpoint publishEndpoint, IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration)
{
_dbContext = dbContext;
_logger = logger;
_sourceAdapters = sourceAdapters;
_eventBus = eventBus;
_publishEndpoint = publishEndpoint;
_novelUpdateServiceConfiguration = novelUpdateServiceConfiguration.Value;
}
@@ -335,7 +335,8 @@ public class NovelUpdateService
.ThenInclude(volume => volume.Chapters)
.ThenInclude(chapter => chapter.Body)
.ThenInclude(localizationKey => localizationKey.Texts)
.Include(n => n.CoverImage)
.Include(n => n.CoverImage).Include(novel => novel.Volumes).ThenInclude(volume => volume.Chapters)
.ThenInclude(chapter => chapter.Name)
.FirstOrDefaultAsync(n =>
n.ExternalId == metadata.ExternalId &&
n.Source.Key == metadata.SourceDescriptor.Key);
@@ -393,14 +394,12 @@ public class NovelUpdateService
// Publish novel created event for new novels
if (existingNovel == null)
{
await _eventBus.Publish(new NovelCreatedEvent
{
NovelId = novel.Id,
Title = novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
OriginalLanguage = novel.RawLanguage,
Source = novel.Source.Key,
AuthorName = novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
});
await _publishEndpoint.Publish<INovelCreated>(new NovelCreated(
novel.Id,
novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
novel.RawLanguage,
novel.Source.Key,
novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text));
}
// Publish chapter created events for new chapters
@@ -408,27 +407,23 @@ public class NovelUpdateService
{
foreach (var chapter in volume.Chapters.Where(c => !existingChapterIds.Contains(c.Id)))
{
await _eventBus.Publish(new ChapterCreatedEvent
{
ChapterId = chapter.Id,
NovelId = novel.Id,
VolumeId = volume.Id,
VolumeOrder = volume.Order,
ChapterOrder = chapter.Order,
ChapterTitle = chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
});
await _publishEndpoint.Publish<IChapterCreated>(new ChapterCreated(
chapter.Id,
novel.Id,
volume.Id,
(uint)volume.Order,
chapter.Order,
chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text));
}
}
// Publish cover image event if needed
if (shouldPublishCoverEvent && novel.CoverImage != null && metadata.CoverImage != null)
{
await _eventBus.Publish(new FileUploadRequestCreatedEvent
{
RequestId = novel.CoverImage.Id,
FileData = metadata.CoverImage.Data,
FilePath = $"Novels/{novel.Id}/Images/cover.jpg"
});
await _publishEndpoint.Publish<IFileUploadRequestCreated>(new FileUploadRequestCreated(
novel.CoverImage.Id,
$"Novels/{novel.Id}/Images/cover.jpg",
metadata.CoverImage.Data));
}
// Publish chapter pull events for chapters without body content
@@ -440,12 +435,10 @@ public class NovelUpdateService
foreach (var chapter in chaptersNeedingPull)
{
await _eventBus.Publish(new ChapterPullRequestedEvent
{
NovelId = novel.Id,
VolumeId = volume.Id,
ChapterOrder = chapter.Order
});
await _publishEndpoint.Publish<IChapterPullRequested>(new ChapterPullRequested(
novel.Id,
volume.Id,
chapter.Order));
}
}
@@ -518,12 +511,10 @@ public class NovelUpdateService
foreach (var image in chapter.Images)
{
var data = rawChapter.ImageData.FirstOrDefault(img => img.Url == image.OriginalPath);
await _eventBus.Publish(new FileUploadRequestCreatedEvent()
{
FileData = data.Data,
FilePath = $"{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
RequestId = image.Id
});
await _publishEndpoint.Publish<IFileUploadRequestCreated>(new FileUploadRequestCreated(
image.Id,
$"Novels/{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
data.Data));
}
return chapter;
@@ -557,25 +548,17 @@ public class NovelUpdateService
await _dbContext.SaveChangesAsync();
}
public async Task<NovelUpdateRequestedEvent> QueueNovelImport(string novelUrl)
public async Task<NovelUpdateRequested> QueueNovelImport(string novelUrl)
{
var importNovelRequestEvent = new NovelUpdateRequestedEvent()
{
NovelUrl = novelUrl
};
await _eventBus.Publish(importNovelRequestEvent);
var importNovelRequestEvent = new NovelUpdateRequested(novelUrl);
await _publishEndpoint.Publish<INovelUpdateRequested>(importNovelRequestEvent);
return importNovelRequestEvent;
}
public async Task<ChapterPullRequestedEvent> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
public async Task<ChapterPullRequested> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
{
var chapterPullEvent = new ChapterPullRequestedEvent()
{
NovelId = novelId,
VolumeId = volumeId,
ChapterOrder = chapterOrder
};
await _eventBus.Publish(chapterPullEvent);
var chapterPullEvent = new ChapterPullRequested(novelId, volumeId, chapterOrder);
await _publishEndpoint.Publish<IChapterPullRequested>(chapterPullEvent);
return chapterPullEvent;
}

3
FictionArchive.Service.NovelService/appsettings.json
View File

@@ -2,7 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
}
},
"Novelpia": {

10
FictionArchive.Service.SchedulerService/Models/JobTemplates/EventJobTemplate.cs
View File

@@ -1,4 +1,4 @@
using FictionArchive.Service.Shared.Services.EventBus;
using MassTransit;
using Newtonsoft.Json;
using Quartz;
@@ -6,15 +6,15 @@ namespace FictionArchive.Service.SchedulerService.Models.JobTemplates;
public class EventJobTemplate : IJob
{
private readonly IEventBus _eventBus;
private readonly IBus _bus;
private readonly ILogger<EventJobTemplate> _logger;
public const string EventTypeParameter = "RoutingKey";
public const string EventDataParameter = "MessageData";
public EventJobTemplate(IEventBus eventBus, ILogger<EventJobTemplate> logger)
public EventJobTemplate(IBus bus, ILogger<EventJobTemplate> logger)
{
_eventBus = eventBus;
_bus = bus;
_logger = logger;
}
@@ -25,7 +25,7 @@ public class EventJobTemplate : IJob
var eventData = context.MergedJobDataMap.GetString(EventDataParameter);
var eventType = context.MergedJobDataMap.GetString(EventTypeParameter);
var eventObject = JsonConvert.DeserializeObject(eventData);
await _eventBus.Publish(eventObject, eventType);
await _bus.Publish(eventObject);
}
catch (Exception ex)
{

6
FictionArchive.Service.SchedulerService/Program.cs
View File

@@ -2,7 +2,6 @@ using FictionArchive.Service.SchedulerService.GraphQL;
using FictionArchive.Service.SchedulerService.Services;
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using Quartz;
using Quartz.Impl.AdoJobStore;
@@ -38,10 +37,7 @@ public class Program
if (!isSchemaExport)
{
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
});
builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
}
#endregion

1
FictionArchive.Service.SchedulerService/Services/JobManagerService.cs
View File

@@ -1,7 +1,6 @@
using System.Data;
using FictionArchive.Service.SchedulerService.Models;
using FictionArchive.Service.SchedulerService.Models.JobTemplates;
using FictionArchive.Service.Shared.Services.EventBus;
using Quartz;
using Quartz.Impl.Matchers;

3
FictionArchive.Service.SchedulerService/appsettings.json
View File

@@ -2,7 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
}
},
"RabbitMQ": {

11
FictionArchive.Service.Shared/Contracts/Events/IChapterCreated.cs Normal file
View File

@@ -0,0 +1,11 @@
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface IChapterCreated
{
uint ChapterId { get; }
uint NovelId { get; }
uint VolumeId { get; }
uint VolumeOrder { get; }
uint ChapterOrder { get; }
string ChapterTitle { get; }
}

8
FictionArchive.Service.Shared/Contracts/Events/IChapterPullRequested.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface IChapterPullRequested
{
uint NovelId { get; }
uint VolumeId { get; }
uint ChapterOrder { get; }
}

8
FictionArchive.Service.Shared/Contracts/Events/IFileUploadRequestCreated.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface IFileUploadRequestCreated
{
Guid RequestId { get; }
string FilePath { get; }
byte[] FileData { get; }
}

11
FictionArchive.Service.Shared/Contracts/Events/IFileUploadRequestStatusUpdate.cs Normal file
View File

@@ -0,0 +1,11 @@
using FictionArchive.Common.Enums;
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface IFileUploadRequestStatusUpdate
{
Guid RequestId { get; }
RequestStatus Status { get; }
string? FileAccessUrl { get; }
string? ErrorMessage { get; }
}

12
FictionArchive.Service.Shared/Contracts/Events/INovelCreated.cs Normal file
View File

@@ -0,0 +1,12 @@
using FictionArchive.Common.Enums;
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface INovelCreated
{
uint NovelId { get; }
string Title { get; }
Language OriginalLanguage { get; }
string Source { get; }
string AuthorName { get; }
}

6
FictionArchive.Service.Shared/Contracts/Events/INovelUpdateRequested.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface INovelUpdateRequested
{
string NovelUrl { get; }
}

7
FictionArchive.Service.Shared/Contracts/Events/ITranslationRequestCompleted.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface ITranslationRequestCompleted
{
Guid? TranslationRequestId { get; }
string? TranslatedText { get; }
}

12
FictionArchive.Service.Shared/Contracts/Events/ITranslationRequestCreated.cs Normal file
View File

@@ -0,0 +1,12 @@
using FictionArchive.Common.Enums;
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface ITranslationRequestCreated
{
Guid TranslationRequestId { get; }
Language From { get; }
Language To { get; }
string Body { get; }
string TranslationEngineKey { get; }
}

12
FictionArchive.Service.Shared/Contracts/Events/IUserInvited.cs Normal file
View File

@@ -0,0 +1,12 @@
namespace FictionArchive.Service.Shared.Contracts.Events;
public interface IUserInvited
{
string InvitedUserId { get; }
string InvitedUsername { get; }
string InvitedEmail { get; }
string InvitedOAuthProviderId { get; }
string InviterId { get; }
string InviterUsername { get; }
string InviterOAuthProviderId { get; }
}

118
FictionArchive.Service.Shared/Extensions/MassTransitExtensions.cs Normal file
View File

@@ -0,0 +1,118 @@
using System.Text.RegularExpressions;
using FictionArchive.Service.Shared.Services.Filters;
using MassTransit;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace FictionArchive.Service.Shared.Extensions;
public static class MassTransitExtensions
{
public static IServiceCollection AddFictionArchiveMassTransit(
this IServiceCollection services,
IConfiguration configuration,
Action<IBusRegistrationConfigurator>? configureConsumers = null)
{
services.AddMassTransit(x =>
{
configureConsumers?.Invoke(x);
x.UsingRabbitMq((context, cfg) =>
{
var (host, username, password) = ParseRabbitMqConfiguration(configuration);
cfg.Host(host, h =>
{
h.Username(username);
h.Password(password);
});
cfg.UseMessageRetry(r => r.Exponential(
retryLimit: 5,
minInterval: TimeSpan.FromSeconds(1),
maxInterval: TimeSpan.FromMinutes(1),
intervalDelta: TimeSpan.FromSeconds(2)));
cfg.UseConsumeFilter(typeof(LoggingConsumeFilter<>), context);
// Process one message at a time per consumer (matches old EventBus behavior)
cfg.PrefetchCount = 1;
cfg.ConfigureEndpoints(context);
});
});
return services;
}
/// <summary>
/// Parses RabbitMQ configuration from either ConnectionString format or separate Host/Username/Password keys.
/// ConnectionString format: amqp://[username:password@]host[:port]
/// </summary>
private static (string Host, string Username, string Password) ParseRabbitMqConfiguration(IConfiguration configuration)
{
var connectionString = configuration["RabbitMQ:ConnectionString"];
if (!string.IsNullOrEmpty(connectionString))
{
return ParseConnectionString(connectionString);
}
// Fallback to separate configuration keys
var host = configuration["RabbitMQ:Host"] ?? "localhost";
var username = configuration["RabbitMQ:Username"] ?? "guest";
var password = configuration["RabbitMQ:Password"] ?? "guest";
return (host, username, password);
}
/// <summary>
/// Parses an AMQP connection string into host, username, and password components.
/// Supports formats:
/// - amqp://host
/// - amqp://host:port
/// - amqp://username:password@host
/// - amqp://username:password@host:port
/// </summary>
private static (string Host, string Username, string Password) ParseConnectionString(string connectionString)
{
var username = "guest";
var password = "guest";
var host = "localhost";
// Try to parse as URI first
if (Uri.TryCreate(connectionString, UriKind.Absolute, out var uri))
{
host = uri.Host;
if (!string.IsNullOrEmpty(uri.UserInfo))
{
var userInfoParts = uri.UserInfo.Split(':', 2);
username = Uri.UnescapeDataString(userInfoParts[0]);
if (userInfoParts.Length > 1)
{
password = Uri.UnescapeDataString(userInfoParts[1]);
}
}
}
else
{
// Fallback regex parsing for edge cases
var match = Regex.Match(connectionString, @"amqp://(?:([^:]+):([^@]+)@)?([^:/]+)");
if (match.Success)
{
if (match.Groups[1].Success && match.Groups[2].Success)
{
username = match.Groups[1].Value;
password = match.Groups[2].Value;
}
if (match.Groups[3].Success)
{
host = match.Groups[3].Value;
}
}
}
return (host, username, password);
}
}

2
FictionArchive.Service.Shared/FictionArchive.Service.Shared.csproj
View File

@@ -31,7 +31,7 @@
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.4" />
<PackageReference Include="Polly" Version="8.6.5" />
<PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.*" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
</ItemGroup>

25
FictionArchive.Service.Shared/Services/EventBus/EventBusBuilder.cs
View File

@@ -1,25 +0,0 @@
using Microsoft.Extensions.DependencyInjection;
namespace FictionArchive.Service.Shared.Services.EventBus;
public class EventBusBuilder<TEventBus> where TEventBus : class, IEventBus
{
private readonly IServiceCollection _services;
private readonly SubscriptionManager _subscriptionManager;
public EventBusBuilder(IServiceCollection services)
{
_services = services;
_services.AddSingleton<IEventBus, TEventBus>();
_subscriptionManager = new SubscriptionManager();
_services.AddSingleton<SubscriptionManager>(_subscriptionManager);
}
public EventBusBuilder<TEventBus> Subscribe<TEvent, TEventHandler>() where TEvent : IIntegrationEvent where TEventHandler : class, IIntegrationEventHandler<TEvent>
{
_services.AddKeyedTransient<IIntegrationEventHandler, TEventHandler>(typeof(TEvent).Name);
_subscriptionManager.RegisterSubscription<TEvent>();
return this;
}
}

12
FictionArchive.Service.Shared/Services/EventBus/EventBusExtensions.cs
View File

@@ -1,12 +0,0 @@
using Microsoft.Extensions.DependencyInjection;
namespace FictionArchive.Service.Shared.Services.EventBus;
public static class EventBusExtensions
{
public static EventBusBuilder<TEventBus> AddEventBus<TEventBus>(this IServiceCollection services)
where TEventBus : class, IEventBus
{
return new EventBusBuilder<TEventBus>(services);
}
}

7
FictionArchive.Service.Shared/Services/EventBus/IEventBus.cs
View File

@@ -1,7 +0,0 @@
namespace FictionArchive.Service.Shared.Services.EventBus;
public interface IEventBus
{
Task Publish<TEvent>(TEvent integrationEvent) where TEvent : IIntegrationEvent;
Task Publish(object integrationEvent, string eventType);
}

7
FictionArchive.Service.Shared/Services/EventBus/IIntegrationEvent.cs
View File

@@ -1,7 +0,0 @@
using NodaTime;
namespace FictionArchive.Service.Shared.Services.EventBus;
public interface IIntegrationEvent
{
}

12
FictionArchive.Service.Shared/Services/EventBus/IIntegrationEventHandler.cs
View File

@@ -1,12 +0,0 @@
namespace FictionArchive.Service.Shared.Services.EventBus;
public interface IIntegrationEventHandler<in TEvent> : IIntegrationEventHandler where TEvent : IIntegrationEvent
{
Task Handle(TEvent @event);
Task IIntegrationEventHandler.Handle(IIntegrationEvent @event) => Handle((TEvent)@event);
}
public interface IIntegrationEventHandler
{
Task Handle(IIntegrationEvent @event);
}

35
FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQConnectionProvider.cs
View File

@@ -1,35 +0,0 @@
using RabbitMQ.Client;
namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
public class RabbitMQConnectionProvider
{
private readonly IConnectionFactory _connectionFactory;
private IConnection Connection { get; set; }
private IChannel DefaultChannel { get; set; }
public RabbitMQConnectionProvider(IConnectionFactory connectionFactory)
{
_connectionFactory = connectionFactory;
}
public async Task<IConnection> GetConnectionAsync()
{
if (Connection == null)
{
Connection = await _connectionFactory.CreateConnectionAsync();
}
return Connection;
}
public async Task<IChannel> GetDefaultChannelAsync()
{
if (DefaultChannel == null)
{
DefaultChannel = await (await GetConnectionAsync()).CreateChannelAsync();
}
return DefaultChannel;
}
}

137
FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQEventBus.cs
View File

@@ -1,137 +0,0 @@
using System.Text;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using NodaTime;
using NodaTime.Serialization.JsonNet;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;
namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
public class RabbitMQEventBus : IEventBus, IHostedService
{
private readonly IServiceScopeFactory _serviceScopeFactory;
private readonly RabbitMQConnectionProvider _connectionProvider;
private readonly RabbitMQOptions _options;
private readonly SubscriptionManager _subscriptionManager;
private readonly ILogger<RabbitMQEventBus> _logger;
private readonly JsonSerializerSettings _jsonSerializerSettings;
private const string ExchangeName = "fiction-archive-event-bus";
private const string CreatedAtHeader = "X-Created-At";
private const string EventIdHeader = "X-Event-Id";
public RabbitMQEventBus(IServiceScopeFactory serviceScopeFactory, RabbitMQConnectionProvider connectionProvider, IOptions<RabbitMQOptions> options, SubscriptionManager subscriptionManager, ILogger<RabbitMQEventBus> logger)
{
_serviceScopeFactory = serviceScopeFactory;
_connectionProvider = connectionProvider;
_subscriptionManager = subscriptionManager;
_logger = logger;
_options = options.Value;
_jsonSerializerSettings = new JsonSerializerSettings().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
}
public async Task Publish<TEvent>(TEvent integrationEvent) where TEvent : IIntegrationEvent
{
var routingKey = typeof(TEvent).Name;
await Publish(integrationEvent, routingKey);
}
public async Task Publish(object integrationEvent, string eventType)
{
var channel = await _connectionProvider.GetDefaultChannelAsync();
var body = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(integrationEvent));
// headers
var props = new BasicProperties();
props.Headers = new Dictionary<string, object?>()
{
{ CreatedAtHeader, Instant.FromDateTimeUtc(DateTime.UtcNow).ToString() },
{ EventIdHeader, Guid.NewGuid().ToString() }
};
await channel.BasicPublishAsync(ExchangeName, eventType, true, props, body);
_logger.LogInformation("Published event {EventName}", eventType);
}
public async Task StartAsync(CancellationToken cancellationToken)
{
_ = Task.Factory.StartNew(async () =>
{
try
{
var channel = await _connectionProvider.GetDefaultChannelAsync();
await channel.ExchangeDeclareAsync(ExchangeName, ExchangeType.Direct,
cancellationToken: cancellationToken);
await channel.BasicQosAsync(prefetchSize: 0, prefetchCount: 1, global: false, cancellationToken: cancellationToken);
await channel.QueueDeclareAsync(_options.ClientIdentifier, true, false, false,
cancellationToken: cancellationToken);
var consumer = new AsyncEventingBasicConsumer(channel);
consumer.ReceivedAsync += (sender, @event) =>
{
return OnReceivedEvent(sender, @event, channel);
};
await channel.BasicConsumeAsync(_options.ClientIdentifier, false, consumer, cancellationToken: cancellationToken);
foreach (var subscription in _subscriptionManager.Subscriptions)
{
await channel.QueueBindAsync(_options.ClientIdentifier, ExchangeName, subscription.Key,
cancellationToken: cancellationToken);
_logger.LogInformation("Subscribed to {SubscriptionKey}", subscription.Key);
}
_logger.LogInformation("RabbitMQ EventBus started.");
}
catch (Exception e)
{
_logger.LogError(e, "An error occurred while starting the RabbitMQ EventBus");
}
}, cancellationToken);
}
public Task StopAsync(CancellationToken cancellationToken)
{
return Task.CompletedTask;
}
private async Task OnReceivedEvent(object sender, BasicDeliverEventArgs @event, IChannel channel)
{
var eventName = @event.RoutingKey;
_logger.LogInformation("Received event {EventName}", eventName);
try
{
if (!_subscriptionManager.Subscriptions.ContainsKey(eventName))
{
_logger.LogWarning("Received event without subscription entry.");
return;
}
var eventBody = Encoding.UTF8.GetString(@event.Body.Span);
var eventObject = JsonConvert.DeserializeObject(eventBody, _subscriptionManager.Subscriptions[eventName], _jsonSerializerSettings) as IIntegrationEvent;
using var scope = _serviceScopeFactory.CreateScope();
foreach (var service in scope.ServiceProvider.GetKeyedServices<IIntegrationEventHandler>(eventName))
{
await service.Handle(eventObject);
}
_logger.LogInformation("Finished handling event with name {EventName}", eventName);
}
catch (Exception e)
{
_logger.LogError(e, "An error occurred while handling an event.");
}
finally
{
await channel.BasicAckAsync(@event.DeliveryTag, false);
}
}
}

24
FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQExtensions.cs
View File

@@ -1,24 +0,0 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using RabbitMQ.Client;
namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
public static class RabbitMQExtensions
{
public static EventBusBuilder<RabbitMQEventBus> AddRabbitMQ(this IServiceCollection services, Action<RabbitMQOptions> configure)
{
services.Configure(configure);
services.AddSingleton<IConnectionFactory, ConnectionFactory>(provider =>
{
var options = provider.GetService<IOptions<RabbitMQOptions>>();
ConnectionFactory factory = new ConnectionFactory();
factory.Uri = new Uri(options.Value.ConnectionString);
return factory;
});
services.AddSingleton<RabbitMQConnectionProvider>();
services.AddHostedService<RabbitMQEventBus>();
return services.AddEventBus<RabbitMQEventBus>();
}
}

7
FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQOptions.cs
View File

@@ -1,7 +0,0 @@
namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
public class RabbitMQOptions
{
public string ConnectionString { get; set; }
public string ClientIdentifier { get; set; }
}

11
FictionArchive.Service.Shared/Services/EventBus/SubscriptionManager.cs
View File

@@ -1,11 +0,0 @@
namespace FictionArchive.Service.Shared.Services.EventBus;
public class SubscriptionManager
{
public Dictionary<string, Type> Subscriptions { get; } = new Dictionary<string, Type>();
public void RegisterSubscription<TEvent>()
{
Subscriptions.Add(typeof(TEvent).Name, typeof(TEvent));
}
}

33
FictionArchive.Service.Shared/Services/Filters/LoggingConsumeFilter.cs Normal file
View File

@@ -0,0 +1,33 @@
using MassTransit;
using Microsoft.Extensions.Logging;
namespace FictionArchive.Service.Shared.Services.Filters;
public class LoggingConsumeFilter<T> : IFilter<ConsumeContext<T>> where T : class
{
private readonly ILogger<LoggingConsumeFilter<T>> _logger;
public LoggingConsumeFilter(ILogger<LoggingConsumeFilter<T>> logger)
{
_logger = logger;
}
public async Task Send(ConsumeContext<T> context, IPipe<ConsumeContext<T>> next)
{
try
{
await next.Send(context);
}
catch (Exception ex)
{
_logger.LogError(ex,
"Message {MessageType} failed after all retries. MessageId: {MessageId}, ConversationId: {ConversationId}",
typeof(T).Name,
context.MessageId,
context.ConversationId);
throw;
}
}
public void Probe(ProbeContext context) => context.CreateFilterScope("logging");
}

53
FictionArchive.Service.TranslationService/Consumers/TranslationRequestCreatedConsumer.cs Normal file
View File

@@ -0,0 +1,53 @@
using FictionArchive.Service.Shared.Contracts.Events;
using FictionArchive.Service.TranslationService.Contracts;
using FictionArchive.Service.TranslationService.Models.Enums;
using FictionArchive.Service.TranslationService.Services;
using MassTransit;
using Microsoft.Extensions.Logging;
namespace FictionArchive.Service.TranslationService.Consumers;
public class TranslationRequestCreatedConsumer : IConsumer<ITranslationRequestCreated>
{
private readonly ILogger<TranslationRequestCreatedConsumer> _logger;
private readonly TranslationEngineService _translationEngineService;
private readonly IPublishEndpoint _publishEndpoint;
public TranslationRequestCreatedConsumer(
ILogger<TranslationRequestCreatedConsumer> logger,
TranslationEngineService translationEngineService,
IPublishEndpoint publishEndpoint)
{
_logger = logger;
_translationEngineService = translationEngineService;
_publishEndpoint = publishEndpoint;
}
public async Task Consume(ConsumeContext<ITranslationRequestCreated> context)
{
var message = context.Message;
_logger.LogInformation("Processing translation request {TranslationRequestId}", message.TranslationRequestId);
var result = await _translationEngineService.Translate(
message.From,
message.To,
message.Body,
message.TranslationEngineKey);
if (result.Status == TranslationRequestStatus.Success)
{
await _publishEndpoint.Publish<ITranslationRequestCompleted>(
new TranslationRequestCompleted(
TranslationRequestId: message.TranslationRequestId,
TranslatedText: result.TranslatedText));
_logger.LogInformation("Translation completed for request {TranslationRequestId}", message.TranslationRequestId);
}
else
{
_logger.LogError("Translation failed for request {TranslationRequestId}", message.TranslationRequestId);
throw new InvalidOperationException($"Translation failed for request {message.TranslationRequestId}");
}
}
}

7
FictionArchive.Service.TranslationService/Contracts/TranslationRequestCompleted.cs Normal file
View File

@@ -0,0 +1,7 @@
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.TranslationService.Contracts;
public record TranslationRequestCompleted(
Guid? TranslationRequestId,
string? TranslatedText) : ITranslationRequestCompleted;

18
FictionArchive.Service.TranslationService/Models/IntegrationEvents/TranslationRequestCompletedEvent.cs
View File

@@ -1,18 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.TranslationService.Models.Enums;
namespace FictionArchive.Service.TranslationService.Models.IntegrationEvents;
public class TranslationRequestCompletedEvent : IIntegrationEvent
{
/// <summary>
/// Maps this event back to a triggering request.
/// </summary>
public Guid? TranslationRequestId { get; set; }
/// <summary>
/// The resulting text.
/// </summary>
public string? TranslatedText { get; set; }
}

13
FictionArchive.Service.TranslationService/Models/IntegrationEvents/TranslationRequestCreatedEvent.cs
View File

@@ -1,13 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.TranslationService.Models.IntegrationEvents;
public class TranslationRequestCreatedEvent : IIntegrationEvent
{
public Guid TranslationRequestId { get; set; }
public Language From { get; set; }
public Language To { get; set; }
public string Body { get; set; }
public string TranslationEngineKey { get; set; }
}

18
FictionArchive.Service.TranslationService/Program.cs
View File

@@ -2,16 +2,13 @@ using DeepL;
using FictionArchive.Common.Extensions;
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using FictionArchive.Service.Shared.Services.GraphQL;
using FictionArchive.Service.TranslationService.Consumers;
using FictionArchive.Service.TranslationService.GraphQL;
using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
using FictionArchive.Service.TranslationService.Services;
using FictionArchive.Service.TranslationService.Services.Database;
using FictionArchive.Service.TranslationService.Services.EventHandlers;
using FictionArchive.Service.TranslationService.Services.TranslationEngines;
using FictionArchive.Service.TranslationService.Services.TranslationEngines.DeepLTranslate;
using RabbitMQ.Client;
namespace FictionArchive.Service.TranslationService;
@@ -26,15 +23,16 @@ public class Program
builder.Services.AddHealthChecks();
#region Event Bus
#region MassTransit
if (!isSchemaExport)
{
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
})
.Subscribe<TranslationRequestCreatedEvent, TranslationRequestCreatedEventHandler>();
builder.Services.AddFictionArchiveMassTransit(
builder.Configuration,
x =>
{
x.AddConsumer<TranslationRequestCreatedConsumer>();
});
}
#endregion

31
FictionArchive.Service.TranslationService/Services/EventHandlers/TranslationRequestCreatedEventHandler.cs
View File

@@ -1,31 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.TranslationService.Models.Enums;
using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
namespace FictionArchive.Service.TranslationService.Services.EventHandlers;
public class TranslationRequestCreatedEventHandler : IIntegrationEventHandler<TranslationRequestCreatedEvent>
{
private readonly ILogger<TranslationRequestCreatedEventHandler> _logger;
private readonly TranslationEngineService _translationEngineService;
private readonly IEventBus _eventBus;
public TranslationRequestCreatedEventHandler(ILogger<TranslationRequestCreatedEventHandler> logger, TranslationEngineService translationEngineService)
{
_logger = logger;
_translationEngineService = translationEngineService;
}
public async Task Handle(TranslationRequestCreatedEvent @event)
{
var result = await _translationEngineService.Translate(@event.From, @event.To, @event.Body, @event.TranslationEngineKey);
if (result.Status == TranslationRequestStatus.Success)
{
await _eventBus.Publish(new TranslationRequestCompletedEvent()
{
TranslatedText = result.TranslatedText,
TranslationRequestId = @event.TranslationRequestId,
});
}
}
}

9
FictionArchive.Service.TranslationService/Services/TranslationEngineService.cs
View File

@@ -1,28 +1,21 @@
using System.Text;
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using FictionArchive.Service.TranslationService.Models;
using FictionArchive.Service.TranslationService.Models.Database;
using FictionArchive.Service.TranslationService.Models.Enums;
using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
using FictionArchive.Service.TranslationService.Services.Database;
using FictionArchive.Service.TranslationService.Services.TranslationEngines;
using RabbitMQ.Client;
namespace FictionArchive.Service.TranslationService.Services;
public class TranslationEngineService
{
private readonly IEnumerable<ITranslationEngine> _translationEngines;
private readonly IEventBus _eventBus;
private readonly TranslationServiceDbContext _dbContext;
public TranslationEngineService(IEnumerable<ITranslationEngine> translationEngines, TranslationServiceDbContext dbContext, IEventBus eventBus)
public TranslationEngineService(IEnumerable<ITranslationEngine> translationEngines, TranslationServiceDbContext dbContext)
{
_translationEngines = translationEngines;
_dbContext = dbContext;
_eventBus = eventBus;
}
public async Task<TranslationResult> Translate(Language from, Language to, string text, string translationEngineKey)

3
FictionArchive.Service.TranslationService/appsettings.json
View File

@@ -2,7 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
}
},
"DeepL": {

39
FictionArchive.Service.UserNovelDataService/Services/EventHandlers/ChapterCreatedEventHandler.cs → FictionArchive.Service.UserNovelDataService/Consumers/ChapterCreatedConsumer.cs
View File

@@ -1,53 +1,56 @@
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.Shared.Contracts.Events;
using FictionArchive.Service.UserNovelDataService.Models.Database;
using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
using FictionArchive.Service.UserNovelDataService.Services;
using MassTransit;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
namespace FictionArchive.Service.UserNovelDataService.Consumers;
public class ChapterCreatedEventHandler : IIntegrationEventHandler<ChapterCreatedEvent>
public class ChapterCreatedConsumer : IConsumer<IChapterCreated>
{
private readonly ILogger<ChapterCreatedConsumer> _logger;
private readonly UserNovelDataServiceDbContext _dbContext;
private readonly ILogger<ChapterCreatedEventHandler> _logger;
public ChapterCreatedEventHandler(
UserNovelDataServiceDbContext dbContext,
ILogger<ChapterCreatedEventHandler> logger)
public ChapterCreatedConsumer(
ILogger<ChapterCreatedConsumer> logger,
UserNovelDataServiceDbContext dbContext)
{
_dbContext = dbContext;
_logger = logger;
_dbContext = dbContext;
}
public async Task Handle(ChapterCreatedEvent @event)
public async Task Consume(ConsumeContext<IChapterCreated> context)
{
var message = context.Message;
// Ensure novel exists
var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == message.NovelId);
if (!novelExists)
{
var novel = new Novel { Id = @event.NovelId };
var novel = new Novel { Id = message.NovelId };
_dbContext.Novels.Add(novel);
}
// Ensure volume exists
var volumeExists = await _dbContext.Volumes.AnyAsync(v => v.Id == @event.VolumeId);
var volumeExists = await _dbContext.Volumes.AnyAsync(v => v.Id == message.VolumeId);
if (!volumeExists)
{
var volume = new Volume { Id = @event.VolumeId };
var volume = new Volume { Id = message.VolumeId };
_dbContext.Volumes.Add(volume);
}
// Create chapter if not exists
var chapterExists = await _dbContext.Chapters.AnyAsync(c => c.Id == @event.ChapterId);
var chapterExists = await _dbContext.Chapters.AnyAsync(c => c.Id == message.ChapterId);
if (chapterExists)
{
_logger.LogDebug("Chapter {ChapterId} already exists, skipping", @event.ChapterId);
_logger.LogDebug("Chapter {ChapterId} already exists, skipping", message.ChapterId);
return;
}
var chapter = new Chapter { Id = @event.ChapterId };
var chapter = new Chapter { Id = message.ChapterId };
_dbContext.Chapters.Add(chapter);
await _dbContext.SaveChangesAsync();
_logger.LogInformation("Created chapter stub for {ChapterId} in novel {NovelId}", @event.ChapterId, @event.NovelId);
_logger.LogInformation("Created chapter stub for {ChapterId} in novel {NovelId}", message.ChapterId, message.NovelId);
}
}

39
FictionArchive.Service.UserNovelDataService/Consumers/NovelCreatedConsumer.cs Normal file
View File

@@ -0,0 +1,39 @@
using FictionArchive.Service.Shared.Contracts.Events;
using FictionArchive.Service.UserNovelDataService.Models.Database;
using FictionArchive.Service.UserNovelDataService.Services;
using MassTransit;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.UserNovelDataService.Consumers;
public class NovelCreatedConsumer : IConsumer<INovelCreated>
{
private readonly ILogger<NovelCreatedConsumer> _logger;
private readonly UserNovelDataServiceDbContext _dbContext;
public NovelCreatedConsumer(
ILogger<NovelCreatedConsumer> logger,
UserNovelDataServiceDbContext dbContext)
{
_logger = logger;
_dbContext = dbContext;
}
public async Task Consume(ConsumeContext<INovelCreated> context)
{
var message = context.Message;
var exists = await _dbContext.Novels.AnyAsync(n => n.Id == message.NovelId);
if (exists)
{
_logger.LogDebug("Novel {NovelId} already exists, skipping", message.NovelId);
return;
}
var novel = new Novel { Id = message.NovelId };
_dbContext.Novels.Add(novel);
await _dbContext.SaveChangesAsync();
_logger.LogInformation("Created novel stub for {NovelId}", message.NovelId);
}
}

44
FictionArchive.Service.UserNovelDataService/Consumers/UserInvitedConsumer.cs Normal file
View File

@@ -0,0 +1,44 @@
using FictionArchive.Service.Shared.Contracts.Events;
using FictionArchive.Service.UserNovelDataService.Models.Database;
using FictionArchive.Service.UserNovelDataService.Services;
using MassTransit;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.UserNovelDataService.Consumers;
public class UserInvitedConsumer : IConsumer<IUserInvited>
{
private readonly ILogger<UserInvitedConsumer> _logger;
private readonly UserNovelDataServiceDbContext _dbContext;
public UserInvitedConsumer(
ILogger<UserInvitedConsumer> logger,
UserNovelDataServiceDbContext dbContext)
{
_logger = logger;
_dbContext = dbContext;
}
public async Task Consume(ConsumeContext<IUserInvited> context)
{
var message = context.Message;
var userId = Guid.Parse(message.InvitedUserId);
var exists = await _dbContext.Users.AnyAsync(u => u.Id == userId);
if (exists)
{
_logger.LogDebug("User {UserId} already exists, skipping", message.InvitedUserId);
return;
}
var user = new User
{
Id = userId,
OAuthProviderId = message.InvitedOAuthProviderId
};
_dbContext.Users.Add(user);
await _dbContext.SaveChangesAsync();
_logger.LogInformation("Created user stub for {UserId}", message.InvitedUserId);
}
}

13
FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/ChapterCreatedEvent.cs
View File

@@ -1,13 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
public class ChapterCreatedEvent : IIntegrationEvent
{
public required uint ChapterId { get; init; }
public required uint NovelId { get; init; }
public required uint VolumeId { get; init; }
public required int VolumeOrder { get; init; }
public required uint ChapterOrder { get; init; }
public required string ChapterTitle { get; init; }
}

13
FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/NovelCreatedEvent.cs
View File

@@ -1,13 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
public class NovelCreatedEvent : IIntegrationEvent
{
public required uint NovelId { get; init; }
public required string Title { get; init; }
public required Language OriginalLanguage { get; init; }
public required string Source { get; init; }
public required string AuthorName { get; init; }
}

15
FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/UserInvitedEvent.cs
View File

@@ -1,15 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
public class UserInvitedEvent : IIntegrationEvent
{
public Guid InvitedUserId { get; set; }
public required string InvitedUsername { get; set; }
public required string InvitedEmail { get; set; }
public required string InvitedOAuthProviderId { get; set; }
public Guid InviterId { get; set; }
public required string InviterUsername { get; set; }
public required string InviterOAuthProviderId { get; set; }
}

21
FictionArchive.Service.UserNovelDataService/Program.cs
View File

@@ -1,11 +1,9 @@
using FictionArchive.Common.Extensions;
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using FictionArchive.Service.UserNovelDataService.Consumers;
using FictionArchive.Service.UserNovelDataService.GraphQL;
using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
using FictionArchive.Service.UserNovelDataService.Services;
using FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
namespace FictionArchive.Service.UserNovelDataService;
@@ -22,17 +20,18 @@ public class Program
builder.Services.AddMemoryCache();
builder.Services.AddHealthChecks();
#region Event Bus
#region MassTransit
if (!isSchemaExport)
{
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
})
.Subscribe<NovelCreatedEvent, NovelCreatedEventHandler>()
.Subscribe<ChapterCreatedEvent, ChapterCreatedEventHandler>()
.Subscribe<UserInvitedEvent, UserInvitedEventHandler>();
builder.Services.AddFictionArchiveMassTransit(
builder.Configuration,
x =>
{
x.AddConsumer<NovelCreatedConsumer>();
x.AddConsumer<ChapterCreatedConsumer>();
x.AddConsumer<UserInvitedConsumer>();
});
}
#endregion

36
FictionArchive.Service.UserNovelDataService/Services/EventHandlers/NovelCreatedEventHandler.cs
View File

@@ -1,36 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.UserNovelDataService.Models.Database;
using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
public class NovelCreatedEventHandler : IIntegrationEventHandler<NovelCreatedEvent>
{
private readonly UserNovelDataServiceDbContext _dbContext;
private readonly ILogger<NovelCreatedEventHandler> _logger;
public NovelCreatedEventHandler(
UserNovelDataServiceDbContext dbContext,
ILogger<NovelCreatedEventHandler> logger)
{
_dbContext = dbContext;
_logger = logger;
}
public async Task Handle(NovelCreatedEvent @event)
{
var exists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
if (exists)
{
_logger.LogDebug("Novel {NovelId} already exists, skipping", @event.NovelId);
return;
}
var novel = new Novel { Id = @event.NovelId };
_dbContext.Novels.Add(novel);
await _dbContext.SaveChangesAsync();
_logger.LogInformation("Created novel stub for {NovelId}", @event.NovelId);
}
}

40
FictionArchive.Service.UserNovelDataService/Services/EventHandlers/UserInvitedEventHandler.cs
View File

@@ -1,40 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.UserNovelDataService.Models.Database;
using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
public class UserInvitedEventHandler : IIntegrationEventHandler<UserInvitedEvent>
{
private readonly UserNovelDataServiceDbContext _dbContext;
private readonly ILogger<UserInvitedEventHandler> _logger;
public UserInvitedEventHandler(
UserNovelDataServiceDbContext dbContext,
ILogger<UserInvitedEventHandler> logger)
{
_dbContext = dbContext;
_logger = logger;
}
public async Task Handle(UserInvitedEvent @event)
{
var exists = await _dbContext.Users.AnyAsync(u => u.Id == @event.InvitedUserId);
if (exists)
{
_logger.LogDebug("User {UserId} already exists, skipping", @event.InvitedUserId);
return;
}
var user = new User
{
Id = @event.InvitedUserId,
OAuthProviderId = @event.InvitedOAuthProviderId
};
_dbContext.Users.Add(user);
await _dbContext.SaveChangesAsync();
_logger.LogInformation("Created user stub for {UserId}", @event.InvitedUserId);
}
}

3
FictionArchive.Service.UserNovelDataService/appsettings.json
View File

@@ -2,7 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
}
},
"ConnectionStrings": {

6
FictionArchive.Service.UserService.Tests/UserManagementServiceTests.cs
View File

@@ -1,9 +1,9 @@
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.UserService.Models.Database;
using FictionArchive.Service.UserService.Services;
using FictionArchive.Service.UserService.Services.AuthenticationClient;
using FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
using FluentAssertions;
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging.Abstractions;
using NSubstitute;
@@ -27,13 +27,13 @@ public class UserManagementServiceTests
private static UserManagementService CreateService(
UserServiceDbContext dbContext,
IAuthenticationServiceClient authClient,
IEventBus? eventBus = null)
IPublishEndpoint? publishEndpoint = null)
{
return new UserManagementService(
dbContext,
NullLogger<UserManagementService>.Instance,
authClient,
eventBus ?? Substitute.For<IEventBus>());
publishEndpoint ?? Substitute.For<IPublishEndpoint>());
}
private static User CreateTestUser(string username, string email, int availableInvites = 5)

12
FictionArchive.Service.UserService/Contracts/UserInvited.cs Normal file
View File

@@ -0,0 +1,12 @@
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.UserService.Contracts;
public record UserInvited(
string InvitedUserId,
string InvitedUsername,
string InvitedEmail,
string InvitedOAuthProviderId,
string InviterId,
string InviterUsername,
string InviterOAuthProviderId) : IUserInvited;

17
FictionArchive.Service.UserService/Models/IntegrationEvents/UserInvitedEvent.cs
View File

@@ -1,17 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.UserService.Models.IntegrationEvents;
public class UserInvitedEvent : IIntegrationEvent
{
// Invited user info
public Guid InvitedUserId { get; set; }
public required string InvitedUsername { get; set; }
public required string InvitedEmail { get; set; }
public required string InvitedOAuthProviderId { get; set; }
// Inviter info
public Guid InviterId { get; set; }
public required string InviterUsername { get; set; }
public required string InviterOAuthProviderId { get; set; }
}

11
FictionArchive.Service.UserService/Program.cs
View File

@@ -2,7 +2,6 @@ using System.Net.Http.Headers;
using FictionArchive.Common.Extensions;
using FictionArchive.Service.Shared;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using FictionArchive.Service.UserService.GraphQL;
using FictionArchive.Service.UserService.Services;
using FictionArchive.Service.UserService.Services.AuthenticationClient;
@@ -19,15 +18,9 @@ public class Program
var builder = WebApplication.CreateBuilder(args);
builder.AddLocalAppsettings();
#region Event Bus
#region MassTransit
if (!isSchemaExport)
{
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
});
}
builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
#endregion

29
FictionArchive.Service.UserService/Services/UserManagementService.cs
View File

@@ -1,7 +1,8 @@
using FictionArchive.Service.Shared.Services.EventBus;
using FictionArchive.Service.Shared.Contracts.Events;
using FictionArchive.Service.UserService.Contracts;
using FictionArchive.Service.UserService.Models.Database;
using FictionArchive.Service.UserService.Models.IntegrationEvents;
using FictionArchive.Service.UserService.Services.AuthenticationClient;
using MassTransit;
using Microsoft.EntityFrameworkCore;
namespace FictionArchive.Service.UserService.Services;
@@ -11,18 +12,18 @@ public class UserManagementService
private readonly ILogger<UserManagementService> _logger;
private readonly UserServiceDbContext _dbContext;
private readonly IAuthenticationServiceClient _authClient;
private readonly IEventBus _eventBus;
private readonly IPublishEndpoint _publishEndpoint;
public UserManagementService(
UserServiceDbContext dbContext,
ILogger<UserManagementService> logger,
IAuthenticationServiceClient authClient,
IEventBus eventBus)
IPublishEndpoint publishEndpoint)
{
_dbContext = dbContext;
_logger = logger;
_authClient = authClient;
_eventBus = eventBus;
_publishEndpoint = publishEndpoint;
}
/// <summary>
@@ -99,16 +100,14 @@ public class UserManagementService
await _dbContext.SaveChangesAsync();
await _eventBus.Publish(new UserInvitedEvent
{
InvitedUserId = newUser.Id,
InvitedUsername = newUser.Username,
InvitedEmail = newUser.Email,
InvitedOAuthProviderId = newUser.OAuthProviderId,
InviterId = inviter.Id,
InviterUsername = inviter.Username,
InviterOAuthProviderId = inviter.OAuthProviderId
});
await _publishEndpoint.Publish<IUserInvited>(new UserInvited(
InvitedUserId: newUser.Id.ToString(),
InvitedUsername: newUser.Username,
InvitedEmail: newUser.Email,
InvitedOAuthProviderId: newUser.OAuthProviderId,
InviterId: inviter.Id.ToString(),
InviterUsername: inviter.Username,
InviterOAuthProviderId: inviter.OAuthProviderId));
_logger.LogInformation(
"User {Username} was successfully invited by {InviterId}. New user id: {NewUserId}",

3
FictionArchive.Service.UserService/appsettings.json
View File

@@ -2,7 +2,8 @@
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
}
},
"ConnectionStrings": {

12
fictionarchive-web-astro/src/lib/graphql/__generated__/graphql.ts generated
View File

@@ -80,7 +80,7 @@ export type ChapterDtoFilterInput = {
url?: InputMaybe<StringOperationFilterInput>;
};
export type ChapterPullRequestedEvent = {
export type ChapterPullRequested = {
chapterOrder: Scalars['UnsignedInt']['output'];
novelId: Scalars['UnsignedInt']['output'];
volumeId: Scalars['UnsignedInt']['output'];
@@ -168,7 +168,7 @@ export type FetchChapterContentsInput = {
};
export type FetchChapterContentsPayload = {
chapterPullRequestedEvent: Maybe<ChapterPullRequestedEvent>;
chapterPullRequested: Maybe<ChapterPullRequested>;
};
export type FormatError = Error & {
@@ -203,7 +203,7 @@ export type ImportNovelInput = {
};
export type ImportNovelPayload = {
novelUpdateRequestedEvent: Maybe<NovelUpdateRequestedEvent>;
novelUpdateRequested: Maybe<NovelUpdateRequested>;
};
export type InstantFilterInput = {
@@ -499,7 +499,7 @@ export type NovelTagDtoFilterInput = {
tagType?: InputMaybe<TagTypeOperationFilterInput>;
};
export type NovelUpdateRequestedEvent = {
export type NovelUpdateRequested = {
novelUrl: Scalars['String']['output'];
};
@@ -1010,7 +1010,7 @@ export type ImportNovelMutationVariables = Exact<{
}>;
export type ImportNovelMutation = { importNovel: { novelUpdateRequestedEvent: { novelUrl: string } | null } };
export type ImportNovelMutation = { importNovel: { novelUpdateRequested: { novelUrl: string } | null } };
export type InviteUserMutationVariables = Exact<{
input: InviteUserInput;
@@ -1114,7 +1114,7 @@ export const AddToReadingListDocument = {"kind":"Document","definitions":[{"kind
export const CreateReadingListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateReadingList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateReadingListInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createReadingList"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readingListPayload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"readingList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"itemCount"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CreateReadingListMutation, CreateReadingListMutationVariables>;
export const DeleteNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"boolean"}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<DeleteNovelMutation, DeleteNovelMutationVariables>;
export const DeleteReadingListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteReadingList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteReadingListInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteReadingList"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<DeleteReadingListMutation, DeleteReadingListMutationVariables>;
export const ImportNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ImportNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ImportNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"importNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUpdateRequestedEvent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUrl"}}]}}]}}]}}]} as unknown as DocumentNode<ImportNovelMutation, ImportNovelMutationVariables>;
export const ImportNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ImportNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ImportNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"importNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUpdateRequested"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUrl"}}]}}]}}]}}]} as unknown as DocumentNode<ImportNovelMutation, ImportNovelMutationVariables>;
export const InviteUserDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InviteUser"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InviteUserInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"inviteUser"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userDto"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InvalidOperationError"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<InviteUserMutation, InviteUserMutationVariables>;
export const RemoveBookmarkDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveBookmark"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoveBookmarkInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeBookmark"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"bookmarkPayload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<RemoveBookmarkMutation, RemoveBookmarkMutationVariables>;
export const RemoveFromReadingListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveFromReadingList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoveFromReadingListInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeFromReadingList"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readingListPayload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"readingList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"itemCount"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<RemoveFromReadingListMutation, RemoveFromReadingListMutationVariables>;

2
fictionarchive-web-astro/src/lib/graphql/mutations/importNovel.graphql
View File

@@ -1,6 +1,6 @@
mutation ImportNovel($input: ImportNovelInput!) {
importNovel(input: $input) {
novelUpdateRequestedEvent {
novelUpdateRequested {
novelUrl
}
}