| | | 1 | | using System.Diagnostics; |
| | | 2 | | using System.Linq.Expressions; |
| | | 3 | | using OServices.FiltersServices.FilterModels; |
| | | 4 | | using OzonDomains.Models; |
| | | 5 | | using OzonDomains.Models.AccessControl; |
| | | 6 | | using Services.AccessControl; |
| | | 7 | | using Services.DataServices; |
| | | 8 | | using Services.CacheServices.Cache.OzonOrdersCache; |
| | | 9 | | using System.Reflection; |
| | | 10 | | using System.Text.RegularExpressions; |
| | | 11 | | using OzonRepositories.Context; |
| | | 12 | | using Microsoft.EntityFrameworkCore; |
| | | 13 | | using Pomelo.EntityFrameworkCore.MySql.Infrastructure; |
| | | 14 | | using Services.FiltersServices.SortModels; |
| | | 15 | | using Services.FiltersServices.SortManagers; |
| | | 16 | | using Services.SearchServices.OrderSearch; |
| | | 17 | | using Microsoft.Extensions.Configuration; |
| | | 18 | | using Microsoft.Extensions.Logging; |
| | | 19 | | |
| | | 20 | | namespace Services.FiltersServices.DataFilterManagers |
| | | 21 | | |
| | | 22 | | { |
| | | 23 | | public class OrderDataFilterManager : IFilterManagerAsync<Order, OrderFilterModel> |
| | | 24 | | |
| | | 25 | | { |
| | | 26 | | private QueryableDataFilter<Order> _filter; |
| | | 27 | | |
| | | 28 | | private DataFilter<Order> _forTransactionOrdersFilter; |
| | | 29 | | |
| | | 30 | | private readonly OrdersDataServices _ordersDataServices; |
| | | 31 | | |
| | | 32 | | private readonly OrderCache _orderCache; |
| | | 33 | | |
| | | 34 | | private readonly ApplicationDbContext _context; |
| | | 35 | | |
| | | 36 | | private readonly OrderSortManager _sortManager; |
| | | 37 | | |
| | | 38 | | private readonly IDataScopeEvaluator _dataScopeEvaluator; |
| | | 39 | | |
| | | 40 | | private readonly IOrderSearchService _orderSearchService; |
| | | 41 | | |
| | | 42 | | private readonly IOrderSearchDiagnosticsStore _orderSearchDiagnostics; |
| | | 43 | | |
| | | 44 | | private readonly IConfiguration _configuration; |
| | | 45 | | |
| | | 46 | | private readonly ILogger<OrderDataFilterManager> _logger; |
| | | 47 | | |
| | 32 | 48 | | public Dictionary<string, Func<Order, object?>> ColumnMappings = new Dictionary<string, Func<Order, object?>> |
| | 32 | 49 | | |
| | 32 | 50 | | { |
| | 0 | 51 | | { "Номер заказа", order => order.ShipmentNumber }, |
| | 32 | 52 | | |
| | 0 | 53 | | { "Клиент", order => order.OzonClient?.Name }, |
| | 32 | 54 | | |
| | 0 | 55 | | { "Принят в обработку", order => order.FullFormattedProcessingDate }, |
| | 32 | 56 | | |
| | 0 | 57 | | { "Дата отгрузки", order => order.FullFormattedShippingDate }, |
| | 32 | 58 | | |
| | 0 | 59 | | { "Срок доставки", order => order.FormattedDeliveryPeriod }, |
| | 32 | 60 | | |
| | 0 | 61 | | { "Статус клиента", order => order.ClientStatus != null ? order.ClientStatus.Name : null }, |
| | 32 | 62 | | |
| | 0 | 63 | | { "Статус", order => order.AppStatus?.Name }, |
| | 32 | 64 | | |
| | 0 | 65 | | { "Наименование товара", order => order.ProductName }, |
| | 32 | 66 | | |
| | 0 | 67 | | { "Артикул", order => order.Article }, |
| | 32 | 68 | | |
| | 0 | 69 | | { "Производитель", order => order.EtProducer?.Name }, |
| | 32 | 70 | | |
| | 0 | 71 | | { "Склад отгрузки", order => order.ShipmentWarehouse?.Name }, |
| | 32 | 72 | | |
| | 0 | 73 | | { "Поставщик", order => order.Supplier?.Name }, |
| | 32 | 74 | | |
| | 0 | 75 | | { "Номер заказа поставщику", order => order.OrderNumberToSupplier }, |
| | 32 | 76 | | |
| | 0 | 77 | | { "Цена сайта", order => order.ProductInfo?.CurrentPriceWithDiscount }, |
| | 32 | 78 | | |
| | 0 | 79 | | { "Цена", order => order.Price }, |
| | 32 | 80 | | |
| | 0 | 81 | | { "Количество", order => order.Quantity }, |
| | 32 | 82 | | |
| | 0 | 83 | | { "Сумма отправления", order => order.ShipmentAmount }, |
| | 32 | 84 | | |
| | 0 | 85 | | { "Категория", order => order.ProductInfo?.CommercialCategory }, |
| | 32 | 86 | | |
| | 0 | 87 | | { "Объемный вес", order => order.ProductInfo?.VolumetricWeight }, |
| | 32 | 88 | | |
| | 0 | 89 | | { "Цена закупки", order => order.PurchasePrice }, |
| | 32 | 90 | | |
| | 0 | 91 | | { "Оригинальная цена", order => order.OriginalPurchasePrice }, |
| | 32 | 92 | | |
| | 0 | 93 | | { "Себестоимость", order => order.CostPrice }, |
| | 32 | 94 | | |
| | 0 | 95 | | { "Комиссия ОЗОН (мин.)", order => order.MinOzonCommission }, |
| | 32 | 96 | | |
| | 0 | 97 | | { "Комиссия ОЗОН (макс.)", order => order.MaxOzonCommission }, |
| | 32 | 98 | | |
| | 0 | 99 | | { "Прибыль (мин.)", order => order.MinProfit }, |
| | 32 | 100 | | |
| | 0 | 101 | | { "Прибыль (макс.)", order => order.MaxProfit }, |
| | 32 | 102 | | |
| | 0 | 103 | | { "Наценка % (мин.)", order => order.MinDiscount }, |
| | 32 | 104 | | |
| | 0 | 105 | | { "Наценка % (макс.)", order => order.MaxDiscount }, |
| | 32 | 106 | | |
| | 0 | 107 | | { "Город доставки", order => order.DeliveryCity } |
| | 32 | 108 | | }; |
| | | 109 | | |
| | | 110 | | |
| | 32 | 111 | | public OrderDataFilterManager(QueryableDataFilter<Order> dataFilter, |
| | 32 | 112 | | DataFilter<Order> forTransactionOrdersFilter, |
| | 32 | 113 | | OrdersDataServices ordersDataServices, |
| | 32 | 114 | | OrderCache orderCache, |
| | 32 | 115 | | ApplicationDbContext context, |
| | 32 | 116 | | OrderSortManager sortManager, |
| | 32 | 117 | | IDataScopeEvaluator dataScopeEvaluator, |
| | 32 | 118 | | IOrderSearchService orderSearchService, |
| | 32 | 119 | | IOrderSearchDiagnosticsStore orderSearchDiagnostics, |
| | 32 | 120 | | IConfiguration configuration, |
| | 32 | 121 | | ILogger<OrderDataFilterManager> logger) |
| | | 122 | | |
| | | 123 | | { |
| | 32 | 124 | | _filter = dataFilter; |
| | | 125 | | |
| | 32 | 126 | | _forTransactionOrdersFilter = forTransactionOrdersFilter; |
| | | 127 | | |
| | 32 | 128 | | _ordersDataServices = ordersDataServices; |
| | | 129 | | |
| | 32 | 130 | | _orderCache = orderCache; |
| | | 131 | | |
| | 32 | 132 | | _context = context; |
| | | 133 | | |
| | 32 | 134 | | _sortManager = sortManager; |
| | | 135 | | |
| | 32 | 136 | | _dataScopeEvaluator = dataScopeEvaluator; |
| | | 137 | | |
| | 32 | 138 | | _orderSearchService = orderSearchService; |
| | | 139 | | |
| | 32 | 140 | | _orderSearchDiagnostics = orderSearchDiagnostics; |
| | | 141 | | |
| | 32 | 142 | | _configuration = configuration; |
| | | 143 | | |
| | 32 | 144 | | _logger = logger; |
| | 32 | 145 | | } |
| | | 146 | | |
| | | 147 | | /// <summary> |
| | | 148 | | /// Сужает <paramref name="ordersQuery"/> до заказов, найденных Elasticsearch по тексту |
| | | 149 | | /// (Search, ShipmentNumber, ProductName, Article) и/или точным фильтрам |
| | | 150 | | /// (AppStatus/Supplier/Manufacturer/ShipmentWarehouse/OzonClient). |
| | | 151 | | /// Вызывается ПОСЛЕ FilterAndSortQueryable и ДО применения RLS (ApplyOrderDataScopeAsync) — |
| | | 152 | | /// ES только сужает кандидатов по Id, авторизация и загрузка остаются в MySQL/EF без изменений. |
| | | 153 | | /// При выключенном флаге OrdersSearch:UseElasticsearch или ошибке ES — fallback на LIKE-фильтрацию. |
| | | 154 | | /// </summary> |
| | | 155 | | public async Task<IQueryable<Order>> NarrowByElasticsearchAsync(IQueryable<Order> ordersQuery, OrderFilterModel |
| | | 156 | | { |
| | 12 | 157 | | if (!_configuration.GetValue<bool>("OrdersSearch:UseElasticsearch")) |
| | | 158 | | { |
| | 1 | 159 | | return ordersQuery; |
| | | 160 | | } |
| | | 161 | | |
| | 11 | 162 | | if (!HasElasticsearchSearchCriteria(filterData)) |
| | | 163 | | { |
| | 1 | 164 | | return ordersQuery; |
| | | 165 | | } |
| | | 166 | | |
| | | 167 | | try |
| | | 168 | | { |
| | 10 | 169 | | var sw = Stopwatch.StartNew(); |
| | 10 | 170 | | IReadOnlyList<string>? articleProductKeys = null; |
| | 10 | 171 | | var article = string.IsNullOrEmpty(filterData.Article) ? filterData.Article2 : filterData.Article; |
| | 10 | 172 | | if (!string.IsNullOrEmpty(article)) |
| | | 173 | | { |
| | 1 | 174 | | var relatedArticles = GetRelatedArticlesSync(article); |
| | 1 | 175 | | if (relatedArticles.Count > 0) |
| | | 176 | | { |
| | 1 | 177 | | articleProductKeys = relatedArticles; |
| | | 178 | | } |
| | | 179 | | } |
| | | 180 | | |
| | 10 | 181 | | var maxResults = GetElasticsearchMaxResults(); |
| | 10 | 182 | | var searchResult = await _orderSearchService.SearchOrderIdsAsync(filterData, articleProductKeys, maxResu |
| | 9 | 183 | | sw.Stop(); |
| | | 184 | | |
| | 9 | 185 | | var displayText = GetElasticsearchSearchDisplayText(filterData); |
| | 9 | 186 | | var largeThreshold = GetElasticsearchLargeResultThreshold(); |
| | 9 | 187 | | var isLargeResult = searchResult.Truncated |
| | 9 | 188 | | || searchResult.Ids.Count >= largeThreshold |
| | 9 | 189 | | || searchResult.TotalHits >= largeThreshold; |
| | | 190 | | |
| | 9 | 191 | | if (isLargeResult) |
| | | 192 | | { |
| | 2 | 193 | | _logger.LogInformation( |
| | 2 | 194 | | "ES-поиск заказов: {Returned} id (всего {Total}, лимит {Max}, обрезка={Truncated}) — «{Search}»" |
| | 2 | 195 | | searchResult.Ids.Count, |
| | 2 | 196 | | searchResult.TotalHits, |
| | 2 | 197 | | searchResult.MaxResults, |
| | 2 | 198 | | searchResult.Truncated, |
| | 2 | 199 | | displayText); |
| | | 200 | | } |
| | | 201 | | |
| | 9 | 202 | | _orderSearchDiagnostics.RecordSearch( |
| | 9 | 203 | | displayText, |
| | 9 | 204 | | BuildElasticsearchFilterSummary(filterData), |
| | 9 | 205 | | sw.ElapsedMilliseconds, |
| | 9 | 206 | | searchResult.Ids.Count, |
| | 9 | 207 | | usedFallback: false, |
| | 9 | 208 | | totalHits: searchResult.TotalHits, |
| | 9 | 209 | | truncated: searchResult.Truncated, |
| | 9 | 210 | | isLargeResult: isLargeResult); |
| | | 211 | | |
| | 9 | 212 | | if (searchResult.Ids.Count == 0) |
| | | 213 | | { |
| | 1 | 214 | | return ordersQuery.Where(o => false); |
| | | 215 | | } |
| | | 216 | | |
| | 8 | 217 | | return ordersQuery.Where(o => searchResult.Ids.Contains(o.Id)); |
| | | 218 | | } |
| | 1 | 219 | | catch (Exception ex) |
| | | 220 | | { |
| | 1 | 221 | | _logger.LogWarning(ex, "Elasticsearch-поиск заказов недоступен — fallback на LIKE-фильтрацию"); |
| | 1 | 222 | | _orderSearchDiagnostics.RecordSearch( |
| | 1 | 223 | | GetElasticsearchSearchDisplayText(filterData), |
| | 1 | 224 | | BuildElasticsearchFilterSummary(filterData), |
| | 1 | 225 | | 0, |
| | 1 | 226 | | 0, |
| | 1 | 227 | | usedFallback: true); |
| | 1 | 228 | | return ApplyPrimaryTextSearchQueryable(ordersQuery, filterData, forceMysql: true); |
| | | 229 | | } |
| | 12 | 230 | | } |
| | | 231 | | |
| | | 232 | | private bool IsElasticsearchTextSearchEnabled() => |
| | 4 | 233 | | _configuration.GetValue<bool>("OrdersSearch:UseElasticsearch"); |
| | | 234 | | |
| | | 235 | | private int GetElasticsearchMaxResults() => |
| | 10 | 236 | | Math.Clamp(_configuration.GetValue("OrdersSearch:MaxResults", 2000), 1, 10_000); |
| | | 237 | | |
| | | 238 | | private int GetElasticsearchLargeResultThreshold() => |
| | 9 | 239 | | Math.Clamp(_configuration.GetValue("OrdersSearch:LargeResultLogThreshold", 500), 1, 10_000); |
| | | 240 | | |
| | | 241 | | public static bool HasElasticsearchSearchCriteria(OrderFilterModel filter) => |
| | 16 | 242 | | HasElasticsearchTextCriteria(filter) || HasElasticsearchExactFilterCriteria(filter); |
| | | 243 | | |
| | | 244 | | public static bool HasElasticsearchTextCriteria(OrderFilterModel filter) => |
| | 25 | 245 | | !string.IsNullOrWhiteSpace(filter.Search) |
| | 25 | 246 | | || !string.IsNullOrWhiteSpace(filter.ShipmentNumber) |
| | 25 | 247 | | || !string.IsNullOrWhiteSpace(filter.ProductName) |
| | 25 | 248 | | || !string.IsNullOrWhiteSpace(filter.Article) |
| | 25 | 249 | | || !string.IsNullOrWhiteSpace(filter.Article2); |
| | | 250 | | |
| | | 251 | | private static bool HasElasticsearchExactFilterCriteria(OrderFilterModel filter) => |
| | 10 | 252 | | (!string.IsNullOrWhiteSpace(filter.AppStatus) && filter.AppStatus != "Все") |
| | 10 | 253 | | || (!string.IsNullOrWhiteSpace(filter.Supplier) && filter.Supplier != "Все") |
| | 10 | 254 | | || !string.IsNullOrWhiteSpace(filter.Manufacturer) |
| | 10 | 255 | | || (!string.IsNullOrWhiteSpace(filter.ShipmentWarehouse) && filter.ShipmentWarehouse != "Все") |
| | 10 | 256 | | || (!string.IsNullOrWhiteSpace(filter.OzonClient) && filter.OzonClient != "Все"); |
| | | 257 | | |
| | | 258 | | internal static string GetElasticsearchSearchDisplayText(OrderFilterModel filter) |
| | | 259 | | { |
| | 15 | 260 | | if (!string.IsNullOrWhiteSpace(filter.Search)) |
| | | 261 | | { |
| | 3 | 262 | | return filter.Search.Trim(); |
| | | 263 | | } |
| | | 264 | | |
| | 12 | 265 | | if (!string.IsNullOrWhiteSpace(filter.ShipmentNumber)) |
| | | 266 | | { |
| | 3 | 267 | | return $"отправление: {filter.ShipmentNumber.Trim()}"; |
| | | 268 | | } |
| | | 269 | | |
| | 9 | 270 | | if (!string.IsNullOrWhiteSpace(filter.ProductName)) |
| | | 271 | | { |
| | 2 | 272 | | return $"товар: {filter.ProductName.Trim()}"; |
| | | 273 | | } |
| | | 274 | | |
| | 7 | 275 | | var article = string.IsNullOrEmpty(filter.Article) ? filter.Article2 : filter.Article; |
| | 7 | 276 | | if (!string.IsNullOrWhiteSpace(article)) |
| | | 277 | | { |
| | 2 | 278 | | return $"артикул: {article.Trim()}"; |
| | | 279 | | } |
| | | 280 | | |
| | 5 | 281 | | return "—"; |
| | | 282 | | } |
| | | 283 | | |
| | | 284 | | private static string BuildElasticsearchFilterSummary(OrderFilterModel filter) |
| | | 285 | | { |
| | 10 | 286 | | var parts = new List<string>(); |
| | 10 | 287 | | if (!string.IsNullOrWhiteSpace(filter.AppStatus) && filter.AppStatus != "Все") |
| | | 288 | | { |
| | 0 | 289 | | parts.Add($"статус={filter.AppStatus}"); |
| | | 290 | | } |
| | | 291 | | |
| | 10 | 292 | | if (!string.IsNullOrWhiteSpace(filter.Supplier) && filter.Supplier != "Все") |
| | | 293 | | { |
| | 4 | 294 | | parts.Add($"поставщик={filter.Supplier}"); |
| | | 295 | | } |
| | | 296 | | |
| | 10 | 297 | | if (!string.IsNullOrWhiteSpace(filter.Manufacturer)) |
| | | 298 | | { |
| | 0 | 299 | | parts.Add($"производитель={filter.Manufacturer}"); |
| | | 300 | | } |
| | | 301 | | |
| | 10 | 302 | | if (!string.IsNullOrWhiteSpace(filter.ShipmentWarehouse) && filter.ShipmentWarehouse != "Все") |
| | | 303 | | { |
| | 0 | 304 | | parts.Add($"склад={filter.ShipmentWarehouse}"); |
| | | 305 | | } |
| | | 306 | | |
| | 10 | 307 | | if (!string.IsNullOrWhiteSpace(filter.OzonClient) && filter.OzonClient != "Все") |
| | | 308 | | { |
| | 0 | 309 | | parts.Add($"клиент={filter.OzonClient}"); |
| | | 310 | | } |
| | | 311 | | |
| | 10 | 312 | | return parts.Count == 0 ? "—" : string.Join(", ", parts); |
| | | 313 | | } |
| | | 314 | | |
| | | 315 | | |
| | | 316 | | public async Task<List<Order>> FilterByRadioButton(List<Order> orders, string buttonState) |
| | | 317 | | |
| | | 318 | | { |
| | 0 | 319 | | await Task.CompletedTask; |
| | 0 | 320 | | if (buttonState == "returnable") |
| | | 321 | | |
| | | 322 | | { |
| | | 323 | | orders = orders.Where(d => d.IsReturnable == true).ToList(); |
| | | 324 | | } |
| | | 325 | | |
| | | 326 | | |
| | 0 | 327 | | if (buttonState == "activated") |
| | | 328 | | |
| | | 329 | | { |
| | | 330 | | orders = orders.Where(d => d.IsVerified == true).ToList(); |
| | | 331 | | } |
| | | 332 | | |
| | 0 | 333 | | else if (buttonState == "notActivated") |
| | | 334 | | |
| | | 335 | | { |
| | | 336 | | orders = orders.Where(d => d.IsVerified == false).ToList(); |
| | | 337 | | } |
| | | 338 | | |
| | 0 | 339 | | else if (buttonState == "changed") |
| | | 340 | | |
| | | 341 | | { |
| | | 342 | | orders = orders.Where(d => d.UpdatedColumns != null && d.UpdatedColumns.Count() != 0).ToList(); |
| | | 343 | | } |
| | | 344 | | |
| | 0 | 345 | | else if (buttonState == "accepted") |
| | | 346 | | |
| | | 347 | | { |
| | | 348 | | orders = orders.Where(d => d.IsAccepted == true).ToList(); |
| | | 349 | | } |
| | | 350 | | |
| | 0 | 351 | | else if (buttonState == "all") |
| | | 352 | | |
| | | 353 | | { |
| | | 354 | | } |
| | | 355 | | |
| | | 356 | | |
| | 0 | 357 | | return orders; |
| | 0 | 358 | | } |
| | | 359 | | |
| | | 360 | | public static string NormalizeShipmentNumberForSearch(string? shipmentNumber) |
| | | 361 | | { |
| | 50 | 362 | | if (string.IsNullOrWhiteSpace(shipmentNumber)) |
| | | 363 | | { |
| | 6 | 364 | | return string.Empty; |
| | | 365 | | } |
| | | 366 | | |
| | 44 | 367 | | return Regex.Replace(shipmentNumber.Trim(), @"/\d+$", string.Empty); |
| | | 368 | | } |
| | | 369 | | |
| | | 370 | | public static bool ShipmentNumberMatchesSearch(string? shipmentNumber, string? searchValue) |
| | | 371 | | { |
| | 12 | 372 | | var normalizedShipmentNumber = NormalizeShipmentNumberForSearch(shipmentNumber); |
| | 12 | 373 | | var normalizedSearchValue = NormalizeShipmentNumberForSearch(searchValue); |
| | | 374 | | |
| | 12 | 375 | | return !string.IsNullOrEmpty(normalizedShipmentNumber) && |
| | 12 | 376 | | !string.IsNullOrEmpty(normalizedSearchValue) && |
| | 12 | 377 | | normalizedShipmentNumber.Contains(normalizedSearchValue, StringComparison.OrdinalIgnoreCase); |
| | | 378 | | } |
| | | 379 | | |
| | | 380 | | /// <summary> |
| | | 381 | | /// Нормализует артикул для поиска: обрезает часть после «=», убирает спецсимволы (оставляет буквы и цифры). |
| | | 382 | | /// </summary> |
| | | 383 | | public static string NormalizeArticleForSearch(string? input) |
| | | 384 | | { |
| | 56 | 385 | | if (string.IsNullOrWhiteSpace(input)) |
| | | 386 | | { |
| | 5 | 387 | | return string.Empty; |
| | | 388 | | } |
| | | 389 | | |
| | 51 | 390 | | var trimmed = input.Trim(); |
| | 51 | 391 | | var equalsIndex = trimmed.IndexOf('='); |
| | 51 | 392 | | if (equalsIndex >= 0) |
| | | 393 | | { |
| | 10 | 394 | | trimmed = trimmed.Substring(0, equalsIndex); |
| | | 395 | | } |
| | | 396 | | |
| | 51 | 397 | | return Regex.Replace(trimmed, @"[^\p{L}\p{Nd}]", ""); |
| | | 398 | | } |
| | | 399 | | |
| | | 400 | | /// <summary> |
| | | 401 | | /// Совпадение артикула после нормализации: искомая строка входит как подпоследовательность |
| | | 402 | | /// в ProductKey или Order.Article (в любой позиции, аналог SQL LIKE '%...%'). |
| | | 403 | | /// </summary> |
| | | 404 | | public static bool ArticleMatchesSearch(string? productKey, string? orderArticle, string? searchArticle) |
| | | 405 | | { |
| | 10 | 406 | | var normalizedSearch = NormalizeArticleForSearch(searchArticle); |
| | 10 | 407 | | if (string.IsNullOrEmpty(normalizedSearch)) |
| | | 408 | | { |
| | 0 | 409 | | return false; |
| | | 410 | | } |
| | | 411 | | |
| | 10 | 412 | | var normalizedProductKey = NormalizeArticleForSearch(productKey); |
| | 10 | 413 | | if (!string.IsNullOrEmpty(normalizedProductKey) && |
| | 10 | 414 | | normalizedProductKey.Contains(normalizedSearch, StringComparison.OrdinalIgnoreCase)) |
| | | 415 | | { |
| | 7 | 416 | | return true; |
| | | 417 | | } |
| | | 418 | | |
| | 3 | 419 | | var normalizedOrderArticle = NormalizeArticleForSearch(orderArticle); |
| | 3 | 420 | | return !string.IsNullOrEmpty(normalizedOrderArticle) && |
| | 3 | 421 | | normalizedOrderArticle.Contains(normalizedSearch, StringComparison.OrdinalIgnoreCase); |
| | | 422 | | } |
| | | 423 | | |
| | | 424 | | private static IQueryable<Order> ApplyArticleFilter(IQueryable<Order> ordersQuery, IEnumerable<string> searchArt |
| | | 425 | | { |
| | 0 | 426 | | var normalizedArticles = searchArticles |
| | 0 | 427 | | .Select(NormalizeArticleForSearch) |
| | 0 | 428 | | .Where(article => !string.IsNullOrWhiteSpace(article)) |
| | 0 | 429 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 0 | 430 | | .ToList(); |
| | | 431 | | |
| | 0 | 432 | | if (normalizedArticles.Count == 0) |
| | | 433 | | { |
| | 0 | 434 | | return ordersQuery; |
| | | 435 | | } |
| | | 436 | | |
| | 0 | 437 | | var orderParameter = Expression.Parameter(typeof(Order), "o"); |
| | 0 | 438 | | var productKeyProperty = Expression.Property(orderParameter, nameof(Order.ProductKey)); |
| | 0 | 439 | | var articleProperty = Expression.Property(orderParameter, nameof(Order.Article)); |
| | 0 | 440 | | var toLowerMethod = typeof(string).GetMethod(nameof(string.ToLower), Type.EmptyTypes)!; |
| | 0 | 441 | | var containsMethod = typeof(string).GetMethod(nameof(string.Contains), new[] { typeof(string) })!; |
| | | 442 | | |
| | 0 | 443 | | Expression? matchesAnyExpression = null; |
| | | 444 | | |
| | 0 | 445 | | foreach (var article in normalizedArticles) |
| | | 446 | | { |
| | 0 | 447 | | var articleLower = article.ToLowerInvariant(); |
| | 0 | 448 | | var articleConst = Expression.Constant(articleLower); |
| | | 449 | | |
| | 0 | 450 | | var productKeyNotNull = Expression.NotEqual( |
| | 0 | 451 | | productKeyProperty, |
| | 0 | 452 | | Expression.Constant(null, typeof(string))); |
| | 0 | 453 | | var productKeyLower = Expression.Call(productKeyProperty, toLowerMethod); |
| | 0 | 454 | | var productKeyContains = Expression.Call(productKeyLower, containsMethod, articleConst); |
| | 0 | 455 | | var productKeyMatch = Expression.AndAlso(productKeyNotNull, productKeyContains); |
| | | 456 | | |
| | 0 | 457 | | var articleNotNull = Expression.NotEqual( |
| | 0 | 458 | | articleProperty, |
| | 0 | 459 | | Expression.Constant(null, typeof(string))); |
| | 0 | 460 | | var articlePropertyLower = Expression.Call(articleProperty, toLowerMethod); |
| | 0 | 461 | | var articleContains = Expression.Call(articlePropertyLower, containsMethod, articleConst); |
| | 0 | 462 | | var articleMatch = Expression.AndAlso(articleNotNull, articleContains); |
| | | 463 | | |
| | 0 | 464 | | var termMatch = Expression.OrElse(productKeyMatch, articleMatch); |
| | 0 | 465 | | matchesAnyExpression = matchesAnyExpression == null |
| | 0 | 466 | | ? termMatch |
| | 0 | 467 | | : Expression.OrElse(matchesAnyExpression, termMatch); |
| | | 468 | | } |
| | | 469 | | |
| | 0 | 470 | | if (matchesAnyExpression == null) |
| | | 471 | | { |
| | 0 | 472 | | return ordersQuery; |
| | | 473 | | } |
| | | 474 | | |
| | 0 | 475 | | var predicate = Expression.Lambda<Func<Order, bool>>(matchesAnyExpression, orderParameter); |
| | 0 | 476 | | return ordersQuery.Where(predicate); |
| | | 477 | | } |
| | | 478 | | |
| | | 479 | | private static IQueryable<Order> ApplyShipmentNumberFilter(IQueryable<Order> ordersQuery, |
| | | 480 | | IEnumerable<string> normalizedShipmentNumbers) |
| | | 481 | | { |
| | 1 | 482 | | var normalizedNumbers = normalizedShipmentNumbers |
| | 1 | 483 | | .Where(number => !string.IsNullOrWhiteSpace(number)) |
| | 1 | 484 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 1 | 485 | | .ToList(); |
| | | 486 | | |
| | 1 | 487 | | if (!normalizedNumbers.Any()) |
| | | 488 | | { |
| | 0 | 489 | | return ordersQuery; |
| | | 490 | | } |
| | | 491 | | |
| | 1 | 492 | | var orderParameter = Expression.Parameter(typeof(Order), "pr"); |
| | 1 | 493 | | var shipmentNumberProperty = Expression.Property(orderParameter, nameof(Order.ShipmentNumber)); |
| | 1 | 494 | | var notNullExpression = Expression.NotEqual( |
| | 1 | 495 | | shipmentNumberProperty, |
| | 1 | 496 | | Expression.Constant(null, typeof(string))); |
| | | 497 | | |
| | 1 | 498 | | Expression? matchesAnyExpression = null; |
| | 1 | 499 | | Expression? scanitMatchesExpression = null; |
| | 1 | 500 | | var containsMethod = typeof(string).GetMethod(nameof(string.Contains), new[] { typeof(string) })!; |
| | 1 | 501 | | var scanitProperty = Expression.Property(orderParameter, nameof(Order.Scanit)); |
| | | 502 | | |
| | 4 | 503 | | foreach (var number in normalizedNumbers) |
| | | 504 | | { |
| | 1 | 505 | | var containsExpression = Expression.Call( |
| | 1 | 506 | | shipmentNumberProperty, |
| | 1 | 507 | | containsMethod, |
| | 1 | 508 | | Expression.Constant(number)); |
| | | 509 | | |
| | 1 | 510 | | matchesAnyExpression = matchesAnyExpression == null |
| | 1 | 511 | | ? containsExpression |
| | 1 | 512 | | : Expression.OrElse(matchesAnyExpression, containsExpression); |
| | | 513 | | |
| | | 514 | | // ScanIt с этикетки ищется там же, где номер заказа, но только точным совпадением. |
| | 1 | 515 | | var scanitEquals = Expression.Equal(scanitProperty, Expression.Constant(number, typeof(string))); |
| | 1 | 516 | | scanitMatchesExpression = scanitMatchesExpression == null |
| | 1 | 517 | | ? scanitEquals |
| | 1 | 518 | | : Expression.OrElse(scanitMatchesExpression, scanitEquals); |
| | | 519 | | } |
| | | 520 | | |
| | 1 | 521 | | if (matchesAnyExpression == null || scanitMatchesExpression == null) |
| | | 522 | | { |
| | 0 | 523 | | return ordersQuery; |
| | | 524 | | } |
| | | 525 | | |
| | 1 | 526 | | var predicate = Expression.Lambda<Func<Order, bool>>( |
| | 1 | 527 | | Expression.OrElse( |
| | 1 | 528 | | Expression.AndAlso(notNullExpression, matchesAnyExpression), |
| | 1 | 529 | | scanitMatchesExpression), |
| | 1 | 530 | | orderParameter); |
| | | 531 | | |
| | 1 | 532 | | return ordersQuery.Where(predicate); |
| | | 533 | | } |
| | | 534 | | |
| | | 535 | | public static bool MatchesGlobalSearch(Order order, string? search) |
| | | 536 | | { |
| | 5 | 537 | | if (order == null || string.IsNullOrWhiteSpace(search)) |
| | | 538 | | { |
| | 0 | 539 | | return false; |
| | | 540 | | } |
| | | 541 | | |
| | 5 | 542 | | var term = search.Trim(); |
| | | 543 | | |
| | 5 | 544 | | if (ShipmentNumberMatchesSearch(order.ShipmentNumber, term)) |
| | | 545 | | { |
| | 1 | 546 | | return true; |
| | | 547 | | } |
| | | 548 | | |
| | 4 | 549 | | if (!string.IsNullOrEmpty(order.ProductName) && |
| | 4 | 550 | | order.ProductName.Contains(term, StringComparison.OrdinalIgnoreCase)) |
| | | 551 | | { |
| | 1 | 552 | | return true; |
| | | 553 | | } |
| | | 554 | | |
| | 3 | 555 | | if (!string.IsNullOrEmpty(order.ProductKey) && |
| | 3 | 556 | | order.ProductKey.Contains(term, StringComparison.OrdinalIgnoreCase)) |
| | | 557 | | { |
| | 1 | 558 | | return true; |
| | | 559 | | } |
| | | 560 | | |
| | 2 | 561 | | if (!string.IsNullOrEmpty(order.Article) && |
| | 2 | 562 | | order.Article.Contains(term, StringComparison.OrdinalIgnoreCase)) |
| | | 563 | | { |
| | 0 | 564 | | return true; |
| | | 565 | | } |
| | | 566 | | |
| | 2 | 567 | | return false; |
| | | 568 | | } |
| | | 569 | | |
| | | 570 | | private static IQueryable<Order> ApplyGlobalSearchQueryable(IQueryable<Order> ordersQuery, string search) |
| | | 571 | | { |
| | 1 | 572 | | var term = search.Trim(); |
| | 1 | 573 | | if (string.IsNullOrWhiteSpace(term)) |
| | | 574 | | { |
| | 0 | 575 | | return ordersQuery; |
| | | 576 | | } |
| | | 577 | | |
| | 1 | 578 | | var termLower = term.ToLowerInvariant(); |
| | | 579 | | |
| | 1 | 580 | | return ordersQuery.Where(o => |
| | 1 | 581 | | (o.ShipmentNumber != null && o.ShipmentNumber.ToLower().Contains(termLower)) || |
| | 1 | 582 | | (o.Scanit != null && o.Scanit == term) || |
| | 1 | 583 | | (o.ProductName != null && o.ProductName.ToLower().Contains(termLower)) || |
| | 1 | 584 | | (o.ProductKey != null && o.ProductKey.ToLower().Contains(termLower)) || |
| | 1 | 585 | | (o.Article != null && o.Article.ToLower().Contains(termLower))); |
| | | 586 | | } |
| | | 587 | | |
| | | 588 | | private IQueryable<Order> ApplyPrimaryTextSearchQueryable(IQueryable<Order> ordersQuery, |
| | | 589 | | OrderFilterModel filterData, bool forceMysql = false) |
| | | 590 | | { |
| | 5 | 591 | | if (!forceMysql && IsElasticsearchTextSearchEnabled() && HasElasticsearchTextCriteria(filterData)) |
| | | 592 | | { |
| | 2 | 593 | | return ordersQuery; |
| | | 594 | | } |
| | | 595 | | |
| | 3 | 596 | | if (!string.IsNullOrWhiteSpace(filterData.Search)) |
| | | 597 | | { |
| | 1 | 598 | | return ApplyGlobalSearchQueryable(ordersQuery, filterData.Search); |
| | | 599 | | } |
| | | 600 | | |
| | 2 | 601 | | if (!string.IsNullOrWhiteSpace(filterData.ShipmentNumber)) |
| | | 602 | | { |
| | 1 | 603 | | var parts = GetShipmentNumbersFromFilter(filterData.ShipmentNumber); |
| | 1 | 604 | | if (parts.Count > 1) |
| | | 605 | | { |
| | 0 | 606 | | var normalizedParts = parts |
| | 0 | 607 | | .Select(NormalizeShipmentNumberForSearch) |
| | 0 | 608 | | .Where(part => !string.IsNullOrWhiteSpace(part)) |
| | 0 | 609 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 0 | 610 | | .ToList(); |
| | | 611 | | |
| | 0 | 612 | | ordersQuery = ApplyShipmentNumberFilter(ordersQuery, normalizedParts); |
| | | 613 | | } |
| | 1 | 614 | | else if (parts.Count == 1) |
| | | 615 | | { |
| | 1 | 616 | | var normalizedShipmentNumber = NormalizeShipmentNumberForSearch(parts[0]); |
| | 1 | 617 | | ordersQuery = ApplyShipmentNumberFilter(ordersQuery, new[] { normalizedShipmentNumber }); |
| | | 618 | | } |
| | | 619 | | else |
| | | 620 | | { |
| | 0 | 621 | | var normalizedShipmentNumber = NormalizeShipmentNumberForSearch(filterData.ShipmentNumber); |
| | 0 | 622 | | ordersQuery = ApplyShipmentNumberFilter(ordersQuery, new[] { normalizedShipmentNumber }); |
| | | 623 | | } |
| | | 624 | | } |
| | | 625 | | |
| | 2 | 626 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.ProductName, filterData.ProductName); |
| | | 627 | | |
| | 2 | 628 | | if (string.IsNullOrEmpty(filterData.Article) && !string.IsNullOrEmpty(filterData.Article2)) |
| | | 629 | | { |
| | 0 | 630 | | filterData.Article = filterData.Article2; |
| | | 631 | | } |
| | | 632 | | |
| | 2 | 633 | | if (!string.IsNullOrEmpty(filterData.Article)) |
| | | 634 | | { |
| | 0 | 635 | | ordersQuery = ApplyArticleFilter(ordersQuery, GetArticleSearchTerms(filterData.Article)); |
| | | 636 | | } |
| | | 637 | | |
| | 2 | 638 | | return ordersQuery; |
| | | 639 | | } |
| | | 640 | | |
| | | 641 | | private IQueryable<Order> ApplyPrimaryTextSearchInMemory(IQueryable<Order> orders, |
| | | 642 | | OrderFilterModel filterData) |
| | | 643 | | { |
| | 0 | 644 | | if (!string.IsNullOrWhiteSpace(filterData.Search)) |
| | | 645 | | { |
| | 0 | 646 | | var termLower = filterData.Search.Trim().ToLowerInvariant(); |
| | | 647 | | |
| | 0 | 648 | | return orders.Where(o => |
| | 0 | 649 | | (o.ShipmentNumber != null && o.ShipmentNumber.ToLower().Contains(termLower)) || |
| | 0 | 650 | | (o.ProductName != null && o.ProductName.ToLower().Contains(termLower)) || |
| | 0 | 651 | | (o.ProductKey != null && o.ProductKey.ToLower().Contains(termLower)) || |
| | 0 | 652 | | (o.Article != null && o.Article.ToLower().Contains(termLower))); |
| | | 653 | | } |
| | | 654 | | |
| | 0 | 655 | | if (!string.IsNullOrWhiteSpace(filterData.ShipmentNumber)) |
| | | 656 | | { |
| | 0 | 657 | | var parts = GetShipmentNumbersFromFilter(filterData.ShipmentNumber); |
| | 0 | 658 | | if (parts.Count > 1) |
| | | 659 | | { |
| | 0 | 660 | | orders = orders.Where(pr => parts.Any(part => ShipmentNumberMatchesSearch(pr.ShipmentNumber, part))) |
| | | 661 | | } |
| | 0 | 662 | | else if (parts.Count == 1) |
| | | 663 | | { |
| | 0 | 664 | | orders = orders.Where(pr => ShipmentNumberMatchesSearch(pr.ShipmentNumber, parts[0])); |
| | | 665 | | } |
| | | 666 | | else |
| | | 667 | | { |
| | 0 | 668 | | orders = orders.Where(pr => ShipmentNumberMatchesSearch(pr.ShipmentNumber, filterData.ShipmentNumber |
| | | 669 | | } |
| | | 670 | | } |
| | | 671 | | |
| | 0 | 672 | | orders = _filter.FilterByString(orders, pr => pr.ProductName, filterData.ProductName); |
| | | 673 | | |
| | 0 | 674 | | if (!string.IsNullOrEmpty(filterData.Article)) |
| | | 675 | | { |
| | 0 | 676 | | orders = orders.Where(o => |
| | 0 | 677 | | GetArticleSearchTerms(filterData.Article) |
| | 0 | 678 | | .Any(term => ArticleMatchesSearch(o.ProductKey, o.Article, term))); |
| | | 679 | | } |
| | | 680 | | |
| | 0 | 681 | | return orders; |
| | | 682 | | } |
| | | 683 | | |
| | | 684 | | |
| | | 685 | | // Реализация интерфейса |
| | | 686 | | |
| | | 687 | | public async Task<List<Order>> FilterByFilterData(List<Order> standartOrders, OrderFilterModel filterData) |
| | | 688 | | |
| | | 689 | | { |
| | 0 | 690 | | return await FilterByFilterData(standartOrders, filterData, null); |
| | 0 | 691 | | } |
| | | 692 | | |
| | | 693 | | |
| | | 694 | | /// <summary> |
| | | 695 | | /// Применяет фильтры к IQueryable на уровне БД (максимальная оптимизация). |
| | | 696 | | /// Возвращает IQueryable для дальнейшего применения фильтров или загрузки. |
| | | 697 | | /// Поддерживает группировку по ShipmentId если включен флаг GroupByShipment. |
| | | 698 | | /// </summary> |
| | | 699 | | public IQueryable<Order> FilterByFilterDataQueryable(IQueryable<Order> ordersQuery, OrderFilterModel filterData, |
| | | 700 | | AccessProfile? accessProfile) |
| | | 701 | | |
| | | 702 | | { |
| | 4 | 703 | | bool filterIsNull = AreAllPropertiesNull(filterData); |
| | | 704 | | |
| | | 705 | | |
| | 4 | 706 | | if (filterIsNull) |
| | | 707 | | |
| | | 708 | | { |
| | 0 | 709 | | return ordersQuery.OrderByDescending(o => o.ProcessingDate); |
| | | 710 | | } |
| | | 711 | | |
| | | 712 | | |
| | | 713 | | // Применяем фильтр по архиву |
| | | 714 | | |
| | 4 | 715 | | if (!filterData.IncludeArchived) |
| | | 716 | | |
| | | 717 | | { |
| | 4 | 718 | | ordersQuery = ordersQuery.Where(o => o.OrderArchive == null); |
| | | 719 | | } |
| | | 720 | | |
| | | 721 | | |
| | | 722 | | // Применяем фильтрацию по правам доступа пользователя |
| | | 723 | | |
| | 4 | 724 | | var scope = _dataScopeEvaluator.Evaluate(accessProfile); |
| | 4 | 725 | | if (!scope.IsUnrestricted) |
| | | 726 | | { |
| | 0 | 727 | | ordersQuery = _dataScopeEvaluator.ApplyToOrders(ordersQuery, scope); |
| | | 728 | | } |
| | | 729 | | |
| | 4 | 730 | | if (filterData.HasOzonPromotion.HasValue) |
| | | 731 | | { |
| | 0 | 732 | | var hasPromotion = filterData.HasOzonPromotion.Value; |
| | 0 | 733 | | ordersQuery = ordersQuery.Where(order => |
| | 0 | 734 | | order.OzonPromotionSnapshot != null && |
| | 0 | 735 | | order.OzonPromotionSnapshot.HasAnyPromotion == hasPromotion); |
| | | 736 | | } |
| | | 737 | | |
| | | 738 | | |
| | | 739 | | // Фильтрация по строковым полям - применяем на уровне БД где возможно |
| | | 740 | | |
| | 4 | 741 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.Key, filterData.Key); |
| | | 742 | | |
| | 4 | 743 | | ordersQuery = ApplyPrimaryTextSearchQueryable(ordersQuery, filterData); |
| | | 744 | | |
| | | 745 | | // Приоритетная фильтрация: сначала склад отгрузки (включая засыл), затем поставщик. |
| | 4 | 746 | | if (!string.IsNullOrEmpty(filterData.ShipmentWarehouse) && filterData.ShipmentWarehouse != "Все") |
| | | 747 | | { |
| | 0 | 748 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 749 | | (o.ShipmentWarehouse != null && o.ShipmentWarehouse.Name == filterData.ShipmentWarehouse) || |
| | 0 | 750 | | o.OrderExtensions.Any(e => e.Key == "Засыл" && e.Value == filterData.ShipmentWarehouse)); |
| | | 751 | | } |
| | | 752 | | |
| | 4 | 753 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 754 | | pr => pr.Supplier != null ? pr.Supplier.Name : "", filterData.Supplier); |
| | | 755 | | |
| | 4 | 756 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 757 | | pr => pr.ClientStatus != null ? pr.ClientStatus.Name : null, filterData.Status); |
| | | 758 | | |
| | 4 | 759 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 760 | | pr => pr.AppStatus != null ? pr.AppStatus.Name : "", filterData.AppStatus); |
| | | 761 | | |
| | 4 | 762 | | if (filterData.SupplierStatusId.HasValue) |
| | | 763 | | { |
| | 0 | 764 | | var supplierStatusId = filterData.SupplierStatusId.Value; |
| | 0 | 765 | | ordersQuery = ordersQuery.Where(o => _context.OrderSupplierStates.Any(state => |
| | 0 | 766 | | state.OrderId == o.Id && |
| | 0 | 767 | | state.ActiveOrderId != null && |
| | 0 | 768 | | state.SupplierStatusId == supplierStatusId)); |
| | | 769 | | } |
| | | 770 | | |
| | 4 | 771 | | ordersQuery = _filter.FilterByString(ordersQuery, |
| | 4 | 772 | | pr => pr.ProductInfo != null ? pr.ProductInfo.Barcode : null, filterData.Barcode); |
| | | 773 | | |
| | 4 | 774 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 775 | | pr => pr.ProductInfo != null ? pr.ProductInfo.CommercialCategory : "", filterData.CommercialCategory); |
| | | 776 | | |
| | 4 | 777 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.NewCategory, filterData.NewCategory); |
| | | 778 | | |
| | 4 | 779 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 780 | | pr => pr.Сurrency != null ? pr.Сurrency.Name : "", filterData.Сurrency); |
| | | 781 | | |
| | 4 | 782 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.DeliveryCity, filterData.DeliveryCity); |
| | | 783 | | |
| | 4 | 784 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.OrderNumberToSupplier, |
| | 4 | 785 | | filterData.OrderNumberToSupplier); |
| | | 786 | | |
| | 4 | 787 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 788 | | pr => pr.EtProducer != null ? pr.EtProducer.Name : "", filterData.Manufacturer); |
| | | 789 | | |
| | 4 | 790 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.OzonClient != null ? pr.OzonClient.Name : "", |
| | 4 | 791 | | filterData.OzonClient); |
| | | 792 | | |
| | 4 | 793 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 794 | | pr => pr.Delivery != null ? pr.Delivery.Provider.Name : "", filterData.Provider); |
| | | 795 | | |
| | 4 | 796 | | ordersQuery = _filter.FilterByStringExactSimple(ordersQuery, |
| | 4 | 797 | | pr => pr.Delivery != null ? pr.Delivery.Name : "", filterData.DeliveryName); |
| | | 798 | | |
| | 4 | 799 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.TrackingNumber, filterData.TrackingNumber); |
| | 4 | 800 | | ordersQuery = _filter.FilterByString(ordersQuery, pr => pr.Scanit, filterData.Scanit); |
| | | 801 | | |
| | | 802 | | |
| | | 803 | | // Фильтрация по датам |
| | | 804 | | |
| | 4 | 805 | | ordersQuery = _filter.FilterByDate(ordersQuery, pr => pr.ProcessingDate, filterData.ProcessingDate); |
| | | 806 | | |
| | | 807 | | |
| | 4 | 808 | | ordersQuery = _filter.FilterByDate(ordersQuery, pr => pr.ShippingDate, filterData.ShippingDate); |
| | | 809 | | |
| | 4 | 810 | | ordersQuery = _filter.FilterByDate(ordersQuery, pr => pr.LastStatusChangeDate, |
| | 4 | 811 | | filterData.LastStatusChangeDate); |
| | | 812 | | |
| | | 813 | | |
| | | 814 | | // Фильтрация по числовым полям |
| | | 815 | | |
| | 4 | 816 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.ProductInfo!.CurrentPriceWithDiscount, |
| | 4 | 817 | | filterData.CurrentPriceWithDiscount); |
| | | 818 | | |
| | 4 | 819 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.Quantity, filterData.Quantity, tolerance: 0); |
| | | 820 | | |
| | 4 | 821 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.ShipmentAmount, filterData.ShipmentAmount); |
| | | 822 | | |
| | 4 | 823 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.Price, filterData.Price); |
| | | 824 | | |
| | 4 | 825 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.PurchasePrice, filterData.PurchasePrice); |
| | | 826 | | |
| | 4 | 827 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.MinOzonCommission, filterData.OzonCommission); |
| | | 828 | | |
| | 4 | 829 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.MinProfit, filterData.Profit); |
| | 4 | 830 | | if (filterData.ProfitMin.HasValue) |
| | 0 | 831 | | ordersQuery = ordersQuery.Where(o => o.MinProfit > filterData.ProfitMin.Value); |
| | 4 | 832 | | if (filterData.ProfitMax.HasValue) |
| | 0 | 833 | | ordersQuery = ordersQuery.Where(o => o.MinProfit < filterData.ProfitMax.Value); |
| | 4 | 834 | | if (filterData.OnlyNegativeProfit) |
| | 0 | 835 | | ordersQuery = ordersQuery.Where(o => o.MinProfit < 0); |
| | 4 | 836 | | if (filterData.OnlyPositiveProfit) |
| | 0 | 837 | | ordersQuery = ordersQuery.Where(o => o.MinProfit > 0); |
| | | 838 | | |
| | 4 | 839 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.MinDiscount, filterData.Discount); |
| | 4 | 840 | | if (filterData.DiscountMin.HasValue) |
| | 0 | 841 | | ordersQuery = ordersQuery.Where(o => o.MinDiscount > filterData.DiscountMin.Value); |
| | 4 | 842 | | if (filterData.DiscountMax.HasValue) |
| | 0 | 843 | | ordersQuery = ordersQuery.Where(o => o.MinDiscount < filterData.DiscountMax.Value); |
| | 4 | 844 | | if (filterData.OnlyNegativeDiscount) |
| | 0 | 845 | | ordersQuery = ordersQuery.Where(o => o.MinDiscount < 0); |
| | | 846 | | |
| | 4 | 847 | | ordersQuery = _filter.FilterByDecimal(ordersQuery, pr => pr.CostPrice, filterData.CostPrice); |
| | | 848 | | |
| | 4 | 849 | | ordersQuery = _filter.FilterByDouble(ordersQuery, pr => pr.ProductInfo!.VolumetricWeight, |
| | 4 | 850 | | filterData.VolumetricWeight); |
| | | 851 | | |
| | | 852 | | // Фильтрация по оставшимся дням до отгрузки (TimeLeftDay = (ShippingDate - Now).Days) |
| | 4 | 853 | | if (filterData.TimeLeftDay.HasValue) |
| | | 854 | | { |
| | 0 | 855 | | var today = DateTime.Today; |
| | 0 | 856 | | var targetDays = filterData.TimeLeftDay.Value; |
| | 0 | 857 | | if (targetDays == 0) |
| | | 858 | | { |
| | 0 | 859 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 860 | | !o.ShippingDate.HasValue || |
| | 0 | 861 | | MySqlDbFunctionsExtensions.DateDiffDay(EF.Functions, today, o.ShippingDate.Value) == 0); |
| | | 862 | | } |
| | | 863 | | else |
| | | 864 | | { |
| | 0 | 865 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 866 | | o.ShippingDate.HasValue && |
| | 0 | 867 | | MySqlDbFunctionsExtensions.DateDiffDay(EF.Functions, today, o.ShippingDate.Value) == targetDays) |
| | | 868 | | } |
| | | 869 | | } |
| | | 870 | | |
| | | 871 | | // Фильтрация по сроку доставки (DeliveryPeriod = ShippingDate - ProcessingDate) |
| | 4 | 872 | | if (!string.IsNullOrEmpty(filterData.DeliveryPeriod)) |
| | | 873 | | { |
| | 0 | 874 | | var day = StringToIntDay(filterData.DeliveryPeriod); |
| | 0 | 875 | | var hours = StringToIntHours(filterData.DeliveryPeriod); |
| | 0 | 876 | | if (day.HasValue && hours.HasValue) |
| | | 877 | | { |
| | 0 | 878 | | var dayVal = day.Value; |
| | 0 | 879 | | var hoursVal = hours.Value; |
| | 0 | 880 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 881 | | o.ProcessingDate.HasValue && o.ShippingDate.HasValue && |
| | 0 | 882 | | MySqlDbFunctionsExtensions.DateDiffDay(EF.Functions, o.ProcessingDate.Value, o.ShippingDate.Valu |
| | 0 | 883 | | MySqlDbFunctionsExtensions.DateDiffHour(EF.Functions, o.ProcessingDate.Value, o.ShippingDate.Val |
| | | 884 | | } |
| | | 885 | | } |
| | | 886 | | |
| | | 887 | | // Фильтрация по наличию засыла |
| | 4 | 888 | | if (filterData.OnlyWithZasyl) |
| | | 889 | | { |
| | 0 | 890 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 891 | | o.OrderExtensions.Any(e => e.Key == "Засыл" && e.Value != null && e.Value != "")); |
| | | 892 | | } |
| | | 893 | | |
| | | 894 | | // Фильтрация по возвратам |
| | 4 | 895 | | if (filterData.OnlyWithReturns) |
| | | 896 | | { |
| | 0 | 897 | | ordersQuery = ordersQuery.Where(o => o.IsReturned); |
| | | 898 | | } |
| | | 899 | | |
| | | 900 | | // Фильтрация по штрихкоду возврата (LogisticBarcode из OrderReturns) |
| | 4 | 901 | | if (!string.IsNullOrWhiteSpace(filterData.ReturnLogisticBarcode)) |
| | | 902 | | { |
| | 0 | 903 | | var barcode = filterData.ReturnLogisticBarcode.Trim(); |
| | 0 | 904 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 905 | | _context.Set<OrderReturn>().Any(r => r.OrderId == o.Id && r.LogisticBarcode != null && r.LogisticBar |
| | | 906 | | } |
| | | 907 | | |
| | | 908 | | // Фильтрация по статусу возврата (VisualStatusSysName из OrderReturns) |
| | 4 | 909 | | if (!string.IsNullOrWhiteSpace(filterData.ReturnStatusSysName)) |
| | | 910 | | { |
| | 0 | 911 | | var returnStatusSysName = filterData.ReturnStatusSysName.Trim(); |
| | 0 | 912 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 913 | | _context.Set<OrderReturn>().Any(r => |
| | 0 | 914 | | r.OrderId == o.Id && |
| | 0 | 915 | | r.VisualStatusSysName != null && |
| | 0 | 916 | | r.VisualStatusSysName == returnStatusSysName)); |
| | | 917 | | } |
| | | 918 | | |
| | | 919 | | // Фильтрация по складу возврата (PlaceName/TargetPlaceName из OrderReturns) |
| | 4 | 920 | | if (!string.IsNullOrWhiteSpace(filterData.ReturnWarehouseName)) |
| | | 921 | | { |
| | 0 | 922 | | var returnWarehouseName = filterData.ReturnWarehouseName.Trim(); |
| | 0 | 923 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 924 | | _context.Set<OrderReturn>().Any(r => |
| | 0 | 925 | | r.OrderId == o.Id && |
| | 0 | 926 | | ( |
| | 0 | 927 | | (r.PlaceName != null && r.PlaceName.Contains(returnWarehouseName)) || |
| | 0 | 928 | | (r.TargetPlaceName != null && r.TargetPlaceName.Contains(returnWarehouseName)) |
| | 0 | 929 | | ))); |
| | | 930 | | } |
| | | 931 | | |
| | | 932 | | // Фильтрация по дате изменения статуса возврата (VisualStatusChangeMoment из OrderReturns) |
| | 4 | 933 | | if (filterData.ReturnStatusChangeDate.HasValue) |
| | | 934 | | { |
| | 0 | 935 | | var returnStatusDate = filterData.ReturnStatusChangeDate.Value.Date; |
| | 0 | 936 | | ordersQuery = ordersQuery.Where(o => |
| | 0 | 937 | | _context.Set<OrderReturn>().Any(r => |
| | 0 | 938 | | r.OrderId == o.Id && |
| | 0 | 939 | | r.VisualStatusChangeMoment.HasValue && |
| | 0 | 940 | | r.VisualStatusChangeMoment.Value.Date == returnStatusDate)); |
| | | 941 | | } |
| | | 942 | | |
| | | 943 | | // Фильтрация по наличию трек-номера |
| | 4 | 944 | | if (filterData.OnlyWithTrackingNumber) |
| | | 945 | | { |
| | 0 | 946 | | ordersQuery = ordersQuery.Where(o => o.TrackingNumber != null && o.TrackingNumber != ""); |
| | | 947 | | } |
| | | 948 | | |
| | | 949 | | // Группировка по ShipmentId (оптимизированная версия на уровне БД) |
| | | 950 | | |
| | 4 | 951 | | if (filterData.GroupByShipment) |
| | | 952 | | |
| | | 953 | | { |
| | 0 | 954 | | ordersQuery = ApplyShipmentGroupingQueryable(ordersQuery, filterData.IncludeArchived); |
| | | 955 | | } |
| | | 956 | | |
| | | 957 | | // Сортировка |
| | | 958 | | |
| | 4 | 959 | | ordersQuery = ordersQuery.OrderByDescending(o => o.ProcessingDate); |
| | | 960 | | |
| | 4 | 961 | | return ordersQuery; |
| | | 962 | | } |
| | | 963 | | |
| | | 964 | | |
| | | 965 | | /// <summary> |
| | | 966 | | /// Применяет фильтры и сортировку к IQueryable на уровне БД (максимальная оптимизация). |
| | | 967 | | /// Возвращает IQueryable для дальнейшего применения фильтров или загрузки. |
| | | 968 | | /// </summary> |
| | | 969 | | public IQueryable<Order> FilterAndSortQueryable(IQueryable<Order> ordersQuery, OrderFilterModel filterData, |
| | | 970 | | AccessProfile? accessProfile, OrderSortState sortOrder) |
| | | 971 | | { |
| | | 972 | | // Сначала применяем фильтрацию |
| | 0 | 973 | | ordersQuery = FilterByFilterDataQueryable(ordersQuery, filterData, accessProfile); |
| | | 974 | | |
| | | 975 | | // Затем применяем сортировку на уровне БД |
| | 0 | 976 | | if (sortOrder != OrderSortState.StandardState && _sortManager != null) |
| | | 977 | | { |
| | 0 | 978 | | ordersQuery = _sortManager.ApplySortOrderQueryable(ordersQuery, sortOrder); |
| | | 979 | | } |
| | | 980 | | |
| | 0 | 981 | | return ordersQuery; |
| | | 982 | | } |
| | | 983 | | |
| | | 984 | | /// <summary> |
| | | 985 | | /// Гарантированно переустанавливает финальный ORDER BY непосредственно перед пагинацией — |
| | | 986 | | /// вызывать последним, после NarrowByElasticsearchAsync и применения RLS-скоупа. Те методы |
| | | 987 | | /// лишь дописывают Where к уже отсортированному запросу и в норме не должны ломать порядок, |
| | | 988 | | /// но это правило (сортировка по дате принятия, а не по релевантности ES) должно соблюдаться |
| | | 989 | | /// строго для всех поисков, поэтому порядок переустанавливается явно как последний шаг. |
| | | 990 | | /// </summary> |
| | | 991 | | public IQueryable<Order> ApplyFinalSortQueryable(IQueryable<Order> ordersQuery, OrderSortState sortOrder) => |
| | 2 | 992 | | _sortManager != null |
| | 2 | 993 | | ? _sortManager.ApplySortOrderQueryable(ordersQuery, sortOrder) |
| | 2 | 994 | | : ordersQuery.OrderByDescending(o => o.ProcessingDate); |
| | | 995 | | |
| | | 996 | | |
| | | 997 | | /// <summary> |
| | | 998 | | /// Применяет сортировку к списку заказов в памяти. |
| | | 999 | | /// </summary> |
| | | 1000 | | public IEnumerable<Order> ApplySortOrder(IEnumerable<Order> orders, OrderSortState sortOrder) |
| | | 1001 | | { |
| | 0 | 1002 | | if (_sortManager == null) |
| | | 1003 | | { |
| | 0 | 1004 | | return orders.OrderByDescending(o => o.ProcessingDate); |
| | | 1005 | | } |
| | | 1006 | | |
| | 0 | 1007 | | return _sortManager.ApplySortOrder(orders, sortOrder); |
| | | 1008 | | } |
| | | 1009 | | |
| | | 1010 | | |
| | | 1011 | | /// <summary> |
| | | 1012 | | /// Получает данные ViewData для сортировки. |
| | | 1013 | | /// </summary> |
| | | 1014 | | public Dictionary<string, OrderSortState> GetSortOrderViewData(OrderSortState sortOrder) |
| | | 1015 | | { |
| | 0 | 1016 | | if (_sortManager == null) |
| | | 1017 | | { |
| | 0 | 1018 | | return new Dictionary<string, OrderSortState>(); |
| | | 1019 | | } |
| | | 1020 | | |
| | 0 | 1021 | | return _sortManager.GetSortOrderViewData(sortOrder); |
| | | 1022 | | } |
| | | 1023 | | |
| | | 1024 | | |
| | | 1025 | | // Перегрузка с поддержкой прав доступа |
| | | 1026 | | |
| | | 1027 | | public async Task<List<Order>> FilterByFilterData(List<Order> standartOrders, OrderFilterModel filterData, |
| | | 1028 | | AccessProfile? accessProfile, OrderSortState sortOrder) |
| | | 1029 | | { |
| | 0 | 1030 | | var filtered = await FilterByFilterData(standartOrders, filterData, accessProfile); |
| | 0 | 1031 | | return ApplySortOrder(filtered, sortOrder).ToList(); |
| | 0 | 1032 | | } |
| | | 1033 | | |
| | | 1034 | | |
| | | 1035 | | public async Task<List<Order>> FilterByFilterData(List<Order> standartOrders, OrderFilterModel filterData, |
| | | 1036 | | AccessProfile? accessProfile) |
| | | 1037 | | { |
| | 0 | 1038 | | bool filterIsNull = AreAllPropertiesNull(filterData); |
| | | 1039 | | |
| | | 1040 | | |
| | 0 | 1041 | | if (filterIsNull) |
| | | 1042 | | |
| | | 1043 | | { |
| | | 1044 | | return standartOrders.OrderByDescending(o => o.ProcessingDate).ToList(); |
| | | 1045 | | } |
| | | 1046 | | |
| | | 1047 | | |
| | | 1048 | | // ВАЖНО: Если есть фильтры, загружаем данные из БД, а не фильтруем переданные заказы |
| | | 1049 | | |
| | | 1050 | | // Это обеспечивает корректную фильтрацию по всем данным из БД |
| | | 1051 | | |
| | 0 | 1052 | | bool hasOtherFilters = !filterIsNull; // Есть любые фильтры кроме проверки на null |
| | | 1053 | | |
| | | 1054 | | |
| | 0 | 1055 | | if (hasOtherFilters) |
| | | 1056 | | |
| | | 1057 | | { |
| | 0 | 1058 | | IQueryable<Order> ordersQuery = _ordersDataServices.GetOrdersQueryable(filterData.IncludeArchived); |
| | 0 | 1059 | | ordersQuery = FilterByFilterDataQueryable(ordersQuery, filterData, accessProfile); |
| | | 1060 | | |
| | | 1061 | | |
| | | 1062 | | // Получаем только ID отфильтрованных заказов (быстрый запрос) |
| | | 1063 | | |
| | 0 | 1064 | | var filteredOrderIds = await ordersQuery.Select(o => o.Id).ToListAsync(); |
| | | 1065 | | |
| | | 1066 | | |
| | 0 | 1067 | | if (!filteredOrderIds.Any()) |
| | | 1068 | | |
| | | 1069 | | { |
| | 0 | 1070 | | return new List<Order>(); |
| | | 1071 | | } |
| | | 1072 | | |
| | | 1073 | | |
| | | 1074 | | // Загружаем полные данные только для отфильтрованных заказов БЕЗ OrderExtensions |
| | | 1075 | | |
| | 0 | 1076 | | var filteredOrders = |
| | 0 | 1077 | | await _ordersDataServices.GetOrdersByIds(filteredOrderIds, filterData.IncludeArchived); |
| | | 1078 | | |
| | | 1079 | | |
| | | 1080 | | // Применяем сложные фильтры, требующие OrderExtensions (засылы) в памяти |
| | | 1081 | | |
| | 0 | 1082 | | if (!string.IsNullOrEmpty(filterData.ShipmentWarehouse) && filterData.ShipmentWarehouse != "Все") |
| | | 1083 | | |
| | | 1084 | | { |
| | | 1085 | | // Загружаем OrderExtensions только для отфильтрованных заказов |
| | | 1086 | | |
| | 0 | 1087 | | await _ordersDataServices.LoadOrderExtensionsForOrders(filteredOrders); |
| | | 1088 | | |
| | | 1089 | | |
| | | 1090 | | // Применяем фильтр по складу с учетом засылов |
| | | 1091 | | |
| | 0 | 1092 | | filteredOrders = filteredOrders.Where(pr => |
| | 0 | 1093 | | (pr.ShipmentWarehouse != null && pr.ShipmentWarehouse.Name == filterData.ShipmentWarehouse) || |
| | 0 | 1094 | | (pr.OrderExtensions != null && pr.OrderExtensions.Any(e => |
| | 0 | 1095 | | e.Key == "Засыл" && e.Value == filterData.ShipmentWarehouse |
| | 0 | 1096 | | )) |
| | 0 | 1097 | | ).ToList(); |
| | | 1098 | | } |
| | | 1099 | | |
| | | 1100 | | |
| | | 1101 | | // Применяем фильтры, которые требуют вычислений в памяти (TimeLeftDay, DeliveryPeriod) |
| | | 1102 | | |
| | 0 | 1103 | | if (filterData.TimeLeftDay.HasValue) |
| | | 1104 | | |
| | | 1105 | | { |
| | 0 | 1106 | | filteredOrders = filteredOrders.Where(o => o.TimeLeftDay == filterData.TimeLeftDay.Value).ToList(); |
| | | 1107 | | } |
| | | 1108 | | |
| | | 1109 | | |
| | 0 | 1110 | | if (!string.IsNullOrEmpty(filterData.DeliveryPeriod)) |
| | | 1111 | | |
| | | 1112 | | { |
| | 0 | 1113 | | var day = StringToIntDay(filterData.DeliveryPeriod); |
| | | 1114 | | |
| | 0 | 1115 | | var hours = StringToIntHours(filterData.DeliveryPeriod); |
| | | 1116 | | |
| | 0 | 1117 | | if (day.HasValue && hours.HasValue) |
| | | 1118 | | |
| | | 1119 | | { |
| | 0 | 1120 | | filteredOrders = filteredOrders.Where(o => |
| | 0 | 1121 | | o.DeliveryPeriod.HasValue && |
| | 0 | 1122 | | o.DeliveryPeriod.Value.Days == day.Value && |
| | 0 | 1123 | | o.DeliveryPeriod.Value.Hours == hours.Value |
| | 0 | 1124 | | ).ToList(); |
| | | 1125 | | } |
| | | 1126 | | } |
| | | 1127 | | |
| | | 1128 | | |
| | | 1129 | | // Сортируем по исходному порядку filteredOrderIds |
| | | 1130 | | |
| | | 1131 | | var orderDict = filteredOrders.ToDictionary(o => o.Id); |
| | | 1132 | | |
| | 0 | 1133 | | filteredOrders = filteredOrderIds |
| | 0 | 1134 | | .Select(id => orderDict.GetValueOrDefault(id)) |
| | 0 | 1135 | | .OfType<Order>() |
| | 0 | 1136 | | .ToList(); |
| | | 1137 | | |
| | | 1138 | | |
| | | 1139 | | // Применяем группировку по ShipmentId если включено |
| | | 1140 | | |
| | 0 | 1141 | | if (filterData.GroupByShipment && filteredOrders.Any()) |
| | | 1142 | | |
| | | 1143 | | { |
| | 0 | 1144 | | filteredOrders = await ExpandByShipmentIdAsync(filteredOrders, filterData.IncludeArchived); |
| | | 1145 | | } |
| | | 1146 | | |
| | | 1147 | | |
| | | 1148 | | return filteredOrders.OrderByDescending(o => o.ProcessingDate).ToList(); |
| | | 1149 | | } |
| | | 1150 | | |
| | | 1151 | | |
| | | 1152 | | // Если нет фильтров, используем существующую логику фильтрации по переданным заказам |
| | | 1153 | | |
| | | 1154 | | // ОПТИМИЗАЦИЯ: Используем уже загруженные заказы из кэша |
| | | 1155 | | |
| | 0 | 1156 | | IQueryable<Order> orders = standartOrders.AsQueryable(); |
| | | 1157 | | |
| | | 1158 | | |
| | | 1159 | | // Применяем фильтр по архиву к уже загруженным заказам (если указан) |
| | | 1160 | | |
| | 0 | 1161 | | if (!filterData.IncludeArchived) |
| | | 1162 | | |
| | | 1163 | | { |
| | 0 | 1164 | | orders = orders.Where(o => o.OrderArchive == null); |
| | | 1165 | | } |
| | | 1166 | | |
| | | 1167 | | |
| | | 1168 | | // Применяем фильтрацию по правам доступа пользователя |
| | | 1169 | | |
| | 0 | 1170 | | var scopeInMemory = _dataScopeEvaluator.Evaluate(accessProfile); |
| | 0 | 1171 | | if (!scopeInMemory.IsUnrestricted) |
| | | 1172 | | { |
| | 0 | 1173 | | orders = _dataScopeEvaluator.ApplyToOrders(orders, scopeInMemory); |
| | | 1174 | | } |
| | | 1175 | | |
| | | 1176 | | |
| | | 1177 | | // Фильтрация по строковым полям - точное совпадение для связанных полей |
| | | 1178 | | |
| | 0 | 1179 | | orders = _filter.FilterByString(orders, pr => pr.Key, filterData.Key); |
| | | 1180 | | |
| | 0 | 1181 | | orders = ApplyPrimaryTextSearchInMemory(orders, filterData); |
| | | 1182 | | |
| | | 1183 | | // Приоритетная фильтрация: сначала склад отгрузки, затем поставщик. |
| | 0 | 1184 | | if (!string.IsNullOrEmpty(filterData.ShipmentWarehouse) && filterData.ShipmentWarehouse != "Все") |
| | | 1185 | | { |
| | 0 | 1186 | | orders = orders.Where(pr => |
| | 0 | 1187 | | |
| | 0 | 1188 | | // Обычный склад |
| | 0 | 1189 | | (pr.ShipmentWarehouse != null && pr.ShipmentWarehouse.Name == filterData.ShipmentWarehouse) || |
| | 0 | 1190 | | |
| | 0 | 1191 | | // Или засыл на этот склад |
| | 0 | 1192 | | (pr.OrderExtensions != null && pr.OrderExtensions.Any(e => |
| | 0 | 1193 | | e.Key == "Засыл" && e.Value == filterData.ShipmentWarehouse |
| | 0 | 1194 | | )) |
| | 0 | 1195 | | ); |
| | | 1196 | | } |
| | | 1197 | | |
| | 0 | 1198 | | orders = _filter.FilterByStringExactSimple(orders, pr => pr.Supplier != null ? pr.Supplier.Name : "", |
| | 0 | 1199 | | filterData.Supplier); |
| | | 1200 | | |
| | | 1201 | | |
| | 0 | 1202 | | orders = _filter.FilterByStringExactSimple(orders, |
| | 0 | 1203 | | pr => pr.ClientStatus != null ? pr.ClientStatus.Name : null, filterData.Status); |
| | | 1204 | | |
| | 0 | 1205 | | orders = _filter.FilterByStringExactSimple(orders, pr => pr.AppStatus != null ? pr.AppStatus.Name : "", |
| | 0 | 1206 | | filterData.AppStatus); |
| | | 1207 | | |
| | 0 | 1208 | | orders = _filter.FilterByString(orders, pr => pr.ProductInfo != null ? pr.ProductInfo.Barcode : null, |
| | 0 | 1209 | | filterData.Barcode); |
| | | 1210 | | |
| | 0 | 1211 | | orders = _filter.FilterByStringExactSimple(orders, |
| | 0 | 1212 | | pr => pr.ProductInfo != null ? pr.ProductInfo.CommercialCategory : "", filterData.CommercialCategory); |
| | | 1213 | | |
| | 0 | 1214 | | orders = _filter.FilterByString(orders, pr => pr.NewCategory, filterData.NewCategory); |
| | | 1215 | | |
| | 0 | 1216 | | orders = _filter.FilterByStringExactSimple(orders, pr => pr.Сurrency != null ? pr.Сurrency.Name : "", |
| | 0 | 1217 | | filterData.Сurrency); |
| | | 1218 | | |
| | 0 | 1219 | | orders = _filter.FilterByString(orders, pr => pr.DeliveryCity, filterData.DeliveryCity); |
| | | 1220 | | |
| | 0 | 1221 | | orders = _filter.FilterByString(orders, pr => pr.OrderNumberToSupplier, filterData.OrderNumberToSupplier); |
| | 0 | 1222 | | orders = _filter.FilterByString(orders, pr => pr.Scanit, filterData.Scanit); |
| | | 1223 | | |
| | 0 | 1224 | | orders = _filter.FilterByStringExactSimple(orders, |
| | 0 | 1225 | | pr => pr.EtProducer != null ? pr.EtProducer.Name : "", |
| | 0 | 1226 | | filterData.Manufacturer); |
| | | 1227 | | |
| | 0 | 1228 | | orders = _filter.FilterByString(orders, pr => pr.OzonClient != null ? pr.OzonClient.Name : "", |
| | 0 | 1229 | | filterData.OzonClient); |
| | | 1230 | | |
| | 0 | 1231 | | orders = _filter.FilterByStringExactSimple(orders, |
| | 0 | 1232 | | pr => pr.Delivery != null ? pr.Delivery.Provider.Name : "", |
| | 0 | 1233 | | filterData.Provider); |
| | | 1234 | | |
| | | 1235 | | |
| | | 1236 | | // Фильтрация по датам |
| | | 1237 | | |
| | 0 | 1238 | | orders = _filter.FilterByDate(orders, pr => pr.ProcessingDate, filterData.ProcessingDate); |
| | | 1239 | | |
| | 0 | 1240 | | orders = _filter.FilterByDate(orders, pr => pr.ShippingDate, filterData.ShippingDate); |
| | | 1241 | | |
| | 0 | 1242 | | orders = _filter.FilterByDate(orders, pr => pr.LastStatusChangeDate, filterData.LastStatusChangeDate); |
| | | 1243 | | |
| | | 1244 | | |
| | | 1245 | | // Фильтрация по числовым полям |
| | | 1246 | | |
| | 0 | 1247 | | orders = _filter.FilterByDecimal(orders, pr => pr.ProductInfo!.CurrentPriceWithDiscount, |
| | 0 | 1248 | | filterData.CurrentPriceWithDiscount); |
| | | 1249 | | |
| | 0 | 1250 | | orders = _filter.FilterByDecimal(orders, pr => pr.Quantity, filterData.Quantity, tolerance: 0); |
| | | 1251 | | |
| | 0 | 1252 | | orders = _filter.FilterByDecimal(orders, pr => pr.ShipmentAmount, filterData.ShipmentAmount); |
| | | 1253 | | |
| | 0 | 1254 | | orders = _filter.FilterByDecimal(orders, pr => pr.Price, filterData.Price); |
| | | 1255 | | |
| | 0 | 1256 | | orders = _filter.FilterByDecimal(orders, pr => pr.PurchasePrice, filterData.PurchasePrice); |
| | | 1257 | | |
| | 0 | 1258 | | orders = _filter.FilterByDecimal(orders, pr => pr.MinOzonCommission, filterData.OzonCommission); |
| | | 1259 | | |
| | 0 | 1260 | | orders = _filter.FilterByDecimal(orders, pr => pr.MinProfit, filterData.Profit); |
| | | 1261 | | |
| | 0 | 1262 | | orders = _filter.FilterByDecimal(orders, pr => pr.MinDiscount, filterData.Discount); |
| | | 1263 | | |
| | 0 | 1264 | | orders = _filter.FilterByDecimal(orders, pr => pr.CostPrice, filterData.CostPrice); |
| | | 1265 | | |
| | | 1266 | | |
| | 0 | 1267 | | orders = _filter.FilterByDouble(orders, pr => pr.ProductInfo!.VolumetricWeight, filterData.VolumetricWeight) |
| | | 1268 | | |
| | | 1269 | | |
| | | 1270 | | // Фильтрация по целым числам (преобразование в List) |
| | | 1271 | | |
| | 0 | 1272 | | List<Order> result = _forTransactionOrdersFilter |
| | | 1273 | | .FilterByInt(orders.ToList(), pr => pr.TimeLeftDay, filterData.TimeLeftDay).ToList(); |
| | | 1274 | | |
| | | 1275 | | |
| | | 1276 | | // Фильтрация по периоду доставки |
| | | 1277 | | |
| | 0 | 1278 | | if (filterData.DeliveryPeriod != null) |
| | | 1279 | | |
| | | 1280 | | { |
| | 0 | 1281 | | var filterByDay = result |
| | 0 | 1282 | | .AsEnumerable() |
| | 0 | 1283 | | .Where(o => o.DeliveryPeriod.HasValue && |
| | 0 | 1284 | | o.DeliveryPeriod.Value.Days == StringToIntDay(filterData.DeliveryPeriod)); |
| | | 1285 | | |
| | | 1286 | | |
| | 0 | 1287 | | result = filterByDay |
| | 0 | 1288 | | .Where(o => o.DeliveryPeriod.HasValue && |
| | 0 | 1289 | | o.DeliveryPeriod.Value.Hours == StringToIntHours(filterData.DeliveryPeriod)) |
| | 0 | 1290 | | .ToList(); |
| | | 1291 | | } |
| | | 1292 | | |
| | | 1293 | | |
| | | 1294 | | return result.OrderBy(o => o.ProcessingDate).ToList(); |
| | 0 | 1295 | | } |
| | | 1296 | | |
| | | 1297 | | |
| | | 1298 | | public async Task<List<Order>> FilterTransactionsOrdersByFilterData(List<Order> orders, |
| | | 1299 | | OrderFilterModel filterData) |
| | | 1300 | | |
| | | 1301 | | { |
| | 0 | 1302 | | await Task.CompletedTask; |
| | 0 | 1303 | | bool filterIsNull = AreAllPropertiesNull(filterData); |
| | | 1304 | | |
| | 0 | 1305 | | bool exactMatch = true; |
| | | 1306 | | |
| | | 1307 | | |
| | 0 | 1308 | | if (filterIsNull) |
| | | 1309 | | |
| | | 1310 | | { |
| | | 1311 | | return orders.OrderBy(pr => pr.ProcessingDate).ToList(); |
| | | 1312 | | } |
| | | 1313 | | |
| | | 1314 | | |
| | | 1315 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.Key, filterData.Key).ToList(); |
| | | 1316 | | |
| | 0 | 1317 | | if (!string.IsNullOrWhiteSpace(filterData.ShipmentNumber)) |
| | | 1318 | | { |
| | 0 | 1319 | | var parts = GetShipmentNumbersFromFilter(filterData.ShipmentNumber); |
| | 0 | 1320 | | if (parts.Count > 1) |
| | | 1321 | | { |
| | 0 | 1322 | | orders = orders.Where(pr => parts.Any(part => ShipmentNumberMatchesSearch(pr.ShipmentNumber, part))) |
| | | 1323 | | } |
| | 0 | 1324 | | else if (parts.Count == 1) |
| | | 1325 | | { |
| | 0 | 1326 | | orders = orders.Where(pr => ShipmentNumberMatchesSearch(pr.ShipmentNumber, parts[0])).ToList(); |
| | | 1327 | | } |
| | | 1328 | | else |
| | | 1329 | | { |
| | 0 | 1330 | | orders = orders.Where(pr => ShipmentNumberMatchesSearch(pr.ShipmentNumber, filterData.ShipmentNumber |
| | | 1331 | | } |
| | | 1332 | | } |
| | | 1333 | | |
| | | 1334 | | // Приоритетная фильтрация: сначала склад, затем поставщик. |
| | 0 | 1335 | | orders = _forTransactionOrdersFilter.FilterByString(orders, |
| | | 1336 | | pr => pr.ShipmentWarehouse?.Name ?? string.Empty, filterData.ShipmentWarehouse, exactMatch).ToList(); |
| | | 1337 | | |
| | | 1338 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.Supplier?.Name ?? string.Empty, |
| | 0 | 1339 | | filterData.Supplier, exactMatch).ToList(); |
| | | 1340 | | |
| | | 1341 | | |
| | 0 | 1342 | | orders = _forTransactionOrdersFilter.FilterByString(orders, |
| | | 1343 | | pr => pr.ClientStatus != null ? pr.ClientStatus.Name : null, filterData.Status, exactMatch) |
| | 0 | 1344 | | .ToList(); |
| | | 1345 | | |
| | | 1346 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.AppStatus?.Name ?? string.Empty, |
| | 0 | 1347 | | filterData.AppStatus, exactMatch).ToList(); |
| | | 1348 | | |
| | | 1349 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.ProductName, filterData.ProductName) |
| | 0 | 1350 | | .ToList(); |
| | | 1351 | | |
| | | 1352 | | |
| | | 1353 | | // Фильтрация по артикулу с учетом связей продуктов |
| | | 1354 | | |
| | 0 | 1355 | | if (!string.IsNullOrEmpty(filterData.Article)) |
| | | 1356 | | |
| | | 1357 | | { |
| | 0 | 1358 | | orders = orders |
| | 0 | 1359 | | .Where(o => GetArticleSearchTerms(filterData.Article) |
| | 0 | 1360 | | .Any(term => ArticleMatchesSearch(o.ProductKey, o.Article, term))) |
| | 0 | 1361 | | .ToList(); |
| | | 1362 | | } |
| | | 1363 | | |
| | | 1364 | | |
| | 0 | 1365 | | if (!string.IsNullOrEmpty(filterData.Barcode)) |
| | | 1366 | | |
| | | 1367 | | { |
| | 0 | 1368 | | orders = orders.Where(pr => pr.ProductInfo != null && |
| | 0 | 1369 | | !string.IsNullOrEmpty(pr.ProductInfo.Barcode) && |
| | 0 | 1370 | | pr.ProductInfo.Barcode.Contains(filterData.Barcode)).ToList(); |
| | | 1371 | | } |
| | | 1372 | | |
| | | 1373 | | |
| | 0 | 1374 | | orders = _forTransactionOrdersFilter.FilterByString(orders, |
| | | 1375 | | pr => pr.ProductInfo?.CommercialCategory ?? string.Empty, filterData.CommercialCategory, exactMatch) |
| | 0 | 1376 | | .ToList(); |
| | | 1377 | | |
| | | 1378 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.NewCategory, filterData.NewCategory) |
| | 0 | 1379 | | .ToList(); |
| | | 1380 | | |
| | | 1381 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.Сurrency?.Name ?? string.Empty, |
| | 0 | 1382 | | filterData.Сurrency, exactMatch).ToList(); |
| | | 1383 | | |
| | | 1384 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.DeliveryCity, filterData.DeliveryCity) |
| | 0 | 1385 | | .ToList(); |
| | | 1386 | | |
| | 0 | 1387 | | orders = _forTransactionOrdersFilter |
| | | 1388 | | .FilterByString(orders, pr => pr.OrderNumberToSupplier, filterData.OrderNumberToSupplier).ToList(); |
| | | 1389 | | |
| | | 1390 | | orders = _forTransactionOrdersFilter.FilterByString(orders, pr => pr.EtProducer?.Name ?? string.Empty, |
| | 0 | 1391 | | filterData.Manufacturer, exactMatch).ToList(); |
| | | 1392 | | |
| | | 1393 | | |
| | 0 | 1394 | | orders = _forTransactionOrdersFilter |
| | | 1395 | | .FilterByString(orders, pr => pr.OzonClient?.Name ?? string.Empty, filterData.OzonClient).ToList(); |
| | | 1396 | | |
| | | 1397 | | |
| | 0 | 1398 | | orders = _forTransactionOrdersFilter |
| | | 1399 | | .FilterByDate(orders, pr => pr.ProcessingDate, filterData.ProcessingDate).ToList(); |
| | | 1400 | | |
| | | 1401 | | orders = _forTransactionOrdersFilter.FilterByDate(orders, pr => pr.ShippingDate, filterData.ShippingDate) |
| | 0 | 1402 | | .ToList(); |
| | | 1403 | | |
| | 0 | 1404 | | orders = _forTransactionOrdersFilter |
| | | 1405 | | .FilterByDate(orders, pr => pr.LastStatusChangeDate, filterData.LastStatusChangeDate).ToList(); |
| | | 1406 | | |
| | | 1407 | | |
| | 0 | 1408 | | orders = _forTransactionOrdersFilter.FilterByDecimal(orders, |
| | | 1409 | | pr => pr.ProductInfo?.CurrentPriceWithDiscount ?? 0, filterData.CurrentPriceWithDiscount).ToList(); |
| | | 1410 | | |
| | 0 | 1411 | | orders = _forTransactionOrdersFilter |
| | | 1412 | | .FilterByDecimal(orders, pr => pr.Quantity, filterData.Quantity, tolerance: 0).ToList(); |
| | | 1413 | | |
| | 0 | 1414 | | orders = _forTransactionOrdersFilter |
| | | 1415 | | .FilterByDecimal(orders, pr => pr.ShipmentAmount, filterData.ShipmentAmount).ToList(); |
| | | 1416 | | |
| | | 1417 | | orders = _forTransactionOrdersFilter.FilterByDecimal(orders, pr => pr.Price, filterData.Price).ToList(); |
| | | 1418 | | |
| | 0 | 1419 | | orders = _forTransactionOrdersFilter |
| | | 1420 | | .FilterByDecimal(orders, pr => pr.PurchasePrice, filterData.PurchasePrice).ToList(); |
| | | 1421 | | |
| | 0 | 1422 | | orders = _forTransactionOrdersFilter |
| | | 1423 | | .FilterByDecimal(orders, pr => pr.MinOzonCommission, filterData.OzonCommission).ToList(); |
| | | 1424 | | |
| | | 1425 | | orders = _forTransactionOrdersFilter.FilterByDecimal(orders, pr => pr.MinProfit, filterData.Profit) |
| | 0 | 1426 | | .ToList(); |
| | 0 | 1427 | | if (filterData.ProfitMin.HasValue) |
| | 0 | 1428 | | orders = orders.Where(o => o.MinProfit > filterData.ProfitMin.Value).ToList(); |
| | 0 | 1429 | | if (filterData.ProfitMax.HasValue) |
| | 0 | 1430 | | orders = orders.Where(o => o.MinProfit < filterData.ProfitMax.Value).ToList(); |
| | 0 | 1431 | | if (filterData.OnlyNegativeProfit) |
| | | 1432 | | orders = orders.Where(o => o.MinProfit < 0).ToList(); |
| | 0 | 1433 | | if (filterData.OnlyPositiveProfit) |
| | | 1434 | | orders = orders.Where(o => o.MinProfit > 0).ToList(); |
| | | 1435 | | |
| | | 1436 | | orders = _forTransactionOrdersFilter.FilterByDecimal(orders, pr => pr.MinDiscount, filterData.Discount) |
| | 0 | 1437 | | .ToList(); |
| | 0 | 1438 | | if (filterData.DiscountMin.HasValue) |
| | 0 | 1439 | | orders = orders.Where(o => o.MinDiscount > filterData.DiscountMin.Value).ToList(); |
| | 0 | 1440 | | if (filterData.DiscountMax.HasValue) |
| | 0 | 1441 | | orders = orders.Where(o => o.MinDiscount < filterData.DiscountMax.Value).ToList(); |
| | 0 | 1442 | | if (filterData.OnlyNegativeDiscount) |
| | | 1443 | | orders = orders.Where(o => o.MinDiscount < 0).ToList(); |
| | | 1444 | | |
| | | 1445 | | orders = _forTransactionOrdersFilter.FilterByDecimal(orders, pr => pr.CostPrice, filterData.CostPrice) |
| | 0 | 1446 | | .ToList(); |
| | | 1447 | | |
| | | 1448 | | |
| | | 1449 | | orders = _forTransactionOrdersFilter.FilterByDouble(orders, pr => pr.ProductInfo?.VolumetricWeight ?? 0, |
| | 0 | 1450 | | filterData.VolumetricWeight).ToList(); |
| | | 1451 | | |
| | | 1452 | | |
| | | 1453 | | orders = _forTransactionOrdersFilter.FilterByInt(orders, pr => pr.TimeLeftDay, filterData.TimeLeftDay) |
| | 0 | 1454 | | .ToList(); |
| | | 1455 | | |
| | | 1456 | | |
| | | 1457 | | List<Order> result; |
| | | 1458 | | |
| | | 1459 | | |
| | 0 | 1460 | | if (filterData.DeliveryPeriod != null) |
| | | 1461 | | |
| | | 1462 | | { |
| | 0 | 1463 | | var filterByDay = orders |
| | 0 | 1464 | | .AsEnumerable() |
| | 0 | 1465 | | .Where(o => o.DeliveryPeriod.HasValue && |
| | 0 | 1466 | | o.DeliveryPeriod.Value.Days == StringToIntDay(filterData.DeliveryPeriod)); |
| | | 1467 | | |
| | | 1468 | | |
| | 0 | 1469 | | result = filterByDay |
| | 0 | 1470 | | .Where(o => o.DeliveryPeriod.HasValue && |
| | 0 | 1471 | | o.DeliveryPeriod.Value.Hours == StringToIntHours(filterData.DeliveryPeriod)) |
| | 0 | 1472 | | .ToList(); |
| | | 1473 | | } |
| | | 1474 | | |
| | | 1475 | | else |
| | | 1476 | | |
| | | 1477 | | { |
| | | 1478 | | result = orders.OrderBy(o => o.ProcessingDate).ToList(); |
| | | 1479 | | } |
| | | 1480 | | |
| | | 1481 | | |
| | | 1482 | | return result.OrderBy(o => o.ProcessingDate).ToList(); |
| | | 1483 | | |
| | | 1484 | | ; |
| | 0 | 1485 | | } |
| | | 1486 | | |
| | | 1487 | | |
| | | 1488 | | // Фильтрация только по переданному списку, без БД |
| | | 1489 | | |
| | | 1490 | | public List<Order> FilterByFilterDataFromList( |
| | | 1491 | | List<Order> standartOrders, |
| | | 1492 | | OrderFilterModel? filterData, |
| | | 1493 | | AccessProfile? accessProfile) |
| | | 1494 | | |
| | | 1495 | | { |
| | 0 | 1496 | | bool filterIsNull = AreAllPropertiesNull(filterData); |
| | | 1497 | | |
| | | 1498 | | |
| | 0 | 1499 | | if (filterIsNull) |
| | | 1500 | | |
| | | 1501 | | { |
| | 0 | 1502 | | return standartOrders |
| | 0 | 1503 | | .OrderByDescending(o => o.ProcessingDate) |
| | 0 | 1504 | | .ToList(); |
| | | 1505 | | } |
| | | 1506 | | |
| | 0 | 1507 | | filterData ??= new OrderFilterModel(); |
| | | 1508 | | |
| | 0 | 1509 | | IQueryable<Order> orders = standartOrders.AsQueryable(); |
| | | 1510 | | |
| | | 1511 | | |
| | | 1512 | | // Фильтрация по правам доступа |
| | | 1513 | | |
| | 0 | 1514 | | var scopeFromList = _dataScopeEvaluator.Evaluate(accessProfile); |
| | 0 | 1515 | | if (!scopeFromList.IsUnrestricted) |
| | | 1516 | | { |
| | 0 | 1517 | | orders = _dataScopeEvaluator.ApplyToOrders(orders, scopeFromList); |
| | | 1518 | | } |
| | | 1519 | | |
| | | 1520 | | |
| | | 1521 | | // Строковые поля |
| | | 1522 | | |
| | 0 | 1523 | | orders = _filter.FilterByString(orders, pr => pr.Key, filterData.Key); |
| | | 1524 | | |
| | 0 | 1525 | | if (!string.IsNullOrWhiteSpace(filterData.ShipmentNumber)) |
| | | 1526 | | { |
| | 0 | 1527 | | var parts = GetShipmentNumbersFromFilter(filterData.ShipmentNumber); |
| | 0 | 1528 | | if (parts.Count > 1) |
| | | 1529 | | { |
| | 0 | 1530 | | orders = _filter.FilterByStringList(orders, pr => pr.ShipmentNumber, parts, true); |
| | | 1531 | | } |
| | 0 | 1532 | | else if (parts.Count == 1) |
| | | 1533 | | { |
| | 0 | 1534 | | orders = _filter.FilterByString(orders, pr => pr.ShipmentNumber, parts[0]); |
| | | 1535 | | } |
| | | 1536 | | else |
| | | 1537 | | { |
| | 0 | 1538 | | orders = _filter.FilterByString(orders, pr => pr.ShipmentNumber, filterData.ShipmentNumber); |
| | | 1539 | | } |
| | | 1540 | | } |
| | | 1541 | | |
| | | 1542 | | // Приоритетная фильтрация: сначала склад + засыл, затем поставщик. |
| | 0 | 1543 | | if (!string.IsNullOrEmpty(filterData.ShipmentWarehouse) && |
| | 0 | 1544 | | filterData.ShipmentWarehouse != "Все") |
| | | 1545 | | |
| | | 1546 | | { |
| | 0 | 1547 | | orders = orders.Where(pr => |
| | 0 | 1548 | | (pr.ShipmentWarehouse != null && |
| | 0 | 1549 | | pr.ShipmentWarehouse.Name == filterData.ShipmentWarehouse) || |
| | 0 | 1550 | | (pr.OrderExtensions != null && |
| | 0 | 1551 | | pr.OrderExtensions.Any(e => |
| | 0 | 1552 | | e.Key == "Засыл" && |
| | 0 | 1553 | | e.Value == filterData.ShipmentWarehouse)) |
| | 0 | 1554 | | ); |
| | | 1555 | | } |
| | | 1556 | | |
| | 0 | 1557 | | orders = _filter.FilterByStringExactSimple( |
| | 0 | 1558 | | orders, |
| | 0 | 1559 | | pr => pr.Supplier != null ? pr.Supplier.Name : "", |
| | 0 | 1560 | | filterData.Supplier); |
| | | 1561 | | |
| | | 1562 | | |
| | 0 | 1563 | | orders = _filter.FilterByStringExactSimple(orders, |
| | 0 | 1564 | | pr => pr.ClientStatus != null ? pr.ClientStatus.Name : null, filterData.Status); |
| | | 1565 | | |
| | 0 | 1566 | | orders = _filter.FilterByStringExactSimple( |
| | 0 | 1567 | | orders, |
| | 0 | 1568 | | pr => pr.AppStatus != null ? pr.AppStatus.Name : "", |
| | 0 | 1569 | | filterData.AppStatus); |
| | | 1570 | | |
| | 0 | 1571 | | if (filterData.SupplierStatusId.HasValue) |
| | | 1572 | | { |
| | 0 | 1573 | | var supplierStatusId = filterData.SupplierStatusId.Value; |
| | 0 | 1574 | | var orderIdsWithStatus = _context.OrderSupplierStates |
| | 0 | 1575 | | .AsNoTracking() |
| | 0 | 1576 | | .Where(state => state.ActiveOrderId != null && state.SupplierStatusId == supplierStatusId) |
| | 0 | 1577 | | .Select(state => state.OrderId) |
| | 0 | 1578 | | .ToHashSet(); |
| | | 1579 | | |
| | 0 | 1580 | | orders = orders.Where(order => orderIdsWithStatus.Contains(order.Id)); |
| | | 1581 | | } |
| | | 1582 | | |
| | | 1583 | | |
| | 0 | 1584 | | orders = _filter.FilterByString(orders, pr => pr.ProductName, filterData.ProductName); |
| | | 1585 | | |
| | | 1586 | | |
| | | 1587 | | // Фильтрация по артикулу с учетом связей продуктов |
| | | 1588 | | |
| | 0 | 1589 | | if (!string.IsNullOrEmpty(filterData.Article)) |
| | | 1590 | | |
| | | 1591 | | { |
| | 0 | 1592 | | orders = orders.Where(o => |
| | 0 | 1593 | | GetArticleSearchTerms(filterData.Article) |
| | 0 | 1594 | | .Any(term => ArticleMatchesSearch(o.ProductKey, o.Article, term))); |
| | | 1595 | | } |
| | | 1596 | | |
| | | 1597 | | |
| | 0 | 1598 | | orders = _filter.FilterByString(orders, pr => pr.ProductInfo != null ? pr.ProductInfo.Barcode : null, |
| | 0 | 1599 | | filterData.Barcode); |
| | | 1600 | | |
| | 0 | 1601 | | orders = _filter.FilterByStringExactSimple( |
| | 0 | 1602 | | orders, |
| | 0 | 1603 | | pr => pr.ProductInfo != null ? pr.ProductInfo.CommercialCategory : "", |
| | 0 | 1604 | | filterData.CommercialCategory); |
| | | 1605 | | |
| | | 1606 | | |
| | 0 | 1607 | | orders = _filter.FilterByString(orders, pr => pr.NewCategory, filterData.NewCategory); |
| | | 1608 | | |
| | 0 | 1609 | | orders = _filter.FilterByStringExactSimple( |
| | 0 | 1610 | | orders, |
| | 0 | 1611 | | pr => pr.Сurrency != null ? pr.Сurrency.Name : "", |
| | 0 | 1612 | | filterData.Сurrency); |
| | | 1613 | | |
| | | 1614 | | |
| | 0 | 1615 | | orders = _filter.FilterByString(orders, pr => pr.DeliveryCity, filterData.DeliveryCity); |
| | | 1616 | | |
| | 0 | 1617 | | orders = _filter.FilterByString(orders, pr => pr.OrderNumberToSupplier, filterData.OrderNumberToSupplier); |
| | 0 | 1618 | | orders = _filter.FilterByString(orders, pr => pr.Scanit, filterData.Scanit); |
| | | 1619 | | |
| | | 1620 | | |
| | 0 | 1621 | | orders = _filter.FilterByStringExactSimple( |
| | 0 | 1622 | | orders, |
| | 0 | 1623 | | pr => pr.EtProducer != null ? pr.EtProducer.Name : "", |
| | 0 | 1624 | | filterData.Manufacturer); |
| | | 1625 | | |
| | | 1626 | | |
| | 0 | 1627 | | orders = _filter.FilterByString( |
| | 0 | 1628 | | orders, |
| | 0 | 1629 | | pr => pr.OzonClient != null ? pr.OzonClient.Name : "", |
| | 0 | 1630 | | filterData.OzonClient); |
| | | 1631 | | |
| | | 1632 | | |
| | 0 | 1633 | | orders = _filter.FilterByStringExactSimple( |
| | 0 | 1634 | | orders, |
| | 0 | 1635 | | pr => pr.Delivery != null ? pr.Delivery.Provider.Name : "", |
| | 0 | 1636 | | filterData.Provider); |
| | | 1637 | | |
| | | 1638 | | |
| | | 1639 | | // Даты |
| | | 1640 | | |
| | 0 | 1641 | | orders = _filter.FilterByDate(orders, pr => pr.ProcessingDate, filterData.ProcessingDate); |
| | | 1642 | | |
| | 0 | 1643 | | orders = _filter.FilterByDate(orders, pr => pr.ShippingDate, filterData.ShippingDate); |
| | | 1644 | | |
| | 0 | 1645 | | orders = _filter.FilterByDate(orders, pr => pr.LastStatusChangeDate, filterData.LastStatusChangeDate); |
| | | 1646 | | |
| | | 1647 | | |
| | | 1648 | | // Числовые |
| | | 1649 | | |
| | 0 | 1650 | | orders = _filter.FilterByDecimal( |
| | 0 | 1651 | | orders, |
| | 0 | 1652 | | pr => pr.ProductInfo!.CurrentPriceWithDiscount, |
| | 0 | 1653 | | filterData.CurrentPriceWithDiscount); |
| | | 1654 | | |
| | | 1655 | | |
| | 0 | 1656 | | orders = _filter.FilterByDecimal(orders, pr => pr.Quantity, filterData.Quantity, tolerance: 0); |
| | | 1657 | | |
| | 0 | 1658 | | orders = _filter.FilterByDecimal(orders, pr => pr.ShipmentAmount, filterData.ShipmentAmount); |
| | | 1659 | | |
| | 0 | 1660 | | orders = _filter.FilterByDecimal(orders, pr => pr.Price, filterData.Price); |
| | | 1661 | | |
| | 0 | 1662 | | orders = _filter.FilterByDecimal(orders, pr => pr.PurchasePrice, filterData.PurchasePrice); |
| | | 1663 | | |
| | 0 | 1664 | | orders = _filter.FilterByDecimal(orders, pr => pr.MinOzonCommission, filterData.OzonCommission); |
| | | 1665 | | |
| | 0 | 1666 | | orders = _filter.FilterByDecimal(orders, pr => pr.MinProfit, filterData.Profit); |
| | | 1667 | | |
| | 0 | 1668 | | orders = _filter.FilterByDecimal(orders, pr => pr.MinDiscount, filterData.Discount); |
| | | 1669 | | |
| | 0 | 1670 | | orders = _filter.FilterByDecimal(orders, pr => pr.CostPrice, filterData.CostPrice); |
| | | 1671 | | |
| | | 1672 | | |
| | 0 | 1673 | | orders = _filter.FilterByDouble( |
| | 0 | 1674 | | orders, |
| | 0 | 1675 | | pr => pr.ProductInfo!.VolumetricWeight, |
| | 0 | 1676 | | filterData.VolumetricWeight); |
| | | 1677 | | |
| | | 1678 | | |
| | | 1679 | | // Фильтрация по int (через List) |
| | | 1680 | | |
| | 0 | 1681 | | List<Order> result = _forTransactionOrdersFilter |
| | 0 | 1682 | | .FilterByInt(orders.ToList(), pr => pr.TimeLeftDay, filterData.TimeLeftDay) |
| | 0 | 1683 | | .ToList(); |
| | | 1684 | | |
| | | 1685 | | |
| | | 1686 | | // Период доставки |
| | | 1687 | | |
| | 0 | 1688 | | if (filterData.DeliveryPeriod != null) |
| | | 1689 | | |
| | | 1690 | | { |
| | 0 | 1691 | | result = result |
| | 0 | 1692 | | .Where(o => o.DeliveryPeriod.HasValue && |
| | 0 | 1693 | | o.DeliveryPeriod.Value.Days == |
| | 0 | 1694 | | StringToIntDay(filterData.DeliveryPeriod) && |
| | 0 | 1695 | | o.DeliveryPeriod.Value.Hours == |
| | 0 | 1696 | | StringToIntHours(filterData.DeliveryPeriod)) |
| | 0 | 1697 | | .ToList(); |
| | | 1698 | | } |
| | | 1699 | | |
| | | 1700 | | |
| | 0 | 1701 | | return result |
| | 0 | 1702 | | .OrderBy(o => o.ProcessingDate) |
| | 0 | 1703 | | .ToList(); |
| | | 1704 | | } |
| | | 1705 | | |
| | | 1706 | | |
| | | 1707 | | public async Task<IEnumerable<Order>> FilterFromFile(bool filter) |
| | | 1708 | | |
| | | 1709 | | { |
| | 0 | 1710 | | IQueryable<Order> orders = await _ordersDataServices.GetOrders(); |
| | | 1711 | | |
| | | 1712 | | |
| | 0 | 1713 | | return orders.Where(o => o.FromFile == filter).OrderBy(pr => pr.ProcessingDate).ToList(); |
| | 0 | 1714 | | } |
| | | 1715 | | |
| | | 1716 | | |
| | | 1717 | | |
| | | 1718 | | |
| | | 1719 | | /// <summary> |
| | | 1720 | | /// Получает список всех складов включая засылы для отображения в фильтре |
| | | 1721 | | /// </summary> |
| | | 1722 | | public async Task<List<string>> GetWarehousesWithZasylAsync() |
| | | 1723 | | |
| | | 1724 | | { |
| | 0 | 1725 | | var warehouses = await _context.Warehouses |
| | 0 | 1726 | | .Where(w => w.Name != null) |
| | 0 | 1727 | | .Select(w => w.Name!) |
| | 0 | 1728 | | .ToListAsync(); |
| | | 1729 | | |
| | | 1730 | | |
| | 0 | 1731 | | var zasylValues = await _ordersDataServices.GetAllZasylValuesAsync(); |
| | | 1732 | | |
| | | 1733 | | |
| | | 1734 | | // Объединяем обычные склады и засылы, убираем дубликаты |
| | | 1735 | | |
| | 0 | 1736 | | var allWarehouses = warehouses.Union(zasylValues) |
| | | 1737 | | .Where(w => !string.IsNullOrEmpty(w)) |
| | 0 | 1738 | | .Distinct() |
| | | 1739 | | .OrderBy(w => w) |
| | 0 | 1740 | | .ToList(); |
| | | 1741 | | |
| | | 1742 | | |
| | 0 | 1743 | | return allWarehouses; |
| | 0 | 1744 | | } |
| | | 1745 | | |
| | | 1746 | | |
| | | 1747 | | public bool AreAllPropertiesNull(OrderFilterModel? model) |
| | | 1748 | | |
| | | 1749 | | { |
| | 10 | 1750 | | if (model == null) |
| | | 1751 | | |
| | 1 | 1752 | | return true; |
| | | 1753 | | |
| | | 1754 | | |
| | 9 | 1755 | | PropertyInfo[] properties = typeof(OrderFilterModel).GetProperties(); |
| | | 1756 | | |
| | | 1757 | | |
| | 483 | 1758 | | foreach (PropertyInfo prop in properties) |
| | | 1759 | | |
| | | 1760 | | { |
| | | 1761 | | // Игнорируем служебные поля, которые не являются фильтрами данных |
| | | 1762 | | |
| | 236 | 1763 | | if (prop.Name == "IncludeArchived" || |
| | 236 | 1764 | | prop.Name == "ArticleExactMatch" || prop.Name == "GroupByShipment" || |
| | 236 | 1765 | | prop.Name == "SyncClientStatusesOnLoad") |
| | | 1766 | | |
| | | 1767 | | continue; |
| | | 1768 | | |
| | | 1769 | | |
| | 224 | 1770 | | object? value = prop.GetValue(model); |
| | | 1771 | | |
| | | 1772 | | |
| | | 1773 | | // Проверяем, не является ли значение null или пустой строкой |
| | | 1774 | | |
| | 224 | 1775 | | if (value != null) |
| | | 1776 | | |
| | | 1777 | | { |
| | | 1778 | | // Для строк проверяем, не пустая ли она |
| | | 1779 | | |
| | 24 | 1780 | | if (value is string stringValue && string.IsNullOrWhiteSpace(stringValue)) |
| | | 1781 | | |
| | | 1782 | | continue; |
| | | 1783 | | |
| | | 1784 | | |
| | | 1785 | | // Для числовых типов можно также проверять на 0, если нужно |
| | | 1786 | | |
| | | 1787 | | // Например, если свойство Price имеет значение 0, это тоже можно считать отсутствием фильтра |
| | | 1788 | | |
| | 23 | 1789 | | if (value is int intValue && intValue == 0) |
| | | 1790 | | |
| | | 1791 | | continue; |
| | | 1792 | | |
| | | 1793 | | |
| | 23 | 1794 | | if (value is decimal decimalValue && decimalValue == 0) |
| | | 1795 | | |
| | | 1796 | | continue; |
| | | 1797 | | |
| | | 1798 | | |
| | 23 | 1799 | | if (value is double doubleValue && doubleValue == 0) |
| | | 1800 | | |
| | | 1801 | | continue; |
| | | 1802 | | |
| | | 1803 | | // bool = false (default) is not an active filter |
| | 23 | 1804 | | if (value is bool boolValue && !boolValue) |
| | | 1805 | | |
| | | 1806 | | continue; |
| | | 1807 | | |
| | | 1808 | | |
| | 7 | 1809 | | return false; |
| | | 1810 | | } |
| | | 1811 | | } |
| | | 1812 | | |
| | | 1813 | | |
| | 2 | 1814 | | return true; |
| | | 1815 | | } |
| | | 1816 | | |
| | | 1817 | | |
| | | 1818 | | public int? StringToIntDay(string deliveryPeriod) |
| | | 1819 | | |
| | | 1820 | | { |
| | 6 | 1821 | | if (deliveryPeriod != null) |
| | | 1822 | | |
| | | 1823 | | { |
| | 5 | 1824 | | MatchCollection matches = Regex.Matches(deliveryPeriod, @"\d+"); |
| | | 1825 | | |
| | | 1826 | | |
| | 5 | 1827 | | if (matches.Count == 2) |
| | | 1828 | | |
| | | 1829 | | { |
| | 2 | 1830 | | return int.Parse(matches[0].Value); |
| | | 1831 | | |
| | | 1832 | | ; |
| | | 1833 | | } |
| | | 1834 | | |
| | | 1835 | | else |
| | | 1836 | | |
| | | 1837 | | { |
| | 3 | 1838 | | return null; |
| | | 1839 | | } |
| | | 1840 | | } |
| | | 1841 | | |
| | | 1842 | | else |
| | | 1843 | | |
| | | 1844 | | { |
| | 1 | 1845 | | return null; |
| | | 1846 | | } |
| | | 1847 | | } |
| | | 1848 | | |
| | | 1849 | | |
| | | 1850 | | public int? StringToIntHours(string deliveryPeriod) |
| | | 1851 | | |
| | | 1852 | | { |
| | 2 | 1853 | | if (deliveryPeriod != null) |
| | | 1854 | | |
| | | 1855 | | { |
| | 2 | 1856 | | MatchCollection matches = Regex.Matches(deliveryPeriod, @"\d+"); |
| | | 1857 | | |
| | | 1858 | | |
| | 2 | 1859 | | if (matches.Count == 2) |
| | | 1860 | | |
| | | 1861 | | { |
| | 2 | 1862 | | return int.Parse(matches[1].Value); |
| | | 1863 | | } |
| | | 1864 | | |
| | | 1865 | | else |
| | | 1866 | | |
| | | 1867 | | { |
| | 0 | 1868 | | return null; |
| | | 1869 | | } |
| | | 1870 | | } |
| | | 1871 | | |
| | | 1872 | | else |
| | | 1873 | | |
| | | 1874 | | { |
| | 0 | 1875 | | return null; |
| | | 1876 | | } |
| | | 1877 | | } |
| | | 1878 | | |
| | | 1879 | | |
| | | 1880 | | public List<Order> FilterOrdersByColumns( |
| | | 1881 | | Dictionary<string, string> filters, |
| | | 1882 | | IEnumerable<Order> orders, |
| | | 1883 | | List<string>? priorityColumns = null) |
| | | 1884 | | |
| | | 1885 | | { |
| | 0 | 1886 | | if (filters == null || !filters.Any() || orders == null) |
| | | 1887 | | |
| | 0 | 1888 | | return orders?.ToList() ?? new List<Order>(); |
| | | 1889 | | |
| | | 1890 | | |
| | 0 | 1891 | | var filteredOrders = orders |
| | 0 | 1892 | | .Where(order => ApplyFilters(order, filters)) |
| | 0 | 1893 | | .ToList(); |
| | | 1894 | | |
| | | 1895 | | |
| | 0 | 1896 | | if (priorityColumns != null && priorityColumns.Any()) |
| | | 1897 | | |
| | | 1898 | | { |
| | 0 | 1899 | | filteredOrders = filteredOrders |
| | 0 | 1900 | | .OrderByDescending(order => CountNonEmptyPriorityFields(order, priorityColumns)) |
| | 0 | 1901 | | .ToList(); |
| | | 1902 | | } |
| | | 1903 | | |
| | | 1904 | | |
| | 0 | 1905 | | return filteredOrders; |
| | | 1906 | | } |
| | | 1907 | | |
| | | 1908 | | |
| | | 1909 | | private bool ApplyFilters(Order order, Dictionary<string, string> filters) |
| | | 1910 | | |
| | | 1911 | | { |
| | 0 | 1912 | | foreach (var filter in filters) |
| | | 1913 | | |
| | | 1914 | | { |
| | 0 | 1915 | | if (string.IsNullOrWhiteSpace(filter.Value)) |
| | | 1916 | | |
| | | 1917 | | continue; |
| | | 1918 | | |
| | | 1919 | | |
| | 0 | 1920 | | var mappingKey = ColumnMappings.Keys |
| | 0 | 1921 | | .FirstOrDefault(k => k.Equals(filter.Key.Trim(), StringComparison.OrdinalIgnoreCase)); |
| | | 1922 | | |
| | | 1923 | | |
| | 0 | 1924 | | if (mappingKey == null || !ColumnMappings.TryGetValue(mappingKey, out var selector)) |
| | | 1925 | | |
| | 0 | 1926 | | return false; |
| | | 1927 | | |
| | | 1928 | | |
| | 0 | 1929 | | var value = selector(order); |
| | | 1930 | | |
| | | 1931 | | |
| | 0 | 1932 | | if (value == null) |
| | | 1933 | | |
| | 0 | 1934 | | return false; |
| | | 1935 | | |
| | | 1936 | | |
| | 0 | 1937 | | var normalizedValue = NormalizeString(value.ToString()); |
| | | 1938 | | |
| | 0 | 1939 | | var normalizedFilter = NormalizeString(filter.Value); |
| | | 1940 | | |
| | | 1941 | | |
| | 0 | 1942 | | if (!normalizedValue.Contains(normalizedFilter) && !normalizedFilter.Contains(normalizedValue)) |
| | | 1943 | | |
| | 0 | 1944 | | return false; |
| | | 1945 | | } |
| | | 1946 | | |
| | | 1947 | | |
| | 0 | 1948 | | return true; |
| | 0 | 1949 | | } |
| | | 1950 | | |
| | | 1951 | | |
| | | 1952 | | private int CountNonEmptyPriorityFields(Order order, List<string> priorityColumns) |
| | | 1953 | | |
| | | 1954 | | { |
| | 0 | 1955 | | int count = 0; |
| | | 1956 | | |
| | | 1957 | | |
| | 0 | 1958 | | foreach (var column in priorityColumns) |
| | | 1959 | | |
| | | 1960 | | { |
| | 0 | 1961 | | var mappingKey = ColumnMappings.Keys |
| | 0 | 1962 | | .FirstOrDefault(k => k.Equals(column.Trim(), StringComparison.OrdinalIgnoreCase)); |
| | | 1963 | | |
| | | 1964 | | |
| | 0 | 1965 | | if (mappingKey != null && ColumnMappings.TryGetValue(mappingKey, out var selector)) |
| | | 1966 | | |
| | | 1967 | | { |
| | 0 | 1968 | | var value = selector(order); |
| | | 1969 | | |
| | 0 | 1970 | | if (value != null && !string.IsNullOrWhiteSpace(value.ToString())) |
| | | 1971 | | |
| | | 1972 | | { |
| | 0 | 1973 | | count++; |
| | | 1974 | | } |
| | | 1975 | | } |
| | | 1976 | | } |
| | | 1977 | | |
| | | 1978 | | |
| | 0 | 1979 | | return count; |
| | | 1980 | | } |
| | | 1981 | | |
| | | 1982 | | |
| | | 1983 | | private string NormalizeString(string? input) |
| | | 1984 | | |
| | | 1985 | | { |
| | 0 | 1986 | | if (string.IsNullOrEmpty(input)) |
| | | 1987 | | |
| | 0 | 1988 | | return string.Empty; |
| | | 1989 | | |
| | | 1990 | | |
| | 0 | 1991 | | return new string(input |
| | 0 | 1992 | | .Where(c => char.IsLetterOrDigit(c)) |
| | 0 | 1993 | | .ToArray()) |
| | 0 | 1994 | | .ToLower(); |
| | | 1995 | | } |
| | | 1996 | | |
| | | 1997 | | |
| | | 1998 | | /// <summary> |
| | | 1999 | | /// Проверяет, содержит ли фильтр ShipmentNumber несколько номеров. |
| | | 2000 | | /// Если несколько номеров найдено, рекомендуется отключить пагинацию. |
| | | 2001 | | /// </summary> |
| | | 2002 | | public static bool HasMultipleShipmentNumbers(string filterValue) |
| | | 2003 | | { |
| | 7 | 2004 | | if (string.IsNullOrWhiteSpace(filterValue)) return false; |
| | | 2005 | | |
| | 3 | 2006 | | var parts = GetShipmentNumbersFromFilter(filterValue); |
| | 3 | 2007 | | return parts.Count > 1; |
| | | 2008 | | } |
| | | 2009 | | |
| | | 2010 | | /// <summary> |
| | | 2011 | | /// Извлекает номера отправлений из строки фильтра (поддержка разделителей и слитного текста). |
| | | 2012 | | /// </summary> |
| | | 2013 | | public static List<string> GetShipmentNumbersFromFilter(string raw) |
| | | 2014 | | { |
| | 16 | 2015 | | if (string.IsNullOrWhiteSpace(raw)) return new List<string>(); |
| | | 2016 | | |
| | 14 | 2017 | | var parts = new List<string>(); |
| | | 2018 | | |
| | | 2019 | | // Сначала пробуем разбить по переносам строк, точкам с запятой и запятым (НЕ по пробелу) |
| | | 2020 | | // Это нужно чтобы не ломать номера вида "СП 0192357", "Q8 0009457" с пробелом внутри |
| | 14 | 2021 | | if (raw.IndexOfAny(new[] { '\n', ';', ',' }) >= 0) |
| | | 2022 | | { |
| | 6 | 2023 | | parts = raw |
| | 6 | 2024 | | .Split(new[] { '\n', '\r', ';', ',' }, StringSplitOptions.RemoveEmptyEntries) |
| | 14 | 2025 | | .Select(p => p.Trim()) |
| | 14 | 2026 | | .Where(p => !string.IsNullOrWhiteSpace(p)) |
| | 6 | 2027 | | .Distinct() |
| | 6 | 2028 | | .Take(500) |
| | 6 | 2029 | | .ToList(); |
| | | 2030 | | } |
| | | 2031 | | |
| | | 2032 | | // Пробел НЕ используется как разделитель — номера вида "СП 0192357", "Q8 0009457" содержат пробелы внутри. |
| | | 2033 | | // Пользователи должны разделять несколько номеров переносом строки, точкой с запятой или запятой. |
| | | 2034 | | |
| | 14 | 2035 | | if (parts.Count == 0) |
| | | 2036 | | { |
| | 8 | 2037 | | var regex = new Regex(@"\d{6,}-\d{3,}-\d{1,3}?", RegexOptions.Compiled); |
| | 8 | 2038 | | var matches = regex.Matches(raw); |
| | 8 | 2039 | | parts = matches |
| | 4 | 2040 | | .Select(m => m.Value.Trim()) |
| | 4 | 2041 | | .Where(p => !string.IsNullOrWhiteSpace(p)) |
| | 8 | 2042 | | .Distinct() |
| | 8 | 2043 | | .Take(500) |
| | 8 | 2044 | | .ToList(); |
| | | 2045 | | } |
| | | 2046 | | |
| | 14 | 2047 | | if (parts.Count == 0) |
| | 5 | 2048 | | parts.Add(raw.Trim()); |
| | | 2049 | | |
| | 14 | 2050 | | return parts; |
| | | 2051 | | } |
| | | 2052 | | |
| | 0 | 2053 | | string Normalize(string? input) => NormalizeArticleForSearch(input); |
| | | 2054 | | |
| | | 2055 | | private List<string> GetArticleSearchTerms(string article) |
| | | 2056 | | { |
| | 0 | 2057 | | var relatedArticles = GetRelatedArticlesSync(article); |
| | 0 | 2058 | | return relatedArticles.Count > 0 |
| | 0 | 2059 | | ? relatedArticles |
| | 0 | 2060 | | : new List<string> { article }; |
| | | 2061 | | } |
| | | 2062 | | |
| | | 2063 | | |
| | | 2064 | | /// <summary> |
| | | 2065 | | /// Получает список всех связанных артикулов для указанного артикула (работает в обе стороны) |
| | | 2066 | | /// Синхронная версия для использования в синхронных методах |
| | | 2067 | | /// </summary> |
| | | 2068 | | /// <param name="article">Оригинальный артикул</param> |
| | | 2069 | | /// <returns>Список артикулов, включая оригинальный и все связанные</returns> |
| | | 2070 | | private List<string> GetRelatedArticlesSync(string article) |
| | | 2071 | | |
| | | 2072 | | { |
| | 1 | 2073 | | if (string.IsNullOrEmpty(article)) |
| | | 2074 | | |
| | 0 | 2075 | | return new List<string>(); |
| | | 2076 | | |
| | | 2077 | | |
| | 1 | 2078 | | var normalizedArticle = NormalizeArticleForSearch(article); |
| | | 2079 | | |
| | 1 | 2080 | | var relatedArticles = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { normalizedArticle }; |
| | | 2081 | | |
| | | 2082 | | |
| | | 2083 | | try |
| | | 2084 | | |
| | | 2085 | | { |
| | | 2086 | | // Находим все продукты с указанным артикулом (нормализованным) |
| | | 2087 | | |
| | 1 | 2088 | | var allProducts = _context.Products |
| | 1 | 2089 | | .Where(p => p.Article != null) |
| | 1 | 2090 | | .Include(p => p.ReplacementProduct) |
| | 1 | 2091 | | .ToList(); |
| | | 2092 | | |
| | | 2093 | | |
| | | 2094 | | // Нормализуем артикулы в памяти и находим продукты с указанным артикулом |
| | | 2095 | | |
| | 0 | 2096 | | var matchingProducts = allProducts |
| | 0 | 2097 | | .Where(p => Normalize(p.Article) == normalizedArticle) |
| | 0 | 2098 | | .ToList(); |
| | | 2099 | | |
| | | 2100 | | |
| | 0 | 2101 | | if (!matchingProducts.Any()) |
| | | 2102 | | |
| | | 2103 | | { |
| | 0 | 2104 | | return relatedArticles.ToList(); |
| | | 2105 | | } |
| | | 2106 | | |
| | | 2107 | | |
| | 0 | 2108 | | var productIds = matchingProducts.Select(p => p.Id).ToList(); |
| | | 2109 | | |
| | | 2110 | | |
| | | 2111 | | // Находим все продукты, которые ссылаются на найденные продукты (прямая связь) |
| | | 2112 | | |
| | | 2113 | | // То есть продукты, у которых ReplacementProductId указывает на найденные продукты |
| | | 2114 | | |
| | 0 | 2115 | | var directlyLinkedProducts = allProducts |
| | 0 | 2116 | | .Where(p => p.ReplacementProductId.HasValue && productIds.Contains(p.ReplacementProductId.Value)) |
| | 0 | 2117 | | .ToList(); |
| | | 2118 | | |
| | | 2119 | | |
| | 0 | 2120 | | foreach (var linkedProduct in directlyLinkedProducts) |
| | | 2121 | | |
| | | 2122 | | { |
| | 0 | 2123 | | if (!string.IsNullOrEmpty(linkedProduct.Article)) |
| | | 2124 | | |
| | | 2125 | | { |
| | 0 | 2126 | | relatedArticles.Add(Normalize(linkedProduct.Article)); |
| | | 2127 | | } |
| | | 2128 | | } |
| | | 2129 | | |
| | | 2130 | | |
| | | 2131 | | // Находим все продукты, на которые ссылаются найденные продукты (обратная связь) |
| | | 2132 | | |
| | | 2133 | | // То есть продукты, на которые указывает ReplacementProductId найденных продуктов |
| | | 2134 | | |
| | 0 | 2135 | | var reverseLinkedProductIds = matchingProducts |
| | 0 | 2136 | | .Where(p => p.ReplacementProductId.HasValue) |
| | 0 | 2137 | | .Select(p => p.ReplacementProductId!.Value) |
| | 0 | 2138 | | .Distinct() |
| | 0 | 2139 | | .ToList(); |
| | | 2140 | | |
| | | 2141 | | |
| | 0 | 2142 | | if (reverseLinkedProductIds.Any()) |
| | | 2143 | | |
| | | 2144 | | { |
| | 0 | 2145 | | var reverseLinkedProducts = allProducts |
| | 0 | 2146 | | .Where(p => reverseLinkedProductIds.Contains(p.Id)) |
| | 0 | 2147 | | .ToList(); |
| | | 2148 | | |
| | | 2149 | | |
| | 0 | 2150 | | foreach (var reverseLinkedProduct in reverseLinkedProducts) |
| | | 2151 | | |
| | | 2152 | | { |
| | 0 | 2153 | | if (!string.IsNullOrEmpty(reverseLinkedProduct.Article)) |
| | | 2154 | | |
| | | 2155 | | { |
| | 0 | 2156 | | relatedArticles.Add(Normalize(reverseLinkedProduct.Article)); |
| | | 2157 | | } |
| | | 2158 | | } |
| | | 2159 | | } |
| | | 2160 | | |
| | | 2161 | | |
| | 0 | 2162 | | return relatedArticles.ToList(); |
| | | 2163 | | } |
| | | 2164 | | |
| | 1 | 2165 | | catch (Exception) |
| | | 2166 | | |
| | | 2167 | | { |
| | | 2168 | | // В случае ошибки возвращаем только оригинальный артикул |
| | | 2169 | | |
| | 1 | 2170 | | return relatedArticles.ToList(); |
| | | 2171 | | } |
| | 1 | 2172 | | } |
| | | 2173 | | |
| | | 2174 | | |
| | | 2175 | | /// <summary> |
| | | 2176 | | /// Применяет группировку по ShipmentId на уровне IQueryable (оптимизированно для БД). |
| | | 2177 | | /// Получает все ShipmentId из отфильтрованного запроса и возвращает все заказы с этими ShipmentId. |
| | | 2178 | | /// Заказы без ShipmentId остаются как одиночные в результате. |
| | | 2179 | | /// </summary> |
| | | 2180 | | /// <param name="filteredQuery">Отфильтрованный IQueryable заказов</param> |
| | | 2181 | | /// <param name="includeArchived">Включать ли архивные заказы</param> |
| | | 2182 | | /// <returns>IQueryable с расширенным набором заказов по ShipmentId</returns> |
| | | 2183 | | private IQueryable<Order> ApplyShipmentGroupingQueryable(IQueryable<Order> filteredQuery, bool includeArchived) |
| | | 2184 | | |
| | | 2185 | | { |
| | | 2186 | | // Получаем уникальные ShipmentId из отфильтрованного запроса (исключаем null) |
| | | 2187 | | |
| | 0 | 2188 | | var shipmentIdsQuery = filteredQuery |
| | 0 | 2189 | | .Where(o => o.ShipmentId.HasValue) |
| | 0 | 2190 | | .Select(o => o.ShipmentId!.Value) |
| | 0 | 2191 | | .Distinct(); |
| | | 2192 | | |
| | | 2193 | | // Получаем ID заказов без ShipmentId из отфильтрованного запроса |
| | | 2194 | | |
| | 0 | 2195 | | var filteredIdsWithoutShipment = filteredQuery |
| | 0 | 2196 | | .Where(o => !o.ShipmentId.HasValue) |
| | 0 | 2197 | | .Select(o => o.Id); |
| | | 2198 | | |
| | | 2199 | | // Используем GetOrdersQueryable с тем же includeArchived — это гарантирует |
| | | 2200 | | // идентичную цепочку Include, что и у filteredQuery (обе из OrderRepository). |
| | | 2201 | | // Это позволяет расширить результат до всех заказов с найденными ShipmentId, |
| | | 2202 | | // а не только тех, что прошли фильтр. |
| | | 2203 | | |
| | 0 | 2204 | | var fullQuery = _ordersDataServices.GetOrdersQueryable(includeArchived); |
| | | 2205 | | |
| | 0 | 2206 | | return fullQuery |
| | 0 | 2207 | | .Where(o => |
| | 0 | 2208 | | // Заказы с ShipmentId, которые есть среди найденных ShipmentId |
| | 0 | 2209 | | (o.ShipmentId.HasValue && shipmentIdsQuery.Contains(o.ShipmentId.Value)) |
| | 0 | 2210 | | || |
| | 0 | 2211 | | // Заказы без ShipmentId из исходной фильтрации |
| | 0 | 2212 | | (!o.ShipmentId.HasValue && filteredIdsWithoutShipment.Contains(o.Id)) |
| | 0 | 2213 | | ); |
| | | 2214 | | } |
| | | 2215 | | |
| | | 2216 | | |
| | | 2217 | | /// <summary> |
| | | 2218 | | /// Расширяет список заказов, добавляя все заказы с тем же ShipmentId. |
| | | 2219 | | /// Заказы без ShipmentId остаются как одиночные. |
| | | 2220 | | /// Выполняет один запрос к БД для получения связанных заказов. |
| | | 2221 | | /// </summary> |
| | | 2222 | | /// <param name="filteredOrders">Исходный список отфильтрованных заказов</param> |
| | | 2223 | | /// <param name="includeArchived">Включать ли архивные заказы</param> |
| | | 2224 | | /// <returns>Расширенный список заказов с учетом группировки по ShipmentId</returns> |
| | | 2225 | | private async Task<List<Order>> ExpandByShipmentIdAsync(List<Order> filteredOrders, bool includeArchived) |
| | | 2226 | | |
| | | 2227 | | { |
| | 0 | 2228 | | if (!filteredOrders.Any()) |
| | | 2229 | | |
| | 0 | 2230 | | return filteredOrders; |
| | | 2231 | | |
| | | 2232 | | |
| | | 2233 | | // Собираем уникальные ShipmentId из найденных заказов (исключаем null) |
| | | 2234 | | |
| | 0 | 2235 | | var shipmentIds = filteredOrders |
| | | 2236 | | .Where(o => o.ShipmentId.HasValue) |
| | | 2237 | | .Select(o => o.ShipmentId!.Value) |
| | 0 | 2238 | | .Distinct() |
| | 0 | 2239 | | .ToList(); |
| | | 2240 | | |
| | | 2241 | | |
| | | 2242 | | // Если нет ShipmentId, возвращаем исходный список |
| | | 2243 | | |
| | 0 | 2244 | | if (!shipmentIds.Any()) |
| | | 2245 | | |
| | 0 | 2246 | | return filteredOrders; |
| | | 2247 | | |
| | | 2248 | | |
| | | 2249 | | // Собираем ID уже найденных заказов для исключения дубликатов |
| | | 2250 | | |
| | | 2251 | | var existingOrderIds = filteredOrders.Select(o => o.Id).ToHashSet(); |
| | | 2252 | | |
| | | 2253 | | |
| | | 2254 | | // Одним запросом получаем все заказы с этими ShipmentId, которых ещё нет в результате |
| | | 2255 | | |
| | 0 | 2256 | | var relatedOrders = await _context.Orders |
| | 0 | 2257 | | .Where(o => o.ShipmentId.HasValue && shipmentIds.Contains(o.ShipmentId.Value)) |
| | 0 | 2258 | | .Where(o => !existingOrderIds.Contains(o.Id)) |
| | 0 | 2259 | | .Where(o => includeArchived || o.OrderArchive == null) |
| | 0 | 2260 | | .Include(o => o.ClientStatus) |
| | 0 | 2261 | | .Include(o => o.AppStatus!) |
| | 0 | 2262 | | .ThenInclude(s => s.StatusColor) |
| | 0 | 2263 | | .Include(o => o.EtProducer) |
| | 0 | 2264 | | .Include(o => o.ShipmentWarehouse) |
| | 0 | 2265 | | .Include(o => o.Supplier) |
| | 0 | 2266 | | .Include(o => o.OzonClient) |
| | 0 | 2267 | | .Include(o => o.ProductInfo) |
| | 0 | 2268 | | .Include(o => o.Delivery!) |
| | 0 | 2269 | | .ThenInclude(d => d.Provider) |
| | 0 | 2270 | | .ToListAsync(); |
| | | 2271 | | |
| | | 2272 | | |
| | | 2273 | | // Объединяем результаты |
| | | 2274 | | |
| | 0 | 2275 | | var result = new List<Order>(filteredOrders); |
| | | 2276 | | |
| | 0 | 2277 | | result.AddRange(relatedOrders); |
| | | 2278 | | |
| | | 2279 | | |
| | 0 | 2280 | | return result; |
| | 0 | 2281 | | } |
| | | 2282 | | } |
| | | 2283 | | } |