refactor: Update namespaces in IdentityService.cs and IEndpoint.cs

Author: foxminchan

Directory.Packages.props

@@ -10,7 +10,7 @@
     <XabarilVersion>8.0.1</XabarilVersion>
     <ApiVersioningVersion>8.1.0</ApiVersioningVersion>
     <PollyVersion>8.4.1</PollyVersion>
-    <AspireUnstablePackagesVersion>8.0.2-preview.1.24326.4</AspireUnstablePackagesVersion>
+    <AspireUnstablePackagesVersion>8.2.0-preview.1.24428.5</AspireUnstablePackagesVersion>
     <GrpcVersion>2.65.0</GrpcVersion>
     <MassTransitVersion>8.2.5</MassTransitVersion>
   </PropertyGroup>
@@ -28,7 +28,7 @@
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(AspireUnstablePackagesVersion)" />
     <PackageVersion Include="Aspire.StackExchange.Redis" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="$(AspireVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
     <!-- Aspirant -->
     <PackageVersion Include="Aspirant.Hosting" Version="$(AspirantVersion)" />
@@ -54,13 +54,13 @@
     <PackageVersion Include="EntityFrameworkCore.Exceptions.Common" Version="8.1.3" />
     <PackageVersion Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
     <!-- Semantic Kernel -->
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.17.2" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.19.0" />
     <!-- Polly -->
     <PackageVersion Include="Polly" Version="$(PollyVersion)" />
     <PackageVersion Include="Polly.Extensions" Version="$(PollyVersion)" />
     <!-- Ardalis -->
     <PackageVersion Include="Ardalis.GuardClauses" Version="4.6.0" />
-    <PackageVersion Include="Ardalis.Result.AspNetCore" Version="9.1.0" />
+    <PackageVersion Include="Ardalis.Result.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Ardalis.Specification" Version="8.0.0" />
     <PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
     <!-- OpenTelemetry -->
@@ -80,11 +80,11 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="FluentAssertions" Version="7.0.0-alpha.4" />
-    <PackageVersion Include="ReportGenerator" Version="5.3.8" />
-    <PackageVersion Include="WireMock.Net.Aspire" Version="1.6.1" />
+    <PackageVersion Include="ReportGenerator" Version="5.3.9" />
+    <PackageVersion Include="WireMock.Net.Aspire" Version="1.6.3" />
     <!-- Grpc -->
     <PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcVersion)" />
     <PackageVersion Include="Grpc.AspNetCore.Server.ClientFactory" Version="$(GrpcVersion)" />
@@ -96,8 +96,9 @@
     <PackageVersion Include="MassTransit.EntityFrameworkCore" Version="$(MassTransitVersion)" />
     <!-- Miscellaneous -->
     <PackageVersion Include="Scrutor" Version="4.2.2" />
-    <PackageVersion Include="MediatR" Version="12.4.0" />
-    <PackageVersion Include="Marten.AspNetCore" Version="7.26.4" />
+    <PackageVersion Include="MediatR" Version="12.4.1" />
+    <PackageVersion Include="MongoDB.Bson" Version="2.28.0" />
+    <PackageVersion Include="Marten.AspNetCore" Version="7.27.0" />
     <PackageVersion Include="FluentEmail.Mailtrap" Version="2.7.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.3" />
     <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />

src/BookWorm.Basket/Features/Get/GetBasketEndpoint.cs

@@ -6,7 +6,6 @@ public void MapEndpoint(IEndpointRouteBuilder app)
     {
         app.MapGet("/baskets", async (ISender sender) => await HandleAsync(sender))
             .Produces<Ok<BasketDto>>()
-            .ProducesProblem(StatusCodes.Status404NotFound)
             .WithTags(nameof(Basket))
             .WithName("Get Basket")
             .MapToApiVersion(new(1, 0))

src/BookWorm.Basket/Features/Get/GetBasketQuery.cs

@@ -17,7 +17,10 @@ public async Task<Result<BasketDto>> Handle(GetBasketQuery query, CancellationTo
 
         var basket = await redisService.HashGetAsync<BasketModel?>(nameof(Basket), customerId);
 
-        Guard.Against.NotFound(customerId, basket);
+        if (basket is null)
+        {
+            return Result.NotFound();
+        }
 
         var basketDto = new BasketDto(basket.AccountId, [], 0.0m);
 

src/BookWorm.Catalog/Features/Books/Get/GetBookEndpoint.cs

@@ -9,7 +9,6 @@ public void MapEndpoint(IEndpointRouteBuilder app)
         app.MapGet("/books/{id:guid}",
                 async (Guid id, ISender sender) => await HandleAsync(id, sender))
             .Produces<Ok<BookDto>>()
-            .ProducesProblem(StatusCodes.Status404NotFound)
             .CacheOutput(policy => policy.Expire(TimeSpan.FromMinutes(20)).SetVaryByRouteValue("id"))
             .WithTags(nameof(Book))
             .WithName("Get Book")

src/BookWorm.Catalog/Features/Books/Get/GetBookQuery.cs

@@ -11,7 +11,10 @@ public async Task<Result<Book>> Handle(GetBookQuery request, CancellationToken c
     {
         var book = await repository.FirstOrDefaultAsync(new BookFilterSpec(request.Id), cancellationToken);
 
-        Guard.Against.NotFound(request.Id, book);
+        if (book is null)
+        {
+            return Result.NotFound();
+        }
 
         return book;
     }

src/BookWorm.Catalog/Features/Books/List/ListBooksQuery.cs

@@ -39,7 +39,7 @@ public async Task<PagedResult<IEnumerable<Book>>> Handle(ListBooksQuery request,
 
         var books = await repository.ListAsync(spec, cancellationToken);
 
-        var totalRecords = await repository.CountAsync(spec, cancellationToken);
+        var totalRecords = await repository.CountAsync(cancellationToken);
 
         var totalPages = (int)Math.Ceiling(totalRecords / (double)request.PageSize);
 

src/BookWorm.Ordering/Features/Buyers/Get/GetBuyerEndpoint.cs

@@ -8,7 +8,6 @@ public void MapEndpoint(IEndpointRouteBuilder app)
     {
         app.MapGet("/buyers/{id:guid}", async (Guid id, ISender sender) => await HandleAsync(id, sender))
             .Produces<Ok<BuyerDto>>()
-            .ProducesProblem(StatusCodes.Status404NotFound)
             .WithTags(nameof(Buyer))
             .WithName("Get Buyer")
             .MapToApiVersion(new(1, 0))

src/BookWorm.Ordering/Features/Buyers/Get/GetBuyerQuery.cs

@@ -14,15 +14,22 @@ public async Task<Result<Buyer>> Handle(GetBuyerQuery request, CancellationToken
         {
             buyer = await repository.GetByIdAsync(request.BuyerId, cancellationToken);
 
-            Guard.Against.NotFound(request.BuyerId, buyer);
+            if (buyer is null)
+            {
+                return Result.NotFound();
+            }
         }
         else
         {
             var customerId = identityService.GetUserIdentity();
             Guard.Against.NullOrEmpty(customerId);
 
             buyer = await repository.GetByIdAsync(Guid.Parse(customerId), cancellationToken);
-            Guard.Against.NotFound(Guid.Parse(customerId), buyer);
+
+            if (buyer is null)
+            {
+                return Result.NotFound();
+            }
         }
 
         return buyer;

src/BookWorm.Ordering/Features/Orders/Get/GetOrderQuery.cs

@@ -27,7 +27,10 @@ public async Task<Result<OrderDetailDto>> Handle(GetOrderQuery request, Cancella
 
         var order = await repository.FirstOrDefaultAsync(spec, cancellationToken);
 
-        Guard.Against.NotFound(customerId, order);
+        if (order is null)
+        {
+            return Result.NotFound();
+        }
 
         List<OrderItemDto> orderItems = [];
         foreach (var item in order.OrderItems)

src/BookWorm.ServiceDefaults/AuthenticationExtension.cs

@@ -1,7 +1,4 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.JsonWebTokens;
 
 namespace BookWorm.ServiceDefaults;

src/BookWorm.ServiceDefaults/AuthorizeCheckOperationFilter.cs

@@ -1,9 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-
-namespace BookWorm.ServiceDefaults;
+namespace BookWorm.ServiceDefaults;
 
 public sealed class AuthorizeCheckOperationFilter(string[] scopes) : IOperationFilter
 {

src/BookWorm.ServiceDefaults/BookWorm.ServiceDefaults.csproj

@@ -22,6 +22,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="MicroElements.Swashbuckle.FluentValidation" />
+    <PackageReference Include="MongoDB.Bson" />
   </ItemGroup>
 
   <ItemGroup>

src/BookWorm.ServiceDefaults/ConfigureSwaggerGenOptions.cs

@@ -1,12 +1,4 @@
-using System.Text;
-using Asp.Versioning.ApiExplorer;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Primitives;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
+using MongoDB.Bson;
 
 namespace BookWorm.ServiceDefaults;
 
@@ -24,6 +16,12 @@ public void Configure(SwaggerGenOptions options)
         {
             Type = "string", Format = "date", Example = new OpenApiString(DateTime.Today.ToString("yyyy-MM-dd"))
         });
+
+        options.MapType<ObjectId>(() => new()
+        {
+            Type = "string", Format = "ObjectId", Example = new OpenApiString(ObjectId.GenerateNewId().ToString())
+        });
+
         options.CustomSchemaIds(type => type.ToString());
 
         ConfigureAuthorization(options);

src/BookWorm.ServiceDefaults/Extensions.cs

@@ -1,20 +1,4 @@
-using BookWorm.Shared.ActivityScope;
-using BookWorm.Shared.Logging;
-using HealthChecks.UI.Client;
-using MassTransit.Logging;
-using MassTransit.Monitoring;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.ServiceDiscovery;
-using OpenTelemetry;
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
-
-namespace BookWorm.ServiceDefaults;
+namespace BookWorm.ServiceDefaults;
 
 public static class Extensions
 {

src/BookWorm.ServiceDefaults/GlobalUsings.cs

@@ -0,0 +1,24 @@
+global using System.Text;
+global using Asp.Versioning.ApiExplorer;
+global using BookWorm.Shared.ActivityScope;
+global using BookWorm.Shared.Logging;
+global using HealthChecks.UI.Client;
+global using MassTransit.Logging;
+global using MassTransit.Monitoring;
+global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Hosting;
+global using Microsoft.Extensions.Logging;
+global using Microsoft.Extensions.Options;
+global using Microsoft.Extensions.Primitives;
+global using Microsoft.Extensions.ServiceDiscovery;
+global using Microsoft.OpenApi.Any;
+global using Microsoft.OpenApi.Models;
+global using OpenTelemetry;
+global using OpenTelemetry.Metrics;
+global using OpenTelemetry.Trace;
+global using Swashbuckle.AspNetCore.SwaggerGen;

src/BookWorm.ServiceDefaults/OpenApiDefaultValues.cs

@@ -1,7 +1,5 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace BookWorm.ServiceDefaults;
 

src/BookWorm.ServiceDefaults/Swagger.Extension.cs

@@ -1,11 +1,4 @@
 using MicroElements.Swashbuckle.FluentValidation.AspNetCore;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
-using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace BookWorm.ServiceDefaults;
 

src/BookWorm.Shared/ActivityScope/ActivityScope.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using OpenTelemetry.Trace;
+using OpenTelemetry.Trace;
 
 namespace BookWorm.Shared.ActivityScope;
 

src/BookWorm.Shared/ActivityScope/ActivitySourceProvider.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics;
-
-namespace BookWorm.Shared.ActivityScope;
+namespace BookWorm.Shared.ActivityScope;
 
 public static class ActivitySourceProvider
 {

src/BookWorm.Shared/ActivityScope/IActivityScope.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics;
-
-namespace BookWorm.Shared.ActivityScope;
+namespace BookWorm.Shared.ActivityScope;
 
 public interface IActivityScope
 {

src/BookWorm.Shared/ActivityScope/StartActivityOptions.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics;
-
-namespace BookWorm.Shared.ActivityScope;
+namespace BookWorm.Shared.ActivityScope;
 
 public sealed record StartActivityOptions
 {

src/BookWorm.Shared/Bus/ConsumeFilter.cs

@@ -1,7 +1,4 @@
-using BookWorm.Shared.ActivityScope;
-using MassTransit;
-
-namespace BookWorm.Shared.Bus;
+namespace BookWorm.Shared.Bus;
 
 public sealed class ConsumeFilter<T>(IActivityScope activityScope) : IFilter<ConsumeContext<T>> where T : class
 {

src/BookWorm.Shared/Bus/Extension.cs

@@ -1,10 +1,4 @@
-using BookWorm.Constants;
-using FluentValidation;
-using MassTransit;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-
-namespace BookWorm.Shared.Bus;
+namespace BookWorm.Shared.Bus;
 
 public static class Extension
 {

src/BookWorm.Shared/Bus/PublishFilter.cs

@@ -1,7 +1,4 @@
-using BookWorm.Shared.ActivityScope;
-using MassTransit;
-
-namespace BookWorm.Shared.Bus;
+namespace BookWorm.Shared.Bus;
 
 public sealed class PublishFilter<T>(IActivityScope activityScope) : IFilter<PublishContext<T>> where T : class
 {

src/BookWorm.Shared/Bus/SendFilter.cs

@@ -1,7 +1,4 @@
-using BookWorm.Shared.ActivityScope;
-using MassTransit;
-
-namespace BookWorm.Shared.Bus;
+namespace BookWorm.Shared.Bus;
 
 public sealed class SendFilter<T>(IActivityScope activityScope) : IFilter<SendContext<T>> where T : class
 {

src/BookWorm.Shared/Converters/DateOnlyJsonConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace BookWorm.Shared.Converters;

src/BookWorm.Shared/Converters/StringTrimmerJsonConverter.cs

@@ -1,5 +1,4 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace BookWorm.Shared.Converters;
 

src/BookWorm.Shared/Endpoints/Extension.cs

@@ -1,9 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BookWorm.Shared.Endpoints;
+namespace BookWorm.Shared.Endpoints;
 
 public static class Extension
 {

src/BookWorm.Shared/Endpoints/IEndpoint.cs

@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Routing;
-
-namespace BookWorm.Shared.Endpoints;
+namespace BookWorm.Shared.Endpoints;
 
 public interface IEndpoint
 {

src/BookWorm.Shared/Exceptions/GlobalExceptionHandler.cs

@@ -1,10 +1,4 @@
-using System.Diagnostics;
-using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-namespace BookWorm.Shared.Exceptions;
+namespace BookWorm.Shared.Exceptions;
 
 public sealed class GlobalExceptionHandler(ILogger<GlobalExceptionHandler> logger) : IExceptionHandler
 {

src/BookWorm.Shared/Exceptions/NotFoundExceptionHandler.cs

@@ -1,8 +1,4 @@
 using Ardalis.GuardClauses;
-using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace BookWorm.Shared.Exceptions;