cleanup

Author: iammukeshm

src/framework/Auditing/Auditing.Endpoints/AuditingModule.cs

@@ -1,6 +1,10 @@
 using System.Reflection;
-using FSH.Framework.Auditing.Endpoints.v1.GetUserAudits;
+using Asp.Versioning;
+using Asp.Versioning.Builder;
+using FSH.Framework.Auditing.Endpoints.v1;
 using FSH.Framework.Infrastructure.Messaging.CQRS;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -19,8 +23,19 @@ public static IServiceCollection AddAuditingModule(this IServiceCollection servi
 
     public static IEndpointRouteBuilder MapAuditingEndpoints(this IEndpointRouteBuilder endpoints)
     {
+        ApiVersionSet apiVersionSet = endpoints.NewApiVersionSet()
+            .HasApiVersion(new ApiVersion(1))
+            .ReportApiVersions()
+            .Build();
+
+        RouteGroupBuilder group = endpoints
+            .MapGroup("api/v{version:apiVersion}/auditing")
+            .WithTags("Auditing")
+            .WithOpenApi()
+            .WithApiVersionSet(apiVersionSet);
+
         // v1 endpoints
-        endpoints.MapGetUserAuditsEndpoint();
+        GetUserAudits.MapEndpoint(group);
 
         return endpoints;
     }

src/framework/Auditing/Auditing.Infrastructure/Auditing.Infrastructure.csproj

@@ -12,5 +12,7 @@
     <ProjectReference Include="..\..\Core\Core.csproj" />
     <ProjectReference Include="..\Auditing.Core\Auditing.Core.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="Finbuckle.MultiTenant.EntityFrameworkCore" />
+  </ItemGroup>
 </Project>

src/framework/Auditing/Auditing.Infrastructure/AuditingConstants.cs

@@ -0,0 +1,5 @@
+namespace FSH.Framework.Auditing.Infrastructure;
+public static class AuditingConstants
+{
+    public const string SchemaName = "auditing";
+}

src/framework/Auditing/Auditing.Infrastructure/Data/AuditingConfiguration.cs

@@ -0,0 +1,17 @@
+using Finbuckle.MultiTenant;
+using FSH.Framework.Auditing.Core.Dtos;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace FSH.Framework.Auditing.Infrastructure.Data;
+public class AuditTrailConfig : IEntityTypeConfiguration<AuditTrail>
+{
+    public void Configure(EntityTypeBuilder<AuditTrail> builder)
+    {
+        builder
+            .ToTable("AuditTrails", AuditingConstants.SchemaName)
+            .IsMultiTenant();
+
+        builder.HasKey(a => a.Id);
+    }
+}

src/framework/Core/Tenant/Abstractions/ITenantService.cs

@@ -1,23 +1,11 @@
-using FSH.Framework.Auditing.Core.Dtos;
+using Finbuckle.MultiTenant;
+using FSH.Framework.Identity.Infrastructure.Roles;
 using FSH.Framework.Identity.Infrastructure.Users;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FSH.Framework.Identity.Infrastructure.Data;
 
-public class AuditTrailConfig : IEntityTypeConfiguration<AuditTrail>
-{
-    public void Configure(EntityTypeBuilder<AuditTrail> builder)
-    {
-        builder
-            .ToTable("AuditTrails", IdentityConstants.SchemaName)
-            .IsMultiTenant();
-
-        builder.HasKey(a => a.Id);
-    }
-}
-
 public class ApplicationUserConfig : IEntityTypeConfiguration<FshUser>
 {
     public void Configure(EntityTypeBuilder<FshUser> builder)

src/framework/Identity/Identity.Infrastructure/Data/IdentityConfigurations.cs

@@ -3,6 +3,7 @@
 using FSH.Framework.Core.Persistence;
 using FSH.Framework.Identity.Infrastructure.Roles;
 using FSH.Framework.Identity.Infrastructure.Users;
+using FSH.Framework.Shared.Multitenancy;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;

src/framework/Identity/Identity.Infrastructure/Data/IdentityDbContext.cs

@@ -4,6 +4,7 @@
 using FSH.Framework.Identity.Infrastructure.Roles;
 using FSH.Framework.Identity.Infrastructure.Users;
 using FSH.Framework.Shared.Constants;
+using FSH.Framework.Shared.Multitenancy;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;

src/framework/Identity/Identity.Infrastructure/Data/IdentityDbInitializer.cs

@@ -9,7 +9,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Auditing\Auditing.Core\Auditing.Core.csproj" />
     <ProjectReference Include="..\..\Core\Core.csproj" />
     <ProjectReference Include="..\..\Shared\Shared.csproj" />
     <ProjectReference Include="..\Identity.Core\Identity.Core.csproj" />
@@ -18,9 +17,6 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" />
-    <PackageReference Include="Finbuckle.MultiTenant" />
-    <PackageReference Include="Finbuckle.MultiTenant.AspNetCore" />
     <PackageReference Include="Finbuckle.MultiTenant.EntityFrameworkCore" />
   </ItemGroup>
 </Project>

src/framework/Identity/Identity.Infrastructure/Identity.Infrastructure.csproj

@@ -0,0 +1,5 @@
+namespace FSH.Framework.Identity.Infrastructure;
+public static class IdentityConstants
+{
+    public const string SchemaName = "identity";
+}