Automapper and Change tracking changes

rahul-atharva · rahul-atharva · commit b433d8620f50 · 2023-05-02T18:44:10.000+05:30
diff --git a/src/BlazorEcommerce.Application/Features/ProductType/Command/UpdateProductType/UpdateProductTypeCommandHandler.cs b/src/BlazorEcommerce.Application/Features/ProductType/Command/UpdateProductType/UpdateProductTypeCommandHandler.cs
@@ -19,7 +19,7 @@ public DeleteProductTypeCommandHandler(ICommandUnitOfWork<int> command, IMapper
 
     public async Task<IResponse> Handle(UpdateProductTypeCommandRequest request, CancellationToken cancellationToken)
     {
-        var productType = await _query.ProductTypeQuery.GetByIdAsync(p => p.Id == request.productType.Id);
+        var productType = await _query.ProductTypeQuery.GetAsync(p => p.Id == request.productType.Id);
         if (productType == null)
         {
             return new DataResponse<string?>(null, HttpStatusCodes.NotFound, String.Format(Messages.NotFound, "Product Type"), false);
diff --git a/src/BlazorEcommerce.Application/MappingProfıles/CategoryProfile.cs b/src/BlazorEcommerce.Application/MappingProfıles/CategoryProfile.cs
@@ -6,6 +6,6 @@ public class CategoryProfile : Profile
 {
     public CategoryProfile()
     {
-        CreateMap<Category, CategoryDto>();
+        CreateMap<Category, CategoryDto>().ReverseMap();
     }
 }
diff --git a/src/BlazorEcommerce.Application/MappingProfıles/OrderProfile.cs b/src/BlazorEcommerce.Application/MappingProfıles/OrderProfile.cs
@@ -6,7 +6,7 @@ public class OrderProfile : Profile
 {
     public OrderProfile()
     {
-        CreateMap<Order, OrderDto>();
-        CreateMap<OrderItem, OrderItemDto>();
+        CreateMap<Order, OrderDto>().ReverseMap();
+        CreateMap<OrderItem, OrderItemDto>().ReverseMap();
     }
 }
diff --git a/src/BlazorEcommerce.Application/MappingProfıles/ProductProfile.cs b/src/BlazorEcommerce.Application/MappingProfıles/ProductProfile.cs
@@ -6,7 +6,7 @@ public class ProductProfile : Profile
 {
     public ProductProfile()
     {
-        CreateMap<Product, ProductDto>();
-        CreateMap<ProductVariant, ProductVariantDto>();
+        CreateMap<Product, ProductDto>().ReverseMap();
+        CreateMap<ProductVariant, ProductVariantDto>().ReverseMap();
     }
 }
diff --git a/src/BlazorEcommerce.Application/MappingProfıles/ProductTypeProfile.cs b/src/BlazorEcommerce.Application/MappingProfıles/ProductTypeProfile.cs
@@ -4,6 +4,6 @@ public class ProductTypeProfile : Profile
 {
     public ProductTypeProfile()
     {
-        CreateMap<ProductType, ProductTypeDto>();
+        CreateMap<ProductType, ProductTypeDto>().ReverseMap();
     }
 }
diff --git a/src/BlazorEcommerce.Persistence/Repositories/Commands/Base/CommandRepository.cs b/src/BlazorEcommerce.Persistence/Repositories/Commands/Base/CommandRepository.cs
@@ -1,7 +1,5 @@
 ﻿using BlazorEcommerce.Application.Repositories.Commands.Base;
 using BlazorEcommerce.Domain.Common;
-using BlazorEcommerce.Server.Contexts;
-using Microsoft.EntityFrameworkCore;
 
 namespace BlazorEcommerce.Persistence.Repositories.Commands.Base;
 
@@ -38,7 +36,6 @@ public void RemoveRange(IEnumerable<T> entities)
     public T Update(T entity)
     {
         context.Set<T>().Update(entity);
-        context.Entry(entity).State = EntityState.Modified;
         return entity;
     }
 }
diff --git a/src/BlazorEcommerce.Persistence/Repositories/Queries/Base/QueryRepository.cs b/src/BlazorEcommerce.Persistence/Repositories/Queries/Base/QueryRepository.cs
@@ -31,15 +31,15 @@ public async Task<IQueryable<T>> GetAllAsync(bool isChangeTracking = false, bool
         IQueryable<T> query = context.Set<T>();
         if (ignoreQueryFilters)
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 return query = query.IgnoreQueryFilters().AsNoTracking().AsQueryable();
             }
             return await Task.Run(() => query.IgnoreQueryFilters().AsQueryable());
         }
         else
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 return query = query.AsNoTracking().AsQueryable();
             }
@@ -53,7 +53,7 @@ public async Task<IEnumerable<T>> GetAllWithIncludeAsync(bool isChangeTracking =
 
         if (ignoreQueryFilters)
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = predicate is null ? query.IgnoreQueryFilters().AsNoTracking()
                                           : query.IgnoreQueryFilters().Where(predicate).AsNoTracking();
@@ -80,7 +80,7 @@ public async Task<IEnumerable<T>> GetAllWithIncludeAsync(bool isChangeTracking =
         }
         else
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = predicate is null ? query.AsNoTracking()
                                           : query.Where(predicate).AsNoTracking();
@@ -114,7 +114,7 @@ public async Task<T> GetAsync(Expression<Func<T, bool>> predicate, bool isChange
         IQueryable<T> query = context.Set<T>();
         if (ignoreQueryFilters)
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = query.IgnoreQueryFilters().Where(predicate).AsNoTracking();
             }
@@ -125,7 +125,7 @@ public async Task<T> GetAsync(Expression<Func<T, bool>> predicate, bool isChange
         }
         else
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = query.Where(predicate).AsNoTracking();
             }
@@ -143,7 +143,7 @@ public async Task<T> GetByIdAsync(Expression<Func<T, bool>> predicate, bool isCh
         IQueryable<T> query = context.Set<T>();
         if (ignoreQueryFilters)
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = query.IgnoreQueryFilters().Where(predicate).AsNoTracking();
             }
@@ -154,7 +154,7 @@ public async Task<T> GetByIdAsync(Expression<Func<T, bool>> predicate, bool isCh
         }
         else
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = query.Where(predicate).AsNoTracking();
             }
@@ -172,7 +172,7 @@ public async Task<T> GetWithIncludeAsync(bool isChangeTracking, Expression<Func<
         IQueryable<T> query = context.Set<T>();
         if (ignoreQueryFilters)
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = query.IgnoreQueryFilters().Where(predicate);
                 if (includes is not null)
@@ -197,7 +197,7 @@ public async Task<T> GetWithIncludeAsync(bool isChangeTracking, Expression<Func<
         }
         else
         {
-            if (isChangeTracking)
+            if (!isChangeTracking)
             {
                 query = query.Where(predicate);
                 if (includes is not null)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public DeleteProductTypeCommandHandler(ICommandUnitOfWork<int> command, IMapper`
`19`	`19`
`20`	`20`	`public async Task<IResponse> Handle(UpdateProductTypeCommandRequest request, CancellationToken cancellationToken)`
`21`	`21`	`{`
`22`		`- var productType = await _query.ProductTypeQuery.GetByIdAsync(p => p.Id == request.productType.Id);`
	`22`	`+ var productType = await _query.ProductTypeQuery.GetAsync(p => p.Id == request.productType.Id);`
`23`	`23`	`if (productType == null)`
`24`	`24`	`{`
`25`	`25`	`return new DataResponse<string?>(null, HttpStatusCodes.NotFound, String.Format(Messages.NotFound, "Product Type"), false);`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ public class CategoryProfile : Profile`
`6`	`6`	`{`
`7`	`7`	`public CategoryProfile()`
`8`	`8`	`{`
`9`		`- CreateMap<Category, CategoryDto>();`
	`9`	`+ CreateMap<Category, CategoryDto>().ReverseMap();`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class OrderProfile : Profile`
`6`	`6`	`{`
`7`	`7`	`public OrderProfile()`
`8`	`8`	`{`
`9`		`- CreateMap<Order, OrderDto>();`
`10`		`- CreateMap<OrderItem, OrderItemDto>();`
	`9`	`+ CreateMap<Order, OrderDto>().ReverseMap();`
	`10`	`+ CreateMap<OrderItem, OrderItemDto>().ReverseMap();`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class ProductProfile : Profile`
`6`	`6`	`{`
`7`	`7`	`public ProductProfile()`
`8`	`8`	`{`
`9`		`- CreateMap<Product, ProductDto>();`
`10`		`- CreateMap<ProductVariant, ProductVariantDto>();`
	`9`	`+ CreateMap<Product, ProductDto>().ReverseMap();`
	`10`	`+ CreateMap<ProductVariant, ProductVariantDto>().ReverseMap();`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ public class ProductTypeProfile : Profile`
`4`	`4`	`{`
`5`	`5`	`public ProductTypeProfile()`
`6`	`6`	`{`
`7`		`- CreateMap<ProductType, ProductTypeDto>();`
	`7`	`+ CreateMap<ProductType, ProductTypeDto>().ReverseMap();`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using BlazorEcommerce.Application.Repositories.Commands.Base;`
`2`	`2`	`using BlazorEcommerce.Domain.Common;`
`3`		`-using BlazorEcommerce.Server.Contexts;`
`4`		`-using Microsoft.EntityFrameworkCore;`
`5`	`3`
`6`	`4`	`namespace BlazorEcommerce.Persistence.Repositories.Commands.Base;`
`7`	`5`
`@@ -38,7 +36,6 @@ public void RemoveRange(IEnumerable<T> entities)`
`38`	`36`	`public T Update(T entity)`
`39`	`37`	`{`
`40`	`38`	`context.Set<T>().Update(entity);`
`41`		`- context.Entry(entity).State = EntityState.Modified;`
`42`	`39`	`return entity;`
`43`	`40`	`}`
`44`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ public async Task<IQueryable<T>> GetAllAsync(bool isChangeTracking = false, bool`
`31`	`31`	`IQueryable<T> query = context.Set<T>();`
`32`	`32`	`if (ignoreQueryFilters)`
`33`	`33`	`{`
`34`		`- if (isChangeTracking)`
	`34`	`+ if (!isChangeTracking)`
`35`	`35`	`{`
`36`	`36`	`return query = query.IgnoreQueryFilters().AsNoTracking().AsQueryable();`
`37`	`37`	`}`
`38`	`38`	`return await Task.Run(() => query.IgnoreQueryFilters().AsQueryable());`
`39`	`39`	`}`
`40`	`40`	`else`
`41`	`41`	`{`
`42`		`- if (isChangeTracking)`
	`42`	`+ if (!isChangeTracking)`
`43`	`43`	`{`
`44`	`44`	`return query = query.AsNoTracking().AsQueryable();`
`45`	`45`	`}`
`@@ -53,7 +53,7 @@ public async Task<IEnumerable<T>> GetAllWithIncludeAsync(bool isChangeTracking =`
`53`	`53`
`54`	`54`	`if (ignoreQueryFilters)`
`55`	`55`	`{`
`56`		`- if (isChangeTracking)`
	`56`	`+ if (!isChangeTracking)`
`57`	`57`	`{`
`58`	`58`	`query = predicate is null ? query.IgnoreQueryFilters().AsNoTracking()`
`59`	`59`	`: query.IgnoreQueryFilters().Where(predicate).AsNoTracking();`
`@@ -80,7 +80,7 @@ public async Task<IEnumerable<T>> GetAllWithIncludeAsync(bool isChangeTracking =`
`80`	`80`	`}`
`81`	`81`	`else`
`82`	`82`	`{`
`83`		`- if (isChangeTracking)`
	`83`	`+ if (!isChangeTracking)`
`84`	`84`	`{`
`85`	`85`	`query = predicate is null ? query.AsNoTracking()`
`86`	`86`	`: query.Where(predicate).AsNoTracking();`
`@@ -114,7 +114,7 @@ public async Task<T> GetAsync(Expression<Func<T, bool>> predicate, bool isChange`
`114`	`114`	`IQueryable<T> query = context.Set<T>();`
`115`	`115`	`if (ignoreQueryFilters)`
`116`	`116`	`{`
`117`		`- if (isChangeTracking)`
	`117`	`+ if (!isChangeTracking)`
`118`	`118`	`{`
`119`	`119`	`query = query.IgnoreQueryFilters().Where(predicate).AsNoTracking();`
`120`	`120`	`}`
`@@ -125,7 +125,7 @@ public async Task<T> GetAsync(Expression<Func<T, bool>> predicate, bool isChange`
`125`	`125`	`}`
`126`	`126`	`else`
`127`	`127`	`{`
`128`		`- if (isChangeTracking)`
	`128`	`+ if (!isChangeTracking)`
`129`	`129`	`{`
`130`	`130`	`query = query.Where(predicate).AsNoTracking();`
`131`	`131`	`}`
`@@ -143,7 +143,7 @@ public async Task<T> GetByIdAsync(Expression<Func<T, bool>> predicate, bool isCh`
`143`	`143`	`IQueryable<T> query = context.Set<T>();`
`144`	`144`	`if (ignoreQueryFilters)`
`145`	`145`	`{`
`146`		`- if (isChangeTracking)`
	`146`	`+ if (!isChangeTracking)`
`147`	`147`	`{`
`148`	`148`	`query = query.IgnoreQueryFilters().Where(predicate).AsNoTracking();`
`149`	`149`	`}`
`@@ -154,7 +154,7 @@ public async Task<T> GetByIdAsync(Expression<Func<T, bool>> predicate, bool isCh`
`154`	`154`	`}`
`155`	`155`	`else`
`156`	`156`	`{`
`157`		`- if (isChangeTracking)`
	`157`	`+ if (!isChangeTracking)`
`158`	`158`	`{`
`159`	`159`	`query = query.Where(predicate).AsNoTracking();`
`160`	`160`	`}`
`@@ -172,7 +172,7 @@ public async Task<T> GetWithIncludeAsync(bool isChangeTracking, Expression<Func<`
`172`	`172`	`IQueryable<T> query = context.Set<T>();`
`173`	`173`	`if (ignoreQueryFilters)`
`174`	`174`	`{`
`175`		`- if (isChangeTracking)`
	`175`	`+ if (!isChangeTracking)`
`176`	`176`	`{`
`177`	`177`	`query = query.IgnoreQueryFilters().Where(predicate);`
`178`	`178`	`if (includes is not null)`
`@@ -197,7 +197,7 @@ public async Task<T> GetWithIncludeAsync(bool isChangeTracking, Expression<Func<`
`197`	`197`	`}`
`198`	`198`	`else`
`199`	`199`	`{`
`200`		`- if (isChangeTracking)`
	`200`	`+ if (!isChangeTracking)`
`201`	`201`	`{`
`202`	`202`	`query = query.Where(predicate);`
`203`	`203`	`if (includes is not null)`