Dependencies updated and naming fixes.

Bruno de Souza Melo · Bruno de Souza Melo · commit 5682c02d6bfd · 2024-02-14T19:37:46.000-03:00
diff --git a/src/NuvTools.AspNetCore.EntityFrameworkCore/Mapper/ServiceWithCrudBase.cs b/src/NuvTools.AspNetCore.EntityFrameworkCore/Mapper/ServiceWithCrudBase.cs
@@ -7,9 +7,9 @@
 
 namespace NuvTools.AspNetCore.EntityFrameworkCore.Mapper;
 
-public abstract class ServiceWithCrudBase<TContext, TForm, TData, TKey> : ServiceWithMapperBase<TForm, TData>
-                                                                where TForm : class
-                                                                where TData : class
+public abstract class ServiceWithCrudBase<TContext, TDTO, TEntity, TKey> : ServiceWithMapperBase<TDTO, TEntity>
+                                                                where TDTO : class
+                                                                where TEntity : class
                                                                 where TContext : DbContext
 {
     protected readonly TContext Context;
@@ -19,35 +19,35 @@ public ServiceWithCrudBase(TContext context, IMapper mapper) : base(mapper)
         Context = context;
     }
 
-    public DbSet<TData> Dataset { get { return Context.Set<TData>(); } }
+    public DbSet<TEntity> Dataset { get { return Context.Set<TEntity>(); } }
 
-    public async Task<TForm> FindAsync(TKey id)
+    public async Task<TDTO> FindAsync(TKey id)
     {
-        return ConvertToForm(await Context.FindAsync<TData>(id));
+        return ConvertToDTO(await Context.FindAsync<TEntity>(id));
     }
 
-    public async Task<TForm> FindAsync(object[] keys)
+    public async Task<TDTO> FindAsync(object[] keys)
     {
-        return ConvertToForm(await Context.FindAsync<TData>(keys));
+        return ConvertToDTO(await Context.FindAsync<TEntity>(keys));
     }
 
-    public async Task<IEnumerable<TForm>> FindFromExpressionAsync(Expression<Func<IQueryable<TData>>> expression)
+    public async Task<IEnumerable<TDTO>> FindFromExpressionAsync(Expression<Func<IQueryable<TEntity>>> expression)
     {
-        return ConvertToForm(await Context.FromExpression(expression).ToListAsync());
+        return ConvertToDTO(await Context.FromExpression(expression).ToListAsync());
     }
 
-    public virtual async Task<IResult<TKey>> AddAndSaveAsync(TForm model)
+    public virtual async Task<IResult<TKey>> AddAndSaveAsync(TDTO model)
     {
-        return await Context.AddAndSaveAsync<TData, TKey>(ConvertToData(model));
+        return await Context.AddAndSaveAsync<TEntity, TKey>(ConvertToEntity(model));
     }
 
-    public virtual async Task<IResult> UpdateAndSaveAsync(TKey id, TForm model)
+    public virtual async Task<IResult> UpdateAndSaveAsync(TKey id, TDTO model)
     {
-        return await Context.UpdateAndSaveAsync(ConvertToData(model), id);
+        return await Context.UpdateAndSaveAsync(ConvertToEntity(model), id);
     }
 
     public virtual async Task<IResult> RemoveAndSaveAsync(TKey id)
     {
-        return await Context.RemoveAndSaveAsync<TData>(id);
+        return await Context.RemoveAndSaveAsync<TEntity>(id);
     }
 }
diff --git a/src/NuvTools.AspNetCore.EntityFrameworkCore/NuvTools.AspNetCore.EntityFrameworkCore.csproj b/src/NuvTools.AspNetCore.EntityFrameworkCore/NuvTools.AspNetCore.EntityFrameworkCore.csproj
@@ -9,7 +9,7 @@
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>NuvTools.AspNetCore.EntityFrameworkCore.snk</AssemblyOriginatorKeyFile>
 		<Description>EntityFramework Core helper library to use with ASP.NET Aplications.</Description>
-		<Version>8.0.0</Version>
+		<Version>8.0.2</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
 		<PackageIcon>icon.png</PackageIcon>
@@ -27,7 +27,7 @@
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 		
-		<PackageReference Include="NuvTools.Data.EntityFrameworkCore" Version="8.0.0" />
+		<PackageReference Include="NuvTools.Data.EntityFrameworkCore" Version="8.0.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(targetframework)' == 'net6'">
diff --git a/src/NuvTools.AspNetCore/Mapper/ServiceWithMapperBase.cs b/src/NuvTools.AspNetCore/Mapper/ServiceWithMapperBase.cs
@@ -2,8 +2,8 @@
 
 namespace NuvTools.AspNetCore.Mapper;
 
-public abstract class ServiceWithMapperBase<TForm, TData> where TForm : class
-                                                    where TData : class
+public abstract class ServiceWithMapperBase<TDTO, TEntity> where TDTO : class
+                                                    where TEntity : class
 {
     private readonly IMapper _mapper;
 
@@ -22,39 +22,39 @@ public ServiceWithMapperBase(IMapper mapper)
 
     #region Converter
 
-    protected TReturn ConvertTo<TReturn>(TData model)
+    protected TReturn ConvertTo<TReturn>(TEntity model)
     {
         return _mapper.Map<TReturn>(model);
     }
 
-    protected IEnumerable<TReturn> ConvertTo<TReturn>(IEnumerable<TData> models)
+    protected IEnumerable<TReturn> ConvertTo<TReturn>(IEnumerable<TEntity> models)
     {
         return _mapper.Map<IEnumerable<TReturn>>(models);
     }
 
-    protected TData ConvertToData(TForm model)
+    protected TEntity ConvertToEntity(TDTO model)
     {
-        return _mapper.Map<TData>(model);
+        return _mapper.Map<TEntity>(model);
     }
 
-    protected TForm ConvertToForm(TData model)
+    protected TDTO ConvertToDTO(TEntity model)
     {
-        return _mapper.Map<TForm>(model);
+        return _mapper.Map<TDTO>(model);
     }
 
-    protected IEnumerable<TForm> ConvertToForm(IEnumerable<TData> models)
-    {
-        return _mapper.Map<IEnumerable<TForm>>(models);
+    protected IEnumerable<TDTO> ConvertToDTO(IEnumerable<TEntity> models)
+    {   
+        return _mapper.Map<IEnumerable<TDTO>>(models);
     }
 
-    protected IList<TForm> ConvertToForm(IList<TData> models)
+    protected IList<TDTO> ConvertToDTO(IList<TEntity> models)
     {
-        return _mapper.Map<IList<TForm>>(models);
+        return _mapper.Map<IList<TDTO>>(models);
     }
 
-    protected TForm[] ConvertToForm(TData[] models)
+    protected TDTO[] ConvertToDTO(TEntity[] models)
     {
-        return _mapper.Map<TForm[]>(models);
+        return _mapper.Map<TDTO[]>(models);
     }
 
     #endregion
diff --git a/src/NuvTools.AspNetCore/NuvTools.AspNetCore.csproj b/src/NuvTools.AspNetCore/NuvTools.AspNetCore.csproj
@@ -9,7 +9,7 @@
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>NuvTools.AspNetCore.snk</AssemblyOriginatorKeyFile>
 		<Description>Common library with helpers to use with ASP.NET Aplications.</Description>
-		<Version>8.0.0</Version>
+		<Version>8.0.2</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
 		<PackageIcon>icon.png</PackageIcon>

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`
`8`	`8`	`namespace NuvTools.AspNetCore.EntityFrameworkCore.Mapper;`
`9`	`9`
`10`		`-public abstract class ServiceWithCrudBase<TContext, TForm, TData, TKey> : ServiceWithMapperBase<TForm, TData>`
`11`		`- where TForm : class`
`12`		`- where TData : class`
	`10`	`+public abstract class ServiceWithCrudBase<TContext, TDTO, TEntity, TKey> : ServiceWithMapperBase<TDTO, TEntity>`
	`11`	`+ where TDTO : class`
	`12`	`+ where TEntity : class`
`13`	`13`	`where TContext : DbContext`
`14`	`14`	`{`
`15`	`15`	`protected readonly TContext Context;`
`@@ -19,35 +19,35 @@ public ServiceWithCrudBase(TContext context, IMapper mapper) : base(mapper)`
`19`	`19`	`Context = context;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public DbSet<TData> Dataset { get { return Context.Set<TData>(); } }`
	`22`	`+ public DbSet<TEntity> Dataset { get { return Context.Set<TEntity>(); } }`
`23`	`23`
`24`		`- public async Task<TForm> FindAsync(TKey id)`
	`24`	`+ public async Task<TDTO> FindAsync(TKey id)`
`25`	`25`	`{`
`26`		`- return ConvertToForm(await Context.FindAsync<TData>(id));`
	`26`	`+ return ConvertToDTO(await Context.FindAsync<TEntity>(id));`
`27`	`27`	`}`
`28`	`28`
`29`		`- public async Task<TForm> FindAsync(object[] keys)`
	`29`	`+ public async Task<TDTO> FindAsync(object[] keys)`
`30`	`30`	`{`
`31`		`- return ConvertToForm(await Context.FindAsync<TData>(keys));`
	`31`	`+ return ConvertToDTO(await Context.FindAsync<TEntity>(keys));`
`32`	`32`	`}`
`33`	`33`
`34`		`- public async Task<IEnumerable<TForm>> FindFromExpressionAsync(Expression<Func<IQueryable<TData>>> expression)`
	`34`	`+ public async Task<IEnumerable<TDTO>> FindFromExpressionAsync(Expression<Func<IQueryable<TEntity>>> expression)`
`35`	`35`	`{`
`36`		`- return ConvertToForm(await Context.FromExpression(expression).ToListAsync());`
	`36`	`+ return ConvertToDTO(await Context.FromExpression(expression).ToListAsync());`
`37`	`37`	`}`
`38`	`38`
`39`		`- public virtual async Task<IResult<TKey>> AddAndSaveAsync(TForm model)`
	`39`	`+ public virtual async Task<IResult<TKey>> AddAndSaveAsync(TDTO model)`
`40`	`40`	`{`
`41`		`- return await Context.AddAndSaveAsync<TData, TKey>(ConvertToData(model));`
	`41`	`+ return await Context.AddAndSaveAsync<TEntity, TKey>(ConvertToEntity(model));`
`42`	`42`	`}`
`43`	`43`
`44`		`- public virtual async Task<IResult> UpdateAndSaveAsync(TKey id, TForm model)`
	`44`	`+ public virtual async Task<IResult> UpdateAndSaveAsync(TKey id, TDTO model)`
`45`	`45`	`{`
`46`		`- return await Context.UpdateAndSaveAsync(ConvertToData(model), id);`
	`46`	`+ return await Context.UpdateAndSaveAsync(ConvertToEntity(model), id);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public virtual async Task<IResult> RemoveAndSaveAsync(TKey id)`
`50`	`50`	`{`
`51`		`- return await Context.RemoveAndSaveAsync<TData>(id);`
	`51`	`+ return await Context.RemoveAndSaveAsync<TEntity>(id);`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace NuvTools.AspNetCore.Mapper;`
`4`	`4`
`5`		`-public abstract class ServiceWithMapperBase<TForm, TData> where TForm : class`
`6`		`- where TData : class`
	`5`	`+public abstract class ServiceWithMapperBase<TDTO, TEntity> where TDTO : class`
	`6`	`+ where TEntity : class`
`7`	`7`	`{`
`8`	`8`	`private readonly IMapper _mapper;`
`9`	`9`
`@@ -22,39 +22,39 @@ public ServiceWithMapperBase(IMapper mapper)`
`22`	`22`
`23`	`23`	`#region Converter`
`24`	`24`
`25`		`- protected TReturn ConvertTo<TReturn>(TData model)`
	`25`	`+ protected TReturn ConvertTo<TReturn>(TEntity model)`
`26`	`26`	`{`
`27`	`27`	`return _mapper.Map<TReturn>(model);`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected IEnumerable<TReturn> ConvertTo<TReturn>(IEnumerable<TData> models)`
	`30`	`+ protected IEnumerable<TReturn> ConvertTo<TReturn>(IEnumerable<TEntity> models)`
`31`	`31`	`{`
`32`	`32`	`return _mapper.Map<IEnumerable<TReturn>>(models);`
`33`	`33`	`}`
`34`	`34`
`35`		`- protected TData ConvertToData(TForm model)`
	`35`	`+ protected TEntity ConvertToEntity(TDTO model)`
`36`	`36`	`{`
`37`		`- return _mapper.Map<TData>(model);`
	`37`	`+ return _mapper.Map<TEntity>(model);`
`38`	`38`	`}`
`39`	`39`
`40`		`- protected TForm ConvertToForm(TData model)`
	`40`	`+ protected TDTO ConvertToDTO(TEntity model)`
`41`	`41`	`{`
`42`		`- return _mapper.Map<TForm>(model);`
	`42`	`+ return _mapper.Map<TDTO>(model);`
`43`	`43`	`}`
`44`	`44`
`45`		`- protected IEnumerable<TForm> ConvertToForm(IEnumerable<TData> models)`
`46`		`- {`
`47`		`- return _mapper.Map<IEnumerable<TForm>>(models);`
	`45`	`+ protected IEnumerable<TDTO> ConvertToDTO(IEnumerable<TEntity> models)`
	`46`	`+ {`
	`47`	`+ return _mapper.Map<IEnumerable<TDTO>>(models);`
`48`	`48`	`}`
`49`	`49`
`50`		`- protected IList<TForm> ConvertToForm(IList<TData> models)`
	`50`	`+ protected IList<TDTO> ConvertToDTO(IList<TEntity> models)`
`51`	`51`	`{`
`52`		`- return _mapper.Map<IList<TForm>>(models);`
	`52`	`+ return _mapper.Map<IList<TDTO>>(models);`
`53`	`53`	`}`
`54`	`54`
`55`		`- protected TForm[] ConvertToForm(TData[] models)`
	`55`	`+ protected TDTO[] ConvertToDTO(TEntity[] models)`
`56`	`56`	`{`
`57`		`- return _mapper.Map<TForm[]>(models);`
	`57`	`+ return _mapper.Map<TDTO[]>(models);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`#endregion`