Skip to content

Features/reimplementing the apis as modules #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaybarden1 merged 2 commits into from
Jan 4, 2026
Merged

Features/reimplementing the apis as modules #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e0ed5f
Resolve some of the build issues
jaybarden1 Jan 4, 2026
c748dc9
Adopt discard assignment, add Minimal.Api.Extensions pkg
jaybarden1 Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 153 additions & 9 deletions AStar.Dev.Web.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,176 @@
</Folder>
<Folder Name="/src/modules/" />
<Folder Name="/src/modules/apis/">
<Project Path="src/modules/apis/AStar.Dev.Admin.Api/AStar.Dev.Admin.Api.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/modules/apis/AStar.Dev.Files.Api/AStar.Dev.Files.Api.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/modules/apis/AStar.Dev.Files.Classifications.Api/AStar.Dev.Files.Classifications.Api.csproj" />
<Project Path="src/modules/apis/AStar.Dev.Images.Api/AStar.Dev.Images.Api.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/modules/apis/AStar.Dev.ToDo.Api/AStar.Dev.ToDo.Api.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/modules/apis/AStar.Web.ApiService/AStar.Web.ApiService.csproj" />
</Folder>
<Folder Name="/src/nuget-packages/">
<Project Path="src/nuget-packages/AStar.Dev.Admin.Api.Client.Sdk/AStar.Dev.Admin.Api.Client.Sdk.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Api.Client.Sdk.Shared/AStar.Dev.Api.Client.Sdk.Shared.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Api.HealthChecks/AStar.Dev.Api.HealthChecks.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Api.Usage.Sdk/AStar.Dev.Api.Usage.Sdk.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.AspNet.Extensions/AStar.Dev.AspNet.Extensions.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Auth.Extensions/AStar.Dev.Auth.Extensions.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Files.Api.Client.SDK/AStar.Dev.Files.Api.Client.SDK.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Fluent.Assignments/AStar.Dev.Fluent.Assignments.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Functional.Extensions/AStar.Dev.Functional.Extensions.csproj" />
<Project Path="src/nuget-packages/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Images.Api.Client.SDK/AStar.Dev.Images.Api.Client.SDK.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Infrastructure.AdminDb/AStar.Dev.Infrastructure.AdminDb.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Infrastructure.UsageDb/AStar.Dev.Infrastructure.UsageDb.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Logging.Extensions/AStar.Dev.Logging.Extensions.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Minimal.Api.Extensions/AStar.Dev.Minimal.Api.Extensions.csproj" />
<Project Path="src/nuget-packages/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Test.Helpers.EndToEnd/AStar.Dev.Test.Helpers.EndToEnd.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Test.Helpers.Integration/AStar.Dev.Test.Helpers.Integration.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Test.Helpers.Unit/AStar.Dev.Test.Helpers.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Test.Helpers/AStar.Dev.Test.Helpers.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Usage.Api.Client.SDK/AStar.Dev.Usage.Api.Client.SDK.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="src/nuget-packages/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj" />
</Folder>
<Folder Name="/src/source-generators/">
<Project Path="src/source-generators/AStar.Dev.Source.Generators.Attributes/AStar.Dev.Source.Generators.Attributes.csproj" />
<Project Path="src/source-generators/AStar.Dev.Source.Generators/AStar.Dev.Source.Generators.csproj" />
</Folder>
<Folder Name="/src/uis/">
<Project Path="src\uis\AStar.Dev.Web\AStar.Dev.Web.csproj" />
</Folder>
<Folder Name="/test/" />
<Folder Name="/test/aspire/" />
<Folder Name="/test/modules/" />
<Folder Name="/test/modules/apis/" />
<Folder Name="/test/modules/apis/">
<Project Path="test/modules/apis/AStar.Dev.Admin.Api.Tests.EndToEnd/AStar.Dev.Admin.Api.Tests.EndToEnd.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Admin.Api.Tests.Integration/AStar.Dev.Admin.Api.Tests.Integration.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Admin.Api.Tests.Unit/AStar.Dev.Admin.Api.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Files.Api.Tests.EndToEnd/AStar.Dev.Files.Api.Tests.EndToEnd.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Files.Api.Tests.Integration/AStar.Dev.Files.Api.Tests.Integration.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Files.Api.Tests.Unit/AStar.Dev.Files.Api.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Images.Api.Tests.EndToEnd/AStar.Dev.Images.Api.Tests.EndToEnd.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Images.Api.Tests.Integration/AStar.Dev.Images.Api.Tests.Integration.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/modules/apis/AStar.Dev.Images.Api.Tests.Unit/AStar.Dev.Images.Api.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
</Folder>
<Folder Name="/test/nuget-packages/">
<Project Path="test/nuget-packages/AStar.Dev.Admin.Api.Client.Sdk.Tests.Unit/AStar.Dev.Admin.Api.Client.Sdk.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Api.HealthChecks.Tests.Unit/AStar.Dev.Api.HealthChecks.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.AspNet.Extensions.Tests.Unit/AStar.Dev.AspNet.Extensions.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Files.Api.Client.Sdk.Tests.Unit/AStar.Dev.Files.Api.Client.Sdk.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Fluent.Assignments.Tests.Unit/AStar.Dev.Fluent.Assignments.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Functional.Extensions.Tests.Unit/AStar.Dev.Functional.Extensions.Tests.Unit.csproj" />
<Project Path="test/nuget-packages/AStar.Dev.Guard.Clauses.Tests.Unit/AStar.Dev.Guard.Clauses.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Images.Api.Client.Sdk.Tests.Unit/AStar.Dev.Images.Api.Client.Sdk.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Infrastructure.AdminDb.Tests.Unit/AStar.Dev.Infrastructure.AdminDb.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Logging.Extensions.Tests.Unit/AStar.Dev.Logging.Extensions.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Test.Helpers.EndToEnd.Tests.Unit/AStar.Dev.Test.Helpers.EndToEnd.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Test.Helpers.Integration.Tests.Unit/AStar.Dev.Test.Helpers.Integration.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Test.Helpers.Tests.Unit.Unit/AStar.Dev.Test.Helpers.Tests.Unit.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Test.Helpers.Tests.Unit/AStar.Dev.Test.Helpers.Tests.Unit.csproj">
<Build Solution="Debug|*" Project="false" />
</Project>
<Project Path="test/nuget-packages/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj" />
</Folder>
<Folder Name="/test/source-generators/">
<Project Path="test/source-generators/AStar.Dev.Source.Generators.Attributes.Tests.Unit/AStar.Dev.Source.Generators.Attributes.Tests.Unit.csproj" />
<Project Path="test/source-generators/AStar.Dev.Source.Generators.Tests.Unit/AStar.Dev.Source.Generators.Tests.Unit.csproj" />
</Folder>
<Folder Name="/test/uis/">
<Project Path="test/uis/AStar.Dev.Web.Tests.Unit/AStar.Dev.Web.Tests.Unit.csproj" />
<Project Path="test\uis\AStar.Dev.Web.Tests.Integration\AStar.Dev.Web.Tests.Integration.csproj" />
Expand Down
6 changes: 6 additions & 0 deletions src/aspire/AStar.Dev.Web.Aspire.Common/AspireConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ public static class Apis
public const string UsageApi = "usage-api";
}

public static class Common
{
public const string AstarMessaging = "astar-messaging";
}

public static class Sql
{
public const string SqlServer = "sql1";
Expand All @@ -21,6 +26,7 @@ public static class Sql
public const string SqlAdminUserPasswordParameter = "admin-user-password";
public const string SqlUsageUserPasswordParameter = "usage-user-password";
public const string AStarDb = "astar-db";
public const string FilesDb = "astar-db";
}

public static class Services
Expand Down
39 changes: 21 additions & 18 deletions src/modules/apis/AStar.Dev.Admin.Api/AStar.Dev.Admin.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,30 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0"/>
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0"/>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.10"/>
<PackageReference Include="Microsoft.Identity.Web" Version="4.0.1"/>
<PackageReference Include="Aspire.RabbitMQ.Client.v7" Version="9.5.2"/>
<PackageReference Include="Serilog" Version="4.3.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6"/>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.6"/>
<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.10" />
<PackageReference Include="Microsoft.Identity.Web" Version="4.0.1" />
<PackageReference Include="Aspire.RabbitMQ.Client.v7" Version="9.5.2" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.6" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\aspire\AStar.Dev.Aspire.Common\AStar.Dev.Aspire.Common.csproj"/>
<ProjectReference Include="..\..\aspire\AStar.Dev.ServiceDefaults\AStar.Dev.ServiceDefaults.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.Api.Usage.Sdk\AStar.Dev.Api.Usage.Sdk.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.AspNet.Extensions\AStar.Dev.AspNet.Extensions.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.Auth.Extensions\AStar.Dev.Auth.Extensions.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.Infrastructure.AdminDb\AStar.Dev.Infrastructure.AdminDb.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.Logging.Extensions\AStar.Dev.Logging.Extensions.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.Minimal.Api.Extensions\AStar.Dev.Minimal.Api.Extensions.csproj"/>
<ProjectReference Include="..\..\nuget-packages\AStar.Dev.Utilities\AStar.Dev.Utilities.csproj"/>
<ProjectReference Include="..\..\..\aspire\AStar.Dev.Web.Aspire.Common\AStar.Dev.Web.Aspire.Common.csproj" />
<ProjectReference Include="..\..\..\aspire\AStar.Dev.Web.ServiceDefaults\AStar.Dev.Web.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Api.Usage.Sdk\AStar.Dev.Api.Usage.Sdk.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Api.HealthChecks\AStar.Dev.Api.HealthChecks.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.AspNet.Extensions\AStar.Dev.AspNet.Extensions.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Auth.Extensions\AStar.Dev.Auth.Extensions.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Infrastructure\AStar.Dev.Infrastructure.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Infrastructure.AdminDb\AStar.Dev.Infrastructure.AdminDb.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Logging.Extensions\AStar.Dev.Logging.Extensions.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Minimal.Api.Extensions\AStar.Dev.Minimal.Api.Extensions.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Technical.Debt.Reporting\AStar.Dev.Technical.Debt.Reporting.csproj" />
<ProjectReference Include="..\..\..\nuget-packages\AStar.Dev.Utilities\AStar.Dev.Utilities.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
22 changes: 11 additions & 11 deletions src/modules/apis/AStar.Dev.Admin.Api/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using AStar.Dev.Admin.Api;
using AStar.Dev.Api.Usage.Sdk;
using AStar.Dev.Api.Usage.Sdk.Metrics;
using AStar.Dev.Aspire.Common;
using AStar.Dev.AspNet.Extensions.PipelineExtensions;
using AStar.Dev.AspNet.Extensions.RootEndpoint;
using AStar.Dev.AspNet.Extensions.ServiceCollectionExtensions;
Expand All @@ -12,7 +11,8 @@
using AStar.Dev.Infrastructure.AdminDb;
using AStar.Dev.Infrastructure.Data;
using AStar.Dev.Logging.Extensions;
using AStar.Dev.ServiceDefaults;
using AStar.Dev.Web.Aspire.Common;
using AStar.Dev.Web.ServiceDefaults;
using Microsoft.AspNetCore.Http.Json;
using Serilog;

Expand All @@ -21,7 +21,7 @@
try
{
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
builder.AddServiceDefaults();
_ = builder.AddServiceDefaults();

_ = builder
.DisableServerHeader()
Expand All @@ -36,7 +36,7 @@
_ = services.AddScoped(_ => new AdminContext(new ConnectionString { Value = connectionString, }, new AStarDbContextOptions()));
_ = services.AddScoped<JwtEvents>();

services.AddUsageServices(builder.Configuration, typeof(IAssemblyMarker).Assembly);
_ = services.AddUsageServices(builder.Configuration, typeof(IAssemblyMarker).Assembly);

// #pragma warning disable ASP0000
// var buildServiceProvider = services.BuildServiceProvider();
Expand Down Expand Up @@ -71,34 +71,34 @@

JwtSecurityTokenHandler.DefaultMapInboundClaims = false;

services.Configure<JsonOptions>(options =>
_ = services.Configure<JsonOptions>(options =>
{
options.SerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
options.SerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
options.SerializerOptions.PropertyNameCaseInsensitive = true;
});

// services.AddAuthorization();
builder.AddRabbitMQClient(AspireConstants.Common.AstarMessaging);
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
_ = services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();

WebApplication app = builder.Build()
.UseApiServices();

//app.MapDefaultEndpoints();
//app.MapDefaultEndpoints();
app.ConfigureRootPage(applicationName.Replace(".", " "))
.UseMetrics();

app.MapDefaultEndpoints();
_ = app.MapDefaultEndpoints();

app.AddApplicationEndpoints();

app.Run();
await app.RunAsync();
}
catch(Exception ex)
{
Log.Fatal(ex, "Fatal error occurred in {AppName}", applicationName);
}
finally
{
Log.CloseAndFlush();
await Log.CloseAndFlushAsync();
}
Loading
Loading