Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Refactoring - use repository extensions (checkout service)
KrzysztofPajak93e1219b5a8a
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.csindex c5b86d6da..e21f8411a 100644--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs@@ -1,7 +1,6 @@using Grand.Domain.Catalog;using Grand.Domain.Data;using MediatR;-using MongoDB.Driver;using System.Threading;using System.Threading.Tasks;@@ -19,7 +18,7 @@ namespace Grand.Business.Checkout.Events.Orderspublic Task Handle(OrderDeletedEvent notification, CancellationToken cancellationToken){//delete product also purchased- var filters = Builders<ProductAlsoPurchased>.Filter;+ var filters = MongoDB.Driver.Builders<ProductAlsoPurchased>.Filter;var filter = filters.Where(x => x.OrderId == notification.Order.Id);return _productAlsoPurchasedRepository.Collection.DeleteManyAsync(filter);}diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.csindex 819b6639f..f1f84b6ab 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs@@ -2,14 +2,13 @@using Grand.Domain.Data;using Grand.Domain.Orders;using MediatR;-using MongoDB.Driver.Linq;using System.Linq;using System.Threading;using System.Threading.Tasks;namespace Grand.Business.Checkout.Queries.Handlers.Orders{- public class GetGiftVoucherQueryHandler : IRequestHandler<GetGiftVoucherQuery, IMongoQueryable<GiftVoucher>>+ public class GetGiftVoucherQueryHandler : IRequestHandler<GetGiftVoucherQuery, IQueryable<GiftVoucher>>{private readonly IRepository<GiftVoucher> _giftVoucherRepository;@@ -18,9 +17,10 @@ namespace Grand.Business.Checkout.Queries.Handlers.Orders_giftVoucherRepository = giftVoucherRepository;}- public Task<IMongoQueryable<GiftVoucher>> Handle(GetGiftVoucherQuery request, CancellationToken cancellationToken)+ public Task<IQueryable<GiftVoucher>> Handle(GetGiftVoucherQuery request, CancellationToken cancellationToken){- var query = _giftVoucherRepository.Table;+ var query = from p in _giftVoucherRepository.Table+ select p;if (!string.IsNullOrEmpty(request.GiftVoucherId))query = query.Where(gc => gc.Id == request.GiftVoucherId);diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.csindex d672b9bf7..3a29443a1 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs@@ -2,14 +2,13 @@using Grand.Domain.Data;using Grand.Domain.Orders;using MediatR;-using MongoDB.Driver.Linq;using System.Linq;using System.Threading;using System.Threading.Tasks;namespace Grand.Business.Checkout.Queries.Handlers.Orders{- public class GetMerchandiseReturnQueryHandler : IRequestHandler<GetMerchandiseReturnQuery, IMongoQueryable<MerchandiseReturn>>+ public class GetMerchandiseReturnQueryHandler : IRequestHandler<GetMerchandiseReturnQuery, IQueryable<MerchandiseReturn>>{private readonly IRepository<MerchandiseReturn> _merchandiseReturnRepository;@@ -18,9 +17,11 @@ namespace Grand.Business.Checkout.Queries.Handlers.Orders_merchandiseReturnRepository = merchandiseReturnRepository;}- public Task<IMongoQueryable<MerchandiseReturn>> Handle(GetMerchandiseReturnQuery request, CancellationToken cancellationToken)+ public Task<IQueryable<MerchandiseReturn>> Handle(GetMerchandiseReturnQuery request, CancellationToken cancellationToken){- var query = _merchandiseReturnRepository.Table;+ var query = from p in _merchandiseReturnRepository.Table+ select p;+if (!string.IsNullOrEmpty(request.StoreId))query = query.Where(rr => request.StoreId == rr.StoreId);diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.csindex 5cbd257c7..4b0ca14ec 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs@@ -2,8 +2,6 @@using Grand.Domain.Data;using Grand.Domain.Orders;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Linq;using System.Threading;@@ -11,7 +9,7 @@ using System.Threading.Tasks;namespace Grand.Business.Checkout.Queries.Handlers.Orders{- public class GetOrderQueryHandler : IRequestHandler<GetOrderQuery, IMongoQueryable<Order>>+ public class GetOrderQueryHandler : IRequestHandler<GetOrderQuery, IQueryable<Order>>{private readonly IRepository<Order> _orderRepository;@@ -20,9 +18,11 @@ namespace Grand.Business.Checkout.Queries.Handlers.Orders_orderRepository = orderRepository;}- public Task<IMongoQueryable<Order>> Handle(GetOrderQuery request, CancellationToken cancellationToken)+ public Task<IQueryable<Order>> Handle(GetOrderQuery request, CancellationToken cancellationToken){- var query = _orderRepository.Table;+ var query = from p in _orderRepository.Table+ select p;+if (!string.IsNullOrEmpty(request.OrderId))query = query.Where(o => o.Id == request.OrderId);diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.csindex 61976155c..36a104a2e 100644--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs@@ -2,14 +2,13 @@using Grand.Domain.Data;using Grand.Domain.Payments;using MediatR;-using MongoDB.Driver.Linq;using System.Linq;using System.Threading;using System.Threading.Tasks;namespace Grand.Business.Checkout.Queries.Handlers.Orders{- public class GetPaymentTransactionQueryHandler : IRequestHandler<GetPaymentTransactionQuery, IMongoQueryable<PaymentTransaction>>+ public class GetPaymentTransactionQueryHandler : IRequestHandler<GetPaymentTransactionQuery, IQueryable<PaymentTransaction>>{private readonly IRepository<PaymentTransaction> _paymentTransactionRepository;@@ -18,9 +17,10 @@ namespace Grand.Business.Checkout.Queries.Handlers.Orders_paymentTransactionRepository = paymentTransactionRepository;}- public Task<IMongoQueryable<PaymentTransaction>> Handle(GetPaymentTransactionQuery request, CancellationToken cancellationToken)+ public Task<IQueryable<PaymentTransaction>> Handle(GetPaymentTransactionQuery request, CancellationToken cancellationToken){- var query = _paymentTransactionRepository.Table;+ var query = from p in _paymentTransactionRepository.Table+ select p;if (!string.IsNullOrEmpty(request.StoreId))query = query.Where(rr => request.StoreId == rr.StoreId);diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.csindex 4594939b6..3b1bb3372 100644--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs@@ -1,11 +1,11 @@using Grand.Domain.Orders;using MediatR;-using MongoDB.Driver.Linq;using System;+using System.Linq;namespace Grand.Business.Checkout.Queries.Models.Orders{- public class GetGiftVoucherQuery : IRequest<IMongoQueryable<GiftVoucher>>+ public class GetGiftVoucherQuery : IRequest<IQueryable<GiftVoucher>>{public string GiftVoucherId { get; set; } = "";public string PurchasedWithOrderItemId { get; set; } = "";diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.csindex a91230524..fbb4fc1d1 100644--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs@@ -1,11 +1,11 @@using Grand.Domain.Orders;using MediatR;-using MongoDB.Driver.Linq;using System;+using System.Linq;namespace Grand.Business.Checkout.Queries.Models.Orders{- public class GetMerchandiseReturnQuery : IRequest<IMongoQueryable<MerchandiseReturn>>+ public class GetMerchandiseReturnQuery : IRequest<IQueryable<MerchandiseReturn>>{public string StoreId { get; set; } = "";public string CustomerId { get; set; } = "";diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.csindex 18469babd..94569c9f7 100644--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs@@ -2,12 +2,12 @@using Grand.Domain.Payments;using Grand.Domain.Shipping;using MediatR;-using MongoDB.Driver.Linq;using System;+using System.Linq;namespace Grand.Business.Checkout.Queries.Models.Orders{- public class GetOrderQuery : IRequest<IMongoQueryable<Order>>+ public class GetOrderQuery : IRequest<IQueryable<Order>>{public string OrderId { get; set; } = "";public string StoreId { get; set; } = "";diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.csindex 8bf7dcae0..647ed3184 100644--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs+++ b/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs@@ -1,11 +1,11 @@using Grand.Domain.Payments;using MediatR;-using MongoDB.Driver.Linq;using System;+using System.Linq;namespace Grand.Business.Checkout.Queries.Models.Orders{- public class GetPaymentTransactionQuery : IRequest<IMongoQueryable<PaymentTransaction>>+ public class GetPaymentTransactionQuery : IRequest<IQueryable<PaymentTransaction>>{public string StoreId { get; set; } = "";public string CustomerEmail { get; set; } = "";diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.csindex 286d83d70..933e7db02 100644--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs@@ -8,8 +8,6 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.SharedKernel.Extensions;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -64,7 +62,9 @@ namespace Grand.Business.Checkout.Services.CheckoutAttributesstring key = string.Format(CacheKey.CHECKOUTATTRIBUTES_ALL_KEY, storeId, excludeShippableAttributes, ignorAcl);return await _cacheBase.GetAsync(key, () =>{- var query = _checkoutAttributeRepository.Table;+ var query = from p in _checkoutAttributeRepository.Table+ select p;+query = query.OrderBy(c => c.DisplayOrder);if ((!String.IsNullOrEmpty(storeId) && !CommonHelper.IgnoreStoreLimitations) ||@@ -89,7 +89,7 @@ namespace Grand.Business.Checkout.Services.CheckoutAttributes{query = query.Where(x => !x.ShippableProductRequired);}- return query.ToListAsync();+ return query.ToListAsync2();});}diff --git a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.csindex 60655934c..177b96cff 100644--- a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs+++ b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs@@ -5,8 +5,6 @@ using Grand.Domain;using Grand.Domain.Data;using Grand.Domain.Orders;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -95,7 +93,7 @@ namespace Grand.Business.Checkout.Services.GiftVouchersselect h;query = query.Where(x => x.UsedWithOrderId == orderId);- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>@@ -153,12 +151,13 @@ namespace Grand.Business.Checkout.Services.GiftVouchersif (String.IsNullOrEmpty(purchasedWithOrderItemId))return new List<GiftVoucher>();- var query = _giftVoucherRepository.Table;+ var query = from p in _giftVoucherRepository.Table+ select p;query = query.Where(gc => gc.PurchasedWithOrderItem.Id == purchasedWithOrderItemId);query = query.OrderBy(gc => gc.Id);- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.csindex fb923a19e..16bb79745 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs@@ -3,8 +3,6 @@ using Grand.Domain.Data;using Grand.Domain.Orders;using Grand.Infrastructure.Extensions;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -53,14 +51,16 @@ namespace Grand.Business.Checkout.Services.Orderspublic virtual async Task<int> GetLoyaltyPointsBalance(string customerId, string storeId){- var query = _rphRepository.Table;+ var query = from p in _rphRepository.Table+ select p;+if (!String.IsNullOrEmpty(customerId))query = query.Where(rph => rph.CustomerId == customerId);if (!_loyaltyPointsSettings.PointsAccumulatedForAllStores)query = query.Where(rph => rph.StoreId == storeId);query = query.OrderByDescending(rph => rph.CreatedOnUtc).ThenByDescending(rph => rph.Id);- var lastRph = await query.FirstOrDefaultAsync();+ var lastRph = await query.FirstOrDefaultAsync2();return lastRph != null ? lastRph.PointsBalance : 0;}@@ -100,7 +100,9 @@ namespace Grand.Business.Checkout.Services.Orderspublic virtual async Task<IList<LoyaltyPointsHistory>> GetLoyaltyPointsHistory(string customerId = "", string storeId = "", bool showAll = false){- var query = _rphRepository.Table;+ var query = from p in _rphRepository.Table+ select p;+if (!string.IsNullOrEmpty(customerId))query = query.Where(rph => rph.CustomerId == customerId);if (!showAll && !_loyaltyPointsSettings.PointsAccumulatedForAllStores)@@ -111,7 +113,7 @@ namespace Grand.Business.Checkout.Services.Orders}query = query.OrderByDescending(rph => rph.CreatedOnUtc).ThenByDescending(rph => rph.Id);- return await query.ToListAsync();+ return await query.ToListAsync2();}#endregiondiff --git a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.csindex f35278b34..5ed7571f1 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs@@ -7,8 +7,6 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -81,7 +79,7 @@ namespace Grand.Business.Checkout.Services.Orders/// <returns>Merchandise return</returns>public virtual Task<MerchandiseReturn> GetMerchandiseReturnById(int id){- return _merchandiseReturnRepository.Table.Where(x => x.ReturnNumber == id).FirstOrDefaultAsync();+ return _merchandiseReturnRepository.Table.Where(x => x.ReturnNumber == id).FirstOrDefaultAsync2();}/// <summary>@@ -131,7 +129,7 @@ namespace Grand.Business.Checkout.Services.Ordersvar query = from rra in _merchandiseReturnActionRepository.Tableorderby rra.DisplayOrder, rra.Idselect rra;- return await query.ToListAsync();+ return await query.ToListAsync2();});}@@ -274,7 +272,7 @@ namespace Grand.Business.Checkout.Services.Ordersvar query = from rra in _merchandiseReturnReasonRepository.Tableorderby rra.DisplayOrder, rra.Idselect rra;- return await query.ToListAsync();+ return await query.ToListAsync2();});}@@ -369,7 +367,7 @@ namespace Grand.Business.Checkout.Services.Ordersorderby merchandiseReturnNote.CreatedOnUtc descendingselect merchandiseReturnNote;- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>@@ -379,7 +377,7 @@ namespace Grand.Business.Checkout.Services.Orders/// <returns>MerchandiseReturnNote</returns>public virtual Task<MerchandiseReturnNote> GetMerchandiseReturnNote(string merchandiseReturnNoteId){- return _merchandiseReturnNoteRepository.Table.Where(x => x.Id == merchandiseReturnNoteId).FirstOrDefaultAsync();+ return _merchandiseReturnNoteRepository.Table.Where(x => x.Id == merchandiseReturnNoteId).FirstOrDefaultAsync2();}#endregiondiff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.csindex c06a0516f..71f7d670a 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs@@ -8,9 +8,6 @@ using Grand.Domain.Payments;using Grand.Domain.Shipping;using Grand.Infrastructure.Extensions;using MediatR;-using MongoDB.Bson;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -78,7 +75,7 @@ namespace Grand.Business.Checkout.Services.Orderswhere o.OrderItems.Any(x => x.Id == orderItemId)select o;- return query.FirstOrDefaultAsync();+ return query.FirstOrDefaultAsync2();}/// <summary>/// Gets an order@@ -87,7 +84,7 @@ namespace Grand.Business.Checkout.Services.Orders/// <returns>Order</returns>public virtual Task<Order> GetOrderByNumber(int orderNumber){- return _orderRepository.Table.FirstOrDefaultAsync(x => x.OrderNumber == orderNumber);+ return _orderRepository.Table.Where(x => x.OrderNumber == orderNumber).FirstOrDefaultAsync2();}/// <summary>@@ -100,7 +97,7 @@ namespace Grand.Business.Checkout.Services.Ordersif (string.IsNullOrEmpty(code))return new List<Order>();- return await _orderRepository.Table.Where(x => x.Code == code.ToUpperInvariant()).ToListAsync();+ return await _orderRepository.Table.Where(x => x.Code == code.ToUpperInvariant()).ToListAsync2();}@@ -117,7 +114,7 @@ namespace Grand.Business.Checkout.Services.Ordersvar query = from o in _orderRepository.Tablewhere orderIds.Contains(o.Id)select o;- var orders = await query.ToListAsync();+ var orders = await query.ToListAsync2();//sort by passed identifiersvar sortedOrders = new List<Order>();foreach (string id in orderIds)@@ -139,7 +136,7 @@ namespace Grand.Business.Checkout.Services.Ordersvar query = from o in _orderRepository.Tablewhere o.OrderGuid == orderGuidselect o;- return query.FirstOrDefaultAsync();+ return query.FirstOrDefaultAsync2();}/// <summary>@@ -250,7 +247,7 @@ namespace Grand.Business.Checkout.Services.Orderso.PaymentStatusId == PaymentStatus.Pending &&o.OrderStatusId == (int)OrderStatusSystem.Pending &&(o.ShippingStatusId == ShippingStatus.Pending || o.ShippingStatusId == ShippingStatus.ShippingNotRequired))- .ToListAsync();+ .ToListAsync2();foreach (var order in orders)await _mediator.Send(new CancelOrderCommand() { Order = order, NotifyCustomer = true });@@ -275,7 +272,7 @@ namespace Grand.Business.Checkout.Services.Orderswhere orderItem.OrderItemGuid == orderItemGuidselect orderItem;- return query.FirstOrDefaultAsync();+ return query.FirstOrDefaultAsync2();}/// <summary>@@ -289,9 +286,9 @@ namespace Grand.Business.Checkout.Services.Ordersvar order = await GetOrderByOrderItemId(orderItem.Id);- var updatebuilder = Builders<Order>.Update;+ var updatebuilder = MongoDB.Driver.Builders<Order>.Update;var updatefilter = updatebuilder.PullFilter(x => x.OrderItems, y => y.Id == orderItem.Id);- await _orderRepository.Collection.UpdateOneAsync(new BsonDocument("_id", order.Id), updatefilter);+ await _orderRepository.Collection.UpdateOneAsync(new MongoDB.Bson.BsonDocument("_id", order.Id), updatefilter);//event notificationawait _mediator.EntityDeleted(orderItem);@@ -338,7 +335,7 @@ namespace Grand.Business.Checkout.Services.Ordersorderby orderNote.CreatedOnUtc descendingselect orderNote;- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>@@ -348,7 +345,7 @@ namespace Grand.Business.Checkout.Services.Orders/// <returns>OrderNote</returns>public virtual Task<OrderNote> GetOrderNote(string ordernoteId){- return _orderNoteRepository.Table.Where(x => x.Id == ordernoteId).FirstOrDefaultAsync();+ return _orderNoteRepository.Table.Where(x => x.Id == ordernoteId).FirstOrDefaultAsync2();}diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.csindex ac8deb116..7af8a35da 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs@@ -5,8 +5,6 @@ using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -35,9 +33,11 @@ namespace Grand.Business.Checkout.Services.Ordersstring key = string.Format(CacheKey.ORDER_STATUS_ALL);var orderstatuses = await _cacheBase.GetAsync(CacheKey.ORDER_STATUS_ALL, () =>{- var query = _orderStatusRepository.Table;+ var query = from p in _orderStatusRepository.Table+ select p;+query = query.OrderBy(l => l.DisplayOrder);- return query.ToListAsync();+ return query.ToListAsync2();});return orderstatuses;diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.csindex 1f46366bb..6d74a099c 100644--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs@@ -5,9 +5,6 @@ using Grand.Infrastructure.Extensions;using Grand.Domain.Data;using Grand.Domain.Orders;using MediatR;-using MongoDB.Bson;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -59,7 +56,7 @@ namespace Grand.Business.Checkout.Services.Ordersselect ot;var dictionary = new Dictionary<string, int>();- foreach (var tag in await query.ToListAsync())+ foreach (var tag in await query.ToListAsync2()){dictionary.Add(tag.Id, tag.Count);}@@ -79,7 +76,7 @@ namespace Grand.Business.Checkout.Services.Orderspublic virtual async Task<IList<OrderTag>> GetAllOrderTags(){var query = _orderTagRepository.Table;- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>@@ -103,7 +100,7 @@ namespace Grand.Business.Checkout.Services.Orderswhere pt.Name == nameselect pt;- return query.FirstOrDefaultAsync();+ return query.FirstOrDefaultAsync2();}/// <summary>@@ -150,9 +147,9 @@ namespace Grand.Business.Checkout.Services.Ordersif (orderTag == null)throw new ArgumentNullException(nameof(orderTag));- var builder = Builders<Order>.Update;+ var builder = MongoDB.Driver.Builders<Order>.Update;var updatefilter = builder.Pull(x => x.OrderTags, orderTag.Id);- await _orderRepository.Collection.UpdateManyAsync(new BsonDocument(), updatefilter);+ await _orderRepository.Collection.UpdateManyAsync(new MongoDB.Bson.BsonDocument(), updatefilter);await _orderTagRepository.DeleteAsync(orderTag);@@ -170,15 +167,15 @@ namespace Grand.Business.Checkout.Services.Orders/// <param name="orderTag">Order's identification</param>public virtual async Task AttachOrderTag(string orderTagId, string orderId){- var updateBuilder = Builders<Order>.Update;+ var updateBuilder = MongoDB.Driver.Builders<Order>.Update;var update = updateBuilder.AddToSet(p => p.OrderTags, orderTagId);- await _orderRepository.Collection.UpdateOneAsync(new BsonDocument("_id", orderId), update);+ await _orderRepository.Collection.UpdateOneAsync(new MongoDB.Bson.BsonDocument("_id", orderId), update);// update ordertag with count's order and new order id- var updateBuilderTag = Builders<OrderTag>.Update+ var updateBuilderTag = MongoDB.Driver.Builders<OrderTag>.Update.Inc(x => x.Count, 1);- await _orderTagRepository.Collection.UpdateOneAsync(new BsonDocument("_id", orderTagId), updateBuilderTag);+ await _orderTagRepository.Collection.UpdateOneAsync(new MongoDB.Bson.BsonDocument("_id", orderTagId), updateBuilderTag);var orderTag = await _orderTagRepository.GetByIdAsync(orderTagId);//cache@@ -195,13 +192,13 @@ namespace Grand.Business.Checkout.Services.Orders/// <param name="orderTag">Order Tag</param>public virtual async Task DetachOrderTag(string orderTagId, string orderId){- var updateBuilder = Builders<Order>.Update;+ var updateBuilder = MongoDB.Driver.Builders<Order>.Update;var update = updateBuilder.Pull(p => p.OrderTags, orderTagId);- await _orderRepository.Collection.UpdateOneAsync(new BsonDocument("_id", orderId), update);+ await _orderRepository.Collection.UpdateOneAsync(new MongoDB.Bson.BsonDocument("_id", orderId), update);- var updateTag = Builders<OrderTag>.Update+ var updateTag = MongoDB.Driver.Builders<OrderTag>.Update.Inc(x => x.Count, -1);- await _orderTagRepository.Collection.UpdateManyAsync(new BsonDocument("_id", orderTagId), updateTag);+ await _orderTagRepository.Collection.UpdateManyAsync(new MongoDB.Bson.BsonDocument("_id", orderTagId), updateTag);//cacheawait _cacheBase.RemoveAsync(string.Format(CacheKey.ORDERS_BY_ID_KEY, orderId));diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.csindex 013aac286..a809f9da8 100644--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs@@ -5,8 +5,6 @@ using Grand.Domain.Data;using Grand.Domain.Payments;using Grand.Infrastructure.Extensions;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -92,7 +90,7 @@ namespace Grand.Business.Checkout.Services.Payments{return await_repositoryPaymentTransaction.Table.Where(x => x.OrderCode == orderCode)- .ToListAsync();+ .ToListAsync2();}/// <summary>@@ -104,7 +102,7 @@ namespace Grand.Business.Checkout.Services.Payments{return await_repositoryPaymentTransaction.Table.Where(x => x.OrderGuid == orderguid)- .FirstOrDefaultAsync();+ .FirstOrDefaultAsync2();}/// <summary>@@ -115,7 +113,8 @@ namespace Grand.Business.Checkout.Services.Payments/// <returns>Order</returns>public virtual async Task<IList<PaymentTransaction>> GetByAuthorizationTransactionIdAndPaymentMethod(string authorizationTransactionId, string paymentMethodSystemName){- var query = _repositoryPaymentTransaction.Table;+ var query = from p in _repositoryPaymentTransaction.Table+ select p;if (!string.IsNullOrEmpty(authorizationTransactionId))query = query.Where(c => c.AuthorizationTransactionId == authorizationTransactionId);@@ -123,7 +122,7 @@ namespace Grand.Business.Checkout.Services.Paymentsif (!string.IsNullOrEmpty(paymentMethodSystemName))query = query.Where(c => c.PaymentMethodSystemName == paymentMethodSystemName);- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>@@ -147,8 +146,7 @@ namespace Grand.Business.Checkout.Services.PaymentsDateTime? createdFromUtc = null,DateTime? createdToUtc = null){- var model = new GetPaymentTransactionQuery()- {+ var model = new GetPaymentTransactionQuery() {CreatedFromUtc = createdFromUtc,CreatedToUtc = createdToUtc,PageIndex = pageIndex,@@ -168,12 +166,7 @@ namespace Grand.Business.Checkout.Services.Payments/// </summary>public virtual async Task SetError(string paymenttransactionId, List<string> errors){- var builder = Builders<PaymentTransaction>.Filter;- var filter = builder.Eq(x => x.Id, paymenttransactionId);- var update = Builders<PaymentTransaction>.Update- .Set(x => x.Errors, errors);-- await _repositoryPaymentTransaction.Collection.UpdateManyAsync(filter, update);+ await _repositoryPaymentTransaction.UpdateField(paymenttransactionId, x => x.Errors, errors);}}}diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.csindex d3af883e6..29bcaca5a 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs@@ -5,8 +5,6 @@ using Grand.Infrastructure.Extensions;using Grand.Domain.Data;using Grand.Domain.Shipping;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -65,7 +63,7 @@ namespace Grand.Business.Checkout.Services.Shippingvar query = from dd in _deliveryDateRepository.Tableorderby dd.DisplayOrderselect dd;- return query.ToListAsync();+ return query.ToListAsync2();});}diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.csindex 805bd6202..41d54391f 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs@@ -5,8 +5,6 @@ using Grand.Infrastructure.Extensions;using Grand.Domain.Data;using Grand.Domain.Shipping;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -64,7 +62,7 @@ namespace Grand.Business.Checkout.Services.Shippingvar query = from pp in _pickupPointsRepository.Tableorderby pp.DisplayOrderselect pp;- return query.ToListAsync();+ return query.ToListAsync2();});}diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.csindex 03497f56e..da6efe471 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs@@ -6,8 +6,6 @@ using Grand.Domain.Common;using Grand.Domain.Data;using Grand.Domain.Shipping;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -73,32 +71,29 @@ namespace Grand.Business.Checkout.Services.ShippingDateTime? createdFromUtc = null, DateTime? createdToUtc = null,int pageIndex = 0, int pageSize = int.MaxValue){-- var builder = Builders<Shipment>.Filter;- var filter = builder.Where(s => s.OrderId != "");+ var query = from p in _shipmentRepository.Table+ select p;if (!string.IsNullOrEmpty(storeId)){- filter = filter & builder.Where(x => x.StoreId == storeId);+ query = query.Where(x => x.StoreId == storeId);}if (!string.IsNullOrEmpty(vendorId)){- filter = filter & builder.Where(x => x.VendorId == vendorId);+ query = query.Where(x => x.VendorId == vendorId);}if (!string.IsNullOrEmpty(trackingNumber))- filter = filter & builder.Where(s => s.TrackingNumber.Contains(trackingNumber));+ query = query.Where(s => s.TrackingNumber.Contains(trackingNumber));if (loadNotShipped)- filter = filter & builder.Where(s => !s.ShippedDateUtc.HasValue);+ query = query.Where(s => !s.ShippedDateUtc.HasValue);if (createdFromUtc.HasValue)- filter = filter & builder.Where(s => createdFromUtc.Value <= s.CreatedOnUtc);+ query = query.Where(s => createdFromUtc.Value <= s.CreatedOnUtc);if (createdToUtc.HasValue)- filter = filter & builder.Where(s => createdToUtc.Value >= s.CreatedOnUtc);-- var builderSort = Builders<Shipment>.Sort.Descending(x => x.CreatedOnUtc);+ query = query.Where(s => createdToUtc.Value >= s.CreatedOnUtc);- var query = _shipmentRepository.Collection;- var shipments = await PagedList<Shipment>.Create(query, filter, builderSort, pageIndex, pageSize);+ query = query.OrderByDescending(x => x.CreatedOnUtc);+ var shipments = await PagedList<Shipment>.Create(query, pageIndex, pageSize);return shipments;}@@ -116,7 +111,7 @@ namespace Grand.Business.Checkout.Services.Shippingvar query = from o in _shipmentRepository.Tablewhere shipmentIds.Contains(o.Id)select o;- var shipments = await query.ToListAsync();+ var shipments = await query.ToListAsync2();//sort by passed identifiersvar sortedOrders = new List<Shipment>();@@ -132,7 +127,7 @@ namespace Grand.Business.Checkout.Services.Shippingpublic virtual async Task<IList<Shipment>> GetShipmentsByOrder(string orderId){- return await _shipmentRepository.Collection.Find(x => x.OrderId == orderId).ToListAsync();+ return await _shipmentRepository.Table.Where(x => x.OrderId == orderId).ToListAsync2();}/// <summary>@@ -212,7 +207,9 @@ namespace Grand.Business.Checkout.Services.Shippingif (!product.UseMultipleWarehouses)return 0;- var query = _shipmentRepository.Table;+ var query = from p in _shipmentRepository.Table+ select p;+if (!String.IsNullOrEmpty(warehouseId))query = query.Where(si => si.ShipmentItems.Any(x => x.WarehouseId == warehouseId));if (ignoreShipped)@@ -228,7 +225,7 @@ namespace Grand.Business.Checkout.Services.Shippingif (!String.IsNullOrEmpty(warehouseId))result = result.Where(x => x.WarehouseId == warehouseId);- return await result.SumAsync(x => x.Quantity);+ return await Task.FromResult(result.Sum(x => x.Quantity));}@@ -271,7 +268,7 @@ namespace Grand.Business.Checkout.Services.Shippingorderby shipmentNote.CreatedOnUtc descendingselect shipmentNote;- return await query.ToListAsync();+ return await query.ToListAsync2();}/// <summary>@@ -281,7 +278,7 @@ namespace Grand.Business.Checkout.Services.Shipping/// <returns>shipmentNote</returns>public virtual Task<ShipmentNote> GetShipmentNote(string shipmentnoteId){- return _shipmentNoteRepository.Table.Where(x => x.Id == shipmentnoteId).FirstOrDefaultAsync();+ return _shipmentNoteRepository.Table.Where(x => x.Id == shipmentnoteId).FirstOrDefaultAsync2();}diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.csindex e1696bf47..2e98936a4 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs@@ -7,8 +7,6 @@ using Grand.Domain.Customers;using Grand.Domain.Data;using Grand.Domain.Shipping;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -89,7 +87,7 @@ namespace Grand.Business.Checkout.Services.Shippingvar query = from sm in _shippingMethodRepository.Tableorderby sm.DisplayOrderselect sm;- return query.ToListAsync();+ return query.ToListAsync2();});if (!string.IsNullOrEmpty(filterByCountryId))diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.csindex ebea9bf63..d8ecce74a 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs@@ -11,8 +11,6 @@ using Grand.Domain.Shipping;using Grand.Domain.Stores;using Grand.Infrastructure.Extensions;using Grand.SharedKernel;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.csindex f669bf6ae..21e7bcf52 100644--- a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs@@ -5,8 +5,6 @@ using Grand.Infrastructure.Extensions;using Grand.Domain.Data;using Grand.Domain.Shipping;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -65,7 +63,7 @@ namespace Grand.Business.Checkout.Services.Shippingvar query = from wh in _warehouseRepository.Tableorderby wh.DisplayOrderselect wh;- return query.ToListAsync();+ return query.ToListAsync2();});}