feat(data): rename *.Services projects, lift TrackEntity onto BlazorBlocks data layer, regenerate initial Postgres migration
DeepDrftWeb.Services → DeepDrftData; DeepDrftContent.Services → DeepDrftContent.Data. TrackEntity:BaseEntity, TrackRepository:Repository<>, TrackManager:Manager<>+ITrackService. Drops DeepDrftModels PagingParameters/PagedResult in favour of Models.Common.* from BlazorBlocks. InitialCreate migration captures full schema including is_deleted index.
This commit is contained in:
@@ -23,8 +23,8 @@
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DeepDrftModels\DeepDrftModels.csproj" />
|
||||
<ProjectReference Include="..\DeepDrftWeb.Services\DeepDrftWeb.Services.csproj" />
|
||||
<ProjectReference Include="..\DeepDrftContent.Services\DeepDrftContent.Services.csproj" />
|
||||
<ProjectReference Include="..\DeepDrftData\DeepDrftData.csproj" />
|
||||
<ProjectReference Include="..\DeepDrftContent.Data\DeepDrftContent.Data.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
+11
-8
@@ -3,10 +3,11 @@ using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using DeepDrftWeb.Services.Data;
|
||||
using DeepDrftWeb.Services.Repositories;
|
||||
using DeepDrftContent.Services.FileDatabase.Services;
|
||||
using DeepDrftContent.Services.Processors;
|
||||
using DeepDrftData;
|
||||
using DeepDrftData.Data;
|
||||
using DeepDrftData.Repositories;
|
||||
using DeepDrftContent.Data.FileDatabase.Services;
|
||||
using DeepDrftContent.Data.Processors;
|
||||
using DeepDrftCli.Services;
|
||||
using DeepDrftCli.Models;
|
||||
using NetBlocks.Utilities.Environment;
|
||||
@@ -49,11 +50,13 @@ builder.Services.AddSingleton<FileDatabase>(provider =>
|
||||
}
|
||||
});
|
||||
|
||||
// Add services
|
||||
// Add services. TrackManager fronts the BlazorBlocks data layer and implements
|
||||
// ITrackService for legacy consumers; same scoped instance backs both registrations.
|
||||
builder.Services.AddScoped<TrackRepository>();
|
||||
builder.Services.AddScoped<DeepDrftWeb.Services.ITrackService, DeepDrftWeb.Services.TrackService>();
|
||||
builder.Services.AddScoped<TrackManager>();
|
||||
builder.Services.AddScoped<ITrackService>(sp => sp.GetRequiredService<TrackManager>());
|
||||
builder.Services.AddScoped<AudioProcessor>();
|
||||
builder.Services.AddScoped<DeepDrftContent.Services.TrackService>();
|
||||
builder.Services.AddScoped<DeepDrftContent.Data.TrackService>();
|
||||
builder.Services.AddScoped<CliService>();
|
||||
builder.Services.AddScoped<GuiService>();
|
||||
|
||||
@@ -72,4 +75,4 @@ else
|
||||
// Run traditional CLI mode
|
||||
var cliService = app.Services.GetRequiredService<CliService>();
|
||||
await cliService.RunAsync(args);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using DeepDrftContent.Services;
|
||||
using DeepDrftContent.Data;
|
||||
using DeepDrftModels.Entities;
|
||||
using NetBlocks.Models;
|
||||
using DeepDrftCli.Utils;
|
||||
@@ -13,13 +13,13 @@ namespace DeepDrftCli.Services;
|
||||
public class CliService
|
||||
{
|
||||
private readonly ILogger<CliService> _logger;
|
||||
private readonly DeepDrftWeb.Services.ITrackService _webTrackService;
|
||||
private readonly DeepDrftContent.Services.TrackService _contentTrackService;
|
||||
private readonly DeepDrftData.ITrackService _webTrackService;
|
||||
private readonly DeepDrftContent.Data.TrackService _contentTrackService;
|
||||
|
||||
public CliService(
|
||||
ILogger<CliService> logger,
|
||||
DeepDrftWeb.Services.ITrackService webTrackService,
|
||||
DeepDrftContent.Services.TrackService contentTrackService)
|
||||
DeepDrftData.ITrackService webTrackService,
|
||||
DeepDrftContent.Data.TrackService contentTrackService)
|
||||
{
|
||||
_logger = logger;
|
||||
_webTrackService = webTrackService;
|
||||
|
||||
@@ -11,8 +11,8 @@ namespace DeepDrftCli.Services;
|
||||
public class GuiService
|
||||
{
|
||||
private readonly ILogger<GuiService> _logger;
|
||||
private readonly DeepDrftWeb.Services.ITrackService _webTrackService;
|
||||
private readonly DeepDrftContent.Services.TrackService _contentTrackService;
|
||||
private readonly DeepDrftData.ITrackService _webTrackService;
|
||||
private readonly DeepDrftContent.Data.TrackService _contentTrackService;
|
||||
|
||||
// GUI Components
|
||||
private Window? _mainWindow;
|
||||
@@ -24,8 +24,8 @@ public class GuiService
|
||||
|
||||
public GuiService(
|
||||
ILogger<GuiService> logger,
|
||||
DeepDrftWeb.Services.ITrackService webTrackService,
|
||||
DeepDrftContent.Services.TrackService contentTrackService)
|
||||
DeepDrftData.ITrackService webTrackService,
|
||||
DeepDrftContent.Data.TrackService contentTrackService)
|
||||
{
|
||||
_logger = logger;
|
||||
_webTrackService = webTrackService;
|
||||
|
||||
Reference in New Issue
Block a user