Merge pull request #96 from gpproton/packages-dependencies-trimming

Packages dependencies trimming

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <Title>Axolotl</Title>
-        <Version>8.0.2</Version>
+        <Version>8.0.5</Version>
         <Authors>radioActive DROID</Authors>
         <Description>Personal shared utility library</Description>
         <RepositoryType>git</RepositoryType>

Directory.Packages.props

@@ -6,20 +6,15 @@
 
     <!-- Shared packages -->
     <ItemGroup>
-        <PackageVersion Include="Ardalis.SmartEnum" Version="$(ArdalisVersion)" />
-        <PackageVersion Include="Ardalis.SmartEnum.SystemTextJson" Version="$(ArdalisVersion)" />
-        <PackageVersion Include="Ardalis.Specification" Version="$(ArdalisVersion)" />
         <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotnetVersion)" />
         <PackageVersion Include="Microsoft.Extensions.Primitives" Version="$(DotnetVersion)" />
         <PackageVersion Include="System.Net.Http.Json" Version="$(DotnetVersion)" />
-        <PackageVersion Include="Nextended.Core" Version="$(NextendedVersion)" />
+        <PackageVersion Include="Mapster" Version="7.4.0" />
     </ItemGroup>
 
     <!-- EFCore packages -->
     <ItemGroup>
-        <PackageVersion Include="Ardalis.SmartEnum.EFCore" Version="$(ArdalisVersion)" />
         <PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="$(ArdalisVersion)" />
-        <PackageVersion Include="EFCore.BulkExtensions" Version="$(BulkExtensions)" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EfcoreVersion)" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(EfcoreVersion)" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EfcoreVersion)" />

src/aspnet/Axolotl.AspNet.csproj

@@ -15,9 +15,8 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <ProjectReference Include="..\efcore\Axolotl.EFCore.csproj" />
     <ProjectReference Include="..\standard\Axolotl.csproj" />
-    <PackageReference Include="Ardalis.Specification" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Mapster" />
   </ItemGroup>
 
 </Project>

src/aspnet/Feature/GenericFeature.Helpers.cs

@@ -34,7 +34,7 @@ protected static IEndpointRouteBuilder SetupGroup<TAFeature, TEntity, TResponse>
         var name = options.Name ?? type.Name.ToLower();
         var url = options.Path ?? $"{root}/{name}";
         var instance = new TFeature() as TAFeature;
-        var group = endpoints.MapGroup(url).WithTags(name.Capitalize());
+        var group = endpoints.MapGroup(url).WithTags(name);
         if (instance! == null) throw new Exception("Feature instance not initialized.");
         instance.Endpoints = group;
 

src/aspnet/Service/GenericService.Extended.cs

@@ -17,6 +17,7 @@
 using Axolotl.Filters;
 using Axolotl.Interfaces;
 using Axolotl.Response;
+using Mapster;
 
 namespace Axolotl.AspNet.Service;
 
@@ -35,7 +36,7 @@ public async Task<PagedResponse<TResponse>> PageFilter(ISpecification<TEntity> s
         var count = await repo.Query(cancellationToken).WithSpecification(specification).CountAsync(cancellationToken);
         var take = (page - 1) * size;
         var result = await repo.Query(cancellationToken).WithSpecification(specification).Take(size).Skip(take).ToListAsync(cancellationToken);
-        var output = result.MapTo<List<TResponse>>();
+        var output = result.Adapt<List<TResponse>>();
 
         return new PagedResponse<TResponse>(output, page, size, count);
     }
@@ -52,7 +53,7 @@ public async Task<PagedResponse<TResponse>> GetAllAsync(IPageFilter? filter, Typ
 
     public async Task<Response<TResponse?>> GetByIdAsync(TKey id, CancellationToken cancellationToken = default) {
         var result = await repo.GetByIdAsync(id, cancellationToken);
-        var output = result.MapTo<TResponse?>();
+        var output = result.Adapt<TResponse?>();
 
         return new Response<TResponse?>(output);
     }
@@ -64,38 +65,38 @@ public async Task<PagedResponse<TResponse>> GetBySpec<TOption>(Type spec, TOptio
     }
 
     public async Task<Response<TResponse>> CreateAsync(IResponse value, CancellationToken cancellationToken = default) {
-        var result = await repo.AddAsync(value.MapTo<TEntity>(), cancellationToken);
-        var output = result.MapTo<TResponse>();
+        var result = await repo.AddAsync(value.Adapt<TEntity>(), cancellationToken);
+        var output = result.Adapt<TResponse>();
 
         return new Response<TResponse>(output);
     }
 
     public async Task<PagedResponse<TResponse>> CreateRangeAsync(IEnumerable<IResponse> values, CancellationToken cancellationToken = default) {
-        var converted = values.MapTo<IEnumerable<TEntity>>().ToList();
+        var converted = values.Adapt<IEnumerable<TEntity>>().ToList();
         var result = await repo.AddRangeAsync(converted, cancellationToken);
-        var output = result.MapTo<IEnumerable<TResponse>>();
+        var output = result.Adapt<IEnumerable<TResponse>>();
 
         return new PagedResponse<TResponse>(output);
     }
 
     public async Task<Response<TResponse>> UpdateAsync(IResponse value, CancellationToken cancellationToken = default) {
-        var result = await repo.UpdateAsync(value.MapTo<TEntity>(), cancellationToken);
-        var output = result.MapTo<TResponse>();
+        var result = await repo.UpdateAsync(value.Adapt<TEntity>(), cancellationToken);
+        var output = result.Adapt<TResponse>();
 
         return new Response<TResponse>(output);
     }
 
     public async Task<PagedResponse<TResponse>> UpdateRangeAsync(IEnumerable<IResponse> values, CancellationToken cancellationToken = default) {
-        var converted = values.MapTo<IEnumerable<TEntity>>().ToList();
+        var converted = values.Adapt<IEnumerable<TEntity>>().ToList();
         var result = await repo.UpdateRangeAsync(converted, cancellationToken);
-        var output = result.MapTo<IEnumerable<TResponse>>();
+        var output = result.Adapt<IEnumerable<TResponse>>();
 
         return new PagedResponse<TResponse>(output);
     }
 
     public async Task<Response<TResponse?>> DeleteAsync(TKey id, CancellationToken cancellationToken = default) {
         var result = await repo.DeleteAsync(id, cancellationToken);
-        var output = result.MapTo<TResponse?>();
+        var output = result.Adapt<TResponse?>();
 
         return new Response<TResponse?>(output, "", result != null);
     }
@@ -109,7 +110,7 @@ public async Task<Response<int>> DeleteRangeAsync(IEnumerable<TKey> ids, Cancell
     public async Task<PagedResponse<TResponse>> DeleteBySpec<TOption>(Type spec, TOption option, CancellationToken cancellationToken = default) where TOption : class {
         var specification = GenerateSpec.Build<TEntity>(spec, option);
         var result = await repo.DeleteBySpec(specification, cancellationToken);
-        var output = result.MapTo<IEnumerable<TResponse>>();
+        var output = result.Adapt<IEnumerable<TResponse>>();
 
         return new PagedResponse<TResponse>(output);
     }

src/efcore/Axolotl.EFCore.csproj

@@ -13,8 +13,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\standard\Axolotl.csproj" />
-    <PackageReference Include="Ardalis.Specification" />
     <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
   </ItemGroup>
 

src/efcore/Context/ModelBuilderExtensions.cs

@@ -9,7 +9,6 @@
 // limitations under the License.
 
 using System.Reflection;
-using Axolotl.EFCore.Converters;
 using Microsoft.EntityFrameworkCore;
 using Axolotl.EFCore.Interfaces;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -33,36 +32,6 @@ public static void RegisterSoftDeleteFilter(this ModelBuilder modelBuilder) {
                 entityType.AddSoftDeleteQueryFilter();
     }
 
-    public static void RegisterEnumConverters<TEnum>(this ModelBuilder modelBuilder, Type type)
-    where TEnum : Enum
-    {
-            foreach (var entityType in modelBuilder.Model.GetEntityTypes()) {
-                var properties = entityType.ClrType.GetProperties()
-                    .Where(p => p.PropertyType == type);
-                foreach (var property in properties)
-                    modelBuilder
-                        .Entity(entityType.Name)
-                        .Property(property.Name)
-                        .HasConversion(new EnumCollectionJsonValueConverter<TEnum>())
-                        .Metadata.SetValueComparer(new CollectionValueComparer<TEnum>());
-            }
-    }
-
-    public static void RegisterObjectConverters<TObject>(this ModelBuilder modelBuilder, Type type)
-        where TObject : Enum
-    {
-        foreach (var entityType in modelBuilder.Model.GetEntityTypes()) {
-            var properties = entityType.ClrType.GetProperties()
-                .Where(p => p.PropertyType == type);
-            foreach (var property in properties)
-                modelBuilder
-                    .Entity(entityType.Name)
-                    .Property(property.Name)
-                    .HasConversion(new JsonValueConverter<TObject>())
-                    .Metadata.SetValueComparer(new CollectionValueComparer<TObject>());
-        }
-    }
-
     public static void DateTimeOffsetToBinary(this ModelBuilder modelBuilder) {
         foreach (var entityType in modelBuilder.Model.GetEntityTypes()) {
             var properties = entityType.ClrType.GetProperties()

src/standard/Axolotl.csproj

@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-    <PackageReference Include="Nextended.Core" />
     <PackageReference Include="System.Net.Http.Json" />
   </ItemGroup>