| | | 1 | | using System.Linq.Expressions; |
| | | 2 | | using System.Text.Json; |
| | | 3 | | using Microsoft.EntityFrameworkCore; |
| | | 4 | | using OzonDomains; |
| | | 5 | | using OzonDomains.Models; |
| | | 6 | | using OzonRepositories.Context; |
| | | 7 | | using Services.BackgroundJobsServices; |
| | | 8 | | using Services.SignalRServices; |
| | | 9 | | |
| | | 10 | | namespace Services.OrderControlServices; |
| | | 11 | | |
| | | 12 | | public sealed class OrderControlService : IOrderControlService |
| | | 13 | | { |
| | | 14 | | private const int DefaultEvaluationIntervalMinutes = 5; |
| | | 15 | | |
| | | 16 | | // Окно отбора кандидатов. Без него правила читали Orders за всю историю: на проде это давало |
| | | 17 | | // 30 356 кандидатов NoStatusMovement и 4 741 SupplierArrivalOverdue, которые каждые 5 минут |
| | | 18 | | // грузились полными сущностями и уходили в синк статусов Ozon. Заказ, застрявший больше двух |
| | | 19 | | // месяцев назад, уже либо имеет задачу, либо разбирается вручную — заводить по нему SLA поздно. |
| | | 20 | | private const int CandidateLookbackDays = 60; |
| | | 21 | | |
| | | 22 | | // Потолок одного прохода актуализации статусов: за ним стоят HTTP-вызовы к Ozon и |
| | | 23 | | // UPDATE ... WHERE Id IN (...). Без потолка urgent-кандидаты попадали в батч целиком — |
| | | 24 | | // на проде ловились IN-списки на 18 707 идентификаторов. |
| | | 25 | | private const int MaxStatusRefreshBatch = 300; |
| | | 26 | | |
| | | 27 | | private readonly ApplicationDbContext _db; |
| | | 28 | | private readonly IOrderDeliveryStatusSynchronizer _deliveryStatusSynchronizer; |
| | | 29 | | private readonly IOrderControlCandidateStatusSynchronizer _candidateStatusSynchronizer; |
| | | 30 | | private readonly TimeProvider _timeProvider; |
| | | 31 | | |
| | 16 | 32 | | public OrderControlService(ApplicationDbContext db, |
| | 16 | 33 | | IOrderDeliveryStatusSynchronizer deliveryStatusSynchronizer, |
| | 16 | 34 | | IOrderControlCandidateStatusSynchronizer candidateStatusSynchronizer, |
| | 16 | 35 | | TimeProvider? timeProvider = null) |
| | | 36 | | { |
| | 16 | 37 | | _db = db; |
| | 16 | 38 | | _deliveryStatusSynchronizer = deliveryStatusSynchronizer; |
| | 16 | 39 | | _candidateStatusSynchronizer = candidateStatusSynchronizer; |
| | 16 | 40 | | _timeProvider = timeProvider ?? TimeProvider.System; |
| | 16 | 41 | | } |
| | | 42 | | |
| | | 43 | | public async Task<int> EvaluateAsync(CancellationToken cancellationToken = default) |
| | | 44 | | { |
| | 15 | 45 | | var nowUtc = _timeProvider.GetUtcNow().UtcDateTime; |
| | 15 | 46 | | var localNow = TimeZoneInfo.ConvertTimeFromUtc(nowUtc, RussianTimeZoneHelper.Zone); |
| | 15 | 47 | | var settings = await _db.OrderControlSettings.AsNoTracking().FirstOrDefaultAsync(x => x.Id == 1, cancellationTok |
| | 15 | 48 | | var evaluationIntervalMinutes = Math.Clamp(settings?.IntervalMinutes ?? DefaultEvaluationIntervalMinutes, 1, 24 |
| | 15 | 49 | | await _deliveryStatusSynchronizer.SynchronizeCancelledAsync(cancellationToken: cancellationToken); |
| | 15 | 50 | | await _deliveryStatusSynchronizer.SynchronizeDeliveredAsync(cancellationToken: cancellationToken); |
| | 15 | 51 | | var rules = await _db.OrderControlRules.AsNoTracking().Where(x => x.IsActive).ToListAsync(cancellationToken); |
| | 15 | 52 | | var created = 0; |
| | | 53 | | |
| | 15 | 54 | | var initialCandidates = new Dictionary<int, List<Candidate>>(); |
| | 56 | 55 | | foreach (var rule in rules) |
| | 13 | 56 | | initialCandidates[rule.Id] = await GetCandidatesAsync(rule, localNow, null, cancellationToken); |
| | | 57 | | |
| | 28 | 58 | | var rulesById = rules.ToDictionary(x => x.Id); |
| | 15 | 59 | | var candidateEntries = initialCandidates |
| | 421 | 60 | | .SelectMany(x => x.Value.Select(candidate => new CandidateEntry( |
| | 421 | 61 | | candidate, |
| | 421 | 62 | | BuildKey(rulesById[x.Key], candidate.Order, candidate.AnchorUtc, localNow)))) |
| | 15 | 63 | | .ToList(); |
| | 423 | 64 | | var candidateKeys = candidateEntries.Select(x => x.DeduplicationKey).Distinct().ToArray(); |
| | 15 | 65 | | var existingKeys = candidateKeys.Length == 0 |
| | 15 | 66 | | ? new HashSet<string>(StringComparer.Ordinal) |
| | 15 | 67 | | : (await _db.OrderControlTasks.AsNoTracking() |
| | 15 | 68 | | .Where(x => candidateKeys.Contains(x.DeduplicationKey)) |
| | 15 | 69 | | .Select(x => x.DeduplicationKey) |
| | 15 | 70 | | .ToListAsync(cancellationToken)).ToHashSet(StringComparer.Ordinal); |
| | 15 | 71 | | var activeOrderIds = await _db.OrderControlTasks.AsNoTracking() |
| | 15 | 72 | | .Where(x => OrderControlTaskStatus.Active.Contains(x.Status) && |
| | 15 | 73 | | x.Order != null && x.Order.OzonClient != null && x.Order.OzonClient.ClientType == ClientType.OZO |
| | 15 | 74 | | .OrderByDescending(x => x.Status == OrderControlTaskStatus.Overdue) |
| | 15 | 75 | | .ThenBy(x => x.DueAtUtc) |
| | 15 | 76 | | .Select(x => x.OrderId) |
| | 15 | 77 | | .ToListAsync(cancellationToken); |
| | 15 | 78 | | var refreshCandidates = candidateEntries |
| | 408 | 79 | | .Where(x => !existingKeys.Contains(x.DeduplicationKey)) |
| | 407 | 80 | | .OrderBy(x => x.Candidate.WarningAtUtc) |
| | 407 | 81 | | .ThenBy(x => x.Candidate.DueAtUtc) |
| | 407 | 82 | | .ThenBy(x => x.Candidate.Order.ProcessingDate) |
| | 15 | 83 | | .ToList(); |
| | 15 | 84 | | var urgentCandidateIds = refreshCandidates |
| | 407 | 85 | | .Where(x => x.Candidate.WarningAtUtc <= nowUtc) |
| | 407 | 86 | | .Select(x => x.Candidate.Order.Id) |
| | 15 | 87 | | .Distinct() |
| | 15 | 88 | | .ToArray(); |
| | 15 | 89 | | var allRefreshOrderIds = refreshCandidates |
| | 407 | 90 | | .Select(x => x.Candidate.Order.Id) |
| | 15 | 91 | | .Concat(activeOrderIds) |
| | 15 | 92 | | .Distinct() |
| | 15 | 93 | | .ToArray(); |
| | 15 | 94 | | var orderIdsToRefresh = SelectDailyStatusRefreshBatch(allRefreshOrderIds, urgentCandidateIds, nowUtc, evaluation |
| | 15 | 95 | | .ToHashSet(); |
| | | 96 | | // Набор заказов, чей статус реально удалось обновить в этом проходе — а не общий флаг успеха |
| | | 97 | | // на весь батч. Раньше одна неудавшаяся заявка к Ozon (таймаут по конкретному shipment'у) блокировала |
| | | 98 | | // создание задач для ВСЕХ кандидатов тика, включая никак не связанные с этим заказы. |
| | 15 | 99 | | var refreshedOrderIds = await _candidateStatusSynchronizer.SynchronizeAsync(orderIdsToRefresh, cancellationToken |
| | | 100 | | |
| | 15 | 101 | | var createdKeys = new HashSet<string>(existingKeys, StringComparer.Ordinal); |
| | 15 | 102 | | var refreshedIdList = refreshedOrderIds.ToArray(); |
| | 56 | 103 | | foreach (var rule in rules) |
| | | 104 | | { |
| | | 105 | | // После ответа Ozon перечитываем кандидатов: отменённые и доставленные заказы в SLA не попадут. |
| | | 106 | | // Сужаем до заказов, чей статус реально обновился: по остальным задача всё равно не создаётся, |
| | | 107 | | // а без сужения это был второй полный проход по Orders за тик. |
| | 13 | 108 | | var candidates = await GetCandidatesAsync(rule, localNow, refreshedIdList, cancellationToken); |
| | 638 | 109 | | foreach (var candidate in candidates) |
| | | 110 | | { |
| | 306 | 111 | | var key = BuildKey(rule, candidate.Order, candidate.AnchorUtc, localNow); |
| | 306 | 112 | | if (!createdKeys.Add(key)) |
| | | 113 | | continue; |
| | | 114 | | |
| | 305 | 115 | | var task = new OrderControlTask |
| | 305 | 116 | | { |
| | 305 | 117 | | RuleId = rule.Id, |
| | 305 | 118 | | OrderId = candidate.Order.Id, |
| | 305 | 119 | | DeduplicationKey = key, |
| | 305 | 120 | | Priority = rule.Priority, |
| | 305 | 121 | | TargetAppRoleId = rule.TargetAppRoleId, |
| | 305 | 122 | | WarningAtUtc = candidate.WarningAtUtc, |
| | 305 | 123 | | DueAtUtc = candidate.DueAtUtc, |
| | 305 | 124 | | Status = nowUtc >= candidate.DueAtUtc ? OrderControlTaskStatus.Overdue : OrderControlTaskStatus.Open |
| | 305 | 125 | | SnapshotJson = JsonSerializer.Serialize(new |
| | 305 | 126 | | { |
| | 305 | 127 | | candidate.Reason, |
| | 305 | 128 | | ShipmentNumber = candidate.Order.ShipmentNumber, |
| | 305 | 129 | | Status = candidate.Order.AppStatusName, |
| | 305 | 130 | | candidate.AnchorUtc |
| | 305 | 131 | | }), |
| | 305 | 132 | | CreatedAtUtc = nowUtc, |
| | 305 | 133 | | UpdatedAtUtc = nowUtc |
| | 305 | 134 | | }; |
| | 305 | 135 | | _db.OrderControlTasks.Add(task); |
| | | 136 | | try |
| | | 137 | | { |
| | 305 | 138 | | await _db.SaveChangesAsync(cancellationToken); |
| | 305 | 139 | | } |
| | 0 | 140 | | catch (DbUpdateException) |
| | | 141 | | { |
| | | 142 | | // Уникальный индекс на DeduplicationKey: параллельный запуск EvaluateAsync |
| | | 143 | | // (второй сервер, ручной RunNow) уже создал эту же задачу — не роняем весь проход. |
| | 0 | 144 | | _db.Entry(task).State = EntityState.Detached; |
| | 0 | 145 | | continue; |
| | | 146 | | } |
| | 305 | 147 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent |
| | 305 | 148 | | { |
| | 305 | 149 | | TaskId = task.Id, |
| | 305 | 150 | | EventType = task.Status == OrderControlTaskStatus.Overdue ? "CreatedOverdue" : "Created", |
| | 305 | 151 | | Details = candidate.Reason, |
| | 305 | 152 | | CreatedAtUtc = nowUtc |
| | 305 | 153 | | }); |
| | 305 | 154 | | await _db.SaveChangesAsync(cancellationToken); |
| | 305 | 155 | | await NotifyCreatedTaskAsync(task, candidate.Order, cancellationToken); |
| | 305 | 156 | | created++; |
| | 305 | 157 | | } |
| | 13 | 158 | | } |
| | | 159 | | |
| | 15 | 160 | | var active = await _db.OrderControlTasks |
| | 15 | 161 | | .Include(x => x.Order).ThenInclude(x => x!.AppStatus) |
| | 15 | 162 | | .Include(x => x.Order).ThenInclude(x => x!.ClientStatus) |
| | 15 | 163 | | .Include(x => x.Order).ThenInclude(x => x!.OzonClient) |
| | 15 | 164 | | .Include(x => x.Rule) |
| | 15 | 165 | | .Where(x => OrderControlTaskStatus.Active.Contains(x.Status)) |
| | 15 | 166 | | .ToListAsync(cancellationToken); |
| | 684 | 167 | | foreach (var task in active) |
| | | 168 | | { |
| | 327 | 169 | | if (task.Order is null || task.Rule is null) |
| | | 170 | | continue; |
| | 327 | 171 | | if (!IsOzonOrder(task.Order)) |
| | | 172 | | { |
| | 1 | 173 | | task.Status = OrderControlTaskStatus.Completed; |
| | 1 | 174 | | task.ClosedAtUtc = nowUtc; |
| | 1 | 175 | | task.CloseReason = "Закрыто автоматически: OrderControl применяется только к заказам Ozon."; |
| | 1 | 176 | | task.UpdatedAtUtc = nowUtc; |
| | 1 | 177 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "AutoCompleted" |
| | 1 | 178 | | continue; |
| | | 179 | | } |
| | 326 | 180 | | if (!StillRequiresAction(task.Rule.RuleType, task.Order, localNow)) |
| | | 181 | | { |
| | 0 | 182 | | task.Status = OrderControlTaskStatus.Completed; |
| | 0 | 183 | | task.ClosedAtUtc = nowUtc; |
| | 0 | 184 | | task.CloseReason = "Закрыто автоматически: состояние заказа изменилось."; |
| | 0 | 185 | | task.UpdatedAtUtc = nowUtc; |
| | 0 | 186 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "AutoCompleted" |
| | | 187 | | } |
| | 326 | 188 | | else if (nowUtc >= task.DueAtUtc && task.Status != OrderControlTaskStatus.Overdue) |
| | | 189 | | { |
| | 0 | 190 | | task.Status = OrderControlTaskStatus.Overdue; |
| | 0 | 191 | | task.EscalatedAtUtc ??= nowUtc; |
| | 0 | 192 | | task.UpdatedAtUtc = nowUtc; |
| | 0 | 193 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "Overdue", Crea |
| | | 194 | | } |
| | | 195 | | } |
| | 15 | 196 | | await _db.SaveChangesAsync(cancellationToken); |
| | 15 | 197 | | return created; |
| | 15 | 198 | | } |
| | | 199 | | |
| | | 200 | | public async Task<IReadOnlyList<OrderControlTask>> GetAvailableTasksAsync(string userId, bool isAdmin, CancellationT |
| | | 201 | | { |
| | 0 | 202 | | var roleIds = await _db.UserAppRoles.Where(x => x.UserId == userId).Select(x => x.AppRoleId).ToListAsync(cancell |
| | 0 | 203 | | var query = _db.OrderControlTasks.AsNoTracking() |
| | 0 | 204 | | .Include(x => x.Order).ThenInclude(x => x!.AppStatus).ThenInclude(x => x!.StatusColor) |
| | 0 | 205 | | .Include(x => x.Order).ThenInclude(x => x!.ClientStatus).ThenInclude(x => x!.StatusColor) |
| | 0 | 206 | | .Include(x => x.Order).ThenInclude(x => x!.Supplier) |
| | 0 | 207 | | .Include(x => x.Order).ThenInclude(x => x!.ProductInfo) |
| | 0 | 208 | | .Include(x => x.Order).ThenInclude(x => x!.EtProducer) |
| | 0 | 209 | | .Include(x => x.Order).ThenInclude(x => x!.Manufacturer) |
| | 0 | 210 | | .Include(x => x.Order).ThenInclude(x => x!.OzonClient) |
| | 0 | 211 | | .Include(x => x.Rule).Include(x => x.TargetAppRole) |
| | 0 | 212 | | .Where(x => OrderControlTaskStatus.Active.Contains(x.Status) && |
| | 0 | 213 | | x.Order != null && x.Order.OzonClient != null && x.Order.OzonClient.ClientType == ClientType.OZO |
| | 0 | 214 | | if (!isAdmin) |
| | 0 | 215 | | query = query.Where(x => roleIds.Contains(x.TargetAppRoleId)); |
| | 0 | 216 | | return await query.OrderByDescending(x => x.Status == OrderControlTaskStatus.Overdue) |
| | 0 | 217 | | .ThenBy(x => x.DueAtUtc) |
| | 0 | 218 | | .ThenBy(x => x.Order!.ProcessingDate) |
| | 0 | 219 | | .ToListAsync(cancellationToken); |
| | 0 | 220 | | } |
| | | 221 | | |
| | | 222 | | public async Task<int> GetAvailableTaskCountAsync(string userId, bool isAdmin, CancellationToken cancellationToken = |
| | | 223 | | { |
| | 1 | 224 | | var roleIds = await _db.UserAppRoles.Where(x => x.UserId == userId).Select(x => x.AppRoleId).ToListAsync(cancell |
| | 1 | 225 | | var query = _db.OrderControlTasks.AsNoTracking() |
| | 1 | 226 | | .Where(x => OrderControlTaskStatus.Active.Contains(x.Status) && |
| | 1 | 227 | | x.Order != null && x.Order.OzonClient != null && x.Order.OzonClient.ClientType == ClientType.OZO |
| | 1 | 228 | | if (!isAdmin) |
| | 0 | 229 | | query = query.Where(x => roleIds.Contains(x.TargetAppRoleId)); |
| | 1 | 230 | | return await query.CountAsync(cancellationToken); |
| | 1 | 231 | | } |
| | | 232 | | |
| | | 233 | | public async Task<bool> ClaimAsync(long taskId, string userId, bool isAdmin, CancellationToken cancellationToken = d |
| | | 234 | | { |
| | 2 | 235 | | if (!isAdmin) |
| | | 236 | | { |
| | 0 | 237 | | var permitted = await FindPermittedTaskAsync(taskId, userId, isAdmin, cancellationToken); |
| | 0 | 238 | | if (permitted is null) |
| | 0 | 239 | | return false; |
| | | 240 | | } |
| | | 241 | | |
| | | 242 | | // ExecuteUpdateAsync с условием ClaimedByUserId == null в WHERE делает захват атомарным — |
| | | 243 | | // read-then-write через сущность допускал бы двух пользователей, claim'ящих одну задачу одновременно. |
| | 2 | 244 | | var now = DateTime.UtcNow; |
| | 2 | 245 | | var updated = await _db.OrderControlTasks |
| | 2 | 246 | | .Where(x => x.Id == taskId && OrderControlTaskStatus.Active.Contains(x.Status) && x.ClaimedByUserId == null) |
| | 2 | 247 | | .ExecuteUpdateAsync(setters => setters |
| | 2 | 248 | | .SetProperty(x => x.ClaimedByUserId, userId) |
| | 2 | 249 | | .SetProperty(x => x.ClaimedAtUtc, now) |
| | 2 | 250 | | .SetProperty(x => x.Status, OrderControlTaskStatus.InProgress) |
| | 2 | 251 | | .SetProperty(x => x.UpdatedAtUtc, now), cancellationToken); |
| | 2 | 252 | | if (updated == 0) |
| | 1 | 253 | | return false; |
| | 1 | 254 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = taskId, EventType = "Claimed", UserId = user |
| | 1 | 255 | | await _db.SaveChangesAsync(cancellationToken); |
| | 1 | 256 | | return true; |
| | 2 | 257 | | } |
| | | 258 | | |
| | | 259 | | public async Task<bool> CloseAsync(long taskId, string userId, string reason, bool isAdmin, CancellationToken cancel |
| | | 260 | | { |
| | 0 | 261 | | if (string.IsNullOrWhiteSpace(reason)) |
| | 0 | 262 | | return false; |
| | 0 | 263 | | var task = await FindPermittedTaskAsync(taskId, userId, isAdmin, cancellationToken); |
| | 0 | 264 | | if (task is null) |
| | 0 | 265 | | return false; |
| | 0 | 266 | | task.Status = OrderControlTaskStatus.Closed; |
| | 0 | 267 | | task.ClosedAtUtc = DateTime.UtcNow; |
| | 0 | 268 | | task.ClosedByUserId = userId; |
| | 0 | 269 | | task.CloseReason = reason.Trim(); |
| | 0 | 270 | | task.UpdatedAtUtc = DateTime.UtcNow; |
| | 0 | 271 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "ClosedManually", UserI |
| | 0 | 272 | | await _db.SaveChangesAsync(cancellationToken); |
| | 0 | 273 | | return true; |
| | 0 | 274 | | } |
| | | 275 | | |
| | | 276 | | public async Task<bool> RemoveFromQueueAsync(long taskId, string userId, bool isAdmin, CancellationToken cancellatio |
| | | 277 | | { |
| | 1 | 278 | | var task = await FindPermittedTaskAsync(taskId, userId, isAdmin, cancellationToken); |
| | 1 | 279 | | if (task is null) |
| | 0 | 280 | | return false; |
| | | 281 | | |
| | | 282 | | // Статус, а не физическое удаление: сохраняет OrderControlTaskEvents (аудит) и не даёт |
| | | 283 | | // ближайшему EvaluateAsync тут же пересоздать ту же задачу по свободному DeduplicationKey. |
| | 1 | 284 | | var now = DateTime.UtcNow; |
| | 1 | 285 | | task.Status = OrderControlTaskStatus.Removed; |
| | 1 | 286 | | task.ClosedAtUtc = now; |
| | 1 | 287 | | task.ClosedByUserId = userId; |
| | 1 | 288 | | task.CloseReason = "Удалено из очереди без указания причины."; |
| | 1 | 289 | | task.UpdatedAtUtc = now; |
| | 1 | 290 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "RemovedFromQueue", Use |
| | 1 | 291 | | await _db.SaveChangesAsync(cancellationToken); |
| | 1 | 292 | | return true; |
| | 1 | 293 | | } |
| | | 294 | | |
| | | 295 | | private async Task<OrderControlTask?> FindPermittedTaskAsync(long taskId, string userId, bool isAdmin, CancellationT |
| | | 296 | | { |
| | 1 | 297 | | var task = await _db.OrderControlTasks.FirstOrDefaultAsync(x => x.Id == taskId && OrderControlTaskStatus.Active. |
| | 1 | 298 | | if (task is null || isAdmin) |
| | 1 | 299 | | return task; |
| | 0 | 300 | | var allowed = await _db.UserAppRoles.AnyAsync(x => x.UserId == userId && x.AppRoleId == task.TargetAppRoleId, ct |
| | 0 | 301 | | return allowed ? task : null; |
| | 1 | 302 | | } |
| | | 303 | | |
| | | 304 | | /// <summary> |
| | | 305 | | /// Кандидаты правила. <paramref name="restrictToOrderIds"/> сужает выборку до конкретных заказов — |
| | | 306 | | /// на повторном проходе после актуализации статусов задачи всё равно создаются только для них. |
| | | 307 | | /// </summary> |
| | | 308 | | private async Task<List<Candidate>> GetCandidatesAsync(OrderControlRule rule, DateTime localNow, |
| | | 309 | | IReadOnlyCollection<int>? restrictToOrderIds, CancellationToken ct) |
| | | 310 | | { |
| | 26 | 311 | | if (restrictToOrderIds is { Count: 0 }) |
| | 6 | 312 | | return []; |
| | | 313 | | |
| | 20 | 314 | | return rule.RuleType switch |
| | 20 | 315 | | { |
| | 3 | 316 | | "NewUnprocessedToday" => await GetNewUnprocessedAsync(localNow, restrictToOrderIds, ct), |
| | 15 | 317 | | "UnprocessedOver12Hours" => await GetUnprocessedOver12HoursAsync(rule, restrictToOrderIds, ct), |
| | 0 | 318 | | "SupplierArrivalOverdue" => await GetSupplierOverdueAsync(restrictToOrderIds, ct), |
| | 2 | 319 | | "NoStatusMovement" => await GetNoMovementAsync(rule, restrictToOrderIds, ct), |
| | 0 | 320 | | _ => [] |
| | 20 | 321 | | }; |
| | 26 | 322 | | } |
| | | 323 | | |
| | | 324 | | /// <summary> |
| | | 325 | | /// Базовый запрос кандидатов — без Include: правилам нужны только идентификатор, номер |
| | | 326 | | /// отправления, даты и имена статусов, а не граф Order целиком (на проде это были десятки |
| | | 327 | | /// тысяч полных сущностей за прогон). Проекция навешивается последней, уже поверх фильтров: |
| | | 328 | | /// EF не транслирует Where поверх конструктора record. |
| | | 329 | | /// </summary> |
| | | 330 | | private IQueryable<Order> CandidateOrders(IReadOnlyCollection<int>? restrictToOrderIds) |
| | | 331 | | { |
| | 19 | 332 | | var query = _db.Orders.AsNoTracking() |
| | 19 | 333 | | .Where(x => x.OzonClient != null && x.OzonClient.ClientType == ClientType.OZON); |
| | 19 | 334 | | return restrictToOrderIds is { Count: > 0 } |
| | 19 | 335 | | ? query.Where(x => restrictToOrderIds.Contains(x.Id)) |
| | 19 | 336 | | : query; |
| | | 337 | | } |
| | | 338 | | |
| | 1 | 339 | | private static readonly Expression<Func<Order, CandidateOrder>> ToCandidateOrder = x => new CandidateOrder( |
| | 1 | 340 | | x.Id, |
| | 1 | 341 | | x.ShipmentNumber, |
| | 1 | 342 | | x.ProcessingDate, |
| | 1 | 343 | | x.LastStatusChangeDate, |
| | 1 | 344 | | x.AppStatus != null ? x.AppStatus.Name : null, |
| | 1 | 345 | | x.ClientStatus != null ? x.ClientStatus.Name : null, |
| | 1 | 346 | | x.Supplier != null ? x.Supplier.ExpectedDeliveryHours : null); |
| | | 347 | | |
| | | 348 | | private async Task<List<Candidate>> GetNewUnprocessedAsync(DateTime localNow, |
| | | 349 | | IReadOnlyCollection<int>? restrictToOrderIds, CancellationToken ct) |
| | | 350 | | { |
| | | 351 | | // ProcessingDate хранится как наивное московское время (см. OrderDailySummaryService), |
| | | 352 | | // поэтому границы дня сравниваются напрямую, без ToUtc — иначе окно съезжает на 3 часа. |
| | 4 | 353 | | if (localNow.TimeOfDay < new TimeSpan(15, 30, 0)) return []; |
| | 2 | 354 | | var start = localNow.Date; |
| | 2 | 355 | | var end = start.AddDays(1); |
| | 2 | 356 | | var orders = await CandidateOrders(restrictToOrderIds) |
| | 2 | 357 | | .Where(x => x.ProcessingDate >= start && x.ProcessingDate < end && |
| | 2 | 358 | | (x.AppStatus == null || x.AppStatus.Name == "Не указан") && |
| | 2 | 359 | | (x.ClientStatus == null || (x.ClientStatus.Name != "Отменен" && x.ClientStatus.Name != "Отменён" |
| | 2 | 360 | | .Select(ToCandidateOrder) |
| | 2 | 361 | | .ToListAsync(ct); |
| | 2 | 362 | | var warning = ToUtc(start.AddHours(15).AddMinutes(30)); |
| | 2 | 363 | | var due = ToUtc(start.AddHours(16)); |
| | 4 | 364 | | return orders.Select(x => new Candidate(x, ToUtc(x.ProcessingDate ?? start), warning, due, "Заказ создан сегодня |
| | 3 | 365 | | } |
| | | 366 | | |
| | | 367 | | private async Task<List<Candidate>> GetSupplierOverdueAsync(IReadOnlyCollection<int>? restrictToOrderIds, Cancellati |
| | | 368 | | { |
| | 0 | 369 | | var lookbackCutoff = LookbackCutoffLocal(); |
| | 0 | 370 | | var orders = await CandidateOrders(restrictToOrderIds) |
| | 0 | 371 | | .Where(x => x.AppStatus != null && x.AppStatus.Name == "Заказан поставщику" && |
| | 0 | 372 | | (x.ClientStatus == null || (x.ClientStatus.Name != "Отменен" && x.ClientStatus.Name != "Отменён" |
| | 0 | 373 | | x.Supplier != null && x.Supplier.ExpectedDeliveryHours != null && |
| | 0 | 374 | | x.LastStatusChangeDate != null && x.LastStatusChangeDate >= lookbackCutoff) |
| | 0 | 375 | | .Select(ToCandidateOrder) |
| | 0 | 376 | | .ToListAsync(ct); |
| | 0 | 377 | | return orders.Select(x => |
| | 0 | 378 | | { |
| | 0 | 379 | | var anchor = ToUtc(x.LastStatusChangeDate!.Value); |
| | 0 | 380 | | var due = anchor.AddHours(x.SupplierExpectedDeliveryHours!.Value); |
| | 0 | 381 | | return new Candidate(x, anchor, due, due, "Истёк норматив поставщика."); |
| | 0 | 382 | | }).Where(x => DateTime.UtcNow >= x.WarningAtUtc).ToList(); |
| | 0 | 383 | | } |
| | | 384 | | |
| | | 385 | | private async Task<List<Candidate>> GetUnprocessedOver12HoursAsync(OrderControlRule rule, |
| | | 386 | | IReadOnlyCollection<int>? restrictToOrderIds, CancellationToken ct) |
| | | 387 | | { |
| | 15 | 388 | | var processingTimeoutHours = ReadHoursParameter(rule, defaultHours: 12); |
| | 15 | 389 | | var nowUtc = DateTime.UtcNow; |
| | 15 | 390 | | var lookbackCutoff = LookbackCutoffLocal(); |
| | 15 | 391 | | var orders = await CandidateOrders(restrictToOrderIds) |
| | 15 | 392 | | .Where(x => x.ProcessingDate != null && x.ProcessingDate >= lookbackCutoff && |
| | 15 | 393 | | (x.AppStatus == null || x.AppStatus.Name == "Не указан")) |
| | 15 | 394 | | .Select(ToCandidateOrder) |
| | 15 | 395 | | .ToListAsync(ct); |
| | | 396 | | |
| | 15 | 397 | | return orders.Select(x => |
| | 15 | 398 | | { |
| | 713 | 399 | | var anchor = ToUtc(x.ProcessingDate!.Value); |
| | 713 | 400 | | var due = anchor.AddHours(processingTimeoutHours); |
| | 713 | 401 | | return new Candidate(x, anchor, due, due, |
| | 713 | 402 | | $"Заказ более {processingTimeoutHours} часов находится без системного статуса."); |
| | 728 | 403 | | }).Where(x => x.DueAtUtc <= nowUtc).ToList(); |
| | 15 | 404 | | } |
| | | 405 | | |
| | | 406 | | private async Task<List<Candidate>> GetNoMovementAsync(OrderControlRule rule, |
| | | 407 | | IReadOnlyCollection<int>? restrictToOrderIds, CancellationToken ct) |
| | | 408 | | { |
| | 2 | 409 | | var hours = ReadHoursParameter(rule, defaultHours: 24); |
| | 2 | 410 | | var cutoff = DateTime.UtcNow.AddHours(-hours); |
| | 2 | 411 | | var lookbackCutoff = LookbackCutoffLocal(); |
| | 2 | 412 | | var orders = await CandidateOrders(restrictToOrderIds) |
| | 2 | 413 | | .Where(x => x.LastStatusChangeDate != null && x.LastStatusChangeDate <= cutoff && |
| | 2 | 414 | | x.LastStatusChangeDate >= lookbackCutoff && x.AppStatus != null && |
| | 2 | 415 | | x.AppStatus.Name != "Отменен" && x.AppStatus.Name != "Доставлен" && |
| | 2 | 416 | | (x.ClientStatus == null || (x.ClientStatus.Name != "Отменен" && x.ClientStatus.Name != "Отменён" |
| | 2 | 417 | | .Select(ToCandidateOrder) |
| | 2 | 418 | | .ToListAsync(ct); |
| | 2 | 419 | | return orders.Select(x => new Candidate(x, ToUtc(x.LastStatusChangeDate!.Value), ToUtc(x.LastStatusChangeDate!.V |
| | 2 | 420 | | } |
| | | 421 | | |
| | | 422 | | private static int ReadHoursParameter(OrderControlRule rule, int defaultHours) |
| | | 423 | | { |
| | 17 | 424 | | if (string.IsNullOrWhiteSpace(rule.ParametersJson)) |
| | 1 | 425 | | return defaultHours; |
| | 16 | 426 | | using var json = JsonDocument.Parse(rule.ParametersJson); |
| | 16 | 427 | | return json.RootElement.TryGetProperty("hours", out var value) && value.TryGetInt32(out var configured) |
| | 16 | 428 | | ? Math.Clamp(configured, 1, 24 * 30) |
| | 16 | 429 | | : defaultHours; |
| | 16 | 430 | | } |
| | | 431 | | |
| | | 432 | | /// <summary> |
| | | 433 | | /// Нижняя граница окна кандидатов. ProcessingDate и LastStatusChangeDate — наивное московское |
| | | 434 | | /// время, поэтому граница считается в нём же, без ToUtc. |
| | | 435 | | /// </summary> |
| | | 436 | | private DateTime LookbackCutoffLocal() => |
| | 17 | 437 | | TimeZoneInfo.ConvertTimeFromUtc(_timeProvider.GetUtcNow().UtcDateTime, RussianTimeZoneHelper.Zone) |
| | 17 | 438 | | .AddDays(-CandidateLookbackDays); |
| | | 439 | | |
| | 326 | 440 | | private static bool StillRequiresAction(string ruleType, Order order, DateTime localNow) => ruleType switch |
| | 326 | 441 | | { |
| | 1 | 442 | | "NewUnprocessedToday" => order.ProcessingDate is not null && |
| | 1 | 443 | | order.ProcessingDate >= localNow.Date && |
| | 1 | 444 | | order.ProcessingDate < localNow.Date.AddDays(1) && |
| | 1 | 445 | | (order.AppStatus is null || order.AppStatus.Name == "Не указан"), |
| | 305 | 446 | | "UnprocessedOver12Hours" => order.ProcessingDate is not null && (order.AppStatus is null || order.AppStatus.Name |
| | 0 | 447 | | "SupplierArrivalOverdue" => order.AppStatus?.Name == "Заказан поставщику" && !IsCancelledByMarketplace(order), |
| | 20 | 448 | | "NoStatusMovement" => order.AppStatus?.Name is not ("Отменен" or "Доставлен") && !IsCancelledByMarketplace(order |
| | 0 | 449 | | _ => false |
| | 326 | 450 | | }; |
| | | 451 | | |
| | | 452 | | private static bool IsCancelledByMarketplace(Order order) => |
| | 20 | 453 | | order.ClientStatus?.Name is "Отменен" or "Отменён" or "Отменено"; |
| | | 454 | | |
| | 327 | 455 | | private static bool IsOzonOrder(Order order) => order.OzonClient?.ClientType == ClientType.OZON; |
| | | 456 | | |
| | 714 | 457 | | private static string BuildKey(OrderControlRule rule, CandidateOrder order, DateTime anchorUtc, DateTime localNow) = |
| | 714 | 458 | | ? $"{rule.Id}:{order.Id}:{localNow:yyyyMMdd}" |
| | 714 | 459 | | : $"{rule.Id}:{order.Id}:{anchorUtc:yyyyMMddHHmmss}"; |
| | | 460 | | |
| | | 461 | | /// <summary> |
| | | 462 | | /// Делит очередь актуализации статусов на циклические батчи в сутки — число батчей считается |
| | | 463 | | /// от фактического интервала прогона (OrderControlSettings.IntervalMinutes), а не от константы, |
| | | 464 | | /// иначе при интервале, отличном от 5 минут, часть заказов никогда не попадёт в свой слот. |
| | | 465 | | /// Задачи с наступившим предупреждением проверяются без ожидания своего слота, но и они |
| | | 466 | | /// подчиняются потолку <see cref="MaxStatusRefreshBatch"/>: за батчем стоят HTTP-вызовы к Ozon, |
| | | 467 | | /// и неограниченный urgent растягивал один прогон на десятки минут. Порядок urgent сохраняется |
| | | 468 | | /// (вызывающий передаёт их отсортированными по времени предупреждения), поэтому при обрезке |
| | | 469 | | /// первыми проверяются самые срочные, а остальные догоняют следующими тиками. |
| | | 470 | | /// </summary> |
| | | 471 | | private static IReadOnlyList<int> SelectDailyStatusRefreshBatch( |
| | | 472 | | IReadOnlyCollection<int> allOrderIds, |
| | | 473 | | IReadOnlyCollection<int> urgentOrderIds, |
| | | 474 | | DateTime nowUtc, |
| | | 475 | | int evaluationIntervalMinutes) |
| | | 476 | | { |
| | 15 | 477 | | var all = allOrderIds.Distinct().ToArray(); |
| | 15 | 478 | | if (all.Length == 0) |
| | 6 | 479 | | return []; |
| | | 480 | | |
| | 9 | 481 | | var allSet = all.ToHashSet(); |
| | 9 | 482 | | var urgent = urgentOrderIds.Where(allSet.Contains).Distinct().Take(MaxStatusRefreshBatch).ToArray(); |
| | 9 | 483 | | var urgentSet = urgent.ToHashSet(); |
| | 558 | 484 | | var rotating = all.Where(x => !urgentSet.Contains(x)).OrderBy(x => x).ToArray(); |
| | 9 | 485 | | var remainingCapacity = MaxStatusRefreshBatch - urgent.Length; |
| | 9 | 486 | | if (rotating.Length == 0 || remainingCapacity <= 0) |
| | 6 | 487 | | return urgent; |
| | | 488 | | |
| | 3 | 489 | | var evaluationsPerDay = Math.Max(1, 24 * 60 / evaluationIntervalMinutes); |
| | 3 | 490 | | var batchSize = Math.Max(1, (int)Math.Ceiling(all.Length / (double)evaluationsPerDay)); |
| | 3 | 491 | | batchSize = Math.Min(batchSize, remainingCapacity); |
| | 3 | 492 | | var slot = (int)(nowUtc.TimeOfDay.TotalMinutes / evaluationIntervalMinutes) % evaluationsPerDay; |
| | 3 | 493 | | var start = (slot * batchSize) % rotating.Length; |
| | 3 | 494 | | var batch = new List<int>(urgent.Length + batchSize); |
| | 3 | 495 | | batch.AddRange(urgent); |
| | 30 | 496 | | for (var index = 0; index < batchSize; index++) |
| | 12 | 497 | | batch.Add(rotating[(start + index) % rotating.Length]); |
| | 3 | 498 | | return batch; |
| | | 499 | | } |
| | | 500 | | |
| | 719 | 501 | | private static DateTime ToUtc(DateTime local) => TimeZoneInfo.ConvertTimeToUtc(DateTime.SpecifyKind(local, DateTimeK |
| | | 502 | | private async Task NotifyCreatedTaskAsync(OrderControlTask task, CandidateOrder order, CancellationToken ct) |
| | | 503 | | { |
| | | 504 | | try |
| | | 505 | | { |
| | 305 | 506 | | var users = await _db.UserAppRoles.Where(x => x.AppRoleId == task.TargetAppRoleId).Select(x => x.UserId).ToL |
| | 305 | 507 | | await NotificationService.NotifyUsersAsync(users, "Контроль заказов", "warning", $"Требует действия заказ {o |
| | 0 | 508 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "SignalRDelivered", |
| | 0 | 509 | | await _db.SaveChangesAsync(ct); |
| | 0 | 510 | | } |
| | 305 | 511 | | catch (Exception ex) |
| | | 512 | | { |
| | 305 | 513 | | _db.OrderControlTaskEvents.Add(new OrderControlTaskEvent { TaskId = task.Id, EventType = "SignalRFailed", De |
| | 305 | 514 | | await _db.SaveChangesAsync(ct); |
| | | 515 | | } |
| | 305 | 516 | | } |
| | | 517 | | |
| | | 518 | | /// <summary> |
| | | 519 | | /// Проекция заказа под нужды правил SLA — вместо графа Order с Include на AppStatus, |
| | | 520 | | /// ClientStatus и Supplier. |
| | | 521 | | /// </summary> |
| | 715 | 522 | | private sealed record CandidateOrder( |
| | 1833 | 523 | | int Id, |
| | 610 | 524 | | string? ShipmentNumber, |
| | 1122 | 525 | | DateTime? ProcessingDate, |
| | 0 | 526 | | DateTime? LastStatusChangeDate, |
| | 305 | 527 | | string? AppStatusName, |
| | 0 | 528 | | string? ClientStatusName, |
| | 715 | 529 | | int? SupplierExpectedDeliveryHours); |
| | | 530 | | |
| | 8348 | 531 | | private sealed record Candidate(CandidateOrder Order, DateTime AnchorUtc, DateTime WarningAtUtc, DateTime DueAtUtc, |
| | 3666 | 532 | | private sealed record CandidateEntry(Candidate Candidate, string DeduplicationKey); |
| | | 533 | | } |