Aspire defaults (#44)

* Clean program.cs in project with better service defaults

* Add masstransit trace and metrics

* Some more cleaning

Author: fdonnet

src/Ubik.Accounting.SalesOrVatTax.Api/Program.cs

@@ -1,9 +1,7 @@
 using MassTransit;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using System.Reflection;
-using System.Text.Json.Serialization;
 using Ubik.Accounting.SalesOrVatTax.Api.Data;
 using Ubik.Accounting.SalesOrVatTax.Api.Data.Init;
 using Ubik.Accounting.SalesOrVatTax.Api.Features.Accounts.Services;
@@ -19,7 +17,9 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
+// From Aspire.ServiceDefaults.Extensions
 builder.AddServiceDefaults();
+builder.AddServiceApiDefaults();
 
 //Options
 var authOptions = new AuthServerOptions();
@@ -29,19 +29,13 @@
 var swaggerUIOptions = new SwaggerUIOptions();
 builder.Configuration.GetSection(SwaggerUIOptions.Position).Bind(swaggerUIOptions);
 
-//Default httpclient - Aspire now
-//builder.Services.ConfigureHttpClientDefaults(http =>
-//{
-//    http.AddStandardResilienceHandler();
-//});
-
 builder.Services.AddDbContextFactory<AccountingSalesTaxDbContext>(
      options => options.UseNpgsql(builder.Configuration.GetConnectionString("AccountingSalesTaxDbContext")), ServiceLifetime.Scoped);
 builder.EnrichNpgsqlDbContext<AccountingSalesTaxDbContext>();
 
+//Dapper
 Dapper.DefaultTypeMap.MatchNamesWithUnderscores = true;
 
-//TODO: remove useless parts (only pub/sub)
 //MessageBroker with masstransit + outbox
 builder.Services.AddMassTransit(config =>
 {
@@ -76,21 +70,6 @@
 
 });
 
-//Api versioning
-builder.Services.AddApiVersionAndExplorer();
-
-//TODO: Cors
-builder.Services.AddCustomCors();
-
-//Tracing and metrics 
-//builder.Logging.AddOpenTelemetry(logging =>
-//{
-//    logging.IncludeFormattedMessage = true;
-//    logging.IncludeScopes = true;
-//});
-
-//builder.Services.AddTracingAndMetrics();
-
 //Swagger config
 var xmlPath = Path.Combine(AppContext.BaseDirectory,
     $"{Assembly.GetExecutingAssembly().GetName().Name}.xml");
@@ -107,27 +86,6 @@
 builder.Services.AddScoped<IApplicationCommandService, ApplicationCommandService>();
 builder.Services.AddTransient<ProblemDetailsFactory, CustomProblemDetailsFactory>();
 
-
-//Strandard API things
-builder.Services.AddControllers(o =>
-{
-    o.Filters.Add(new ProducesAttribute("application/json"));
-}).AddJsonOptions(options =>
-    options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()));
-
-builder.Services.AddHttpContextAccessor();
-
-//Route config
-builder.Services.Configure<RouteOptions>(options =>
-{
-    options.LowercaseUrls = true;
-});
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
 var app = builder.Build();
 
 app.MapDefaultEndpoints();
@@ -163,10 +121,6 @@
     subApp => subApp.UseMiddleware<UserInHeaderMiddleware>()
 );
 
-//app.UseHttpsRedirection();
-
-//app.UseAuthorization();
-
 app.MapControllers();
 
 app.Run();

src/Ubik.Accounting.SalesOrVatTax.Api/Ubik.Accounting.SalesOrVatTax.Api.csproj

@@ -14,8 +14,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
-    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.2.2" />
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />

src/Ubik.Accounting.Structure.Api/Program.cs

@@ -27,10 +27,7 @@ public static async Task Main(string[] args)
         {
             var builder = WebApplication.CreateBuilder(args);
             builder.AddServiceDefaults();
-
-            //Log
-            //TODO: Begin to log usefull things
-            //builder.Host.UseSerilog((context, configuration) => configuration.ReadFrom.Configuration(context.Configuration));
+            builder.AddServiceApiDefaults();
 
             //Options
             var authOptions = new AuthServerOptions();
@@ -40,22 +37,12 @@ public static async Task Main(string[] args)
             var swaggerUIOptions = new SwaggerUIOptions();
             builder.Configuration.GetSection(SwaggerUIOptions.Position).Bind(swaggerUIOptions);
 
-            //Auth server and JWT (no need, no auth)
-            //builder.Services.AddAuthServerAndJwt(authOptions);
-
-            ////Default httpclient - Aspire now 
-            //builder.Services.ConfigureHttpClientDefaults(http =>
-            //{
-            //    http.AddStandardResilienceHandler();
-            //});
-
             //DB
             builder.Services.AddDbContextFactory<AccountingDbContext>(
                  options => options.UseNpgsql(builder.Configuration.GetConnectionString("AccountingContext")), ServiceLifetime.Scoped);
 
             Dapper.DefaultTypeMap.MatchNamesWithUnderscores = true;
 
-            //TODO: remove useless parts (only pub/sub)
             //MessageBroker with masstransit + outbox
             builder.Services.AddMassTransit(config =>
             {
@@ -90,28 +77,9 @@ public static async Task Main(string[] args)
                 });
 
                 //Add all consumers
-                //config.AddConsumers(Assembly.GetExecutingAssembly());
-
-                //Add commands clients
-
+                config.AddConsumers(Assembly.GetExecutingAssembly());
             });
 
-
-            //Api versioning
-            builder.Services.AddApiVersionAndExplorer();
-
-            //TODO: Cors
-            builder.Services.AddCustomCors();
-
-            ////Tracing and metrics - Aspire now
-            //builder.Logging.AddOpenTelemetry(logging =>
-            //{
-            //    logging.IncludeFormattedMessage = true;
-            //    logging.IncludeScopes = true;
-            //});
-
-            //builder.Services.AddTracingAndMetrics();
-
             //Swagger config
             var xmlPath = Path.Combine(AppContext.BaseDirectory,
                 $"{Assembly.GetExecutingAssembly().GetName().Name}.xml");
@@ -131,22 +99,6 @@ public static async Task Main(string[] args)
             builder.Services.AddScoped<ICurrentUser, CurrentUser>();
             builder.Services.AddTransient<ProblemDetailsFactory, CustomProblemDetailsFactory>();
 
-            //Strandard API things
-            builder.Services.AddControllers(o =>
-            {
-                o.Filters.Add(new ProducesAttribute("application/json"));
-            }).AddJsonOptions(options =>
-                options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()));
-
-            builder.Services.AddHttpContextAccessor();
-            builder.Services.AddEndpointsApiExplorer();
-
-            //Route config
-            builder.Services.Configure<RouteOptions>(options =>
-            {
-                options.LowercaseUrls = true;
-            });
-
             //Build the app
             var app = builder.Build();
 
@@ -186,10 +138,6 @@ public static async Task Main(string[] args)
                 subApp => subApp.UseMiddleware<UserInHeaderMiddleware>()
             );
 
-            //app.UseHttpsRedirection();
-            //app.UseAuthentication();
-            //app.UseAuthorization();
-
             app.MapControllers();
             app.Run();
         }

src/Ubik.Accounting.Structure.Api/Ubik.Accounting.Structure.Api.csproj

@@ -21,8 +21,6 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
-    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
     <PackageReference Include="LanguageExt.Core" Version="4.4.9" />
@@ -38,7 +36,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
   </ItemGroup>
 

src/Ubik.Accounting.Structure.Api/appsettings.json

@@ -26,34 +26,5 @@
     "ClientId": "ubik_app",
     "ClientSecret": "Ye6Y36ocA4SaGqYzd0HgmqMhVaM2jlkE"
   },
-  "AllowedHosts": "*",
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.File", "Serilog.Sinks.Console" ],
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Microsoft": "Warning",
-        "System": "Warning",
-        "Microsoft.Hosting.Lifetime": "Warning",
-        "Serilog.AspNetCore.RequestLoggingMiddleware": "Warning",
-        "Microsoft.EntityFrameworkCore.Database": "Information",
-        "Microsoft.EntityFrameworkCore.Migrations": "Warning"
-      }
-    },
-    "WriteTo": [
-      {
-        "Name": "Console"
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "/logs/log-.txt",
-          "rollOnFileSizeLimit": true,
-          "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter,Serilog.Formatting.Compact",
-          "rollingInterval": "Day"
-        }
-      }
-    ],
-    "Enrich": [ "FromLogContext", "WithThreadId", "WithMachineName" ]
-  }
+  "AllowedHosts": "*"
 }

src/Ubik.Accounting.Transaction.Api/Program.cs

@@ -20,6 +20,7 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.AddServiceDefaults();
+builder.AddServiceApiDefaults();
 
 //Options
 var authOptions = new AuthServerOptions();
@@ -29,12 +30,6 @@
 var swaggerUIOptions = new SwaggerUIOptions();
 builder.Configuration.GetSection(SwaggerUIOptions.Position).Bind(swaggerUIOptions);
 
-//Default httpclient - Aspire now
-//builder.Services.ConfigureHttpClientDefaults(http =>
-//{
-//    http.AddStandardResilienceHandler();
-//});
-
 builder.Services.AddDbContextFactory<AccountingTxContext>(
      options => options.UseNpgsql(builder.Configuration.GetConnectionString("AccountingTxContext")), ServiceLifetime.Scoped);
 
@@ -78,19 +73,6 @@
 
 });
 
-//Api versioning
-builder.Services.AddApiVersionAndExplorer();
-
-//TODO: Cors
-builder.Services.AddCustomCors();
-
-//Tracing and metrics - Aspire now
-//builder.Logging.AddOpenTelemetry(logging =>
-//{
-//    logging.IncludeFormattedMessage = true;
-//    logging.IncludeScopes = true;
-//});
-
 //Services
 builder.Services.AddScoped<ICurrentUser, CurrentUser>();
 builder.Services.AddScoped<IAccountCommandService, AccountCommandService>();
@@ -99,26 +81,6 @@
 builder.Services.AddScoped<IApplicationCommandService, ApplicationCommandService>();
 builder.Services.AddTransient<ProblemDetailsFactory, CustomProblemDetailsFactory>();
 
-//builder.Services.AddTracingAndMetrics();
-
-builder.Services.AddControllers(o =>
-{
-    o.Filters.Add(new ProducesAttribute("application/json"));
-}).AddJsonOptions(options =>
-    options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()));
-
-builder.Services.AddHttpContextAccessor();
-builder.Services.AddEndpointsApiExplorer();
-
-//Route config
-builder.Services.Configure<RouteOptions>(options =>
-{
-    options.LowercaseUrls = true;
-});
-
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-
 //Swagger config
 var xmlPath = Path.Combine(AppContext.BaseDirectory,
     $"{Assembly.GetExecutingAssembly().GetName().Name}.xml");
@@ -162,8 +124,6 @@
 
 app.UseHttpsRedirection();
 
-//app.UseAuthorization();
-
 app.MapControllers();
 
 app.Run();

src/Ubik.Accounting.WebApp/Program.cs

@@ -144,16 +144,19 @@
     });
 
 builder.Services.AddAuthorization();
+
+//Services
 builder.Services.AddSingleton<IRenderContext, ServerRenderContext>();
 builder.Services.AddScoped<BreakpointsService>();
 builder.Services.AddScoped<AuthenticationStateProvider, PersistingRevalidatingAuthenticationStateProvider>();
+builder.Services.AddScoped<ClassificationStateService>();
 
 //User service with circuit
 builder.Services.AddScoped<UserService>();
-//TODO:check I think this thing is never used
 builder.Services.TryAddEnumerable(
     ServiceDescriptor.Scoped<CircuitHandler, UserCircuitHandler>());
 
+//Typed clients
 builder.Services.AddHttpClient<IAccountingApiClient, AccountingApiClient>();
 
 builder.Services.Configure<ApiOptions>(
@@ -181,8 +184,6 @@
     return httpClientHandler;
 });
 
-builder.Services.AddScoped<ClassificationStateService>();
-
 builder.Services.Configure<ForwardedHeadersOptions>(options =>
 {
     options.ForwardedHeaders =