| | | 1 | | using System.Linq.Expressions; |
| | | 2 | | using System.Diagnostics; |
| | | 3 | | using Microsoft.EntityFrameworkCore; |
| | | 4 | | using MySqlConnector; |
| | | 5 | | using Newtonsoft.Json; |
| | | 6 | | using OzonDomains.Models; |
| | | 7 | | using OzonDomains.Models.BitrixModels; |
| | | 8 | | using OzonOrdersWeb.Areas.Studio2.ViewModels.Bitrix; |
| | | 9 | | using OzonRepositories.Context; |
| | | 10 | | using OzonRepositories.Services; |
| | | 11 | | using Microsoft.Extensions.Caching.Memory; |
| | | 12 | | using System.Data; |
| | | 13 | | using JsonSerializer = System.Text.Json.JsonSerializer; |
| | | 14 | | |
| | | 15 | | namespace OzonRepositories.Data.Bitrix; |
| | | 16 | | |
| | | 17 | | public class BitrixStockRepository |
| | | 18 | | { |
| | | 19 | | private readonly BitrixContext _context; |
| | | 20 | | private readonly SupplierRepository _supplierRepository; |
| | | 21 | | private readonly IBitrixConnectionService _connectionService; |
| | | 22 | | private readonly IMemoryCache _memoryCache; |
| | | 23 | | private const string DebugLogPath = "/Users/evgen/RiderProjects/Studio2Prod/.cursor/debug-8edffb.log"; |
| | | 24 | | |
| | 1 | 25 | | public BitrixStockRepository(BitrixContext context, |
| | 1 | 26 | | SupplierRepository supplierRepository, |
| | 1 | 27 | | IBitrixConnectionService connectionService, |
| | 1 | 28 | | IMemoryCache memoryCache) |
| | | 29 | | { |
| | 1 | 30 | | _context = context; |
| | 1 | 31 | | _supplierRepository = supplierRepository; |
| | 1 | 32 | | _connectionService = connectionService; |
| | 1 | 33 | | _memoryCache = memoryCache; |
| | 1 | 34 | | } |
| | | 35 | | |
| | | 36 | | public async Task<PagedResult<RemainingStockBitrix>> GetRemainingStockAsync(RemainingStockFilter filter) |
| | | 37 | | { |
| | 0 | 38 | | var totalSw = Stopwatch.StartNew(); |
| | | 39 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 40 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 41 | | { |
| | | 42 | | // Возвращаем пустой результат вместо падения страницы |
| | 0 | 43 | | return new PagedResult<RemainingStockBitrix> |
| | 0 | 44 | | { |
| | 0 | 45 | | Items = new List<RemainingStockBitrix>(), |
| | 0 | 46 | | TotalCount = 0, |
| | 0 | 47 | | Page = filter.Page, |
| | 0 | 48 | | PageSize = filter.PageSize |
| | 0 | 49 | | }; |
| | | 50 | | } |
| | | 51 | | |
| | | 52 | | try |
| | | 53 | | { |
| | 0 | 54 | | var sqlParameters = new List<MySqlParameter>(); |
| | 0 | 55 | | var sqlWhereClauses = new List<string>(); |
| | | 56 | | |
| | 0 | 57 | | if (filter.ProductId.HasValue) |
| | | 58 | | { |
| | 0 | 59 | | sqlWhereClauses.Add("e.ID = @filterProductId"); |
| | 0 | 60 | | sqlParameters.Add(new MySqlParameter("@filterProductId", filter.ProductId.Value)); |
| | | 61 | | } |
| | | 62 | | |
| | 0 | 63 | | if (!string.IsNullOrWhiteSpace(filter.Article)) |
| | | 64 | | { |
| | 0 | 65 | | sqlWhereClauses.Add("p.VALUE LIKE @filterArticle"); |
| | 0 | 66 | | sqlParameters.Add(new MySqlParameter("@filterArticle", $"%{filter.Article}%")); |
| | | 67 | | } |
| | | 68 | | |
| | 0 | 69 | | if (filter.SelectedStoreTitles != null && filter.SelectedStoreTitles.Any()) |
| | | 70 | | { |
| | 0 | 71 | | var storeParameterNames = new List<string>(); |
| | 0 | 72 | | for (var i = 0; i < filter.SelectedStoreTitles.Count; i++) |
| | | 73 | | { |
| | 0 | 74 | | var parameterName = $"@storeTitle{i}"; |
| | 0 | 75 | | storeParameterNames.Add(parameterName); |
| | 0 | 76 | | sqlParameters.Add(new MySqlParameter(parameterName, filter.SelectedStoreTitles[i])); |
| | | 77 | | } |
| | | 78 | | |
| | 0 | 79 | | sqlWhereClauses.Add($"s.TITLE IN ({string.Join(",", storeParameterNames)})"); |
| | | 80 | | } |
| | | 81 | | |
| | 0 | 82 | | var dynamicWhereSql = sqlWhereClauses.Any() |
| | 0 | 83 | | ? " AND " + string.Join(" AND ", sqlWhereClauses) |
| | 0 | 84 | | : string.Empty; |
| | | 85 | | |
| | | 86 | | // ==== SQL-запрос плоской выборки ==== |
| | 0 | 87 | | var sql = $@" |
| | 0 | 88 | | SELECT |
| | 0 | 89 | | CAST(e.ID AS SIGNED) AS ProductId, |
| | 0 | 90 | | MAX(p.VALUE) AS Article, |
| | 0 | 91 | | e.PREVIEW_TEXT AS PreviewText, |
| | 0 | 92 | | e.ACTIVE AS Active, |
| | 0 | 93 | | e.TIMESTAMP_X AS TimestampX, |
| | 0 | 94 | | c.QUANTITY AS Quantity, |
| | 0 | 95 | | CAST(c.AVAILABLE AS CHAR) AS Available, |
| | 0 | 96 | | supplier_enum.VALUE AS Supplier, |
| | 0 | 97 | | price.PRICE AS Price, |
| | 0 | 98 | | sp.STORE_ID AS StoreId, |
| | 0 | 99 | | s.TITLE AS StoreTitle, |
| | 0 | 100 | | sp.AMOUNT AS Amount |
| | 0 | 101 | | FROM b_iblock_element e |
| | 0 | 102 | | LEFT JOIN b_iblock_element_property p |
| | 0 | 103 | | ON e.ID = p.IBLOCK_ELEMENT_ID AND p.DESCRIPTION = 'Артикул' |
| | 0 | 104 | | LEFT JOIN b_catalog_product c |
| | 0 | 105 | | ON c.ID = e.ID |
| | 0 | 106 | | LEFT JOIN b_iblock_element_property prop_supplier |
| | 0 | 107 | | ON e.ID = prop_supplier.IBLOCK_ELEMENT_ID AND prop_supplier.IBLOCK_PROPERTY_ID = 2458 |
| | 0 | 108 | | LEFT JOIN b_iblock_property_enum supplier_enum |
| | 0 | 109 | | ON prop_supplier.VALUE = supplier_enum.ID AND supplier_enum.PROPERTY_ID = 2458 |
| | 0 | 110 | | LEFT JOIN b_catalog_price price |
| | 0 | 111 | | ON price.PRODUCT_ID = e.ID AND price.CATALOG_GROUP_ID = 3 |
| | 0 | 112 | | LEFT JOIN b_catalog_store_product sp |
| | 0 | 113 | | ON sp.PRODUCT_ID = e.ID |
| | 0 | 114 | | LEFT JOIN b_catalog_store s |
| | 0 | 115 | | ON sp.STORE_ID = s.ID |
| | 0 | 116 | | WHERE e.IBLOCK_ID = 93 |
| | 0 | 117 | | AND sp.AMOUNT >= 0 |
| | 0 | 118 | | {dynamicWhereSql} |
| | 0 | 119 | | GROUP BY e.ID, e.PREVIEW_TEXT, e.ACTIVE, e.TIMESTAMP_X, |
| | 0 | 120 | | c.QUANTITY, c.AVAILABLE, supplier_enum.VALUE, price.PRICE, |
| | 0 | 121 | | sp.STORE_ID, s.TITLE, sp.AMOUNT |
| | 0 | 122 | | "; |
| | | 123 | | |
| | | 124 | | |
| | 0 | 125 | | var flatQuery = _context.Set<RemainingStockFlat>().FromSqlRaw(sql, sqlParameters.ToArray()).AsNoTracking().A |
| | | 126 | | |
| | | 127 | | // ==== Применяем фильтры ==== |
| | 0 | 128 | | if (filter.ProductId.HasValue) |
| | 0 | 129 | | flatQuery = flatQuery.Where(x => x.ProductId == filter.ProductId.Value); |
| | | 130 | | |
| | 0 | 131 | | if (!string.IsNullOrWhiteSpace(filter.Article)) |
| | 0 | 132 | | flatQuery = flatQuery.Where(x => x.Article != null && x.Article.Contains(filter.Article)); |
| | | 133 | | |
| | 0 | 134 | | if (!string.IsNullOrWhiteSpace(filter.PreviewText)) |
| | 0 | 135 | | flatQuery = flatQuery.Where(x => x.PreviewText != null && x.PreviewText.Contains(filter.PreviewText)); |
| | | 136 | | |
| | 0 | 137 | | if (!string.IsNullOrWhiteSpace(filter.Active)) |
| | 0 | 138 | | flatQuery = flatQuery.Where(x => x.Active == filter.Active); |
| | | 139 | | |
| | 0 | 140 | | if (!string.IsNullOrWhiteSpace(filter.Available)) |
| | 0 | 141 | | flatQuery = flatQuery.Where(x => x.Available == filter.Available); |
| | | 142 | | |
| | 0 | 143 | | if (!string.IsNullOrWhiteSpace(filter.Supplier)) |
| | 0 | 144 | | flatQuery = flatQuery.Where(x => x.Supplier != null && x.Supplier.Contains(filter.Supplier)); |
| | | 145 | | |
| | 0 | 146 | | if (filter.QuantityFrom.HasValue) |
| | 0 | 147 | | flatQuery = flatQuery.Where(x => x.Quantity >= filter.QuantityFrom.Value); |
| | | 148 | | |
| | 0 | 149 | | if (filter.QuantityTo.HasValue) |
| | 0 | 150 | | flatQuery = flatQuery.Where(x => x.Quantity <= filter.QuantityTo.Value); |
| | | 151 | | |
| | 0 | 152 | | if (filter.DateFrom.HasValue) |
| | 0 | 153 | | flatQuery = flatQuery.Where(x => x.TimestampX >= filter.DateFrom.Value); |
| | | 154 | | |
| | 0 | 155 | | if (filter.DateTo.HasValue) |
| | 0 | 156 | | flatQuery = flatQuery.Where(x => x.TimestampX < filter.DateTo.Value.AddDays(1)); |
| | | 157 | | |
| | 0 | 158 | | if (filter.PriceValueFrom.HasValue) |
| | 0 | 159 | | flatQuery = flatQuery.Where(x => x.Price >= (double)filter.PriceValueFrom.Value); |
| | | 160 | | |
| | 0 | 161 | | if (filter.PriceValueTo.HasValue) |
| | 0 | 162 | | flatQuery = flatQuery.Where(x => x.Price <= (double)filter.PriceValueTo.Value); |
| | | 163 | | |
| | 0 | 164 | | if (filter.StoreId.HasValue) |
| | 0 | 165 | | flatQuery = flatQuery.Where(x => x.StoreId == filter.StoreId.Value); |
| | | 166 | | |
| | 0 | 167 | | if (filter.SelectedStoreTitles != null && filter.SelectedStoreTitles.Any()) |
| | 0 | 168 | | flatQuery = flatQuery.Where(x => filter.SelectedStoreTitles.Contains(x.StoreTitle)); |
| | 0 | 169 | | else if (!string.IsNullOrWhiteSpace(filter.StoreTitle)) |
| | 0 | 170 | | flatQuery = flatQuery.Where(x => x.StoreTitle.Contains(filter.StoreTitle)); |
| | | 171 | | |
| | 0 | 172 | | if (filter.AmountFrom.HasValue) |
| | 0 | 173 | | flatQuery = flatQuery.Where(x => x.Amount >= filter.AmountFrom.Value); |
| | | 174 | | |
| | 0 | 175 | | if (filter.AmountTo.HasValue) |
| | 0 | 176 | | flatQuery = flatQuery.Where(x => x.Amount <= filter.AmountTo.Value); |
| | | 177 | | |
| | 0 | 178 | | var useSinglePassStrategy = filter.ProductId.HasValue || !string.IsNullOrWhiteSpace(filter.Article); |
| | | 179 | | // #region agent log |
| | 0 | 180 | | WriteDebugLog("run-empty-1", "E1", "BitrixStockRepository.GetRemainingStockAsync:strategy", "Strategy chosen", n |
| | 0 | 181 | | { |
| | 0 | 182 | | useSinglePassStrategy, |
| | 0 | 183 | | hasArticle = !string.IsNullOrWhiteSpace(filter.Article), |
| | 0 | 184 | | hasProductId = filter.ProductId.HasValue, |
| | 0 | 185 | | selectedStoresCount = filter.SelectedStoreTitles?.Count ?? 0 |
| | 0 | 186 | | }); |
| | | 187 | | // #endregion |
| | 0 | 188 | | if (useSinglePassStrategy) |
| | | 189 | | { |
| | 0 | 190 | | var flatItems = await flatQuery.ToListAsync(); |
| | 0 | 191 | | var groupedItems = flatItems |
| | 0 | 192 | | .GroupBy(f => f.ProductId) |
| | 0 | 193 | | .Select(g => new RemainingStockBitrix |
| | 0 | 194 | | { |
| | 0 | 195 | | ProductId = g.Key, |
| | 0 | 196 | | Article = g.First().Article, |
| | 0 | 197 | | PreviewText = g.First().PreviewText, |
| | 0 | 198 | | Active = g.First().Active, |
| | 0 | 199 | | Available = g.First().Available, |
| | 0 | 200 | | Supplier = g.First().Supplier, |
| | 0 | 201 | | TimestampX = g.First().TimestampX, |
| | 0 | 202 | | Quantity = g.First().Quantity, |
| | 0 | 203 | | Price = g.First().Price, |
| | 0 | 204 | | Stores = g.Select(s => new StockByStore |
| | 0 | 205 | | { |
| | 0 | 206 | | StoreId = s.StoreId, |
| | 0 | 207 | | Title = s.StoreTitle, |
| | 0 | 208 | | Amount = s.Amount |
| | 0 | 209 | | }).ToList() |
| | 0 | 210 | | }) |
| | 0 | 211 | | .ToList(); |
| | | 212 | | |
| | 0 | 213 | | if (!string.IsNullOrEmpty(filter.SortColumn)) |
| | | 214 | | { |
| | 0 | 215 | | groupedItems = ApplyClientSideSorting(groupedItems, filter.SortColumn, filter.SortDirection); |
| | | 216 | | } |
| | | 217 | | else |
| | | 218 | | { |
| | 0 | 219 | | groupedItems = groupedItems.OrderBy(x => x.ProductId).ToList(); |
| | | 220 | | } |
| | | 221 | | |
| | 0 | 222 | | var totalCountSinglePass = groupedItems.Count; |
| | 0 | 223 | | var pagedItems = filter.DisablePagination |
| | 0 | 224 | | ? groupedItems |
| | 0 | 225 | | : groupedItems |
| | 0 | 226 | | .Skip((filter.Page - 1) * filter.PageSize) |
| | 0 | 227 | | .Take(filter.PageSize) |
| | 0 | 228 | | .ToList(); |
| | | 229 | | |
| | 0 | 230 | | return new PagedResult<RemainingStockBitrix> |
| | 0 | 231 | | { |
| | 0 | 232 | | Items = pagedItems, |
| | 0 | 233 | | TotalCount = totalCountSinglePass, |
| | 0 | 234 | | Page = filter.Page, |
| | 0 | 235 | | PageSize = filter.PageSize |
| | 0 | 236 | | }; |
| | | 237 | | } |
| | | 238 | | |
| | | 239 | | // ==== Получаем ID уникальных товаров с правильной сортировкой ==== |
| | | 240 | | // Группируем один раз и применяем сортировку к одному IQueryable. |
| | 0 | 241 | | var grouped = flatQuery.GroupBy(f => f.ProductId); |
| | 0 | 242 | | var desc = string.Equals(filter.SortDirection, "desc", StringComparison.OrdinalIgnoreCase); |
| | | 243 | | |
| | 0 | 244 | | IQueryable<int> productIdsQuery = (filter.SortColumn?.ToLowerInvariant()) switch |
| | 0 | 245 | | { |
| | 0 | 246 | | "article" => desc ? grouped.OrderByDescending(g => g.Max(f => f.Article)).Select(g => g.Key) |
| | 0 | 247 | | : grouped.OrderBy(g => g.Max(f => f.Article)).Select(g => g.Key), |
| | 0 | 248 | | "previewtext" => desc ? grouped.OrderByDescending(g => g.Max(f => f.PreviewText)).Select(g => g.Key) |
| | 0 | 249 | | : grouped.OrderBy(g => g.Max(f => f.PreviewText)).Select(g => g.Key), |
| | 0 | 250 | | "supplier" => desc ? grouped.OrderByDescending(g => g.Max(f => f.Supplier)).Select(g => g.Key) |
| | 0 | 251 | | : grouped.OrderBy(g => g.Max(f => f.Supplier)).Select(g => g.Key), |
| | 0 | 252 | | "quantity" => desc ? grouped.OrderByDescending(g => g.Max(f => f.Quantity)).Select(g => g.Key) |
| | 0 | 253 | | : grouped.OrderBy(g => g.Max(f => f.Quantity)).Select(g => g.Key), |
| | 0 | 254 | | "price" => desc ? grouped.OrderByDescending(g => g.Max(f => f.Price)).Select(g => g.Key) |
| | 0 | 255 | | : grouped.OrderBy(g => g.Max(f => f.Price)).Select(g => g.Key), |
| | 0 | 256 | | "timestampx" => desc ? grouped.OrderByDescending(g => g.Max(f => f.TimestampX)).Select(g => g.Key) |
| | 0 | 257 | | : grouped.OrderBy(g => g.Max(f => f.TimestampX)).Select(g => g.Key), |
| | 0 | 258 | | _ => desc ? grouped.OrderByDescending(g => g.Key).Select(g => g.Key) |
| | 0 | 259 | | : grouped.OrderBy(g => g.Key).Select(g => g.Key), |
| | 0 | 260 | | }; |
| | | 261 | | |
| | 0 | 262 | | var totalCount = await productIdsQuery.CountAsync(); |
| | | 263 | | |
| | 0 | 264 | | var productIdsPage = filter.DisablePagination |
| | 0 | 265 | | ? await productIdsQuery.ToListAsync() |
| | 0 | 266 | | : await productIdsQuery |
| | 0 | 267 | | .Skip((filter.Page - 1) * filter.PageSize) |
| | 0 | 268 | | .Take(filter.PageSize) |
| | 0 | 269 | | .ToListAsync(); |
| | | 270 | | |
| | | 271 | | // ==== Получаем все flat записи для этих товаров ==== |
| | 0 | 272 | | var flatItemsPage = await flatQuery |
| | 0 | 273 | | .Where(f => productIdsPage.Contains(f.ProductId)) |
| | 0 | 274 | | .ToListAsync(); |
| | | 275 | | |
| | | 276 | | // ==== Группируем на клиенте в RemainingStockBitrix ==== |
| | 0 | 277 | | var items = flatItemsPage |
| | 0 | 278 | | .GroupBy(f => f.ProductId) |
| | 0 | 279 | | .Select(g => new RemainingStockBitrix |
| | 0 | 280 | | { |
| | 0 | 281 | | ProductId = g.Key, |
| | 0 | 282 | | Article = g.First().Article, |
| | 0 | 283 | | PreviewText = g.First().PreviewText, |
| | 0 | 284 | | Active = g.First().Active, |
| | 0 | 285 | | Available = g.First().Available, |
| | 0 | 286 | | Supplier = g.First().Supplier, |
| | 0 | 287 | | TimestampX = g.First().TimestampX, |
| | 0 | 288 | | Quantity = g.First().Quantity, |
| | 0 | 289 | | Price = g.First().Price, |
| | 0 | 290 | | Stores = g.Select(s => new StockByStore |
| | 0 | 291 | | { |
| | 0 | 292 | | StoreId = s.StoreId, |
| | 0 | 293 | | Title = s.StoreTitle, |
| | 0 | 294 | | Amount = s.Amount |
| | 0 | 295 | | }).ToList() |
| | 0 | 296 | | }) |
| | 0 | 297 | | .ToList(); |
| | | 298 | | |
| | | 299 | | // Применяем окончательную сортировку на клиенте для гарантии |
| | 0 | 300 | | if (!string.IsNullOrEmpty(filter.SortColumn)) |
| | | 301 | | { |
| | 0 | 302 | | items = ApplyClientSideSorting(items, filter.SortColumn, filter.SortDirection); |
| | | 303 | | } |
| | 0 | 304 | | totalSw.Stop(); |
| | | 305 | | // #region agent log |
| | 0 | 306 | | WriteDebugLog("run-empty-1", "E2", "BitrixStockRepository.GetRemainingStockAsync:non-single-pass", "Non single-p |
| | 0 | 307 | | { |
| | 0 | 308 | | filter.Page, |
| | 0 | 309 | | filter.PageSize, |
| | 0 | 310 | | totalCount, |
| | 0 | 311 | | pageIdsCount = productIdsPage.Count, |
| | 0 | 312 | | flatItemsPageCount = flatItemsPage.Count, |
| | 0 | 313 | | groupedItemsCount = items.Count, |
| | 0 | 314 | | totalMs = totalSw.ElapsedMilliseconds |
| | 0 | 315 | | }); |
| | | 316 | | // #endregion |
| | 0 | 317 | | return new PagedResult<RemainingStockBitrix> |
| | 0 | 318 | | { |
| | 0 | 319 | | Items = items, |
| | 0 | 320 | | TotalCount = totalCount, |
| | 0 | 321 | | Page = filter.Page, |
| | 0 | 322 | | PageSize = filter.PageSize |
| | 0 | 323 | | }; |
| | | 324 | | } |
| | 0 | 325 | | catch (Exception) |
| | | 326 | | { |
| | | 327 | | // При ошибке возвращаем пустой результат вместо падения страницы |
| | 0 | 328 | | return new PagedResult<RemainingStockBitrix> |
| | 0 | 329 | | { |
| | 0 | 330 | | Items = new List<RemainingStockBitrix>(), |
| | 0 | 331 | | TotalCount = 0, |
| | 0 | 332 | | Page = filter.Page, |
| | 0 | 333 | | PageSize = filter.PageSize |
| | 0 | 334 | | }; |
| | | 335 | | } |
| | 0 | 336 | | } |
| | | 337 | | |
| | | 338 | | // Вспомогательный метод для сортировки на клиенте |
| | | 339 | | private List<RemainingStockBitrix> ApplyClientSideSorting( |
| | | 340 | | List<RemainingStockBitrix> items, |
| | | 341 | | string sortColumn, |
| | | 342 | | string? sortDirection) |
| | | 343 | | { |
| | 0 | 344 | | var isDescending = sortDirection?.ToLower() == "desc"; |
| | | 345 | | |
| | 0 | 346 | | return sortColumn.ToLower() switch |
| | 0 | 347 | | { |
| | 0 | 348 | | "article" => isDescending |
| | 0 | 349 | | ? items.OrderByDescending(x => x.Article).ToList() |
| | 0 | 350 | | : items.OrderBy(x => x.Article).ToList(), |
| | 0 | 351 | | "previewtext" => isDescending |
| | 0 | 352 | | ? items.OrderByDescending(x => x.PreviewText).ToList() |
| | 0 | 353 | | : items.OrderBy(x => x.PreviewText).ToList(), |
| | 0 | 354 | | "supplier" => isDescending |
| | 0 | 355 | | ? items.OrderByDescending(x => x.Supplier).ToList() |
| | 0 | 356 | | : items.OrderBy(x => x.Supplier).ToList(), |
| | 0 | 357 | | "quantity" => isDescending |
| | 0 | 358 | | ? items.OrderByDescending(x => x.Quantity).ToList() |
| | 0 | 359 | | : items.OrderBy(x => x.Quantity).ToList(), |
| | 0 | 360 | | "price" => isDescending |
| | 0 | 361 | | ? items.OrderByDescending(x => x.Price).ToList() |
| | 0 | 362 | | : items.OrderBy(x => x.Price).ToList(), |
| | 0 | 363 | | "timestampx" => isDescending |
| | 0 | 364 | | ? items.OrderByDescending(x => x.TimestampX).ToList() |
| | 0 | 365 | | : items.OrderBy(x => x.TimestampX).ToList(), |
| | 0 | 366 | | _ => isDescending |
| | 0 | 367 | | ? items.OrderByDescending(x => x.ProductId).ToList() |
| | 0 | 368 | | : items.OrderBy(x => x.ProductId).ToList() |
| | 0 | 369 | | }; |
| | | 370 | | } |
| | | 371 | | |
| | | 372 | | private static void WriteDebugLog(string runId, string hypothesisId, string location, string message, object data) |
| | | 373 | | { |
| | | 374 | | try |
| | | 375 | | { |
| | 0 | 376 | | var payload = new |
| | 0 | 377 | | { |
| | 0 | 378 | | sessionId = "8edffb", |
| | 0 | 379 | | runId, |
| | 0 | 380 | | hypothesisId, |
| | 0 | 381 | | location, |
| | 0 | 382 | | message, |
| | 0 | 383 | | data, |
| | 0 | 384 | | timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() |
| | 0 | 385 | | }; |
| | 0 | 386 | | System.IO.File.AppendAllText(DebugLogPath, JsonSerializer.Serialize(payload) + Environment.NewLine); |
| | 0 | 387 | | } |
| | 0 | 388 | | catch |
| | | 389 | | { |
| | | 390 | | // ignore debug logging failures |
| | 0 | 391 | | } |
| | 0 | 392 | | } |
| | | 393 | | |
| | | 394 | | public async Task<List<string>> GetActiveStoresAsync() |
| | | 395 | | { |
| | | 396 | | const string cacheKey = "Bitrix:ActiveStores"; |
| | 0 | 397 | | if (_memoryCache.TryGetValue(cacheKey, out List<string>? cachedStores) && cachedStores != null) |
| | | 398 | | { |
| | 0 | 399 | | return cachedStores; |
| | | 400 | | } |
| | | 401 | | |
| | | 402 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 403 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 404 | | { |
| | | 405 | | // Возвращаем пустой список вместо падения страницы |
| | 0 | 406 | | return new List<string>(); |
| | | 407 | | } |
| | | 408 | | |
| | | 409 | | try |
| | | 410 | | { |
| | 0 | 411 | | var stores = await _context.Set<BCatalogStore>() |
| | 0 | 412 | | .Where(s => !string.IsNullOrEmpty(s.Title)) |
| | 0 | 413 | | .Select(s => s.Title!) |
| | 0 | 414 | | .Distinct() |
| | 0 | 415 | | .OrderBy(t => t) |
| | 0 | 416 | | .ToListAsync(); |
| | | 417 | | |
| | 0 | 418 | | var result = stores |
| | 0 | 419 | | .Where(t => !string.IsNullOrEmpty(t)) |
| | 0 | 420 | | .OrderBy(t => t) |
| | 0 | 421 | | .ToList(); |
| | | 422 | | |
| | 0 | 423 | | _memoryCache.Set(cacheKey, result, new MemoryCacheEntryOptions() |
| | 0 | 424 | | .SetAbsoluteExpiration(TimeSpan.FromMinutes(30)) |
| | 0 | 425 | | .SetSlidingExpiration(TimeSpan.FromMinutes(10))); |
| | | 426 | | |
| | 0 | 427 | | return result; |
| | | 428 | | } |
| | 0 | 429 | | catch (Exception) |
| | | 430 | | { |
| | | 431 | | // При ошибке возвращаем пустой список вместо падения страницы |
| | 0 | 432 | | return new List<string>(); |
| | | 433 | | } |
| | 0 | 434 | | } |
| | | 435 | | |
| | | 436 | | public async Task SetPricesForOrdersAsyncFromBitrix(List<Order> orders) |
| | | 437 | | { |
| | | 438 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 439 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 440 | | { |
| | | 441 | | // Если соединение недоступно, просто не устанавливаем цены (заглушка) |
| | 0 | 442 | | return; |
| | | 443 | | } |
| | | 444 | | |
| | | 445 | | try |
| | | 446 | | { |
| | | 447 | | // Берем артикулы из ProductKey (до "=") |
| | 0 | 448 | | var articles = orders |
| | 0 | 449 | | .Where(o => !string.IsNullOrWhiteSpace(o.ProductKey)) |
| | 0 | 450 | | .Select(o => o.ProductKey!.Split('=')[0].Trim()) |
| | 0 | 451 | | .Where(a => !string.IsNullOrWhiteSpace(a)) |
| | 0 | 452 | | .Distinct() |
| | 0 | 453 | | .ToList(); |
| | | 454 | | |
| | 0 | 455 | | if (!articles.Any()) |
| | | 456 | | { |
| | 0 | 457 | | return; |
| | | 458 | | } |
| | | 459 | | |
| | 0 | 460 | | var sql = @" |
| | 0 | 461 | | SELECT |
| | 0 | 462 | | p.VALUE AS Article, |
| | 0 | 463 | | price.PRICE AS Price |
| | 0 | 464 | | FROM b_iblock_element e |
| | 0 | 465 | | LEFT JOIN b_iblock_element_property p |
| | 0 | 466 | | ON e.ID = p.IBLOCK_ELEMENT_ID AND p.DESCRIPTION = 'Артикул' |
| | 0 | 467 | | LEFT JOIN b_catalog_price price |
| | 0 | 468 | | ON price.PRODUCT_ID = e.ID AND price.CATALOG_GROUP_ID = 3 |
| | 0 | 469 | | WHERE e.IBLOCK_ID = 93 |
| | 0 | 470 | | AND p.VALUE IN ({0})"; |
| | | 471 | | |
| | | 472 | | // Подготавливаем параметры для IN |
| | 0 | 473 | | var parameters = articles.Select((a, i) => new MySqlParameter($"@p{i}", a)).ToArray(); |
| | 0 | 474 | | var inClause = string.Join(",", parameters.Select(p => p.ParameterName)); |
| | 0 | 475 | | var formattedSql = string.Format(sql, inClause); |
| | | 476 | | |
| | | 477 | | // Выполняем запрос |
| | 0 | 478 | | var results = await _context.Database |
| | 0 | 479 | | .SqlQueryRaw<ArticlePriceResult>(formattedSql, parameters) |
| | 0 | 480 | | .ToListAsync(); |
| | | 481 | | |
| | | 482 | | // Словарь "Артикул -> Цена" |
| | 0 | 483 | | var priceDictionary = results |
| | 0 | 484 | | .Where(r => !string.IsNullOrEmpty(r.Article)) |
| | 0 | 485 | | .GroupBy(r => r.Article!) |
| | 0 | 486 | | .ToDictionary( |
| | 0 | 487 | | g => g.Key, |
| | 0 | 488 | | g => g.First().Price.HasValue |
| | 0 | 489 | | ? (decimal?)Math.Round((decimal)g.First().Price!.Value, 2) |
| | 0 | 490 | | : null |
| | 0 | 491 | | ); |
| | | 492 | | |
| | | 493 | | // Проставляем цены в заказы |
| | 0 | 494 | | foreach (var order in orders) |
| | | 495 | | { |
| | 0 | 496 | | if (string.IsNullOrWhiteSpace(order.ProductKey)) |
| | | 497 | | continue; |
| | | 498 | | |
| | 0 | 499 | | var article = order.ProductKey.Split('=')[0].Trim(); |
| | | 500 | | |
| | 0 | 501 | | if (priceDictionary.TryGetValue(article, out var price)) |
| | | 502 | | { |
| | 0 | 503 | | order.PurchasePrice = price; |
| | | 504 | | } |
| | | 505 | | } |
| | 0 | 506 | | } |
| | 0 | 507 | | catch (Exception) |
| | | 508 | | { |
| | | 509 | | // При ошибке просто не устанавливаем цены (заглушка) |
| | | 510 | | // Страница продолжит работать без цен из Bitrix |
| | 0 | 511 | | } |
| | 0 | 512 | | } |
| | | 513 | | |
| | | 514 | | public async Task<Dictionary<int, List<StockInfo>>> SetStocksForOrdersAsyncFromBitrix(List<Order> orders) |
| | | 515 | | { |
| | | 516 | | |
| | | 517 | | // Кэшируем по ключу, основанному на артикулах |
| | 0 | 518 | | var articles = orders |
| | 0 | 519 | | .Where(o => !string.IsNullOrWhiteSpace(o.ProductKey)) |
| | 0 | 520 | | .Select(o => o.ProductKey!.Split('=')[0].Trim()) |
| | 0 | 521 | | .Where(a => !string.IsNullOrWhiteSpace(a)) |
| | 0 | 522 | | .Distinct() |
| | 0 | 523 | | .ToList(); |
| | | 524 | | |
| | 0 | 525 | | if (!articles.Any()) |
| | | 526 | | { |
| | 0 | 527 | | return new Dictionary<int, List<StockInfo>>(); |
| | | 528 | | } |
| | | 529 | | |
| | | 530 | | // Формируем ключ кэша на основе артикула (можно добавить сортировку для уникальности) |
| | 0 | 531 | | var cacheKey = $"BitrixStocks:{string.Join(",", articles.OrderBy(a => a))}"; |
| | 0 | 532 | | if (_memoryCache.TryGetValue(cacheKey, out Dictionary<int, List<StockInfo>>? cachedStocks) && cachedStocks != nu |
| | | 533 | | { |
| | 0 | 534 | | return cachedStocks; |
| | | 535 | | } |
| | | 536 | | |
| | | 537 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 538 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 539 | | { |
| | | 540 | | // Возвращаем пустой словарь вместо падения страницы |
| | 0 | 541 | | return new Dictionary<int, List<StockInfo>>(); |
| | | 542 | | } |
| | | 543 | | |
| | | 544 | | try |
| | | 545 | | { |
| | | 546 | | |
| | 0 | 547 | | var sql = @" |
| | 0 | 548 | | SELECT |
| | 0 | 549 | | CAST(e.ID AS SIGNED) AS ProductId, |
| | 0 | 550 | | p.VALUE AS Article, |
| | 0 | 551 | | e.PREVIEW_TEXT AS PreviewText, |
| | 0 | 552 | | e.ACTIVE AS Active, |
| | 0 | 553 | | e.TIMESTAMP_X AS TimestampX, |
| | 0 | 554 | | c.QUANTITY AS Quantity, |
| | 0 | 555 | | CAST(c.AVAILABLE AS CHAR) AS Available, |
| | 0 | 556 | | supplier_enum.VALUE AS Supplier, |
| | 0 | 557 | | price.PRICE AS Price, |
| | 0 | 558 | | sp.STORE_ID AS StoreId, |
| | 0 | 559 | | s.TITLE AS StoreTitle, |
| | 0 | 560 | | sp.AMOUNT AS Amount |
| | 0 | 561 | | FROM b_iblock_element e |
| | 0 | 562 | | LEFT JOIN b_iblock_element_property p |
| | 0 | 563 | | ON e.ID = p.IBLOCK_ELEMENT_ID AND p.DESCRIPTION = 'Артикул' |
| | 0 | 564 | | LEFT JOIN b_catalog_product c |
| | 0 | 565 | | ON c.ID = e.ID |
| | 0 | 566 | | LEFT JOIN b_iblock_element_property prop_supplier |
| | 0 | 567 | | ON e.ID = prop_supplier.IBLOCK_ELEMENT_ID AND prop_supplier.IBLOCK_PROPERTY_ID = 2458 |
| | 0 | 568 | | LEFT JOIN b_iblock_property_enum supplier_enum |
| | 0 | 569 | | ON prop_supplier.VALUE = supplier_enum.ID AND supplier_enum.PROPERTY_ID = 2458 |
| | 0 | 570 | | LEFT JOIN b_catalog_price price |
| | 0 | 571 | | ON price.PRODUCT_ID = e.ID AND price.CATALOG_GROUP_ID = 3 |
| | 0 | 572 | | LEFT JOIN b_catalog_store_product sp |
| | 0 | 573 | | ON sp.PRODUCT_ID = e.ID |
| | 0 | 574 | | LEFT JOIN b_catalog_store s |
| | 0 | 575 | | ON sp.STORE_ID = s.ID |
| | 0 | 576 | | WHERE e.IBLOCK_ID = 93 |
| | 0 | 577 | | AND p.VALUE IN ({0}) |
| | 0 | 578 | | AND sp.AMOUNT > 0 |
| | 0 | 579 | | GROUP BY e.ID, e.PREVIEW_TEXT, e.ACTIVE, e.TIMESTAMP_X, |
| | 0 | 580 | | c.QUANTITY, c.AVAILABLE, supplier_enum.VALUE, price.PRICE, |
| | 0 | 581 | | sp.STORE_ID, s.TITLE, sp.AMOUNT"; |
| | | 582 | | |
| | | 583 | | // Подготавливаем параметры для IN |
| | 0 | 584 | | var parameters = articles.Select((a, i) => new MySqlParameter($"@p{i}", a)).ToArray(); |
| | 0 | 585 | | var inClause = string.Join(",", parameters.Select(p => p.ParameterName)); |
| | 0 | 586 | | var formattedSql = string.Format(sql, inClause); |
| | | 587 | | |
| | | 588 | | // Выполняем запрос |
| | 0 | 589 | | var results = await _context.Set<RemainingStockFlat>() |
| | 0 | 590 | | .FromSqlRaw(formattedSql, parameters) |
| | 0 | 591 | | .ToListAsync(); |
| | | 592 | | |
| | | 593 | | // Группируем по артикулу и преобразуем в удобную структуру |
| | 0 | 594 | | var stocksDictionary = results |
| | 0 | 595 | | .Where(r => !string.IsNullOrEmpty(r.Article)) |
| | 0 | 596 | | .GroupBy(r => r.Article!) |
| | 0 | 597 | | .ToDictionary( |
| | 0 | 598 | | g => g.Key, |
| | 0 | 599 | | g => new |
| | 0 | 600 | | { |
| | 0 | 601 | | TotalAmount = g.Sum(x => x.Amount), // Общий остаток по всем складам |
| | 0 | 602 | | Stores = g.Select(x => new StockInfo |
| | 0 | 603 | | { |
| | 0 | 604 | | StoreId = x.StoreId, |
| | 0 | 605 | | StoreTitle = x.StoreTitle, |
| | 0 | 606 | | Amount = x.Amount |
| | 0 | 607 | | }).ToList() |
| | 0 | 608 | | } |
| | 0 | 609 | | ); |
| | | 610 | | |
| | 0 | 611 | | Dictionary<int, List<StockInfo>> result = new Dictionary<int, List<StockInfo>>(); |
| | | 612 | | // Проставляем остатки в заказы |
| | 0 | 613 | | foreach (var order in orders) |
| | | 614 | | { |
| | 0 | 615 | | if (string.IsNullOrWhiteSpace(order.ProductKey)) |
| | | 616 | | continue; |
| | | 617 | | |
| | 0 | 618 | | var article = order.ProductKey.Split('=')[0].Trim(); |
| | | 619 | | |
| | 0 | 620 | | if (stocksDictionary.TryGetValue(article, out var stockInfo)) |
| | | 621 | | { |
| | 0 | 622 | | if (stockInfo.Stores.Count() > 1) |
| | | 623 | | { |
| | | 624 | | continue; |
| | | 625 | | } |
| | | 626 | | |
| | 0 | 627 | | var targetSupplier = await _supplierRepository.GetAsync(new Supplier() |
| | 0 | 628 | | { Name = stockInfo.Stores.FirstOrDefault()?.StoreTitle }); |
| | 0 | 629 | | if (targetSupplier != null) |
| | | 630 | | { |
| | 0 | 631 | | order.Supplier = targetSupplier; |
| | 0 | 632 | | order.SupplierId = targetSupplier.Id; |
| | | 633 | | } |
| | | 634 | | |
| | 0 | 635 | | result.Add(order.Id, stockInfo.Stores); |
| | | 636 | | } |
| | 0 | 637 | | } |
| | | 638 | | |
| | | 639 | | // Кэшируем результат на 10 минут |
| | 0 | 640 | | _memoryCache.Set(cacheKey, result, TimeSpan.FromMinutes(10)); |
| | 0 | 641 | | return result; |
| | | 642 | | } |
| | 0 | 643 | | catch (Exception) |
| | | 644 | | { |
| | | 645 | | // При ошибке возвращаем пустой словарь вместо падения страницы |
| | 0 | 646 | | return new Dictionary<int, List<StockInfo>>(); |
| | | 647 | | } |
| | 0 | 648 | | } |
| | | 649 | | |
| | | 650 | | /// <summary> |
| | | 651 | | /// Возвращает максимальный TimestampX среди элементов Bitrix (для детекта изменений). |
| | | 652 | | /// </summary> |
| | | 653 | | public async Task<DateTime?> GetMaxTimestampAsync() |
| | | 654 | | { |
| | | 655 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 1 | 656 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 657 | | { |
| | | 658 | | // Возвращаем null вместо падения страницы |
| | 0 | 659 | | return null; |
| | | 660 | | } |
| | | 661 | | |
| | | 662 | | try |
| | | 663 | | { |
| | 1 | 664 | | var sql = "SELECT MAX(e.TIMESTAMP_X) AS MaxTimestamp FROM b_iblock_element e WHERE e.IBLOCK_ID = 93"; |
| | 1 | 665 | | var result = await _context.Set<MaxTimestampResult>() |
| | 1 | 666 | | .FromSqlRaw(sql) |
| | 1 | 667 | | .SingleOrDefaultAsync(); |
| | | 668 | | |
| | 1 | 669 | | return result?.MaxTimestamp; |
| | | 670 | | } |
| | 0 | 671 | | catch (Exception) |
| | | 672 | | { |
| | | 673 | | // При ошибке возвращаем null вместо падения страницы |
| | 0 | 674 | | return null; |
| | | 675 | | } |
| | 1 | 676 | | } |
| | | 677 | | |
| | | 678 | | /// <summary> |
| | | 679 | | /// Обновляет поле ACTIVE в таблице b_iblock_element по ID элемента |
| | | 680 | | /// </summary> |
| | | 681 | | /// <param name="elementId">ID элемента</param> |
| | | 682 | | /// <param name="isActive">true - активировать ("Y"), false - деактивировать ("N")</param> |
| | | 683 | | /// <returns>Количество обновленных записей</returns> |
| | | 684 | | public async Task<int> UpdateElementActiveStatus(int elementId, bool isActive) |
| | | 685 | | { |
| | | 686 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 687 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 688 | | { |
| | | 689 | | // Возвращаем 0 вместо падения страницы |
| | 0 | 690 | | return 0; |
| | | 691 | | } |
| | | 692 | | |
| | | 693 | | try |
| | | 694 | | { |
| | 0 | 695 | | var activeValue = isActive ? "Y" : "N"; |
| | | 696 | | |
| | 0 | 697 | | var sql = @" |
| | 0 | 698 | | UPDATE b_iblock_element |
| | 0 | 699 | | SET ACTIVE = {0}, TIMESTAMP_X = NOW() |
| | 0 | 700 | | WHERE ID = {1} AND IBLOCK_ID = 93 |
| | 0 | 701 | | "; |
| | | 702 | | |
| | 0 | 703 | | return await _context.Database.ExecuteSqlRawAsync(sql, activeValue, elementId); |
| | | 704 | | } |
| | 0 | 705 | | catch (Exception) |
| | | 706 | | { |
| | | 707 | | // При ошибке возвращаем 0 вместо падения страницы |
| | 0 | 708 | | return 0; |
| | | 709 | | } |
| | 0 | 710 | | } |
| | | 711 | | |
| | | 712 | | /// <summary> |
| | | 713 | | /// Обновляет поле ACTIVE для нескольких элементов |
| | | 714 | | /// </summary> |
| | | 715 | | /// <param name="elementIds">Список ID элементов</param> |
| | | 716 | | /// <param name="isActive">true - активировать ("Y"), false - деактивировать ("N")</param> |
| | | 717 | | /// <returns>Количество обновленных записей</returns> |
| | | 718 | | public async Task<int> UpdateElementsActiveStatus(List<int> elementIds, bool isActive) |
| | | 719 | | { |
| | 0 | 720 | | if (elementIds == null || !elementIds.Any()) |
| | | 721 | | { |
| | 0 | 722 | | return 0; |
| | | 723 | | } |
| | | 724 | | |
| | | 725 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 726 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 727 | | { |
| | | 728 | | // Возвращаем 0 вместо падения страницы |
| | 0 | 729 | | return 0; |
| | | 730 | | } |
| | | 731 | | |
| | | 732 | | try |
| | | 733 | | { |
| | 0 | 734 | | var activeValue = isActive ? "Y" : "N"; |
| | 0 | 735 | | var idsString = string.Join(",", elementIds); |
| | | 736 | | |
| | 0 | 737 | | var sql = $@" |
| | 0 | 738 | | UPDATE b_iblock_element |
| | 0 | 739 | | SET ACTIVE = {{0}}, TIMESTAMP_X = NOW() |
| | 0 | 740 | | WHERE ID IN ({idsString}) AND IBLOCK_ID = 93 |
| | 0 | 741 | | "; |
| | | 742 | | |
| | 0 | 743 | | return await _context.Database.ExecuteSqlRawAsync(sql, activeValue); |
| | | 744 | | } |
| | 0 | 745 | | catch (Exception) |
| | | 746 | | { |
| | | 747 | | // При ошибке возвращаем 0 вместо падения страницы |
| | 0 | 748 | | return 0; |
| | | 749 | | } |
| | 0 | 750 | | } |
| | | 751 | | |
| | | 752 | | /// <summary> |
| | | 753 | | /// Получает текущее значение ACTIVE для элемента как bool |
| | | 754 | | /// </summary> |
| | | 755 | | /// <param name="elementId">ID элемента</param> |
| | | 756 | | /// <returns>true если активен, false если не активен, null если элемент не найден</returns> |
| | | 757 | | public async Task<bool?> GetElementActiveStatus(int elementId) |
| | | 758 | | { |
| | | 759 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 760 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 761 | | { |
| | | 762 | | // Возвращаем null вместо падения страницы |
| | 0 | 763 | | return null; |
| | | 764 | | } |
| | | 765 | | |
| | | 766 | | try |
| | | 767 | | { |
| | 0 | 768 | | await using var command = _context.Database.GetDbConnection().CreateCommand(); |
| | | 769 | | |
| | 0 | 770 | | if (command.Connection?.State != ConnectionState.Open) |
| | | 771 | | { |
| | 0 | 772 | | await _context.Database.OpenConnectionAsync(); |
| | | 773 | | } |
| | | 774 | | |
| | 0 | 775 | | command.CommandText = @" |
| | 0 | 776 | | SELECT ACTIVE |
| | 0 | 777 | | FROM b_iblock_element |
| | 0 | 778 | | WHERE ID = @elementId AND IBLOCK_ID = 93 |
| | 0 | 779 | | "; |
| | | 780 | | |
| | | 781 | | // Добавляем параметр для безопасности от SQL-инъекций |
| | 0 | 782 | | var parameter = command.CreateParameter(); |
| | 0 | 783 | | parameter.ParameterName = "@elementId"; |
| | 0 | 784 | | parameter.Value = elementId; |
| | 0 | 785 | | command.Parameters.Add(parameter); |
| | | 786 | | |
| | 0 | 787 | | var result = await command.ExecuteScalarAsync(); |
| | 0 | 788 | | if (result == null || result == DBNull.Value) |
| | | 789 | | { |
| | 0 | 790 | | return null; |
| | | 791 | | } |
| | | 792 | | |
| | 0 | 793 | | var activeValue = result.ToString(); |
| | 0 | 794 | | return activeValue == "Y"; |
| | 0 | 795 | | } |
| | 0 | 796 | | catch (Exception) |
| | | 797 | | { |
| | | 798 | | // При ошибке возвращаем null вместо падения страницы |
| | 0 | 799 | | return null; |
| | | 800 | | } |
| | | 801 | | finally |
| | | 802 | | { |
| | | 803 | | try |
| | | 804 | | { |
| | 0 | 805 | | await _context.Database.CloseConnectionAsync(); |
| | 0 | 806 | | } |
| | 0 | 807 | | catch |
| | | 808 | | { |
| | | 809 | | // Игнорируем ошибки при закрытии соединения |
| | 0 | 810 | | } |
| | | 811 | | } |
| | 0 | 812 | | } |
| | | 813 | | |
| | | 814 | | /// <summary> |
| | | 815 | | /// Переключает значение ACTIVE (true -> false, false -> true) |
| | | 816 | | /// </summary> |
| | | 817 | | /// <param name="elementId">ID элемента</param> |
| | | 818 | | /// <returns>Новое значение ACTIVE как bool или null если элемент не найден</returns> |
| | | 819 | | public async Task<bool?> ToggleElementActiveStatus(int elementId) |
| | | 820 | | { |
| | | 821 | | // Проверяем доступность соединения с Bitrix (с кэшированием) |
| | 0 | 822 | | if (!await _connectionService.IsConnectionAvailableAsync()) |
| | | 823 | | { |
| | | 824 | | // Возвращаем null вместо падения страницы |
| | 0 | 825 | | return null; |
| | | 826 | | } |
| | | 827 | | |
| | | 828 | | try |
| | | 829 | | { |
| | 0 | 830 | | var currentStatus = await GetElementActiveStatus(elementId); |
| | 0 | 831 | | if (currentStatus == null) |
| | | 832 | | { |
| | 0 | 833 | | return null; |
| | | 834 | | } |
| | | 835 | | |
| | 0 | 836 | | var newStatus = !currentStatus.Value; |
| | 0 | 837 | | await UpdateElementActiveStatus(elementId, newStatus); |
| | | 838 | | |
| | 0 | 839 | | return newStatus; |
| | | 840 | | } |
| | 0 | 841 | | catch (Exception) |
| | | 842 | | { |
| | | 843 | | // При ошибке возвращаем null вместо падения страницы |
| | 0 | 844 | | return null; |
| | | 845 | | } |
| | 0 | 846 | | } |
| | | 847 | | |
| | | 848 | | private static Expression<Func<RemainingStockFlat, object>> GetSortPropertyFlat(string sortColumn) |
| | | 849 | | { |
| | 0 | 850 | | return sortColumn.ToLower() switch |
| | 0 | 851 | | { |
| | 0 | 852 | | "productid" => x => x.ProductId, |
| | 0 | 853 | | "article" => x => x.Article ?? "", |
| | 0 | 854 | | "previewtext" => x => x.PreviewText ?? "", |
| | 0 | 855 | | "active" => x => x.Active, |
| | 0 | 856 | | "available" => x => x.Available, |
| | 0 | 857 | | "supplier" => x => x.Supplier ?? "", |
| | 0 | 858 | | "timestampx" => x => x.TimestampX, |
| | 0 | 859 | | "quantity" => x => x.Quantity, |
| | 0 | 860 | | "price" => x => x.Price ?? 0, |
| | 0 | 861 | | |
| | 0 | 862 | | // поля по складам |
| | 0 | 863 | | "storeid" => x => x.StoreId, |
| | 0 | 864 | | "storetitle" => x => x.StoreTitle ?? "", |
| | 0 | 865 | | "amount" => x => x.Amount, |
| | 0 | 866 | | |
| | 0 | 867 | | _ => x => x.TimestampX // дефолтная сортировка |
| | 0 | 868 | | }; |
| | | 869 | | } |
| | | 870 | | |
| | | 871 | | } |