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 (reports)
KrzysztofPajak509f8a059cd4
diff --git a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.csindex 8835973a3..b9cbc9178 100644--- a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs@@ -41,7 +41,7 @@ namespace Grand.Business.System.Services.Reports/// <param name="dateTimeService">Date time helper</param>/// <param name="groupService">group service</param>public CustomerReportService(IRepository<Customer> customerRepository,- IRepository<Order> orderRepository,+ IRepository<Order> orderRepository,ICustomerService customerService,IGroupService groupService,IDateTimeService dateTimeService)@@ -117,8 +117,7 @@ namespace Grand.Business.System.Services.Reports}var tmp = new PagedList<dynamic>(query2, pageIndex, pageSize);- return new PagedList<BestCustomerReportLine>(tmp.Select(x => new BestCustomerReportLine- {+ return new PagedList<BestCustomerReportLine>(tmp.Select(x => new BestCustomerReportLine {CustomerId = x.CustomerId,OrderTotal = x.OrderTotal,OrderCount = x.OrderCount@@ -183,8 +182,8 @@ namespace Grand.Business.System.Services.Reportsvar daydiff = (endTimeUtc.Value - startTimeUtc.Value).TotalDays;if (daydiff > 31){- var query = builderquery.GroupBy(x => new- { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month })+ var query = builderquery.GroupBy(x => new+ { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month }).Select(g => new CustomerStats {Year = g.Key.Year,Month = g.Key.Month,@@ -192,9 +191,8 @@ namespace Grand.Business.System.Services.Reports}).ToList();foreach (var item in query){- report.Add(new CustomerByTimeReportLine()- {- Time = item.Year.ToString() + "-" + item.Month.ToString(),+ report.Add(new CustomerByTimeReportLine() {+ Time = item.Year.ToString() + "-" + item.Month.ToString().PadLeft(2, '0'),Registered = item.Count,});}@@ -204,16 +202,15 @@ namespace Grand.Business.System.Services.Reportsvar query = builderquery.GroupBy(x =>new { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month, Day = x.CreatedOnUtc.Day }).Select(g => new CustomerStats {- Year = g.Key.Year,- Month = g.Key.Month,- Day = g.Key.Day,- Count = g.Count(),- }).ToList();+ Year = g.Key.Year,+ Month = g.Key.Month,+ Day = g.Key.Day,+ Count = g.Count(),+ }).ToList();foreach (var item in query){- report.Add(new CustomerByTimeReportLine()- {- Time = item.Year.ToString() + "-" + item.Month.ToString() + "-" + item.Day.ToString(),+ report.Add(new CustomerByTimeReportLine() {+ Time = item.Year.ToString() + "-" + item.Month.ToString().PadLeft(2, '0') + "-" + item.Day.ToString().PadLeft(2, '0'),Registered = item.Count,});}@@ -221,7 +218,7 @@ namespace Grand.Business.System.Services.Reports- return report;+ return report.OrderBy(x => x.Time).ToList();}#endregiondiff --git a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.csindex 57a7f609d..de9669f65 100644--- a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs+++ b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs@@ -7,8 +7,6 @@ using Grand.Domain.Data;using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Domain.Shipping;-using MongoDB.Bson;-using MongoDB.Driver;using System;using System.Collections.Generic;using System.Globalization;@@ -95,8 +93,7 @@ namespace Grand.Business.System.Services.Reports}).OrderByDescending(x => x.SumOrders)- .Select(r => new OrderByCountryReportLine- {+ .Select(r => new OrderByCountryReportLine {CountryId = r.CountryId,TotalOrders = r.TotalOrders,SumOrders = r.SumOrders@@ -124,25 +121,31 @@ namespace Grand.Business.System.Services.Reportsvar endTime = new DateTime(endTimeUtc.Value.Year, endTimeUtc.Value.Month, endTimeUtc.Value.Day, 23, 59, 00);- var builder = Builders<Order>.Filter;+ var builderquery = from p in _orderRepository.Table+ select p;- var filter = builder.Where(o => !o.Deleted);- filter = filter & builder.Where(o => o.CreatedOnUtc >= startTimeUtc.Value && o.CreatedOnUtc <= endTime);+ builderquery = builderquery.Where(o => !o.Deleted);+ builderquery = builderquery.Where(o => o.CreatedOnUtc >= startTimeUtc.Value && o.CreatedOnUtc <= endTime);if (!string.IsNullOrEmpty(storeId))- filter = filter & builder.Where(o => o.StoreId == storeId);+ builderquery = builderquery.Where(o => o.StoreId == storeId);var daydiff = (endTimeUtc.Value - startTimeUtc.Value).TotalDays;if (daydiff > 31){- var query = await _orderRepository.Collection.Aggregate().Match(filter).Group(x =>- new { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month },- g => new { Period = g.Key, Amount = g.Sum(x => x.OrderTotal / x.CurrencyRate), Count = g.Count() }).SortBy(x => x.Period).ToListAsync();+ var query = await builderquery.GroupBy(x =>+ new { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month })+ .Select(g => new OrderStats {+ Year = g.Key.Year,+ Month = g.Key.Month,+ Count = g.Count(),+ Amount = g.Sum(x => x.OrderTotal * x.CurrencyRate)+ }).ToListAsync2();+foreach (var item in query){- report.Add(new OrderByTimeReportLine()- {- Time = item.Period.Year.ToString() + "-" + item.Period.Month.ToString(),+ report.Add(new OrderByTimeReportLine() {+ Time = item.Year.ToString().PadLeft(2, '0') + "-" + item.Month.ToString().PadLeft(2, '0'),SumOrders = Math.Round(item.Amount, 2),TotalOrders = item.Count,});@@ -150,14 +153,20 @@ namespace Grand.Business.System.Services.Reports}else{- var query = await _orderRepository.Collection.Aggregate().Match(filter).Group(x =>- new { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month, Day = x.CreatedOnUtc.Day },- g => new { Period = g.Key, Amount = g.Sum(x => x.OrderTotal / x.CurrencyRate), Count = g.Count() }).SortBy(x => x.Period).ToListAsync();+ var query = await builderquery.GroupBy(x =>+ new { Year = x.CreatedOnUtc.Year, Month = x.CreatedOnUtc.Month, Day = x.CreatedOnUtc.Day })+ .Select(g => new OrderStats {+ Year = g.Key.Year,+ Month = g.Key.Month,+ Day = g.Key.Day,+ Count = g.Count(),+ Amount = g.Sum(x => x.OrderTotal * x.CurrencyRate)+ }).ToListAsync2();+foreach (var item in query){- report.Add(new OrderByTimeReportLine()- {- Time = item.Period.Year.ToString() + "-" + item.Period.Month.ToString() + "-" + item.Period.Day.ToString(),+ report.Add(new OrderByTimeReportLine() {+ Time = item.Year.ToString().PadLeft(2, '0') + "-" + item.Month.ToString().PadLeft(2, '0') + "-" + item.Day.ToString().PadLeft(2, '0'),SumOrders = Math.Round(item.Amount, 2),TotalOrders = item.Count,});@@ -196,78 +205,75 @@ namespace Grand.Business.System.Services.Reportsstring billingEmail = null, string billingLastName = "", bool ignoreCancelledOrders = false,string tagid = null){- var builder = Builders<Order>.Filter;+ var builderquery = from p in _orderRepository.Table+ select p;- var filter = builder.Where(o => !o.Deleted);+ builderquery = builderquery.Where(o => !o.Deleted);if (!string.IsNullOrEmpty(storeId))- filter &= builder.Where(o => o.StoreId == storeId);+ builderquery = builderquery.Where(o => o.StoreId == storeId);if (!string.IsNullOrEmpty(orderId))- filter &= builder.Where(o => o.Id == orderId);+ builderquery = builderquery.Where(o => o.Id == orderId);if (!string.IsNullOrEmpty(customerId))- filter &= builder.Where(o => o.CustomerId == customerId);+ builderquery = builderquery.Where(o => o.CustomerId == customerId);if (!string.IsNullOrEmpty(vendorId)){- filter &= builder+ builderquery = builderquery.Where(o => o.OrderItems.Any(orderItem => orderItem.VendorId == vendorId));}if (!string.IsNullOrEmpty(salesEmployeeId))- filter &= builder.Where(o => o.SeId == salesEmployeeId);+ builderquery = builderquery.Where(o => o.SeId == salesEmployeeId);if (!string.IsNullOrEmpty(billingCountryId))- filter &= builder.Where(o => o.BillingAddress != null && o.BillingAddress.CountryId == billingCountryId);+ builderquery = builderquery.Where(o => o.BillingAddress != null && o.BillingAddress.CountryId == billingCountryId);if (ignoreCancelledOrders){var cancelledOrderStatusId = OrderStatusSystem.Cancelled;- filter &= builder.Where(o => o.OrderStatusId != (int)cancelledOrderStatusId);+ builderquery = builderquery.Where(o => o.OrderStatusId != (int)cancelledOrderStatusId);}if (!string.IsNullOrEmpty(paymentMethodSystemName))- filter &= builder.Where(o => o.PaymentMethodSystemName == paymentMethodSystemName);+ builderquery = builderquery.Where(o => o.PaymentMethodSystemName == paymentMethodSystemName);if (os.HasValue)- filter &= builder.Where(o => o.OrderStatusId == os.Value);+ builderquery = builderquery.Where(o => o.OrderStatusId == os.Value);if (ps.HasValue)- filter &= builder.Where(o => o.PaymentStatusId == ps.Value);+ builderquery = builderquery.Where(o => o.PaymentStatusId == ps.Value);if (ss.HasValue)- filter &= builder.Where(o => o.ShippingStatusId == ss.Value);+ builderquery = builderquery.Where(o => o.ShippingStatusId == ss.Value);if (startTimeUtc.HasValue)- filter &= builder.Where(o => startTimeUtc.Value <= o.CreatedOnUtc);+ builderquery = builderquery.Where(o => startTimeUtc.Value <= o.CreatedOnUtc);if (endTimeUtc.HasValue)- filter &= builder.Where(o => endTimeUtc.Value >= o.CreatedOnUtc);+ builderquery = builderquery.Where(o => endTimeUtc.Value >= o.CreatedOnUtc);if (!string.IsNullOrEmpty(billingEmail))- filter &= builder.Where(o => o.BillingAddress != null && !String.IsNullOrEmpty(o.BillingAddress.Email) && o.BillingAddress.Email.Contains(billingEmail));+ builderquery = builderquery.Where(o => o.BillingAddress != null && !String.IsNullOrEmpty(o.BillingAddress.Email) && o.BillingAddress.Email.Contains(billingEmail));if (!string.IsNullOrEmpty(billingLastName))- filter &= builder.Where(o => o.BillingAddress != null && !String.IsNullOrEmpty(o.BillingAddress.LastName) && o.BillingAddress.LastName.Contains(billingLastName));+ builderquery = builderquery.Where(o => o.BillingAddress != null && !String.IsNullOrEmpty(o.BillingAddress.LastName) && o.BillingAddress.LastName.Contains(billingLastName));//tag filteringif (!string.IsNullOrEmpty(tagid))- filter &= builder.Where(o => o.OrderTags.Any(y => y == tagid));+ builderquery = builderquery.Where(o => o.OrderTags.Any(y => y == tagid));- var query = await _orderRepository.Collection- .Aggregate()- .Match(filter)- .Group(x => 1, g => new OrderAverageReportLine- {+ var query = await builderquery+ .GroupBy(x => 1).Select(g => new OrderAverageReportLine {CountOrders = g.Count(),- SumShippingExclTax = g.Sum(o => o.OrderShippingExclTax / o.CurrencyRate),- SumTax = g.Sum(o => o.OrderTax / o.CurrencyRate),- SumOrders = g.Sum(o => o.OrderTotal / o.CurrencyRate)- }).ToListAsync();+ SumShippingExclTax = g.Sum(o => o.OrderShippingExclTax * o.CurrencyRate),+ SumTax = g.Sum(o => o.OrderTax * o.CurrencyRate),+ SumOrders = g.Sum(o => o.OrderTotal * o.CurrencyRate)+ }).ToListAsync2();- var item2 = query.Count() > 0 ? query.FirstOrDefault() : new OrderAverageReportLine- {+ var item2 = query.Count() > 0 ? query.FirstOrDefault() : new OrderAverageReportLine {CountOrders = 0,SumShippingExclTax = decimal.Zero,SumTax = decimal.Zero,@@ -371,78 +377,54 @@ namespace Grand.Business.System.Services.Reportsint pageIndex = 0, int pageSize = int.MaxValue,bool showHidden = false){- var builder = Builders<Order>.Filter;- var builderItem = Builders<UnwindedOrderItem>.Filter;-- var filter = builder.Where(o => !o.Deleted);- var filterItem = builderItem.Where(x => true);- if (!string.IsNullOrEmpty(vendorId))- {- filterItem &= builderItem.Where(x => x.OrderItems.VendorId == vendorId);- }-+ var builderquery = from p in _orderRepository.Table+ select p;++ builderquery = builderquery.Where(o => !o.Deleted);+if (!string.IsNullOrEmpty(storeId))- filter &= builder.Where(o => o.StoreId == storeId);+ builderquery = builderquery.Where(o => o.StoreId == storeId);if (!string.IsNullOrEmpty(vendorId)){- filter &= builder+ builderquery = builderquery.Where(o => o.OrderItems.Any(orderItem => orderItem.VendorId == vendorId));}if (!string.IsNullOrEmpty(billingCountryId))- filter &= builder.Where(o => o.BillingAddress != null && o.BillingAddress.CountryId == billingCountryId);+ builderquery = builderquery.Where(o => o.BillingAddress != null && o.BillingAddress.CountryId == billingCountryId);if (os.HasValue)- filter &= builder.Where(o => o.OrderStatusId == os.Value);+ builderquery = builderquery.Where(o => o.OrderStatusId == os.Value);if (ps.HasValue)- filter &= builder.Where(o => o.PaymentStatusId == ps.Value);+ builderquery = builderquery.Where(o => o.PaymentStatusId == ps.Value);if (ss.HasValue)- filter &= builder.Where(o => o.ShippingStatusId == ss.Value);+ builderquery = builderquery.Where(o => o.ShippingStatusId == ss.Value);if (createdFromUtc.HasValue)- filter &= builder.Where(o => createdFromUtc.Value <= o.CreatedOnUtc);+ builderquery = builderquery.Where(o => createdFromUtc.Value <= o.CreatedOnUtc);if (createdToUtc.HasValue)- filter &= builder.Where(o => createdToUtc.Value >= o.CreatedOnUtc);-- FilterDefinition<BsonDocument> filterPublishedProduct =- !showHidden ? new BsonDocument("Product.Published", true) : new BsonDocument();-- var groupBy = new BsonDocument- {- new BsonElement("_id", "$OrderItems.ProductId"),- new BsonElement("TotalAmount", new BsonDocument("$sum", new BsonDocument("$divide",new BsonArray { "$OrderItems.PriceExclTax", "$CurrencyRate" }))),- new BsonElement("TotalQuantity", new BsonDocument("$sum", "$OrderItems.Quantity"))- };+ builderquery = builderquery.Where(o => createdToUtc.Value >= o.CreatedOnUtc);- var query = _orderRepository.Collection- .Aggregate()- .Match(filter)- .Unwind<Order, UnwindedOrderItem>(x => x.OrderItems)- .Match(filterItem)- .Lookup("Product", "OrderItems.ProductId", "_id", "Product")- .Match(filterPublishedProduct)- .Group(groupBy);+ var query = from p in builderquery+ from item in p.OrderItems+ select item;- if (orderBy == 1)- {- query = query.SortByDescending(x => x["TotalQuantity"]);- }- else+ if (!string.IsNullOrEmpty(vendorId)){- query = query.SortByDescending(x => x["TotalAmount"]);+ query = query.Where(x => x.VendorId == vendorId);}- var query2 = new List<BestsellersReportLine>();- await query.ForEachAsync(q =>- {- var line = new BestsellersReportLine();- line.ProductId = q["_id"].ToString();- line.TotalAmount = q["TotalAmount"].AsDecimal;- line.TotalQuantity = q["TotalQuantity"].AsInt32;- query2.Add(line);+ var queryItem = query.GroupBy(x => new { ProductId = x.ProductId }).Select(x => new BestsellersReportLine() {+ ProductId = x.Key.ProductId,+ TotalAmount = x.Sum(y => y.PriceInclTax),+ TotalQuantity = x.Sum(y => y.Quantity)});- var result = new PagedList<BestsellersReportLine>(query2, pageIndex, pageSize);++ var queryItemOrdered = orderBy == 1 ? await queryItem.OrderByDescending(x => x.TotalQuantity).ToListAsync2() :+ await queryItem.OrderByDescending(x => x.TotalAmount).ToListAsync2();++ var result = new PagedList<BestsellersReportLine>(queryItemOrdered, pageIndex, pageSize);return result;}@@ -654,6 +636,14 @@ namespace Grand.Business.System.Services.Reportspublic OrderItem OrderItems { get; set; }}+ public class OrderStats+ {+ public int Year { get; set; }+ public int Month { get; set; }+ public int Day { get; set; }+ public int Count { get; set; }+ public decimal Amount { get; set; }+ }#endregion}