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 - Grand.Business.Message
KrzysztofPajak85690782da0e
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.csindex 09eaa5157..a1d0e4844 100644--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs@@ -1,8 +1,6 @@using Grand.Domain.Catalog;using Grand.Domain.Data;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System.Collections.Generic;using System.Linq;using System.Threading;@@ -24,7 +22,7 @@ namespace Grand.Business.Messages.Queries.Models.Handlersreturn await _bidRepository.Table.Where(x => x.ProductId == request.ProductId).OrderByDescending(x => x.Date)- .ToListAsync();+ .ToListAsync2();}}}diff --git a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs b/src/Business/Grand.Business.Messages/Services/EmailAccountService.csindex a3d82427f..e65f18b69 100644--- a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs+++ b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs@@ -7,8 +7,6 @@ using Grand.Domain.Messages;using Grand.SharedKernel;using Grand.SharedKernel.Extensions;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -157,7 +155,7 @@ namespace Grand.Business.Messages.Servicesvar query = from ea in _emailAccountRepository.Tableorderby ea.Idselect ea;- return query.ToListAsync();+ return query.ToListAsync2();});}}diff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.csindex fd972e572..a509e7928 100644--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.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;@@ -123,11 +121,12 @@ namespace Grand.Business.Messages.Servicesstring key = string.Format(CacheKey.MESSAGETEMPLATES_BY_NAME_KEY, messageTemplateName, storeId);return await _cacheBase.GetAsync(key, async () =>{- var query = _messageTemplateRepository.Table;+ var query = from p in _messageTemplateRepository.Table+ select p;query = query.Where(t => t.Name == messageTemplateName);query = query.OrderBy(t => t.Id);- var templates = await query.ToListAsync();+ var templates = await query.ToListAsync2();//store aclif (!String.IsNullOrEmpty(storeId))@@ -152,7 +151,8 @@ namespace Grand.Business.Messages.Servicesstring key = string.Format(CacheKey.MESSAGETEMPLATES_ALL_KEY, storeId);return await _cacheBase.GetAsync(key, () =>{- var query = _messageTemplateRepository.Table;+ var query = from p in _messageTemplateRepository.Table+ select p;query = query.OrderBy(t => t.Name);@@ -164,7 +164,7 @@ namespace Grand.Business.Messages.Servicesselect p;query = query.OrderBy(t => t.Name);}- return query.ToListAsync();+ return query.ToListAsync2();});}diff --git a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.csindex 1b6c527d2..6830b5ae9 100644--- a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs+++ b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs@@ -4,8 +4,6 @@ using Grand.Domain;using Grand.Domain.Data;using Grand.Domain.Messages;using MediatR;-using MongoDB.Driver;-using MongoDB.Driver.Linq;using System;using System.Collections.Generic;using System.Linq;@@ -84,9 +82,9 @@ namespace Grand.Business.Messages.Servicesif (email == null)throw new ArgumentNullException("email");- var builder = Builders<QueuedEmail>.Filter;- var filter = builder.Eq(x => x.To, email);- await _queuedEmailRepository.Collection.DeleteManyAsync(filter);+ var deleteCustomerEmail = _queuedEmailRepository.Table.Where(x => x.To == email);++ await _queuedEmailRepository.DeleteAsync(deleteCustomerEmail);}/// <summary>@@ -113,7 +111,7 @@ namespace Grand.Business.Messages.Servicesvar query = from qe in _queuedEmailRepository.Tablewhere queuedEmailIds.Contains(qe.Id)select qe;- var queuedEmails = await query.ToListAsync();+ var queuedEmails = await query.ToListAsync2();//sort by passed identifiersvar sortedQueuedEmails = new List<QueuedEmail>();foreach (string id in queuedEmailIds)@@ -147,7 +145,8 @@ namespace Grand.Business.Messages.ServicesfromEmail = (fromEmail ?? string.Empty).Trim();toEmail = (toEmail ?? string.Empty).Trim();- var query = _queuedEmailRepository.Table;+ var query = from p in _queuedEmailRepository.Table+ select p;if (!string.IsNullOrEmpty(fromEmail))query = query.Where(qe => qe.From.ToLower().Contains(fromEmail.ToLower()));