Compare commits

..

2 Commits

Author SHA1 Message Date
Дмитрий 1114cd1722 docs(brain): brain dashboard implementation plan
13 tasks across 3 phases — static server + topology extraction + 4 views
(Карта / Разбор / Лента / Агрегат). TDD on dashboard-core.js, smoke on UI.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-19 15:04:09 +03:00
Дмитрий 092f55829b docs(brain): brain dashboard design spec
Standalone HTML dashboard that visualises the observer episode log over
the automation-graph topology — 4 views (map / task-replay / session
feed / aggregate), graph as shared canvas, 3-phase build order.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-19 14:22:05 +03:00
207 changed files with 1903 additions and 27639 deletions
-43
View File
@@ -1,43 +0,0 @@
---
name: billing-audit
description: Аудит денежной корректности биллинг-кода Лидерры — money-инварианты при правке/ревью списаний, тарифов и баланса. Используй при «проверь списание», «аудит биллинга», «не теряются ли копейки», «идемпотентно ли списание», «корректна ли тарифная ступень», «что значит дрейф CsvReconcile», «провенанс charge_source». НЕ для моделирования процесса (process-modeling), поиска узких мест (process-analysis), security-аудита (D3), РСБУ/налогов (ru-tax-accounting), метрик выручки (product-management).
---
# Billing Audit — аудит денежной корректности биллинга Лидерры
Проектный скил раздела C6 карты «Финансы — биллинг и тарификация». Проверяет
**денежные инварианты** биллинг-подсистемы при правке или ревью кода. Объект —
корректность *начисления* (не процесс, не безопасность, не учёт/налоги).
## Когда использовать
- Правка/ревью кода в `app/app/Services/Billing/**`, `app/app/Jobs/Supplier/CsvReconcileJob.php`,
моделей `PricingTier`/`LeadCharge`, контроллеров биллинга.
- Вопрос «безопасно ли это денежно?» по списанию, тарифу, балансу, сверке.
## Процедура аудита (5 инвариантов)
Полный чек-лист с проверками и ссылками на файлы — `references/invariants.md`.
1. **Сохранение суммы** — все денежные операции через `bcmath` (bcadd/bcsub/bcmul/bcdiv,
scale фиксирован), никаких float; prepaid→₽ конвертация без потери копеек.
2. **Идемпотентность списания** — один лид = одно списание; повтор/ретрай джоба
не дублирует начисление (проверить уникальный ключ / advisory-lock / upsert).
3. **Корректность тарифной ступени**`PricingTierResolver` выбирает верную из 7
ступеней по объёму; границы ступеней (включительно/исключительно) однозначны.
4. **Дрейф сверки**`CsvReconcileJob` порог >5%: что сравнивается, что значит дрейф,
куда смотреть (рассинхрон поставки vs ошибка тарифа).
5. **Провенанс charge_source** — каждое списание имеет прослеживаемый источник
(`charge_source`); ручные/авто/CSV-восстановленные различимы.
## Границы
-`process-modeling` #52 / `process-analysis` #53 — те про *поток/процесс*; billing-audit про *деньги в коде*.
- ≠ D3 audit-security (#39/#40) — те про *безопасность*; billing-audit про *денежную корректность*.
-`ru-tax-accounting` #63 — тот про *учёт/налоги* (выход биллинга → налоговая база); billing-audit про *начисление*.
-`product-management:metrics-review` #42 — тот про *метрики выручки*; billing-audit про *корректность*.
## Связано
- Reuse: Boost #10 (модели), Pest #18 (тесты инвариантов), Larastan #12 (bcmath/без float), Sentry #34 / Redis #35 (runtime/очередь).
- ADR-012 (граница finance-tooling C6/C7).
@@ -1,22 +0,0 @@
{
"skill": "billing-audit",
"positive": [
"проверь корректность списания за лид",
"аудит денежной логики биллинга",
"не теряются ли копейки в prepaid→рублёвом балансе",
"идемпотентно ли списание при ретрае",
"правильно ли резолвится тарифная ступень",
"что значит дрейф >5% в CsvReconcile",
"проверь провенанс charge_source",
"ревью PricingTierResolver на ошибки округления",
"ledger двойной баланс — где может утечь сумма",
"audit charge invariants before merge"
],
"near_miss": [
{"prompt": "смоделируй BPMN процесса списания", "expect": "process-modeling #52"},
{"prompt": "где узкое место в воронке оплат", "expect": "process-analysis #53"},
{"prompt": "security-аудит платёжного эндпоинта", "expect": "D3 audit-security / Semgrep"},
{"prompt": "посчитай РСБУ-проводки по выручке", "expect": "ru-tax-accounting #63"},
{"prompt": "метрика MRR за месяц", "expect": "product-management metrics-review #42"}
]
}
@@ -1,46 +0,0 @@
# Денежные инварианты биллинга Лидерры — чек-лист аудита
Объект-файлы (на момент 20.05.2026):
- `app/app/Services/Billing/PricingTierResolver.php` — резолюция 7 ступеней (pure).
- `app/app/Services/Billing/LedgerService.php` — двойной баланс prepaid→₽ (bcmath).
- `app/app/Services/Billing/BillingTopupService.php` — пополнение.
- `app/app/Services/Billing/ChargeResult.php` — DTO результата списания.
- `app/app/Models/PricingTier.php`, `app/app/Models/LeadCharge.php`.
- `app/app/Repositories/PricingTierRepository.php`.
- `app/app/Jobs/Supplier/CsvReconcileJob.php` — hourly сверка, алерт дрейфа >5%.
- `app/app/Http/Controllers/Api/{AdminPricingTiersController,AdminBillingController,BillingController,TenantChargesController}.php`.
## I1. Сохранение суммы (bcmath, без float)
- [ ] Все арифметические операции с деньгами — `bcadd`/`bcsub`/`bcmul`/`bcdiv`/`bccomp` с явным `scale`.
- [ ] Нет `+`/`-`/`*`/`/` над денежными значениями (Larastan/grep на float-арифметику в Billing).
- [ ] prepaid→₽: конвертация округляет детерминированно (TRUNC/округление вниз в пользу tenant — свериться с кодом), сумма prepaid + ₽ не «исчезает».
- [ ] Денежные колонки — целочисленные копейки или DECIMAL, не float/double.
## I2. Идемпотентность списания
- [ ] Один лид → одно списание: уникальность по (lead_id) или advisory-lock в `LedgerService`.
- [ ] Ретрай `ImportLeadsJob`/`CsvReconcileJob` не создаёт дубль `lead_charges`.
- [ ] Транзакция + `lockForUpdate` на балансе при мутации (TOCTOU — см. Sprint 3 lockForUpdate).
## I3. Корректность тарифной ступени
- [ ] `PricingTierResolver` выбирает ступень по объёму `delivered_in_month` верно на границах.
- [ ] Границы ступеней непрерывны (нет дыр/перекрытий между 7 ступенями).
- [ ] Pest покрывает граничные значения (ступень N → N+1).
## I4. Дрейф сверки CsvReconcile
- [ ] Порог >5% — что сравнивается (поставка поставщика vs начислено) → `supplier_csv_reconcile_log`.
- [ ] Дрейф = рассинхрон поставки (норм) ИЛИ ошибка тарифа (баг) — различить по `charge_source`.
## I5. Провенанс charge_source
- [ ] Каждое `lead_charges.charge_source` заполнено и прослеживаемо.
- [ ] Авто/ручное/CSV-восстановленное (`recovered_from_csv_at`) различимы.
## Reuse-инструменты
Boost #10 (Eloquent-introspection), Pest #18 + pest-parallel-debugger (тесты + race),
Larastan #12 (статанализ bcmath), Sentry MCP #34 (runtime списаний), Redis MCP #35 (очередь сверки), context7 #60 (доки bcmath).
+1 -2
View File
@@ -24,12 +24,11 @@ Aggregator over observer evidence. Reads JSONL + optional MD notes, surfaces can
1. **Determine period**: ask user «за какой период» or default to «since last brain-retro» (find latest `docs/observer/notes/YYYY-MM-DD-brain-retro-*.md`).
2. **Read evidence**: glob `docs/observer/episodes-YYYY-MM.jsonl` for the period; read all lines as JSON.
3. **Read optional notes**: glob `docs/observer/notes/*.md` filtered by date.
4. **Update read-counter**: run `node tools/observer-of-observer.mjs record`. This atomically bumps `docs/observer/.read-counter.json` `last_read_at` to now and increments `read_count_last_period`. (Side-effect — used by C3 observer-of-observer for 54-week self-prune detection.)
4. **Update read-counter**: bump `docs/observer/.read-counter.json` `last_read_at` to now, increment `read_count_last_period`. (Side-effect — used by C3 observer-of-observer.)
5. **Run the deterministic analyzer**: `node tools/brain-retro-analyzer.mjs docs/observer/episodes-YYYY-MM.jsonl` (pass every monthly file in the period). It returns JSON with `episodeCount`, `observerErrorCount`, `tasks` (episodes grouped into tasks), `causalChains` (error→fix candidates) and `factorMatrix` (outcome distribution per factor). The analyzer deduplicates the routing-gate double-write and infers the true `outcome` of each episode from the next episode's `prompt_signal` — never trust the stored `outcome` (it is `unknown` at write time).
6. **Aggregate** per `references/aggregation-template.md` — fill the Factor analysis matrix from the analyzer's `factorMatrix`, the task groups from `tasks`, the causal-chain candidates from `causalChains`.
7. **Propose candidates** — clearly separated section «Candidates for owner review». Each candidate has rationale + suggested edit + rejection-option.
8. **Save retro note**: `docs/observer/notes/YYYY-MM-DD-brain-retro.md` with full aggregation.
8a. **Refresh STATUS.md**: `node tools/status-md-generator.mjs` — auto-rebuild dashboard so it reflects the just-finished retro (`Last /brain-retro: 0 day(s) ago`, current episode count, refreshed C1C5 controller statuses). Without this, STATUS.md only updates on the next git commit.
9. **Report to user**: high-signal summary.
## Output anatomy
@@ -70,14 +70,10 @@ For each factor below, render a table: factor value × outcome counts
- `observerErrorCount` from the analyzer — observer_error markers in the period.
Non-zero = the observer failed silently somewhere; investigate.
## Canonical chains L1L13+ hit rate (from analyzer `factorMatrix.chain_ref`)
## Canonical chains L1L12 hit rate
| chain | times | outcome split | notes |
|---|---|---|---|
Each node may belong to several L (a multi-chain episode is counted in each).
`null` = episodes outside any chain (`direct` + nodes not in L1L13+) — **not a
problem** per `memory/feedback_brain_unused_tools_not_problem`.
| chain | times | notes |
|---|---|---|
## Improvised chains (path_type=improvised, repeated ≥2)
@@ -1,62 +0,0 @@
---
name: laravel-backend-patterns
description: Backend-конвенции Лидерры (Laravel 13) — как писать controller→service→job, RLS-aware Eloquent, деньги через bcmath/LedgerService, идемпотентные джобы, partition-aware запросы. Используй при «как писать backend в Лидерре», «паттерн контроллера/сервиса/джоба», scaffolding новой backend-фичи. НЕ для generic-паттернов (architecture-patterns #38), аудита денег (billing-audit #62), РСБУ/налогов (ru-tax-accounting), security-аудита (D3).
---
# Laravel Backend Patterns — конвенции backend-кода Лидерры
Проектный скил, который описывает **как здесь пишут backend**, а не как рекомендует generic-Laravel.
При scaffolding новой фичи или ревью кода — сверяться с пятью конвенциями ниже.
Детальные примеры с образцами кода и антипаттернами — в `references/conventions.md`.
## 1. Слоистость: Controller → FormRequest → Service → Job
Контроллер тонкий: принимает FormRequest, делегирует Service, возвращает JSON-ответ.
Бизнес-логика — в Service; асинхронная работа — в Job.
Слои зафиксированы в `app/deptrac.yaml` (13 слоёв, pre-commit gate job 10).
Подробнее: `references/conventions.md` §1.
## 2. RLS-aware Eloquent и middleware `tenant`
Middleware `SetTenantContext` оборачивает HTTP-запрос в транзакцию и выполняет
`SET LOCAL app.current_tenant_id = X`, обеспечивая RLS-изоляцию между tenant'ами.
**КРИТИЧНО**: очередные джобы выполняются под ролью `crm_supplier_worker` (BYPASSRLS),
поэтому RLS не фильтрует. Каждый запрос в джобе **обязан** содержать явный
`where('tenant_id', $tenantId)` или устанавливать `SET LOCAL` вручную внутри транзакции.
Подробнее: `references/conventions.md` §2.
## 3. Деньги — только через bcmath и LedgerService
Все денежные операции — `bcadd` / `bcsub` / `bcmul` / `bcdiv` / `bccomp` со строковыми операндами
и фиксированным `scale`. Никаких операторов `+` / `-` / `*` / `/` над деньгами, никакого `float`.
Точка входа для биллингового списания — `LedgerService::chargeForDelivery()`.
Аудит денежных инвариантов кода — скил `billing-audit` (#62); здесь — только конвенция написания.
Подробнее: `references/conventions.md` §3.
## 4. Идемпотентные джобы через advisory lock
Повторный запуск джоба не должен дублировать результат.
Паттерн: `pg_advisory_xact_lock(composite_bigint)` внутри транзакции — сериализует
конкурентные обработки одного (tenant_id, source_crm_id). Дополнительно: `lockForUpdate`
на строку Tenant защищает баланс от TOCTOU при конкурентных списаниях.
Подробнее: `references/conventions.md` §4.
## 5. Partition-aware запросы для `deals` и `supplier_lead_costs`
Таблицы `deals` и `supplier_lead_costs` секционированы по `RANGE (received_at)`.
Запросы к этим таблицам должны включать условие по `received_at` (или `created_at`
для `supplier_lead_costs`) — это включает pruning и предотвращает full-scan всех партиций.
Подробнее: `references/conventions.md` §5.
## Связано
- `billing-audit` #62 — аудит денежной корректности (I1–I5 инварианты).
- `architecture-patterns` #38 — общие паттерны архитектуры (не Лидерра-специфика).
- Boost #10 — Eloquent introspection, документация Laravel 13.
- Larastan #12 — статанализ PHP (ловит float-арифметику на деньгах).
- ADR-005 — deptrac architecture-fitness gate.
@@ -1,10 +0,0 @@
{
"skill": "laravel-backend-patterns",
"cases": [
{"prompt": "как написать контроллер для новой backend-фичи в Лидерре", "should_trigger": true},
{"prompt": "как правильно списать деньги в джобе под crm_supplier_worker", "should_trigger": true},
{"prompt": "проверь, не теряются ли копейки в списании", "should_trigger": false, "expected": "billing-audit"},
{"prompt": "опиши Clean Architecture в общем", "should_trigger": false, "expected": "architecture-patterns"},
{"prompt": "учёт выручки по РСБУ", "should_trigger": false, "expected": "ru-tax-accounting"}
]
}
@@ -1,280 +0,0 @@
# Backend-конвенции Лидерры — детальный справочник
Образцы ниже — реальный код из `app/` (Laravel 13, PHP 8.3).
Указаны конкретные `file:line` на момент 20.05.2026.
---
## §1. Слоистость: Controller → FormRequest → Service → Job
### Правило
Контроллер принимает FormRequest (валидация), делегирует Service (бизнес-логика),
при необходимости Service dispatch'ит Job (асинхрон). Контроллер не содержит бизнес-логики.
Слои задокументированы в `app/deptrac.yaml` — 13 слоёв:
Controller, Request, Resource, Middleware, Service, Job, Console, Repository,
Model, Mail, Rule, Exception, Provider.
Допустимые направления зависимостей — только вниз по иерархии (deptrac gate, lefthook job 10).
### Образец из кода
`app/app/Http/Controllers/Api/ProjectController.php:8790` — контроллер тонкий:
```php
/** POST /api/projects */
public function store(StoreProjectRequest $request): JsonResponse
{
$project = $this->projects->create($request->user()->tenant, $request->validated());
return response()->json(['data' => new ProjectResource($project)], 201);
}
```
`app/app/Http/Requests/StoreProjectRequest.php:1844` — вся валидация в FormRequest:
```php
public function rules(): array
{
$base = [
'name' => ['required', 'string', 'max:255'],
'signal_type' => ['required', Rule::in(['site', 'call', 'sms'])],
'daily_limit_target' => ['required', 'integer', 'min:1', 'max:10000'],
'regions' => ['present', 'array'],
'regions.*' => ['integer', 'between:1,89'],
'delivery_days_mask' => ['required', 'integer', 'min:1', 'max:127'],
];
// ... conditional rules by signal_type
return $base;
}
```
`app/app/Services/Billing/LedgerService.php` — бизнес-логика в Service.
`app/app/Jobs/ProcessWebhookJob.php` — асинхрон в Job.
### Антипаттерн
```php
// ПЛОХО: бизнес-логика в контроллере
public function store(Request $request): JsonResponse
{
$tier = PricingTier::where('min_leads', '<=', $count)->orderBy('min_leads', 'desc')->first();
$price = $tier->price_per_lead_kopecks * $count; // float-арифметика + логика тира прямо здесь
Deal::create([...]);
return response()->json(['ok' => true]);
}
```
---
## §2. RLS-aware Eloquent и middleware `tenant`
### Правило
Middleware `SetTenantContext` (`app/app/Http/Middleware/SetTenantContext.php`) оборачивает
каждый HTTP-запрос в транзакцию и выполняет `SET LOCAL app.current_tenant_id = X`,
после чего RLS-политики PostgreSQL автоматически фильтруют строки по tenant.
**КРИТИЧНО для джобов**: очередные джобы Laravel выполняются в отдельном процессе вне
HTTP-стека. Роль `crm_supplier_worker` (connection `pgsql_supplier`) имеет атрибут
BYPASSRLS — RLS-политики для неё **не применяются**. Любой запрос в таком джобе без
явного `where('tenant_id', $tenantId)` вернёт строки всех tenant'ов.
Правило: в каждом джобе либо устанавливай `SET LOCAL` внутри транзакции (паттерн
`ProcessWebhookJob`/`ImportLeadsJob`), либо добавляй явный `where('tenant_id', ...)`.
### Образец из кода
`app/app/Http/Middleware/SetTenantContext.php:3643` — HTTP-путь:
```php
DB::beginTransaction();
try {
DB::statement('SET LOCAL app.current_tenant_id = ' . $tenantId);
$response = $next($request);
DB::commit();
return $response;
} catch (\Throwable $e) {
DB::rollBack();
throw $e;
}
```
`app/app/Jobs/ImportLeadsJob.php:9296` — джоб устанавливает `SET LOCAL` вручную:
```php
return DB::transaction(function (): ?ImportLog {
DB::statement('SET LOCAL app.current_tenant_id = ' . $this->tenantId);
return ImportLog::query()->find($this->importLogId);
});
```
`app/app/Jobs/ProcessWebhookJob.php:8086` — аналогичный паттерн в webhook-джобе:
```php
DB::transaction(function () use ($duplicateDetector): void {
DB::statement('SET LOCAL app.current_tenant_id = ' . $this->tenantId);
$tenant = Tenant::query()
->whereKey($this->tenantId)
->lockForUpdate()
->first();
```
### Антипаттерн
```php
// ПЛОХО: джоб под crm_supplier_worker без SET LOCAL и без where tenant_id
// → вернёт все строки всех tenant'ов (BYPASSRLS не фильтрует)
public function handle(): void
{
$logs = ImportLog::query()->where('status', 'pending')->get(); // ВСЕ tenant'ы!
}
```
---
## §3. Деньги — только через bcmath и LedgerService
### Правило
Все арифметические операции с деньгами (рубли, копейки) — исключительно через
функции `bcmath` с явным `scale`. Операнды передаются строками.
Никаких PHP `float`, никакого `+` / `-` / `*` / `/` над денежными значениями.
Точка входа для списания за лид — `LedgerService::chargeForDelivery()`.
Этот метод реализует dual-balance flow (prepaid-лиды → `balance_leads`, рубли → `balance_rub`).
Вызывается **внутри открытой транзакции** с `lockForUpdate(Tenant)` — см. §4.
Аудит денежных инвариантов (I1–I5) — скил `billing-audit` (#62). Здесь — конвенция написания.
### Образец из кода
`app/app/Services/Billing/LedgerService.php:6465` — конвертация копеек в рубли:
```php
$amountRub = bcdiv((string) $priceKopecks, '100', 2);
$newBalanceRub = bcsub((string) $lockedTenant->balance_rub, $amountRub, 2);
```
`app/app/Services/Billing/LedgerService.php:124125` — сравнение балансов:
```php
$balanceKopecks = bcmul((string) $tenant->balance_rub, '100', 0);
if (bccomp($balanceKopecks, (string) $priceKopecks, 0) >= 0) {
return 'rub';
}
```
### Антипаттерн
```php
// ПЛОХО: float-арифметика теряет копейки
$price = $tier->price_per_lead_kopecks / 100; // float
$newBalance = $tenant->balance_rub - $price; // потеря точности при накоплении
```
---
## §4. Идемпотентные джобы через advisory lock
### Правило
Повторный запуск джоба (ретрай, краш, дубль cron) не должен создавать дублирующие
записи. Паттерн: `pg_advisory_xact_lock(bigint)` внутри транзакции сериализует все
конкурентные обработки одного (tenant_id, source_crm_id).
Дополнительно для мутаций баланса: `lockForUpdate` на строку Tenant — защита от
TOCTOU (между чтением баланса и его обновлением другой воркер не должен изменить значение).
### Образец из кода
`app/app/Jobs/ProcessWebhookJob.php:293296` — advisory lock перед upsert:
```php
// pg_advisory_xact_lock(bigint): верхние 32 бита = tenant_id, нижние 32 = source_crm_id
$lockKey = (($tenant->id & 0xFFFFFFFF) << 32) | ($sourceCrmId & 0xFFFFFFFF);
DB::statement('SELECT pg_advisory_xact_lock(?)', [$lockKey]);
```
`app/app/Services/Import/HistoricalImportService.php:145147` — тот же паттерн в сервисе:
```php
// advisory lock (tenant_id, source_crm_id) — сериализует upsert (§6.5)
$lockKey = (($tenantId & 0xFFFFFFFF) << 32) | ($row->sourceCrmId & 0xFFFFFFFF);
DB::statement('SELECT pg_advisory_xact_lock(?)', [$lockKey]);
```
`app/app/Jobs/RouteSupplierLeadJob.php:210213` — lockForUpdate на Tenant перед списанием:
```php
$tenant = Tenant::query()
->whereKey($project->tenant_id)
->lockForUpdate()
->firstOrFail();
```
Для overlap-защиты долгоживущих джобов (cron) — `Cache::lock` (Redis):
`app/app/Jobs/Supplier/CsvReconcileJob.php:6974`:
```php
$lock = $lockStore->lock(self::LOCK_NAME, self::LOCK_TTL_SECONDS);
if (! $lock->get()) {
Log::info('csv_reconcile.skipped_overlap');
return;
}
```
### Антипаттерн
```php
// ПЛОХО: нет lock — два конкурентных воркера создают два deal для одного vid
$existing = Deal::where('source_crm_id', $vid)->where('tenant_id', $tenantId)->first();
if (!$existing) {
Deal::create([...]); // race condition: оба воркера видят null и оба создают
}
```
---
## §5. Partition-aware запросы для `deals` и `supplier_lead_costs`
### Правило
Таблицы `deals` и `supplier_lead_costs` секционированы по `PARTITION BY RANGE (received_at)`.
Запросы должны содержать условие по `received_at` (ключ партиционирования) — это позволяет
PostgreSQL выполнять partition pruning и не сканировать все партиции.
Запрос без `WHERE received_at ...` делает full-scan всех партиций.
### Образец из кода
`db/schema.sql:1658` — партиционирование `deals`:
```sql
) PARTITION BY RANGE (received_at);
```
`db/schema.sql:2361` — партиционирование `supplier_lead_costs`:
```sql
) PARTITION BY RANGE (received_at);
```
`app/app/Services/DuplicateDetector.php:49` — запрос к `deals` с ключом партиции:
```php
->where('received_at', '>=', $windowStart)
```
`app/app/Jobs/Supplier/CsvReconcileJob.php:113` — запрос к `supplier_leads` с ключом:
```php
->where('received_at', '>=', $windowStart)
```
### Антипаттерн
```php
// ПЛОХО: запрос к deals без received_at — full-scan всех партиций
$deals = Deal::where('tenant_id', $tenantId)
->where('phone', $phone)
->get(); // сканирует deals_2026_05, deals_2026_06, ... все партиции
```
-43
View File
@@ -1,43 +0,0 @@
---
name: ru-tax-accounting
description: Контекст РСБУ и налогов РФ (НК РФ, НДС/УСН) применительно к SaaS-выручке Лидерры за лиды. Используй при «учёт выручки по РСБУ», «НДС или УСН», «налоговая база по выручке», «налогооблагаемое событие», «выгрузка для бухгалтера», «проводки РСБУ». НЕ для денежной корректности кода (billing-audit), US-GAAP-отчётности (finance plugin), договоров (D1 право), ПДн (D2), сверки с банком (finance reconciliation).
---
# RU Tax & Accounting — РСБУ/НК РФ контекст для выручки Лидерры
Проектный скил раздела C7 карты «Финансы — бухгалтерия и налоги». Переводит
billing-выручку (выход C6) в **российский учётно-налоговый контекст** (РСБУ + НК РФ).
Закрывает gap, который US-GAAP-плагин `finance` (#61) не покрывает.
## Когда использовать
- Вопрос «как это учесть/обложить по РФ-правилам?» по выручке/пополнениям/возвратам.
- Подготовка выгрузок/пояснений для бухгалтера из billing-данных.
- Определение налогооблагаемого события и налоговой базы.
## Содержание (см. references/ru-tax-context.md)
1. **Налоговые режимы РФ** — НДС (ОСНО) vs УСН (доходы / доходы-расходы); что применимо к SaaS за лиды.
2. **Налогооблагаемое событие** — пополнение баланса (аванс) vs списание за лид (реализация) vs возврат.
3. **Маппинг billing→база**`lead_charges`/`LedgerService` → выручка → налоговая база; роль `charge_source`.
4. **РСБУ vs управленческий** — отличие от US-GAAP-отчётов плагина finance; первичка/документы.
5. **Выгрузки для бухгалтера** — какие данные и в каком разрезе извлечь (Boost/Pest как инструменты выгрузки).
## Границы
-`billing-audit` #62 — тот про *корректность начисления в коде*; ru-tax про *учёт/налог результата*.
-`finance` plugin #61 — тот US-GAAP-механика (проводки/отчёты/сверка); ru-tax — РФ-специфика РСБУ/НК.
- ≠ D1 «Юриспруденция/договорная» — там договоры/право; ru-tax — налоги.
- ≠ D2 «Защита ПДн (152-ФЗ)» — там персональные данные; ru-tax — налоги.
## Ограничение
Бухгалтерия компании ведётся вне dev-репо (1С/аутсорс). Скил даёт **контекст и выгрузки**,
не заменяет бухгалтера и не является налоговой консультацией. Реальный платёжный
провайдер — DEFERRED (Б-1).
## Связано
- Вход: выручка из C6 (`lead_charges`, `LedgerService`).
- Reuse: data-scientist #49 (финмодели), Boost #10 / Pest #18 (выгрузка), finance plugin #61 (US-механика).
- ADR-012 (граница finance-tooling C6/C7).
@@ -1,21 +0,0 @@
{
"skill": "ru-tax-accounting",
"positive": [
"как учесть выручку за лиды по РСБУ",
"НДС или УСН для SaaS-выручки",
"переведи billing-выручку в налоговую базу",
"какое налогооблагаемое событие при пополнении баланса",
"выгрузка lead_charges для бухгалтера",
"проводки по РСБУ за списания",
"налоговый режим для подписочной выручки портала",
"что с НДС при возврате на баланс tenant",
"налоговая база УСН доходы по выручке за лиды"
],
"near_miss": [
{"prompt": "проверь идемпотентность списания", "expect": "billing-audit #62"},
{"prompt": "US-GAAP financial statement", "expect": "finance plugin #61 financial-statements"},
{"prompt": "договор с поставщиком лидов", "expect": "D1 юриспруденция"},
{"prompt": "обработка ПДн при выгрузке", "expect": "D2 ПДн 152-ФЗ"},
{"prompt": "сверка ledger с банком", "expect": "finance plugin #61 reconciliation"}
]
}
@@ -1,40 +0,0 @@
# РСБУ / НК РФ — контекст для выручки Лидерры за лиды
> Не налоговая консультация. Контекст для подготовки данных бухгалтеру.
## 1. Налоговые режимы РФ
- **ОСНО + НДС (НК РФ гл. 21)** — НДС 20% на реализацию услуг РФ. Электронные/рекламные
услуги — проверить место реализации и применимые льготы.
- **УСН (НК РФ гл. 26.2)** — «доходы» (6%) или «доходы минус расходы» (15%). Без НДС
(кроме исключений). Типичный режим для раннего SaaS.
- Применимый режим зависит от регистрации ООО (Б-1) — до закрытия Б-1 фиксируем как параметр.
## 2. Налогооблагаемое событие
- **Пополнение баланса** = аванс (предоплата). По НДС — момент определения базы может
возникать на аванс; по УСН-доходы — доход по поступлению (кассовый метод).
- **Списание за лид** = реализация услуги (закрытие аванса).
- **Возврат на баланс / с баланса** = корректировка базы.
- Различать по `lead_charges.charge_source` и операциям `LedgerService`.
## 3. Маппинг billing → налоговая база
| Billing-сущность | Учётный смысл |
|---|---|
| Пополнение (`BillingTopupService`) | Аванс / поступление |
| Списание (`LedgerService`, `lead_charges`) | Реализация (выручка) |
| `delivered_in_month` (`tenants`) | Объём для tier — не налог напрямую |
| Возврат | Корректировка |
## 4. РСБУ vs управленческий / US-GAAP
- РСБУ — российский план счетов, первичные документы (акт/УПД), кассовый/начисление.
- US-GAAP-скилы плагина `finance` (#61) — иная форма (income statement / balance sheet);
применимы для *внутренней управленки*, не для РФ-отчётности.
## 5. Выгрузки для бухгалтера
- Реестр списаний за период: `lead_charges` (period, tenant, сумма, charge_source).
- Реестр пополнений: операции `LedgerService` / `BillingTopupService`.
- Инструменты выгрузки: Boost #10 (Eloquent/SQL), Pest #18 (фикстуры/проверки), `BillingSummaryProvider` (готовый отчёт-провайдер).
+1 -4
View File
@@ -98,10 +98,7 @@ paths = [
# Vitest-тесты с assertion на mock-данные (mock-телефоны из mockDeals)
'''app/tests/Frontend/.*\.(spec|test)\.ts''',
# Settings-вкладки с фиктивными mock-данными (профиль/сессии — UI-разводка)
'''app/resources/js/views/settings/.*\.vue''',
# Test fixtures for the observer PII filter — contains synthetic JWT / AWS /
# Yandex tokens that the filter is supposed to redact. Not real secrets.
'''tools/observer-pii-filter\.test\.mjs'''
'''app/resources/js/views/settings/.*\.vue'''
]
regexTarget = "match"
regexes = [
-7
View File
@@ -1,7 +0,0 @@
# gitleaks false-positive allowlist (fingerprints).
# Format: one fingerprint per line. `gitleaks detect --report-format json` outputs them.
# Nuclei docs `-u http://...` — nuclei's -u flag is "target URL", not curl basic-auth.
# Rule `curl-auth-user` matches the pattern but it's not authentication.
f696ca50266eb1c2974b5fc89f6fa585edaf4b6b:docs/security/nuclei-setup.md:curl-auth-user:27
05437ba79a26a7a7bbbe0ffb2f2573c432a9a4d1:docs/security/nuclei-setup.md:curl-auth-user:27
+4 -19
View File
File diff suppressed because one or more lines are too long
@@ -10,9 +10,6 @@ use App\Models\Project;
use App\Models\SupplierManualSyncQueue;
use App\Models\SupplierProject;
use App\Services\Supplier\Channel\SupplierProjectChannel;
use App\Services\Supplier\SupplierExportMode;
use App\Services\Supplier\SupplierPortalClient;
use App\Support\RussianRegions;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@@ -145,114 +142,4 @@ final class AdminSupplierIntegrationController extends Controller
return response()->json(['resolved' => true, 'external_id' => $found]);
}
/**
* Глобальный режим экспорта проектов поставщику (Plan 4 Task 1).
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.1.
*/
public function getExportMode(): JsonResponse
{
return response()->json(['mode' => SupplierExportMode::current()]);
}
public function setExportMode(Request $request): JsonResponse
{
$data = $request->validate([
'mode' => ['required', 'in:online,batch'],
]);
DB::table('system_settings')->updateOrInsert(
['key' => 'supplier_export_mode'],
['value' => $data['mode'], 'type' => 'string', 'updated_at' => now()],
);
return response()->json(['mode' => $data['mode']]);
}
/**
* Plan 4 Task 2: список supplier_projects + кто заказывал (через pivot
* projects tenants) + дата последней поставки лида.
*/
public function projectsIndex(): JsonResponse
{
$rows = DB::table('supplier_projects as sp')
->select([
'sp.id',
'sp.platform',
'sp.signal_type',
'sp.unique_key',
'sp.subject_code',
'sp.supplier_external_id',
'sp.current_limit',
'sp.inactive_since',
])
->orderBy('sp.unique_key')
->orderBy('sp.subject_code')
->orderBy('sp.platform')
->get();
$projects = $rows->map(function ($sp): array {
$orderers = DB::table('project_supplier_links as psl')
->join('projects as p', 'p.id', '=', 'psl.project_id')
->join('tenants as t', 't.id', '=', 'p.tenant_id')
->where('psl.supplier_project_id', $sp->id)
->distinct()
->pluck('t.organization_name')
->all();
$lastDelivery = DB::table('supplier_leads')
->where('supplier_project_id', $sp->id)
->max('received_at');
$subjectCode = $sp->subject_code !== null ? (int) $sp->subject_code : null;
return [
'id' => (int) $sp->id,
'platform' => $sp->platform,
'signal_type' => $sp->signal_type,
'unique_key' => $sp->unique_key,
'subject_code' => $subjectCode,
'subject_name' => $subjectCode !== null
? (RussianRegions::CODE_TO_NAME[$subjectCode] ?? null)
: 'РФ',
'current_limit' => (int) $sp->current_limit,
'supplier_external_id' => $sp->supplier_external_id,
'inactive_since' => $sp->inactive_since,
'orderers' => $orderers,
'last_delivery_at' => $lastDelivery,
];
});
return response()->json(['projects' => $projects->all()]);
}
/**
* Plan 4 Task 2: bulk-delete выбранных supplier_projects.
* Сначала на портале (deleteProject), затем локально (pivot снимается CASCADE).
* Сбой по строке не прерывает batch, копится в failures[].
*/
public function projectsDestroy(Request $request, SupplierPortalClient $client): JsonResponse
{
$data = $request->validate([
'ids' => ['required', 'array', 'min:1'],
'ids.*' => ['integer'],
]);
$deleted = 0;
$failures = [];
foreach (SupplierProject::whereIn('id', $data['ids'])->get() as $sp) {
try {
if ($sp->supplier_external_id !== null) {
$client->deleteProject((int) $sp->supplier_external_id);
}
$sp->delete();
$deleted++;
} catch (\Throwable $e) {
$failures[] = ['id' => $sp->id, 'error' => $e->getMessage()];
}
}
return response()->json(['deleted' => $deleted, 'failures' => $failures]);
}
}
@@ -74,6 +74,7 @@ class DashboardController extends Controller
// --- active projects ---
$activeProjects = DB::table('projects')
->where('tenant_id', $tenantId)
->whereNull('archived_at')
->where('is_active', true)
->count();
$maxProjects = (int) (($tenant->limits['max_projects'] ?? 0));
@@ -52,12 +52,16 @@ class ProjectController extends Controller
// Фильтр по статусу жизненного цикла
$status = $request->query('status');
if ($status === 'active') {
$query->where('is_active', true);
if ($status === 'archived') {
$query->archived();
} elseif ($status === 'active') {
$query->active()->where('is_active', true);
} elseif ($status === 'paused') {
$query->where('is_active', false);
$query->active()->where('is_active', false);
} else {
// По умолчанию: все не архивированные (active + paused)
$query->active();
}
// default → no extra filter
// Поиск по name и signal_identifier
if ($search = $request->query('search')) {
@@ -107,11 +111,11 @@ class ProjectController extends Controller
return response()->json(['data' => new ProjectResource($project)]);
}
/** DELETE /api/projects/{id} — hard delete (guard по сделкам: 422 если есть сделки) */
/** DELETE /api/projects/{id} — soft-archive (sets archived_at, is_active=false) */
public function destroy(Request $request, int $id): JsonResponse
{
$project = Project::where('tenant_id', $request->user()->tenant_id)->findOrFail($id);
$this->projects->delete($project);
$this->projects->archive($project);
return response()->json(null, 204);
}
@@ -135,7 +139,7 @@ class ProjectController extends Controller
return response()->json(['data' => new ProjectResource($project->fresh())]);
}
/** POST /api/projects/bulk — batch pause/resume/delete/update_regions/update_days/update_limit */
/** POST /api/projects/bulk — batch pause/resume/archive/update_regions/update_days/update_limit */
public function bulk(BulkProjectActionRequest $request): JsonResponse
{
$tenantId = $request->user()->tenant_id;
+3 -9
View File
@@ -29,16 +29,10 @@ class EnsureSaasAdmin
{
public function handle(Request $request, Closure $next): Response
{
if (app()->environment('local', 'testing')) {
return $next($request);
if (! app()->environment('local', 'testing')) {
abort(503, 'SaaS-admin авторизация не настроена (ожидает Б-1 + DO-4).');
}
// ВРЕМЕННО (тест-деплой): пропускаем при включённом флаге.
// TODO: убрать после внедрения Yandex 360 SSO (Б-1 + DO-4).
if (config('app.saas_admin_test_bypass') === true) {
return $next($request);
}
abort(503, 'SaaS-admin авторизация не настроена (ожидает Б-1 + DO-4).');
return $next($request);
}
}
@@ -20,7 +20,7 @@ class BulkProjectActionRequest extends FormRequest
$rules = [
'action' => ['required', Rule::in([
'pause', 'resume', 'delete',
'pause', 'resume', 'archive',
'update_regions', 'update_days', 'update_limit',
])],
'ids' => ['nullable', 'array', 'max:500'],
@@ -28,7 +28,7 @@ class BulkProjectActionRequest extends FormRequest
'scope' => ['nullable', 'array'],
'scope.filter' => ['nullable', 'array'],
'scope.filter.signal_type' => ['nullable', 'string', Rule::in(['site', 'call', 'sms'])],
'scope.filter.status' => ['nullable', 'string', Rule::in(['active', 'paused'])],
'scope.filter.status' => ['nullable', 'string', Rule::in(['active', 'paused', 'archived'])],
'scope.filter.search' => ['nullable', 'string', 'max:255'],
];
@@ -13,6 +13,9 @@ class ProjectResource extends JsonResource
{
public function toArray(Request $request): array
{
/** @var Project $project */
$project = $this->resource;
return [
'id' => $this->id,
'name' => $this->name,
@@ -25,6 +28,7 @@ class ProjectResource extends JsonResource
'delivered_today' => $this->delivered_today,
'delivered_in_month' => $this->delivered_in_month,
'is_active' => $this->is_active,
'archived_at' => $project->archived_at?->toIso8601String(),
'region_mask' => $this->region_mask,
'region_mode' => $this->region_mode,
'regions' => $this->regions,
+11 -14
View File
@@ -12,10 +12,8 @@ use App\Models\SupplierLead;
use App\Models\Tenant;
use App\Services\Billing\LedgerService;
use App\Services\DuplicateDetector;
use App\Services\LeadDistributor;
use App\Services\LeadRouter;
use App\Services\NotificationService;
use App\Services\RegionTagResolver;
use App\Services\SupplierProjects\SupplierProjectResolver;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -88,8 +86,6 @@ class RouteSupplierLeadJob implements ShouldQueue
DuplicateDetector $duplicateDetector,
NotificationService $notifier,
LedgerService $ledger,
LeadDistributor $distributor,
RegionTagResolver $tagResolver,
): void {
$lead = SupplierLead::findOrFail($this->supplierLeadId);
@@ -112,19 +108,20 @@ class RouteSupplierLeadJob implements ShouldQueue
$supplier = $resolver->resolveOrStub($platform, $signalType, $identifier);
$lead->update(['supplier_project_id' => $supplier->id]);
$matched = $router->matchEligibleProjects($supplier);
$selected = $distributor->selectRecipients($matched); // cap=3 случайных
$subjectCode = $tagResolver->resolve((string) ($lead->raw_payload['tag'] ?? ''));
$matched = $router->matchEligibleProjects($supplier, (string) $lead->phone);
$createdCount = 0;
$failures = [];
foreach ($selected as $project) {
foreach ($matched as $project) {
try {
if ($this->createDealCopyForProject($lead, $project, $duplicateDetector, $notifier, $ledger, $subjectCode)) {
if ($this->createDealCopyForProject($lead, $project, $duplicateDetector, $notifier, $ledger)) {
$createdCount++;
}
} catch (Throwable $e) {
// Per-Project failure isolation (Plan 2 code-review Important).
// Sharing-model: один сбой проекта не должен абортить routing других tenant'ов.
// Логируем и продолжаем; final failed() callback зафиксирует общий проблемный лид
// только если ВСЕ Projects упали (через handle() rethrow ниже).
$failures[] = ['project_id' => $project->id, 'tenant_id' => $project->tenant_id, 'error' => $e->getMessage()];
Log::warning('supplier_lead.per_project_routing_failed', [
'supplier_lead_id' => $lead->id,
@@ -135,7 +132,9 @@ class RouteSupplierLeadJob implements ShouldQueue
}
}
if ($selected->isNotEmpty() && $createdCount === 0 && count($failures) === $selected->count()) {
// Если ВСЕ Projects упали (а matched был непустой) — пробрасываем последнюю ошибку,
// чтобы failed() callback сработал и проблема ушла в failed_webhook_jobs.
if ($matched->isNotEmpty() && $createdCount === 0 && count($failures) === $matched->count()) {
throw new RuntimeException(
'All eligible projects failed routing for supplier_lead='.$lead->id.
'; last error: '.($failures[array_key_last($failures)]['error'] ?? 'unknown')
@@ -200,10 +199,9 @@ class RouteSupplierLeadJob implements ShouldQueue
DuplicateDetector $duplicateDetector,
NotificationService $notifier,
LedgerService $ledger,
?int $subjectCode,
): bool {
try {
return DB::transaction(function () use ($lead, $project, $duplicateDetector, $notifier, $ledger, $subjectCode): bool {
return DB::transaction(function () use ($lead, $project, $duplicateDetector, $notifier, $ledger): bool {
DB::statement("SET LOCAL app.current_tenant_id = '{$project->tenant_id}'");
/** @var Tenant $tenant */
@@ -254,7 +252,6 @@ class RouteSupplierLeadJob implements ShouldQueue
'phones' => $phones,
'status' => 'new',
'received_at' => $receivedAt,
'subject_code' => $subjectCode,
]);
$master = $duplicateDetector->findMaster(
@@ -1,80 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Jobs\Supplier;
use App\Models\SupplierProject;
use App\Services\Supplier\SupplierPortalClient;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Throwable;
/**
* Удаление/пере-синк доноров у поставщика после удаления Лидерра-проекта.
*
* Для каждого supplier_project S (донора), к которому был привязан удалённый проект:
* - остались другие потребители (project_supplier_links) донор нужен другим клиентам:
* НЕ удаляем у поставщика, пере-синкаем агрегат (SyncSupplierProjectsJob).
* - потребителей не осталось удаляем у поставщика (deleteProject) + локальную запись S.
*
* Spec: docs/superpowers/specs/2026-05-21-project-delete-dedup-errors-design.md §Решение 2.
*/
class DeleteSupplierProjectJob implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public int $tries = 3;
public int $backoff = 60;
public const string DB_CONNECTION = 'pgsql_supplier';
/** @param array<int,int> $supplierProjectIds */
public function __construct(public array $supplierProjectIds) {}
public function handle(SupplierPortalClient $client): void
{
$needsResync = false;
foreach ($this->supplierProjectIds as $id) {
$sp = SupplierProject::on(self::DB_CONNECTION)->find($id);
if ($sp === null) {
continue;
}
$remaining = DB::connection(self::DB_CONNECTION)
->table('project_supplier_links')
->where('supplier_project_id', $id)
->count();
if ($remaining > 0) {
$needsResync = true;
continue;
}
if ($sp->supplier_external_id !== null && $sp->supplier_external_id !== '') {
try {
$client->deleteProject((int) $sp->supplier_external_id);
} catch (Throwable $e) {
Log::warning('supplier.delete_donor_failed', [
'supplier_project_id' => $id, 'error' => $e->getMessage(),
]);
throw $e; // retry the job
}
}
$sp->delete();
}
if ($needsResync) {
SyncSupplierProjectsJob::dispatch();
}
}
}
+140 -336
View File
@@ -14,53 +14,47 @@ use App\Models\SupplierProject;
use App\Models\SupplierSyncLog;
use App\Services\Supplier\Channel\Exceptions\TierEscalatedException;
use App\Services\Supplier\Channel\Exceptions\WindowDeferredException;
use App\Services\Supplier\Channel\FailoverProjectChannel;
use App\Services\Supplier\Channel\SupplierProjectChannel;
use App\Services\Supplier\Dto\SupplierProjectDto;
use App\Services\Supplier\SupplierPortalClient;
use App\Services\Supplier\SupplierProjectGrouping;
use App\Services\Supplier\SupplierQuotaAllocator;
use App\Support\RussianRegions;
use Carbon\Carbon;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use stdClass;
use Throwable;
/**
* Daily 18:00 МСК cron-job: синхронизирует supplier_projects с поставщиком crm.bp-gr.ru
* (расписание перенесено 20:30 18:00, см. routes/console.php).
* Daily 20:30 МСК cron-job: синхронизирует supplier_projects с поставщиком crm.bp-gr.ru.
*
* Алгоритм (план 3 Task 5 переработан: one-group-per-identifier):
* 1. Загрузить активные Лидерра-projects (is_active=true).
* 2. Сгруппировать по (signal_type, identifier) БЕЗ subject_code:
* - identifier = buildUniqueKeyAgnostic() (site/call signal_identifier; sms+keyword sender+keyword; sms sender).
* - platforms = resolvePlatforms() (site/call B1+B2+B3; sms+keyword B2+B3; sms B3).
* - merged_regions = union(project.regions) по всем проектам группы.
* Если хотя бы один проект имеет regions=[] («Вся РФ»), merged_regions=[].
* 3. Для каждой группы:
* - eligible-today проекты группы (workday-маска на завтра).
* - order = computeOrder($eligibleLimits); workdays = union.
* - tag = name региона если один, иначе «РФ».
* - Найти существующие supplier_projects (unique_key, signal_type, platform) без subject_code-фильтра:
* - Нет saveProjectMultiFlag [platform id] upsert supplier_projects (subject_code=null).
* - Есть partial-set recovery + updateProject каждого с актуальными regions/limit.
* - Pivot: project × supplier_project INSERT ... ON CONFLICT DO NOTHING (subject_code=null).
* 4. Failure-handling (Auth/Transient/Client/Window/TierEscalated), time-budget cutoff сохранены.
* Алгоритм (per spec §4.3):
* 1. Итерация по всем активным (inactive_since IS NULL) supplier_projects.
* 2. Для каждого:
* a. Подтянуть активные Лидерра-projects через FK supplier_b{1,2,3}_project_id.
* b. Адаптировать в plain stdClass с полями daily_limit/workdays/regions.
* c. Вызвать SupplierQuotaAllocator::allocate() pure distribution.
* d. Сравнить с current state через SupplierProjectDto::equals(); skip if no diff.
* e. saveProject() при supplier_external_id=null, иначе updateProject().
* f. Записать audit row в supplier_sync_log.
* 3. Failure-handling:
* - SupplierAuthException SupplierCriticalAlertMail('sticky_auth') + Sentry + throw.
* - SupplierTransientException log + continue. После 50 подряд mass_transient alert + break.
* - SupplierClientException log + continue.
* 4. Time budget cutoff: после 20:55 МСК прервать loop (буфер 5 мин до 21:00).
*
* Портальное ограничение: один identifier = одна группа B1/B2/B3 (status=Doubles на дублирование).
* Поэтому все регионы проекта передаются одним списком portal фильтрует оба одновременно.
*
* NOTE про connection: Eloquent::on('pgsql_supplier') для cross-tenant видимости.
* NOTE про connection: Job's $connection это queue connection, не DB. Используем
* Eloquent::on('pgsql_supplier') для cross-tenant видимости (Plan 3 Task 3 learning).
*
* Spec:
* - docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.3
* - docs/superpowers/plans/2026-05-20-project-migration-redesign-plan-3-export.md Task 5
* - docs/superpowers/specs/2026-05-10-supplier-integration-design.md §4.3-§4.4
* - docs/superpowers/specs/2026-05-11-plan3-supplier-sync-design.md §4
*/
class SyncSupplierProjectsJob implements ShouldQueue
{
@@ -74,79 +68,33 @@ class SyncSupplierProjectsJob implements ShouldQueue
private SupplierProjectChannel $channel;
private SupplierPortalClient $client;
public function handle(?SupplierProjectChannel $channel = null): void
{
$this->channel = $channel ?? app(SupplierProjectChannel::class);
$this->client = app(SupplierPortalClient::class);
$consecutiveTransient = 0;
// 1. Load active Лидерра-projects via pgsql_supplier
/** @var Collection<int, Project> $projects */
$projects = Project::on(self::DB_CONNECTION)
->where('is_active', true)
$projects = SupplierProject::on(self::DB_CONNECTION)
->whereNull('inactive_since')
->orderBy('id')
->get();
// 2. Group by (signal_type, identifier) — no subject_code split.
// Portal constraint: one identifier = one B1/B2/B3 group (status=Doubles on duplicate name).
// group key => [ 'signal_type', 'identifier', 'merged_regions', 'platforms', 'projects' => [...] ]
/** @var array<string, array{signal_type: string, identifier: string, merged_regions: list<int>, has_all_russia: bool, platforms: list<string>, projects: list<Project>}> $groups */
$groups = [];
foreach ($projects as $project) {
$platforms = SupplierProjectGrouping::resolvePlatforms($project);
if ($platforms === []) {
continue;
}
$identifier = SupplierProjectGrouping::buildUniqueKeyAgnostic($project);
$key = $project->signal_type.'|'.$identifier;
if (! isset($groups[$key])) {
$groups[$key] = [
'signal_type' => (string) $project->signal_type,
'identifier' => $identifier,
'merged_regions' => [],
'has_all_russia' => false,
'platforms' => $platforms,
'projects' => [],
];
}
// Merge regions — union across all projects in this group.
// If any project has empty regions ("Вся РФ"), the whole group becomes "Вся РФ".
if (! $groups[$key]['has_all_russia']) {
$projectRegions = array_map('intval', (array) ($project->regions ?? []));
if ($projectRegions === []) {
$groups[$key]['has_all_russia'] = true;
$groups[$key]['merged_regions'] = [];
} else {
$groups[$key]['merged_regions'] = array_values(array_unique(
array_merge($groups[$key]['merged_regions'], $projectRegions)
));
}
}
$groups[$key]['projects'][] = $project;
}
// 3. Sync each group
foreach ($groups as $group) {
foreach ($projects as $sp) {
if (now()->timezone('Europe/Moscow')->format('H:i') >= self::TIME_BUDGET_CUTOFF) {
Log::warning('supplier.sync.time_budget_reached', [
'group' => $group['identifier'],
'processed_until' => $sp->id,
]);
break;
}
try {
$this->syncGroup($group);
$this->syncOne($sp);
$consecutiveTransient = 0;
} catch (TierEscalatedException $e) {
Log::info("SyncSupplierProjectsJob: group {$group['identifier']} escalated to manual queue #{$e->queueRowId}, reason: {$e->reason}");
Log::info("SyncSupplierProjectsJob: sp #{$sp->id} escalated to manual queue #{$e->queueRowId}, reason: {$e->reason}");
continue;
} catch (WindowDeferredException) {
Log::info("SyncSupplierProjectsJob: group {$group['identifier']} deferred by portal window");
Log::info("SyncSupplierProjectsJob: sp #{$sp->id} deferred by portal window");
continue;
} catch (SupplierAuthException $e) {
@@ -159,7 +107,7 @@ class SyncSupplierProjectsJob implements ShouldQueue
throw $e;
} catch (SupplierTransientException $e) {
$consecutiveTransient++;
$this->logGroupFailure($group, $e);
$this->logSyncFailure($sp, $e);
if ($consecutiveTransient >= self::MASS_FAIL_THRESHOLD) {
Mail::to((string) config('services.supplier.alert_email'))
->queue(new SupplierCriticalAlertMail(
@@ -172,7 +120,7 @@ class SyncSupplierProjectsJob implements ShouldQueue
continue;
} catch (SupplierClientException $e) {
$this->logGroupFailure($group, $e);
$this->logSyncFailure($sp, $e);
report($e);
continue;
@@ -180,285 +128,131 @@ class SyncSupplierProjectsJob implements ShouldQueue
}
}
/**
* @param array{signal_type: string, identifier: string, merged_regions: list<int>, has_all_russia: bool, platforms: list<string>, projects: list<Project>} $group
*/
private function syncGroup(array $group): void
private function syncOne(SupplierProject $sp): void
{
$signalType = $group['signal_type'];
$identifier = $group['identifier'];
$platforms = $group['platforms'];
$fkColumn = $this->fkColumnForPlatform($sp->platform);
/** @var list<Project> $groupProjects */
$groupProjects = $group['projects'];
/** @var EloquentCollection<int, Project> $liderraProjects */
$liderraProjects = Project::on(self::DB_CONNECTION)
->where($fkColumn, $sp->id)
->where('is_active', true)
->get();
// Eligible-today: workday-mask for tomorrow
$targetDate = Carbon::tomorrow('Europe/Moscow');
$targetWeekday = $targetDate->isoWeekday();
/** @var list<Project> $eligible */
$eligible = array_values(array_filter(
$groupProjects,
fn (Project $p) => ($p->delivery_days_mask & (1 << ($targetWeekday - 1))) !== 0
));
if ($eligible === []) {
if ($liderraProjects->isEmpty()) {
return;
}
// Compute order and union workdays
$eligibleLimits = array_map(fn (Project $p) => (int) $p->daily_limit_target, $eligible);
$order = SupplierQuotaAllocator::computeOrder($eligibleLimits);
$adapted = $this->adaptProjectsForAllocator($liderraProjects);
$workdaysUnion = [];
foreach ($eligible as $p) {
foreach ($this->bitmaskToList((int) $p->delivery_days_mask, 7) as $d) {
$workdaysUnion[$d] = $d;
}
$allocation = SupplierQuotaAllocator::allocate(
platform: $sp->platform,
signalType: $sp->signal_type,
uniqueKey: $sp->unique_key,
activeLiderraProjects: $adapted,
targetDate: Carbon::tomorrow('Europe/Moscow'),
);
if ($allocation === null) {
return;
}
sort($workdaysUnion);
$workdays = $workdaysUnion;
// Portal constraint: one identifier = one B1/B2/B3 group — pass all regions as a single list.
$allRegions = $group['merged_regions'];
sort($allRegions);
// count=0 → all-Russia; count=1 → named region; count>1 → merged → 'РФ'
$tag = count($allRegions) === 1
? (RussianRegions::CODE_TO_NAME[$allRegions[0]] ?? (string) $allRegions[0])
: 'РФ';
$current = SupplierProjectDto::fromModel($sp);
if ($allocation->equals($current)) {
return;
}
// Find existing supplier_projects for this group (no subject_code filter)
$existingSps = SupplierProject::on(self::DB_CONNECTION)
->where('unique_key', $identifier)
->where('signal_type', $signalType)
->whereIn('platform', $platforms)
->get();
$isCreate = $sp->supplier_external_id === null;
if ($existingSps->isEmpty()) {
// Create path: saveProjectMultiFlag → [platform => external_id]
$dto = new SupplierProjectDto(
platform: $platforms[0],
signalType: $signalType,
uniqueKey: $identifier,
limit: $order,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: $platforms,
);
// NOTE: НЕ оборачиваем в DB::transaction() — HTTP-call к supplier выходит за
// границы транзакционного контекста, атомарности всё равно нет. Два DB-write
// (supplier_project update + supplier_sync_log insert) на одной connection
// выполняются последовательно; ошибка между ними — recoverable through retry
// на следующем cron-tick'е (supplier_external_id уже записан, скип через equals()).
// Context-project для project_id в очереди яруса 3 при эскалации.
$contextProject = $liderraProjects->first();
$idMap = $this->client->saveProjectMultiFlag($dto);
// Upsert supplier_projects rows (one per platform)
foreach ($platforms as $platform) {
$externalId = $idMap[$platform] ?? null;
if ($externalId === null) {
continue;
}
$sp = SupplierProject::on(self::DB_CONNECTION)->forceCreate([
'platform' => $platform,
'signal_type' => $signalType,
'unique_key' => $identifier,
'subject_code' => null,
'supplier_external_id' => (string) $externalId,
'current_limit' => $order,
'current_workdays' => $workdays,
'current_regions' => $allRegions,
'sync_status' => 'ok',
'last_synced_at' => now(),
]);
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => 'create',
'http_status' => 200,
'created_at' => now(),
]);
$existingSps->push($sp);
}
if ($isCreate) {
$externalId = $this->channel instanceof FailoverProjectChannel
? $this->channel->createProjectForLiderra($contextProject, $allocation)
: $this->channel->createProject($allocation);
$sp->forceFill([
'supplier_external_id' => (string) $externalId,
'current_limit' => $allocation->limit,
'current_workdays' => $allocation->workdays,
'current_regions' => $allocation->regions,
'sync_status' => 'ok',
'last_synced_at' => now(),
])->save();
} else {
// External-deletion recovery: донор мог быть удалён на портале → external_id
// в нашей БД мёртв, updateProject его молча no-op'ит. Сверяемся со списком живых
// проектов портала и пересоздаём недостающих in-place (НЕ удаляя записи — на них
// могут висеть лиды/списания). Throws пропагируют в outer handle() catch
// (SupplierAuth/Transient/Client) — failover-counter semantics сохраняется.
$livePortalIds = collect($this->client->listProjects())
->map(fn ($p) => (string) ($p['id'] ?? ''))
->filter()
->all();
$deadSps = $existingSps->filter(
fn (SupplierProject $sp) => $sp->supplier_external_id !== null
&& ! in_array((string) $sp->supplier_external_id, $livePortalIds, true)
);
if ($deadSps->isNotEmpty()) {
$deadPlatforms = array_values($deadSps->pluck('platform')->all());
$recreateDto = new SupplierProjectDto(
platform: $deadPlatforms[0],
signalType: $signalType,
uniqueKey: $identifier,
limit: $order,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: $deadPlatforms,
);
$recreatedIdMap = $this->client->saveProjectMultiFlag($recreateDto);
foreach ($deadSps as $sp) {
$newId = $recreatedIdMap[$sp->platform] ?? null;
if ($newId !== null) {
$sp->forceFill(['supplier_external_id' => (string) $newId])->save();
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => 'create',
'http_status' => 200,
'created_at' => now(),
]);
}
}
}
// Fix #3 (review-followup): partial-set recovery — если предыдущий run создал
// не все platforms (e.g. B1+B2 OK, B3 escalated), re-attempt missing via multi-flag
// save с platforms=$missingPlatforms. Throws пропагируют в outer handle() catch
// (SupplierAuth/Transient/Client) — full failover-counter semantics сохраняется.
$existingPlatforms = $existingSps->pluck('platform')->all();
$missingPlatforms = array_values(array_diff($platforms, $existingPlatforms));
if ($missingPlatforms !== []) {
$missingDto = new SupplierProjectDto(
platform: $missingPlatforms[0],
signalType: $signalType,
uniqueKey: $identifier,
limit: $order,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: $missingPlatforms,
);
$missingIdMap = $this->client->saveProjectMultiFlag($missingDto);
foreach ($missingPlatforms as $platform) {
$externalId = $missingIdMap[$platform] ?? null;
if ($externalId === null) {
continue;
}
$sp = SupplierProject::on(self::DB_CONNECTION)->forceCreate([
'platform' => $platform,
'signal_type' => $signalType,
'unique_key' => $identifier,
'subject_code' => null,
'supplier_external_id' => (string) $externalId,
'current_limit' => $order,
'current_workdays' => $workdays,
'current_regions' => $allRegions,
'sync_status' => 'ok',
'last_synced_at' => now(),
]);
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => 'create',
'http_status' => 200,
'created_at' => now(),
]);
$existingSps->push($sp);
}
}
// Fix #2 (review-followup): per-platform DTO в update-loop, чтобы portal получал
// правильные srcrt/srcbl/srcmt для конкретной редактируемой строки (не first()
// из mixed-platform existing set). R6 one shared limit/regions сохраняется.
foreach ($existingSps as $sp) {
if ($sp->supplier_external_id === null) {
continue;
}
$perPlatformDto = new SupplierProjectDto(
platform: $sp->platform,
signalType: $signalType,
uniqueKey: $identifier,
limit: $order,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: [$sp->platform],
);
$this->channel->updateProject((int) $sp->supplier_external_id, $perPlatformDto);
$sp->forceFill([
'current_limit' => $order,
'current_workdays' => $workdays,
'current_regions' => $allRegions,
'sync_status' => 'ok',
'last_synced_at' => now(),
])->save();
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => 'update',
'http_status' => 200,
'created_at' => now(),
]);
if ($this->channel instanceof FailoverProjectChannel) {
$this->channel->updateProjectForLiderra($contextProject, (int) $sp->supplier_external_id, $allocation);
} else {
$this->channel->updateProject((int) $sp->supplier_external_id, $allocation);
}
$sp->forceFill([
'current_limit' => $allocation->limit,
'current_workdays' => $allocation->workdays,
'current_regions' => $allocation->regions,
'sync_status' => 'ok',
'last_synced_at' => now(),
])->save();
}
// Pivot: for each contributing Лидерра-project × each supplier_project → ON CONFLICT DO NOTHING
foreach ($groupProjects as $lp) {
foreach ($existingSps as $sp) {
DB::connection(self::DB_CONNECTION)->table('project_supplier_links')->insertOrIgnore([
'project_id' => $lp->id,
'supplier_project_id' => $sp->id,
'platform' => $sp->platform,
'subject_code' => null,
]);
}
}
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => $isCreate ? 'create' : 'update',
'http_status' => 200,
'created_at' => now(),
]);
}
/**
* Log failure for a group (before any supplier_project is created/updated we don't have sp id,
* so we look up existing or skip best-effort audit).
*
* @param array{signal_type: string, identifier: string, merged_regions: list<int>, has_all_russia: bool, platforms: list<string>, projects: list<Project>} $group
*/
private function logGroupFailure(array $group, Throwable $e): void
private function logSyncFailure(SupplierProject $sp, Throwable $e): void
{
$httpStatus = null;
if ($e instanceof SupplierException) {
$httpStatus = $e->httpStatus;
}
// Find any existing sp row for the group to link log entry (no subject_code filter)
$sp = SupplierProject::on(self::DB_CONNECTION)
->where('unique_key', $group['identifier'])
->where('signal_type', $group['signal_type'])
->first();
if ($sp !== null) {
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => $sp->supplier_external_id === null ? 'create' : 'update',
'http_status' => $httpStatus,
'error_message' => substr($e->getMessage(), 0, 1000),
'created_at' => now(),
]);
}
SupplierSyncLog::on(self::DB_CONNECTION)->create([
'supplier_project_id' => $sp->id,
'action' => $sp->supplier_external_id === null ? 'create' : 'update',
'http_status' => $httpStatus,
'error_message' => substr($e->getMessage(), 0, 1000),
'created_at' => now(),
]);
}
/**
* Bitmask ordered list 1..maxBits.
* Адаптер Eloquent Project stdClass с полями daily_limit/workdays/regions,
* которые ожидает SupplierQuotaAllocator (pure function, не вяжется к Eloquent).
*
* Маппинг:
* daily_limit daily_limit_target
* workdays биты delivery_days_mask (bit 0=Пн, , bit 6=Вс) ISO 1..7
* regions projects.regions INT[] (subject codes 1..89) direct copy
*
* @param EloquentCollection<int, Project> $projects
* @return Collection<int, stdClass>
*/
private function adaptProjectsForAllocator(EloquentCollection $projects): Collection
{
return $projects->map(function (Project $p): stdClass {
$obj = new stdClass;
$obj->daily_limit = (int) $p->daily_limit_target;
$obj->workdays = $this->bitmaskToList((int) $p->delivery_days_mask, 7);
// Plan 6: projects.regions[] напрямую копируется в supplier_projects.current_regions.
// Empty array = "вся РФ" (паритет с supplier API semantics).
// Legacy region_mask/region_mode игнорируются — они dual-write для PhonePrefixService,
// outbound к supplier использует только regions[]. Cleanup в Plan 6.5.
$obj->regions = array_values((array) $p->regions);
return $obj;
})->values();
}
/**
* Bitmask ordered list 1..maxBits для bits, выставленных в 1.
*
* @return array<int, int>
*/
@@ -473,4 +267,14 @@ class SyncSupplierProjectsJob implements ShouldQueue
return $out;
}
private function fkColumnForPlatform(string $platform): string
{
return match ($platform) {
'B1' => 'supplier_b1_project_id',
'B2' => 'supplier_b2_project_id',
'B3' => 'supplier_b3_project_id',
default => throw new \InvalidArgumentException("Unknown supplier platform: {$platform}"),
};
}
}
+72 -316
View File
@@ -11,45 +11,32 @@ use App\Services\Supplier\Channel\Exceptions\WindowDeferredException;
use App\Services\Supplier\Channel\FailoverProjectChannel;
use App\Services\Supplier\Channel\SupplierProjectChannel;
use App\Services\Supplier\Dto\SupplierProjectDto;
use App\Services\Supplier\SupplierExportMode;
use App\Services\Supplier\SupplierPortalClient;
use App\Services\Supplier\SupplierProjectGrouping;
use App\Support\RussianRegions;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
/**
* Синхронизирует Лидерра-проект с supplier_projects на B1/B2/B3
* в зависимости от signal_type и текущего SupplierExportMode.
* в зависимости от signal_type.
*
* Режимы:
* online для каждой (subject × platform-set) группы проекта:
* saveProjectMultiFlag с полными параметрами (limit, regions, tag)
* upsert supplier_projects + pivot project_supplier_links.
* batch «каркас»: создаёт supplier_projects с limit=0, без регионов
* (старый путь); ночной SyncSupplierProjectsJob дольёт полные параметры.
* Семантика:
* site / call B1 + B2 + B3
* sms с keyword B2 + B3
* sms без keyword B3
*
* Канал миграции:
* batch mode SupplierProjectChannel (FailoverProjectChannel: ярус 1 AJAX
* ярус 2 browser-form ярус 3 manual queue) для createProject.
* online mode multi-flag save идёт напрямую через SupplierPortalClient
* (tier-1 AJAX only multi-flag нет в tier-2 form по архитектуре
* портала). При любом transient/auth fail log warning + skip
* subject; Laravel retry (tries=3 backoff [15s,60s,300s]) ночной
* SyncSupplierProjectsJob подберёт с полным failover каналом.
* updateProject в online остаётся через $channel (полная схема failover).
* При эскалации на ярус 3 / переносе по окну портала platform/subject пропускается
* (FK/pivot остаётся пустым; ночной SyncSupplierProjectsJob восстанавливает).
* Записывает полученные supplier_projects.id в projects.supplier_b{1,2,3}_project_id.
*
* Канал миграции SupplierProjectChannel (резолвится в FailoverProjectChannel:
* ярус 1 AJAX ярус 2 browser-form ярус 3 manual queue). При эскалации на
* ярус 3 / переносе по окну портала platform пропускается (FK остаётся NULL,
* ночной SyncSupplierProjectsJob подберёт после ручного вмешательства).
*
* Retry: 3 попытки с backoff [15s, 60s, 300s].
*
* Spec: docs/superpowers/specs/2026-05-19-supplier-project-channel-failover-design.md §5
* Plan: docs/superpowers/plans/2026-05-20-project-migration-redesign-plan-3-export.md Task 6
*/
class SyncSupplierProjectJob implements ShouldQueue
{
@@ -60,23 +47,11 @@ class SyncSupplierProjectJob implements ShouldQueue
/** @var array<int, int> */
public array $backoff = [15, 60, 300];
/**
* BYPASSRLS-роль crm_supplier_worker для всех DB-операций (как у всех supplier-flow
* джобов: SyncSupplierProjectsJob/DeleteSupplierProjectJob/CsvReconcileJob/).
*
* Джоб запускается из очереди, где SetTenantContext-прослойка не отрабатывает и
* app.current_tenant_id GUC не установлен. Под обычной ролью crm_app_user первый же
* SELECT по projects падает 42704 (unrecognized configuration parameter
* "app.current_tenant_id"). На dev не всплывало там DB_USERNAME=postgres (superuser,
* RLS обходится). Plan 3 Task 3 learning.
*/
public const DB_CONNECTION = 'pgsql_supplier';
public function __construct(public int $projectId) {}
public function handle(SupplierProjectChannel $channel): void
{
$project = Project::on(self::DB_CONNECTION)->find($this->projectId);
$project = Project::find($this->projectId);
if ($project === null) {
Log::warning("SyncSupplierProjectJob: project {$this->projectId} not found — skipping");
@@ -84,264 +59,14 @@ class SyncSupplierProjectJob implements ShouldQueue
return;
}
if (SupplierExportMode::isOnline()) {
$this->handleOnline($project, $channel);
} else {
$this->handleBatch($project, $channel);
}
}
// -------------------------------------------------------------------------
// Online mode: per-subject full-param sync
// -------------------------------------------------------------------------
private function handleOnline(Project $project, SupplierProjectChannel $channel): void
{
$client = app(SupplierPortalClient::class);
$platforms = SupplierProjectGrouping::resolvePlatforms($project);
if ($platforms === []) {
return;
}
$identifier = SupplierProjectGrouping::buildUniqueKey($project, $platforms[0]);
// Portal constraint: one identifier = one B1/B2/B3 group (status=Doubles on duplicate name).
// Pass all project regions as a single group — no per-subject split.
$allRegions = array_map('intval', (array) ($project->regions ?? []));
// count=0 → all-Russia; count=1 → named region; count>1 → merged → 'РФ'
$tag = count($allRegions) === 1
? (RussianRegions::CODE_TO_NAME[$allRegions[0]] ?? (string) $allRegions[0])
: 'РФ';
$workdays = $this->workdaysFromMask((int) $project->delivery_days_mask);
// Idempotency: find existing by identifier regardless of subject_code (any previous run).
$existingSps = SupplierProject::on(self::DB_CONNECTION)
->where('unique_key', $identifier)
->where('signal_type', (string) $project->signal_type)
->whereIn('platform', $platforms)
->get();
if ($existingSps->isEmpty()) {
// Create path: saveProjectMultiFlag → [platform => external_id]
$dto = new SupplierProjectDto(
platform: $platforms[0],
signalType: (string) $project->signal_type,
uniqueKey: $identifier,
limit: (int) $project->daily_limit_target,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: $platforms,
);
try {
$idMap = $client->saveProjectMultiFlag($dto);
} catch (TierEscalatedException $e) {
Log::info("SyncSupplierProjectJob: project {$project->id} escalated to manual queue #{$e->queueRowId}");
return;
} catch (WindowDeferredException) {
Log::info("SyncSupplierProjectJob: project {$project->id} deferred by portal window");
return;
} catch (\Throwable $e) {
Log::warning("SyncSupplierProjectJob: online multi-flag save failed for project {$project->id} (".get_class($e).'): '.$e->getMessage());
return;
}
foreach ($platforms as $platform) {
$externalId = $idMap[$platform] ?? null;
if ($externalId === null) {
continue;
}
$sp = SupplierProject::on(self::DB_CONNECTION)->create([
'platform' => $platform,
'signal_type' => (string) $project->signal_type,
'unique_key' => $identifier,
'subject_code' => null,
'supplier_external_id' => (string) $externalId,
'current_limit' => (int) $project->daily_limit_target,
'current_workdays' => $workdays,
'current_regions' => $allRegions,
'sync_status' => 'ok',
'last_synced_at' => now(),
]);
$existingSps->push($sp);
}
} else {
// External-deletion recovery: донор мог быть удалён на портале (вручную или
// прошлым hard-delete). Тогда external_id в нашей БД мёртв, а updateProject
// такого id портал молча принимает (no-op) — донор не пересоздаётся. Поэтому
// сверяемся со списком живых проектов портала и пересоздаём недостающих
// in-place (НЕ удаляя записи — на supplier_project могут висеть лиды/списания).
$livePortalIds = collect($client->listProjects())
->map(fn ($p) => (string) ($p['id'] ?? ''))
->filter()
->all();
$deadSps = $existingSps->filter(
fn (SupplierProject $sp) => $sp->supplier_external_id !== null
&& ! in_array((string) $sp->supplier_external_id, $livePortalIds, true)
);
if ($deadSps->isNotEmpty()) {
$deadPlatforms = array_values($deadSps->pluck('platform')->all());
$recreateDto = new SupplierProjectDto(
platform: $deadPlatforms[0],
signalType: (string) $project->signal_type,
uniqueKey: $identifier,
limit: (int) $project->daily_limit_target,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: $deadPlatforms,
);
try {
$recreatedIdMap = $client->saveProjectMultiFlag($recreateDto);
} catch (TierEscalatedException $e) {
Log::info("SyncSupplierProjectJob: project {$project->id} dead-donor re-create escalated #{$e->queueRowId}");
$recreatedIdMap = [];
} catch (WindowDeferredException) {
Log::info("SyncSupplierProjectJob: project {$project->id} dead-donor re-create deferred by portal window");
$recreatedIdMap = [];
} catch (\Throwable $e) {
Log::warning("SyncSupplierProjectJob: dead-donor re-create failed for project {$project->id}: ".$e->getMessage());
$recreatedIdMap = [];
}
foreach ($deadSps as $sp) {
$newId = $recreatedIdMap[$sp->platform] ?? null;
if ($newId !== null) {
$sp->forceFill(['supplier_external_id' => (string) $newId])->save();
}
}
}
// Partial-set recovery: если предыдущий run создал не все platforms.
$existingPlatforms = $existingSps->pluck('platform')->all();
$missingPlatforms = array_values(array_diff($platforms, $existingPlatforms));
if ($missingPlatforms !== []) {
$missingDto = new SupplierProjectDto(
platform: $missingPlatforms[0],
signalType: (string) $project->signal_type,
uniqueKey: $identifier,
limit: (int) $project->daily_limit_target,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: $missingPlatforms,
);
try {
$missingIdMap = $client->saveProjectMultiFlag($missingDto);
} catch (TierEscalatedException $e) {
Log::info("SyncSupplierProjectJob: project {$project->id} missing-platform re-attempt escalated #{$e->queueRowId}");
$missingIdMap = [];
} catch (WindowDeferredException) {
Log::info("SyncSupplierProjectJob: project {$project->id} missing-platform deferred by portal window");
$missingIdMap = [];
} catch (\Throwable $e) {
Log::warning("SyncSupplierProjectJob: missing-platform multi-flag failed for project {$project->id}: ".$e->getMessage());
$missingIdMap = [];
}
foreach ($missingPlatforms as $platform) {
$externalId = $missingIdMap[$platform] ?? null;
if ($externalId === null) {
continue;
}
$sp = SupplierProject::on(self::DB_CONNECTION)->create([
'platform' => $platform,
'signal_type' => (string) $project->signal_type,
'unique_key' => $identifier,
'subject_code' => null,
'supplier_external_id' => (string) $externalId,
'current_limit' => (int) $project->daily_limit_target,
'current_workdays' => $workdays,
'current_regions' => $allRegions,
'sync_status' => 'ok',
'last_synced_at' => now(),
]);
$existingSps->push($sp);
}
}
// Update existing supplier projects with current regions/limit.
foreach ($existingSps as $sp) {
if ($sp->supplier_external_id === null) {
continue;
}
$perPlatformDto = new SupplierProjectDto(
platform: $sp->platform,
signalType: (string) $project->signal_type,
uniqueKey: $identifier,
limit: (int) $project->daily_limit_target,
workdays: $workdays,
regions: $allRegions,
regionsReverse: false,
status: 'active',
tag: $tag,
platforms: [$sp->platform],
);
$channel->updateProject((int) $sp->supplier_external_id, $perPlatformDto);
$sp->forceFill([
'current_limit' => (int) $project->daily_limit_target,
'current_workdays' => $workdays,
'current_regions' => $allRegions,
'sync_status' => 'ok',
'last_synced_at' => now(),
])->save();
}
}
// Pivot: project × each supplier_project → ON CONFLICT DO NOTHING
foreach ($existingSps as $sp) {
DB::connection(self::DB_CONNECTION)->table('project_supplier_links')->insertOrIgnore([
'project_id' => $project->id,
'supplier_project_id' => $sp->id,
'platform' => $sp->platform,
'subject_code' => null,
]);
}
// Mirror the link into the legacy FK columns (supplier_b{1,2,3}_project_id) so the
// UI sync-status (ProjectResource → aggregateSyncStatus, which reads supplierB1/B2/B3)
// reflects the synced stack in online mode too — online primarily uses the pivot.
foreach ($existingSps as $sp) {
$column = 'supplier_'.strtolower((string) $sp->platform).'_project_id';
$project->{$column} = $sp->id;
}
$project->save();
}
// -------------------------------------------------------------------------
// Batch mode: каркас (limit=0, no regions) — backward-compat
// -------------------------------------------------------------------------
private function handleBatch(Project $project, SupplierProjectChannel $channel): void
{
$platforms = SupplierProjectGrouping::resolvePlatforms($project);
$workdays = $this->workdaysFromMask((int) $project->delivery_days_mask);
$platforms = $this->resolvePlatforms($project);
foreach ($platforms as $platform) {
$uniqueKey = SupplierProjectGrouping::buildUniqueKey($project, $platform);
$uniqueKey = $this->buildUniqueKey($project, $platform);
$column = 'supplier_'.strtolower($platform).'_project_id';
// Idempotency: local supplier_projects-запись уже есть?
$existing = SupplierProject::on(self::DB_CONNECTION)
// Идемпотентность: local supplier_projects-запись для тройки уже есть?
$existing = SupplierProject::query()
->where('platform', $platform)
->where('signal_type', $project->signal_type)
->where('unique_key', $uniqueKey)
@@ -353,16 +78,7 @@ class SyncSupplierProjectJob implements ShouldQueue
continue;
}
$dto = new SupplierProjectDto(
platform: $platform,
signalType: (string) $project->signal_type,
uniqueKey: $uniqueKey,
limit: 0,
workdays: $workdays,
regions: [],
regionsReverse: false,
status: 'active',
);
$dto = $this->buildDto($project, $platform, $uniqueKey);
try {
$externalId = $channel instanceof FailoverProjectChannel
@@ -378,13 +94,13 @@ class SyncSupplierProjectJob implements ShouldQueue
continue;
}
$sp = SupplierProject::on(self::DB_CONNECTION)->create([
$sp = SupplierProject::query()->create([
'platform' => $platform,
'signal_type' => $project->signal_type,
'unique_key' => $uniqueKey,
'supplier_external_id' => (string) $externalId,
'current_limit' => 0,
'current_workdays' => $workdays,
'current_workdays' => [1, 2, 3, 4, 5, 6, 7],
'current_regions' => null,
'sync_status' => 'ok',
]);
@@ -396,22 +112,62 @@ class SyncSupplierProjectJob implements ShouldQueue
}
/**
* Bitmask ISO weekday list. bit 0 = Mon (ISO 1) bit 6 = Sun (ISO 7).
*
* Mirror of SyncSupplierProjectsJob::bitmaskToList(). Kept inline (not
* extracted to a shared helper) to keep this fix surgical.
*
* @return list<int>
* Initial-create DTO: лимит 0 (квота приедет ночным SyncSupplierProjectsJob),
* полная неделя, без регионов.
*/
private function workdaysFromMask(int $mask): array
private function buildDto(Project $project, string $platform, string $uniqueKey): SupplierProjectDto
{
$out = [];
for ($i = 0; $i < 7; $i++) {
if (($mask & (1 << $i)) !== 0) {
$out[] = $i + 1;
}
return new SupplierProjectDto(
platform: $platform,
signalType: (string) $project->signal_type,
uniqueKey: $uniqueKey,
limit: 0,
workdays: [1, 2, 3, 4, 5, 6, 7],
regions: [],
regionsReverse: false,
status: 'active',
);
}
/**
* Возвращает список uppercase platform-кодов для данного project.
* Коды соответствуют CHECK constraint: 'B1' / 'B2' / 'B3'.
*
* @return array<int, string>
*/
private function resolvePlatforms(Project $project): array
{
if (in_array($project->signal_type, ['site', 'call'], true)) {
return ['B1', 'B2', 'B3'];
}
return $out;
if ($project->signal_type === 'sms') {
return $project->sms_keyword ? ['B2', 'B3'] : ['B3'];
}
return [];
}
/**
* Строит unique_key для пары (project, platform):
* site/call signal_identifier (домен / телефон)
* sms B2 sender + '+' + keyword
* sms B3 sender
*/
private function buildUniqueKey(Project $project, string $platform): string
{
if (in_array($project->signal_type, ['site', 'call'], true)) {
return (string) $project->signal_identifier;
}
// sms
$sender = (string) ($project->sms_senders[0] ?? '');
if ($platform === 'B2') {
return $sender.'+'.($project->sms_keyword ?? '');
}
// B3
return $sender;
}
}
-2
View File
@@ -54,7 +54,6 @@ class Deal extends Model
'utm_campaign',
'utm_content',
'region_code',
'subject_code',
'city',
'time_in_form_seconds',
'lead_score',
@@ -73,7 +72,6 @@ class Deal extends Model
'duplicate_of_id' => 'integer',
'escalated_count' => 'integer',
'time_in_form_seconds' => 'integer',
'subject_code' => 'integer',
'lead_score' => 'decimal:2',
'phones' => 'array',
'is_test' => 'boolean',
+31 -10
View File
@@ -11,7 +11,6 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Collection;
/**
@@ -40,6 +39,8 @@ class Project extends Model
'tag',
'type',
'is_active',
// Plan 5 Task 1 (schema v8.20): soft archive flow — lifecycle-state рядом с is_active.
'archived_at',
'daily_limit_target',
'effective_daily_limit_today',
'effective_limit_calculated_at',
@@ -85,6 +86,8 @@ class Project extends Model
'sms_senders' => 'array',
'delivered_in_month' => 'integer',
'delivered_today' => 'integer',
// Plan 5 Task 1 (schema v8.20): soft archive.
'archived_at' => 'datetime',
];
}
@@ -112,15 +115,6 @@ class Project extends Model
return $this->belongsTo(SupplierProject::class, 'supplier_b3_project_id');
}
/**
* @return BelongsToMany<SupplierProject, $this>
*/
public function supplierProjects(): BelongsToMany
{
return $this->belongsToMany(SupplierProject::class, 'project_supplier_links')
->withPivot(['platform', 'subject_code']);
}
/**
* Активные проекты, у которых сегодняшний день включён в delivery_days_mask.
*
@@ -147,6 +141,33 @@ class Project extends Model
return $query->where('signal_type', $signalType)->where('signal_identifier', $identifier);
}
/**
* Не архивированные проекты (archived_at IS NULL).
*
* Внимание: scope не фильтрует is_active. Приостановленные (is_active=false)
* проекты сюда попадают это разные lifecycle-состояния. Если нужны только
* «работающие» (не архив И не на паузе) комбинируйте:
* ->active()->where('is_active', true).
*
* @param Builder<Project> $query
* @return Builder<Project>
*/
public function scopeActive(Builder $query): Builder
{
return $query->whereNull('archived_at');
}
/**
* Архивированные проекты (archived_at IS NOT NULL).
*
* @param Builder<Project> $query
* @return Builder<Project>
*/
public function scopeArchived(Builder $query): Builder
{
return $query->whereNotNull('archived_at');
}
/**
* Все связанные SupplierProject из eager-loaded BelongsTo отношений.
*
@@ -7,24 +7,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
/**
* Очередь яруса 3 резерва канала миграции проектов.
*
* Spec: docs/superpowers/specs/2026-05-19-supplier-project-channel-failover-design.md §4.5
*
* @property int $id
* @property int $project_id
* @property string $platform
* @property string $operation
* @property string|null $external_id
* @property array<string, mixed> $payload_snapshot
* @property string $failure_reason
* @property string $status
* @property int|null $resolved_by_user_id
* @property Carbon|null $created_at
* @property Carbon|null $resolved_at
*/
class SupplierManualSyncQueue extends Model
{
-12
View File
@@ -8,7 +8,6 @@ use Database\Factories\SupplierProjectFactory;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
/**
* Supplier-уровневый агрегат проекта у поставщика crm.bp-gr.ru.
@@ -41,7 +40,6 @@ class SupplierProject extends Model
'sync_status',
'last_synced_at',
'inactive_since',
'subject_code',
];
protected function casts(): array
@@ -52,7 +50,6 @@ class SupplierProject extends Model
'current_limit' => 'integer',
'last_synced_at' => 'datetime',
'inactive_since' => 'datetime',
'subject_code' => 'integer',
];
}
@@ -84,15 +81,6 @@ class SupplierProject extends Model
return $query->where('signal_type', $signalType)->where('unique_key', $uniqueKey);
}
/**
* @return BelongsToMany<Project, $this>
*/
public function projects(): BelongsToMany
{
return $this->belongsToMany(Project::class, 'project_supplier_links')
->withPivot(['platform', 'subject_code']);
}
protected static function newFactory(): SupplierProjectFactory
{
return SupplierProjectFactory::new();
-44
View File
@@ -1,44 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Services;
use Illuminate\Support\Collection;
use Random\Randomizer;
/**
* Отбор получателей входящего лида: CAP случайных из eligible (sharing cap).
*
* cap=3 защита владельца номера-донора (лид продаётся максимум 3 раза).
* Eligible уже отфильтрован LeadRouter (есть остаток лимита) отбор лимит не
* превышает. Рандом через инъектируемый \Random\Randomizer (тесты сидируют
* Mt19937 для детерминизма; прод CSPRNG по умолчанию).
*
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.6.
*/
final class LeadDistributor
{
public const CAP = 3;
public function __construct(private readonly Randomizer $randomizer = new Randomizer) {}
/**
* @template T
*
* @param Collection<int, T> $eligible
* @return Collection<int, T>
*/
public function selectRecipients(Collection $eligible): Collection
{
$items = $eligible->values()->all();
if (count($items) <= self::CAP) {
return collect($items);
}
$keys = $this->randomizer->pickArrayKeys($items, self::CAP);
return collect($keys)->map(fn (int $k) => $items[$k])->values();
}
}
+51 -20
View File
@@ -8,45 +8,70 @@ use App\Models\Project;
use App\Models\SupplierProject;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use InvalidArgumentException;
/**
* Подбор eligible Лидерра-проектов для входящего лида (sharing-model §6).
*
* Eligibility структурно через pivot project_supplier_links: проект eligible,
* если связан с пришедшим supplier_project (= источник × субъект) + активен +
* сегодня рабочий день + есть остаток лимита + у тенанта есть баланс.
* Алгоритм:
* 1. SELECT projects WHERE supplier_b{1,2,3}_project_id = $supplier->id (по platform).
* 2. Фильтр: is_active=true.
* 3. Workdays: (delivery_days_mask & today_bit) <> 0, today_bit = 1 << (ISO_DOW - 1).
* 4. delivered_today < COALESCE(effective_daily_limit_today, daily_limit_target).
* 5. tenants.balance_leads > 0 OR tenants.balance_rub > 0 (через WHERE EXISTS;
* Plan 4 Task 4: dual-balance rub-only tenant ДОЛЖЕН пройти, LedgerService
* сам резолвит prepaid/rub и кидает InsufficientBalanceException, если оба = 0).
* 6. Region match через PhonePrefixService::phoneMatchesRegions (в PHP, не в SQL
* district-bit резолвится по 3/4-значному коду в PHP-словаре).
* 7. Сортировка: created_at ASC, id ASC (детерминированно spec §6 step 4).
*
* Регион сопоставляется самим supplier_project (тег = субъект) phone-prefix
* фильтр убран (эпик миграции проектов, Q5): для мобильных он no-op, а регион
* гарантирован тем, через какой supplier_project пришёл лид.
* Plan 3 Task 3: запрос идёт через connection `pgsql_supplier` (BYPASSRLS-роль
* crm_supplier_worker). Это закрывает WARN #2 — в sharing-flow tenant ещё не
* определён, SELECT обходит RLS-фильтрацию и видит проекты ВСЕХ tenant'ов
* параллельно. WHERE-фильтры (is_active, FK на supplier_project, workdays, лимиты,
* balance) сохраняются как defense-in-depth.
*
* Запрос через connection pgsql_supplier (BYPASSRLS crm_supplier_worker) в
* sharing-flow tenant ещё не определён, SELECT видит проекты всех tenant'ов.
*
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.5.
* Spec: docs/superpowers/specs/2026-05-10-supplier-integration-design.md §6 +
* docs/superpowers/specs/2026-05-11-plan3-supplier-sync-design.md §1.
*/
class LeadRouter
{
public function __construct(
private readonly PhonePrefixService $phonePrefix,
) {}
/**
* @return Collection<int, Project>
*/
public function matchEligibleProjects(SupplierProject $supplierProject): Collection
public function matchEligibleProjects(SupplierProject $supplierProject, string $phone): Collection
{
// МСК-aligned ISO day-of-week (reset-cron тоже 00:00 МСК).
$fkColumn = match ($supplierProject->platform) {
'B1' => 'supplier_b1_project_id',
'B2' => 'supplier_b2_project_id',
'B3' => 'supplier_b3_project_id',
// Unreachable per CHECK chk_supplier_projects_platform; defensive for static analysis.
default => throw new InvalidArgumentException(
"Unknown supplier platform: {$supplierProject->platform}"
),
};
// МСК-aligned ISO day-of-week: Plan 2 Task 9 reset cron also runs at 00:00 МСК,
// so workday-mask check must use same timezone to avoid off-by-one near midnight.
$todayBit = 1 << (Carbon::now('Europe/Moscow')->isoWeekday() - 1);
/** @var Collection<int, Project> $candidates */
$candidates = Project::on('pgsql_supplier')
->whereExists(function ($q) use ($supplierProject): void {
$q->selectRaw('1')
->from('project_supplier_links')
->whereColumn('project_supplier_links.project_id', 'projects.id')
->where('project_supplier_links.supplier_project_id', $supplierProject->id);
})
->where($fkColumn, $supplierProject->id)
->where('is_active', true)
->whereRaw('(delivery_days_mask & ?) <> 0', [$todayBit])
->whereRaw('delivered_today < COALESCE(effective_daily_limit_today, daily_limit_target)')
->whereRaw(
'delivered_today < COALESCE(effective_daily_limit_today, daily_limit_target)'
)
->whereExists(function ($q): void {
// Plan 4 Task 4: dual-balance — допускаем rub-only tenant'ов.
// LedgerService::chargeForDelivery сам выбирает prepaid (balance_leads--)
// или rub (balance_rub -= tier_price) и кидает InsufficientBalanceException,
// если ОБА = 0. До Plan 4 фильтр был строгий balance_leads > 0 (prepaid only).
$q->selectRaw('1')
->from('tenants')
->whereColumn('tenants.id', 'projects.tenant_id')
@@ -59,6 +84,12 @@ class LeadRouter
->orderBy('id')
->get();
return $candidates->values();
return $candidates->filter(
fn (Project $p): bool => $this->phonePrefix->phoneMatchesRegions(
$phone,
(int) $p->region_mask,
(string) $p->region_mode,
)
)->values();
}
}
+16 -118
View File
@@ -4,12 +4,10 @@ declare(strict_types=1);
namespace App\Services\Project;
use App\Jobs\Supplier\DeleteSupplierProjectJob;
use App\Jobs\SyncSupplierProjectJob;
use App\Models\Project;
use App\Models\Tenant;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Support\Facades\DB;
class ProjectService
{
@@ -21,6 +19,7 @@ class ProjectService
$data['tenant_id'], $data['signal_type'],
$data['delivered_today'], $data['delivered_in_month'],
$data['supplier_b1_project_id'], $data['supplier_b2_project_id'], $data['supplier_b3_project_id'],
$data['archived_at'],
);
if (isset($data['daily_limit_target']) && $data['daily_limit_target'] < $project->delivered_today) {
@@ -33,26 +32,10 @@ class ProjectService
], 422));
}
// Resync на смену источник-несущих полей, регионов, лимита и дней недели —
// поставщик должен видеть актуальные параметры сразу, не дожидаясь ночного батча.
// Resync на смену любого источник-несущего поля — поставщику нужно знать актуальный домен/телефон/sms.
$needsResync = array_key_exists('sms_senders', $data)
|| array_key_exists('sms_keyword', $data)
|| array_key_exists('signal_identifier', $data)
|| array_key_exists('regions', $data)
|| array_key_exists('daily_limit_target', $data)
|| array_key_exists('delivery_days_mask', $data);
if (array_key_exists('signal_identifier', $data) || array_key_exists('sms_senders', $data) || array_key_exists('sms_keyword', $data)) {
$this->assertSourceUnique($project->tenant_id, array_merge([
'signal_type' => $project->signal_type,
'signal_identifier' => $project->signal_identifier,
'sms_senders' => $project->sms_senders,
'sms_keyword' => $project->sms_keyword,
], $data), exceptId: $project->id);
}
if (array_key_exists('name', $data)) {
$this->assertNameUnique($project->tenant_id, (string) $data['name'], exceptId: $project->id);
}
|| array_key_exists('signal_identifier', $data);
$project->update($data);
@@ -63,26 +46,17 @@ class ProjectService
return $project->fresh();
}
public function delete(Project $project): void
public function archive(Project $project): void
{
$hasDeals = DB::table('deals')->where('project_id', $project->id)->exists();
if ($hasDeals) {
if ($project->archived_at !== null) {
throw new HttpResponseException(response()->json([
'errors' => ['project' => ['Нельзя удалить проект: по нему есть сделки. Поставьте приём на паузу, чтобы скрыть проект из работы.']],
], 422));
}
// Капчим доноров ДО удаления — pivot уйдёт каскадом.
$supplierProjectIds = DB::table('project_supplier_links')
->where('project_id', $project->id)
->pluck('supplier_project_id')
->all();
$project->delete(); // hard delete (Project без SoftDeletes); cascade чистит pivot + служебные.
if ($supplierProjectIds !== []) {
DeleteSupplierProjectJob::dispatch(array_map('intval', $supplierProjectIds));
'message' => 'Project уже архивирован.',
], 409));
}
$project->update([
'is_active' => false,
'archived_at' => now(),
]);
}
public function triggerSync(Project $project): void
@@ -105,8 +79,9 @@ class ProjectService
}
if (! empty($filter['status'])) {
match ($filter['status']) {
'active' => $query->where('is_active', true),
'paused' => $query->where('is_active', false),
'active' => $query->where('is_active', true)->whereNull('archived_at'),
'paused' => $query->where('is_active', false)->whereNull('archived_at'),
'archived' => $query->whereNotNull('archived_at'),
default => null,
};
}
@@ -129,7 +104,7 @@ class ProjectService
return match ($action) {
'pause' => $this->bulkSimpleUpdate($query, ['is_active' => false]),
'resume' => $this->bulkSimpleUpdate($query, ['is_active' => true]),
'delete' => $this->bulkDelete($query),
'archive' => $this->bulkSimpleUpdate($query, ['is_active' => false, 'archived_at' => now()]),
'update_regions' => $this->bulkUpdateRegions($query, $payload),
'update_days' => $this->bulkUpdateDays($query, $payload),
'update_limit' => $this->bulkUpdateLimit($query, $payload),
@@ -143,29 +118,6 @@ class ProjectService
return ['updated' => $updated, 'skipped' => [], 'warnings' => []];
}
private function bulkDelete($query): array
{
$projects = (clone $query)->get(['id']);
$deleted = 0;
$skipped = [];
foreach ($projects as $p) {
$model = Project::find($p->id);
if ($model === null) {
continue;
}
try {
$this->delete($model);
$deleted++;
} catch (HttpResponseException) {
$skipped[] = ['id' => $p->id, 'reason' => 'has_deals'];
}
}
return ['updated' => $deleted, 'skipped' => $skipped, 'warnings' => []];
}
/**
* Plan 6.5: субъект-уровневый bulk-edit `regions` INT[].
*
@@ -257,60 +209,10 @@ class ProjectService
return ['updated' => $updated, 'skipped' => $skipped, 'warnings' => []];
}
private function assertNameUnique(int $tenantId, string $name, ?int $exceptId = null): void
{
$q = Project::where('tenant_id', $tenantId)->where('name', $name);
if ($exceptId !== null) {
$q->where('id', '!=', $exceptId);
}
if ($q->exists()) {
throw new HttpResponseException(response()->json([
'errors' => ['name' => ['Проект с таким названием у вас уже есть. Выберите другое название.']],
], 422));
}
}
/** @param array<string,mixed> $data */
private function assertSourceUnique(int $tenantId, array $data, ?int $exceptId = null): void
{
$signalType = $data['signal_type'] ?? null;
$q = Project::where('tenant_id', $tenantId)->where('signal_type', $signalType);
if ($exceptId !== null) {
$q->where('id', '!=', $exceptId);
}
if (in_array($signalType, ['call', 'site'], true)) {
$identifier = (string) ($data['signal_identifier'] ?? '');
if ($identifier === '') {
return;
}
$q->where('signal_identifier', $identifier);
} elseif ($signalType === 'sms') {
$senders = (array) ($data['sms_senders'] ?? []);
$norm = collect($senders)->map(fn ($s) => mb_strtolower(trim((string) $s)))->sort()->values()->all();
if ($norm === []) {
return;
}
$keyword = $data['sms_keyword'] ?? null;
$q->where('sms_keyword', $keyword)
->whereJsonContains('sms_senders', $norm)
->whereRaw('jsonb_array_length(sms_senders::jsonb) = ?', [count($norm)]);
} else {
return;
}
$existing = $q->first();
if ($existing !== null) {
throw new HttpResponseException(response()->json([
'errors' => ['signal_identifier' => ["У вас уже есть проект с этим источником: «{$existing->name}»."]],
], 422));
}
}
public function create(Tenant $tenant, array $data): Project
{
$limit = (int) ($tenant->limits['max_projects'] ?? 10);
$current = Project::where('tenant_id', $tenant->id)->count();
$current = Project::where('tenant_id', $tenant->id)->active()->count();
if ($current >= $limit) {
throw new HttpResponseException(response()->json([
'message' => "Достигнут лимит проектов ({$limit}). Смените тариф.",
@@ -324,10 +226,6 @@ class ProjectService
// PhonePrefixService / LeadRouter, удаляются в Plan 6.5 после переключения читателей.
$data['region_mask'] = 255;
$data['region_mode'] = 'include';
$this->assertNameUnique($tenant->id, (string) $data['name']);
$this->assertSourceUnique($tenant->id, $data);
$project = Project::create($data);
SyncSupplierProjectJob::dispatch($project->id);
-27
View File
@@ -1,27 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Services;
use App\Support\RussianRegions;
/**
* Резолвит регион-тег поставщика (raw_payload['tag'] = имя субъекта или «РФ»)
* в код субъекта 1..89. «РФ»/пусто/неизвестно null (пул «Вся РФ»/неизвестно).
*
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.4.
*/
final class RegionTagResolver
{
public function resolve(string $tag): ?int
{
$tag = trim($tag);
if ($tag === '' || $tag === 'РФ') {
return null;
}
return RussianRegions::nameToCode()[$tag] ?? null;
}
}
@@ -33,9 +33,6 @@ final readonly class SupplierProjectDto
array $regions,
public bool $regionsReverse, // false = include (default), true = exclude
public string $status, // active / paused
public string $tag = '_lidpotok',
/** @var array<int, string> */
public array $platforms = [],
) {
// Canonical order for deterministic equals() vs PG jsonb non-deterministic order.
// sort() reorders in-place AND re-indexes keys 0..N-1 (PHP guarantees list-semantics).
@@ -8,7 +8,7 @@ use App\Exceptions\Supplier\SupplierAuthException;
class PlaywrightBridge
{
private const TIMEOUT_SECONDS = 180; // 60s Node timeout + запас на холодный старт Chromium на маломощных VM (тест-сервер YC 2vCPU/2GB: ~65s wall-clock на refresh-session). До 21.05.2026 было 75с — упиралось на тест-сервере.
private const TIMEOUT_SECONDS = 75; // 60s Node timeout + 15s safety buffer
private const SCRIPT_RELATIVE_PATH = 'playwright/refresh-session.js';
@@ -1,32 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Services\Supplier;
use Illuminate\Support\Facades\DB;
/**
* Глобальный режим экспорта проектов поставщику (system_settings).
* 'online' sync сразу при create/edit с полными параметрами;
* 'batch' каркас сразу + полные параметры ночным SyncSupplierProjectsJob (18:00).
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.1.
*/
final class SupplierExportMode
{
public const ONLINE = 'online';
public const BATCH = 'batch';
public static function current(): string
{
$value = DB::table('system_settings')->where('key', 'supplier_export_mode')->value('value');
return $value === self::ONLINE ? self::ONLINE : self::BATCH;
}
public static function isOnline(): bool
{
return self::current() === self::ONLINE;
}
}
@@ -94,40 +94,6 @@ class SupplierPortalClient
$this->assertStatusOk($response, '/admin/visit/rt-project-save');
}
/**
* R5: один save с флагами всех dto->platforms портал создаёт N rt-проектов,
* портал делит лимит сам (R6). Ответ rt-project-save отдаёт id последнего
* дочитываем listProjects и матчим по name+tag (R-SAVE вариант а, Task 1 finding).
*
* @return array<string, int> [platform => external_id]
*/
public function saveProjectMultiFlag(SupplierProjectDto $dto): array
{
$response = $this->request(
'POST', '/admin/visit/rt-project-save',
$this->toPayload($dto, externalId: 0), asJson: true,
);
$this->assertStatusOk($response, '/admin/visit/rt-project-save');
$srcToPlatform = ['rt' => 'B1', 'bl' => 'B2', 'mt' => 'B3'];
$out = [];
foreach ($this->listProjects() as $p) {
// Real portal returns name='B1_<identifier>' and identifier in 'content'.
// Test mocks omit 'content' and put identifier directly in 'name' — fall back to 'name'
// when 'content' is absent so both shapes work.
$identifier = $p['content'] ?? $p['name'] ?? null;
if ($identifier !== $dto->uniqueKey || ($p['tag'] ?? null) !== $dto->tag) {
continue;
}
$platform = $srcToPlatform[$p['src'] ?? ''] ?? null;
if ($platform !== null && in_array($platform, $dto->platforms !== [] ? $dto->platforms : [$dto->platform], true)) {
$out[$platform] = (int) $p['id'];
}
}
return $out;
}
public function deleteProject(int $externalId): void
{
$response = $this->request(
@@ -354,43 +320,9 @@ class SupplierPortalClient
);
}
// Defense-in-depth: портал отдаёт логин-страницу с HTTP 200 при истекшей
// сессии middle-of-use (вместо 401/403). Детектим Yii2-маркер и форсим
// refresh+retry. Verified 2026-05-19: refresh-session.js ловит #loginform-username.
if ($this->isHtmlLoginPage($response)) {
if ($isRetry) {
throw new SupplierAuthException(
"Portal returned login page after refresh on {$path}",
httpStatus: $response->status(),
responseBody: $response->body(),
);
}
try {
dispatch_sync(app(RefreshSupplierSessionJob::class));
} catch (\Throwable $e) {
throw new SupplierAuthException(
"Session refresh failed during HTML-login retry on {$path}: {$e->getMessage()}",
httpStatus: $response->status(),
previous: $e,
);
}
return $this->request($method, $path, $body, isRetry: true, asJson: $asJson);
}
return $response;
}
private function isHtmlLoginPage(Response $response): bool
{
$contentType = $response->header('Content-Type');
if (! str_starts_with(mb_strtolower($contentType), 'text/html')) {
return false;
}
return preg_match('~loginform-(username|password)~i', $response->body()) === 1;
}
/**
* @return array{phpsessid: string, csrf: string, refreshed_at?: string}
*/
@@ -453,17 +385,16 @@ class SupplierPortalClient
default => $dto->signalType,
};
$platforms = $dto->platforms !== [] ? $dto->platforms : [$dto->platform];
$srcrt = in_array('B1', $platforms, true);
$srcbl = in_array('B2', $platforms, true);
$srcmt = in_array('B3', $platforms, true);
$srcrt = $dto->platform === 'B1';
$srcbl = $dto->platform === 'B2';
$srcmt = $dto->platform === 'B3';
// workdays: int → string (portal: ["1","2",...,"7"]).
$workdays = array_map(static fn (int $d): string => (string) $d, $dto->workdays);
return [
'id' => $externalId,
'tag' => $dto->tag,
'tag' => '_lidpotok',
'name' => $dto->uniqueKey,
'type' => $type,
'content' => $dto->uniqueKey,
@@ -1,105 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Services\Supplier;
use App\Models\Project;
/**
* DRY-хелперы для группировки Лидерра-проектов по (subject × platform-set).
*
* Используется в:
* - SyncSupplierProjectJob (онлайн-режим, один проект)
* - SyncSupplierProjectsJob (ночной батч, все проекты)
*
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.3
* Plan: docs/superpowers/plans/2026-05-20-project-migration-redesign-plan-3-export.md Task 6
*/
final class SupplierProjectGrouping
{
/**
* Строит unique_key для пары (project, platform):
* site/call signal_identifier (домен / телефон)
* sms B2 sender + '+' + keyword
* sms B3 sender
*
* Для ночного батч-джоба используйте buildUniqueKeyNoplatform() он
* выбирает B2-ключ автоматически при наличии keyword.
*/
public static function buildUniqueKey(Project $project, string $platform): string
{
if (in_array($project->signal_type, ['site', 'call'], true)) {
return (string) $project->signal_identifier;
}
// sms
$sender = (string) ($project->sms_senders[0] ?? '');
if ($platform === 'B2') {
return $sender.'+'.($project->sms_keyword ?? '');
}
// B3
return $sender;
}
/**
* Unique identifier key без привязки к конкретной платформе
* (для группировки в ночном батч-джобе):
* site/call signal_identifier
* sms+keyword sender+keyword (B2 ключ)
* sms без keyword sender (B3 ключ)
*/
public static function buildUniqueKeyAgnostic(Project $project): string
{
if (in_array($project->signal_type, ['site', 'call'], true)) {
return (string) $project->signal_identifier;
}
$sender = (string) ($project->sms_senders[0] ?? '');
if ($project->sms_keyword !== null && $project->sms_keyword !== '') {
return $sender.'+'.$project->sms_keyword;
}
return $sender;
}
/**
* Возвращает список uppercase platform-кодов для данного project.
* Коды соответствуют CHECK constraint: 'B1' / 'B2' / 'B3'.
*
* @return list<string>
*/
public static function resolvePlatforms(Project $project): array
{
if (in_array($project->signal_type, ['site', 'call'], true)) {
return ['B1', 'B2', 'B3'];
}
if ($project->signal_type === 'sms') {
return ($project->sms_keyword !== null && $project->sms_keyword !== '')
? ['B2', 'B3']
: ['B3'];
}
return [];
}
/**
* Returns subjects (region codes 1..89) for a project.
* Empty regions [null] (one group, "Вся РФ" pool).
*
* @return list<int|null>
*/
public static function subjectsOf(Project $project): array
{
$regions = array_values((array) $project->regions);
// @phpstan-ignore-next-line identical.alwaysFalse — PostgresIntArray PHPDoc non-empty, runtime can be empty
if (count($regions) === 0) {
return [null];
}
return array_map(fn ($r) => (int) $r, $regions);
}
}
@@ -9,24 +9,26 @@ use Carbon\Carbon;
use Illuminate\Support\Collection;
/**
* Pure function: формула заказа у поставщика на (источник × субъект).
* Pure function: распределение квоты daily_limit между platform B1/B2/B3.
*
* Эпик миграции проектов (Plan 3): platform-split B1/B2/B3 удалён портал
* делит лимит сам (R6). Один лимит на группу eligible-клиентов:
* Используется SyncSupplierProjectsJob для агрегирования daily_limit_target
* всех активных Лидерра-проектов на одного supplier_project и распределения
* суммарной квоты между B1/B2/B3 платформами.
*
* order = max(наибольший_лимит, ceil(Σ_лимитов / 3))
* Spec: docs/superpowers/specs/2026-05-10-supplier-integration-design.md §4.3-§4.4
*
* ceil(Σ/3) ёмкость шаринга (лид продаётся ≤3 раз).
* наиб крупнейший клиент должен иметь шанс добрать.
*
* `allocate()` оставлен с прежней сигнатурой для временной совместимости
* c SyncSupplierProjectsJob внутри использует computeOrder, возвращает
* DTO с одинаковым limit на любую platform/signalType.
* Distribution-формулы:
* site/call:
* B1 = ceil(total/3)
* B2 = ceil((total - B1) / 2)
* B3 = total - B1 - B2
* sms-with-keyword (B1 не поддерживает СМС):
* B1 = 0
* B2 = ceil(total/2)
* B3 = floor(total/2)
*
* Workdays и regions союзы (deduplicated, sorted) активных Лидерра-проектов,
* eligible на targetDate (фильтр по weekday в Europe/Moscow).
*
* Spec: docs/superpowers/specs/2026-05-20-project-migration-redesign-design.md §4.5.
*/
final class SupplierQuotaAllocator
{
@@ -54,9 +56,7 @@ final class SupplierQuotaAllocator
$workdaysUnion = self::unionInts($eligibleProjects->pluck('workdays'));
$regionsUnion = self::unionInts($eligibleProjects->pluck('regions'));
$platformLimit = self::computeOrder(
$eligibleProjects->pluck('daily_limit')->map(fn ($v) => (int) $v)->all()
);
$platformLimit = self::distributeForPlatform($signalType, $platform, $totalQuota);
return new SupplierProjectDto(
platform: $platform,
@@ -70,26 +70,28 @@ final class SupplierQuotaAllocator
);
}
/**
* Заказ у поставщика на (источник × субъект): max(наибольший лимит, ceil(Σ/3)).
*
* ceil(Σ/3) ёмкость шаринга (лид продаётся ≤3 раз).
* наиб крупнейший клиент должен иметь шанс добрать.
*
* Один лимит на группу; портал делит на B1/B2/B3 сам (R6 наш split убран).
*
* @param array<int, int> $dailyLimits лимиты eligible-сегодня клиентов группы
*/
public static function computeOrder(array $dailyLimits): int
private static function distributeForPlatform(string $signalType, string $platform, int $total): int
{
if ($dailyLimits === []) {
return 0;
if ($signalType === 'sms') {
if ($platform === 'B1') {
return 0;
}
return $platform === 'B2'
? (int) ceil($total / 2)
: (int) floor($total / 2);
}
$sum = array_sum($dailyLimits);
$max = max($dailyLimits);
$b1 = (int) ceil($total / 3);
$b2 = (int) ceil(($total - $b1) / 2);
$b3 = $total - $b1 - $b2;
return max($max, (int) ceil($sum / 3));
return match ($platform) {
'B1' => $b1,
'B2' => $b2,
'B3' => $b3,
default => 0,
};
}
/**
-122
View File
@@ -1,122 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Support;
/**
* Канонический справочник субъектов РФ (1..89) PHP-зеркало
* resources/js/constants/regions.ts (конституционный порядок, ст. 65).
* Sentinel 0 «Вся РФ» не входит (= NULL subject_code / пустой regions).
*
* ВАЖНО: при правке regions.ts синхронно править этот файл (тест RegionTagResolverTest
* «mirrors regions.ts exactly 89» ловит расхождение по count, но не по именам
* сверять имена вручную при изменениях).
*/
final class RussianRegions
{
/** @var array<int, string> code(1..89) => официальное имя субъекта */
public const CODE_TO_NAME = [
// 24 республики
1 => 'Республика Адыгея',
2 => 'Республика Алтай',
3 => 'Республика Башкортостан',
4 => 'Республика Бурятия',
5 => 'Республика Дагестан',
6 => 'Донецкая Народная Республика',
7 => 'Республика Ингушетия',
8 => 'Кабардино-Балкарская Республика',
9 => 'Республика Калмыкия',
10 => 'Карачаево-Черкесская Республика',
11 => 'Республика Карелия',
12 => 'Республика Коми',
13 => 'Республика Крым',
14 => 'Луганская Народная Республика',
15 => 'Республика Марий Эл',
16 => 'Республика Мордовия',
17 => 'Республика Саха (Якутия)',
18 => 'Республика Северная Осетия — Алания',
19 => 'Республика Татарстан',
20 => 'Республика Тыва',
21 => 'Удмуртская Республика',
22 => 'Республика Хакасия',
23 => 'Чеченская Республика',
24 => 'Чувашская Республика',
// 9 краёв
25 => 'Алтайский край',
26 => 'Забайкальский край',
27 => 'Камчатский край',
28 => 'Краснодарский край',
29 => 'Красноярский край',
30 => 'Пермский край',
31 => 'Приморский край',
32 => 'Ставропольский край',
33 => 'Хабаровский край',
// 48 областей
34 => 'Амурская область',
35 => 'Архангельская область',
36 => 'Астраханская область',
37 => 'Белгородская область',
38 => 'Брянская область',
39 => 'Владимирская область',
40 => 'Волгоградская область',
41 => 'Вологодская область',
42 => 'Воронежская область',
43 => 'Запорожская область',
44 => 'Ивановская область',
45 => 'Иркутская область',
46 => 'Калининградская область',
47 => 'Калужская область',
48 => 'Кемеровская область',
49 => 'Кировская область',
50 => 'Костромская область',
51 => 'Курганская область',
52 => 'Курская область',
53 => 'Ленинградская область',
54 => 'Липецкая область',
55 => 'Магаданская область',
56 => 'Московская область',
57 => 'Мурманская область',
58 => 'Нижегородская область',
59 => 'Новгородская область',
60 => 'Новосибирская область',
61 => 'Омская область',
62 => 'Оренбургская область',
63 => 'Орловская область',
64 => 'Пензенская область',
65 => 'Псковская область',
66 => 'Ростовская область',
67 => 'Рязанская область',
68 => 'Самарская область',
69 => 'Саратовская область',
70 => 'Сахалинская область',
71 => 'Свердловская область',
72 => 'Смоленская область',
73 => 'Тамбовская область',
74 => 'Тверская область',
75 => 'Томская область',
76 => 'Тульская область',
77 => 'Тюменская область',
78 => 'Ульяновская область',
79 => 'Херсонская область',
80 => 'Челябинская область',
81 => 'Ярославская область',
// 3 города федерального значения
82 => 'Москва',
83 => 'Санкт-Петербург',
84 => 'Севастополь',
// 1 автономная область
85 => 'Еврейская автономная область',
// 4 автономных округа
86 => 'Ненецкий автономный округ',
87 => 'Ханты-Мансийский автономный округ — Югра',
88 => 'Чукотский автономный округ',
89 => 'Ямало-Ненецкий автономный округ',
];
/** @return array<string, int> name => code (обратный индекс) */
public static function nameToCode(): array
{
return array_flip(self::CODE_TO_NAME);
}
}
+1 -17
View File
@@ -2,12 +2,9 @@
use App\Http\Middleware\EnsureSaasAdmin;
use App\Http\Middleware\SetTenantContext;
use Illuminate\Database\QueryException;
use Illuminate\Foundation\Application;
use Illuminate\Foundation\Configuration\Exceptions;
use Illuminate\Foundation\Configuration\Middleware;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
return Application::configure(basePath: dirname(__DIR__))
->withRouting(
@@ -33,18 +30,5 @@ return Application::configure(basePath: dirname(__DIR__))
]);
})
->withExceptions(function (Exceptions $exceptions): void {
$exceptions->render(function (QueryException $e, Request $request) {
Log::error('db.query_exception', [
'message' => $e->getMessage(),
'sql' => $e->getSql(),
'path' => $request->path(),
]);
if ($request->expectsJson()) {
return response()->json([
'message' => 'Не удалось сохранить. Проверьте данные или попробуйте ещё раз.',
], 422);
}
return null; // default render for non-JSON
});
//
})->create();
+1 -8
View File
@@ -18,7 +18,6 @@
"require-dev": {
"barryvdh/laravel-ide-helper": "*",
"deptrac/deptrac": "^4.6",
"driftingly/rector-laravel": "^2.3",
"fakerphp/faker": "^1.23",
"infection/infection": "^0.32.7",
"larastan/larastan": "*",
@@ -28,10 +27,8 @@
"laravel/pint": "^1.29",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.6",
"nunomaduro/phpinsights": "*",
"pestphp/pest": "^4.7",
"pestphp/pest-plugin-laravel": "^4.1",
"rector/rector": "^2.4",
"roave/security-advisories": "dev-latest"
},
"autoload": {
@@ -67,9 +64,6 @@
"pint:test": "@php vendor/bin/pint --test",
"test:parallel": "@php vendor/bin/pest --parallel --recreate-databases",
"stan": "@php vendor/bin/phpstan analyse --memory-limit=512M",
"rector": "@php vendor/bin/rector process --dry-run",
"rector:fix": "@php vendor/bin/rector process",
"insights": "@php artisan insights --no-interaction",
"mutation": "@php vendor/bin/infection --threads=2 --min-msi=50",
"audit-offline": "@composer audit --locked",
"demo:seed": "@php artisan db:seed --class=DemoSeeder --force",
@@ -108,8 +102,7 @@
"allow-plugins": {
"pestphp/pest-plugin": true,
"php-http/discovery": true,
"infection/extension-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true
"infection/extension-installer": true
}
},
"minimum-stability": "stable",
+1 -2162
View File
File diff suppressed because it is too large Load Diff
-7
View File
@@ -28,13 +28,6 @@ return [
'env' => env('APP_ENV', 'production'),
/*
| ВРЕМЕННО (тест-деплой): пропуск гейта SaaS-admin зоны вне local/testing.
| По умолчанию false прод не затронут. Включается только на тест-сервере
| (SAAS_ADMIN_TEST_BYPASS=true). Убрать после внедрения Yandex 360 SSO (Б-1 + DO-4).
*/
'saas_admin_test_bypass' => (bool) env('SAAS_ADMIN_TEST_BYPASS', false),
/*
|--------------------------------------------------------------------------
| Application Debug Mode
-148
View File
@@ -1,148 +0,0 @@
<?php
declare(strict_types=1);
use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenDefineFunctions;
use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenFinalClasses;
use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses;
use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenPrivateMethods;
use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenTraits;
use NunoMaduro\PhpInsights\Domain\Insights\SyntaxCheck;
use NunoMaduro\PhpInsights\Domain\Metrics\Architecture\Classes;
use SlevomatCodingStandard\Sniffs\Commenting\UselessFunctionDocCommentSniff;
use SlevomatCodingStandard\Sniffs\Namespaces\AlphabeticallySortedUsesSniff;
use SlevomatCodingStandard\Sniffs\TypeHints\DeclareStrictTypesSniff;
use SlevomatCodingStandard\Sniffs\TypeHints\DisallowMixedTypeHintSniff;
use SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff;
use SlevomatCodingStandard\Sniffs\TypeHints\PropertyTypeHintSniff;
use SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff;
return [
/*
|--------------------------------------------------------------------------
| Default Preset
|--------------------------------------------------------------------------
|
| This option controls the default preset that will be used by PHP Insights
| to make your code reliable, simple, and clean. However, you can always
| adjust the `Metrics` and `Insights` below in this configuration file.
|
| Supported: "default", "laravel", "symfony", "magento2", "drupal", "wordpress"
|
*/
'preset' => 'laravel',
/*
|--------------------------------------------------------------------------
| IDE
|--------------------------------------------------------------------------
|
| This options allow to add hyperlinks in your terminal to quickly open
| files in your favorite IDE while browsing your PhpInsights report.
|
| Supported: "textmate", "macvim", "emacs", "sublime", "phpstorm",
| "atom", "vscode".
|
| If you have another IDE that is not in this list but which provide an
| url-handler, you could fill this config with a pattern like this:
|
| myide://open?url=file://%f&line=%l
|
*/
'ide' => null,
/*
|--------------------------------------------------------------------------
| Configuration
|--------------------------------------------------------------------------
|
| Here you may adjust all the various `Insights` that will be used by PHP
| Insights. You can either add, remove or configure `Insights`. Keep in
| mind, that all added `Insights` must belong to a specific `Metric`.
|
*/
'exclude' => [
// 'path/to/directory-or-file'
],
'add' => [
Classes::class => [
ForbiddenFinalClasses::class,
],
],
'remove' => [
// SyntaxCheck спавнит дочерний `php -l` процесс — на native-Windows возвращает
// не-JSON и крашит PHP Insights (A1 backend-tooling, 20.05.2026). Избыточен:
// синтаксис ловят Pint / Larastan / сам PHP. Стиль — владелец Pint (BT4, ADR-013).
SyntaxCheck::class,
AlphabeticallySortedUsesSniff::class,
DeclareStrictTypesSniff::class,
DisallowMixedTypeHintSniff::class,
ForbiddenDefineFunctions::class,
ForbiddenNormalClasses::class,
ForbiddenTraits::class,
ParameterTypeHintSniff::class,
PropertyTypeHintSniff::class,
ReturnTypeHintSniff::class,
UselessFunctionDocCommentSniff::class,
],
'config' => [
ForbiddenPrivateMethods::class => [
'title' => 'The usage of private methods is not idiomatic in Laravel.',
],
],
/*
|--------------------------------------------------------------------------
| Requirements
|--------------------------------------------------------------------------
|
| Here you may define a level you want to reach per `Insights` category.
| When a score is lower than the minimum level defined, then an error
| code will be returned. This is optional and individually defined.
|
*/
'requirements' => [
// Anti-regression floors из baseline 20.05.2026 (Code 80 / Complexity 81 /
// Architecture 75). Чуть ниже текущих — гейт ловит деградацию, не текущий долг.
// Style НЕ гейтим — владелец стиля Pint (BT4, ADR-013). Security-check off —
// дублирует roave/security-advisories + composer audit.
'min-quality' => 78,
'min-complexity' => 79,
'min-architecture' => 73,
'disable-security-check' => true,
],
/*
|--------------------------------------------------------------------------
| Threads
|--------------------------------------------------------------------------
|
| Here you may adjust how many threads (core) PHPInsights can use to perform
| the analysis. This is optional, don't provide it and the tool will guess
| the max core number available. It accepts null value or integer > 0.
|
*/
'threads' => null,
/*
|--------------------------------------------------------------------------
| Timeout
|--------------------------------------------------------------------------
| Here you may adjust the timeout (in seconds) for PHPInsights to run before
| a ProcessTimedOutException is thrown.
| This accepts an int > 0. Default is 60 seconds, which is the default value
| of Symfony's setTimeout function.
|
*/
'timeout' => 60,
];
+1 -6
View File
@@ -7,7 +7,6 @@ namespace Database\Factories;
use App\Models\Project;
use App\Models\Tenant;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str;
/**
* @extends Factory<Project>
@@ -21,11 +20,7 @@ class ProjectFactory extends Factory
{
return [
'tenant_id' => Tenant::factory(),
// Квирк #77: fake()->unique() создаёт новый UniqueGenerator на каждый
// definition()-call → history между вызовами не сохраняется, uniqueness
// внутри batch не гарантирована (коллизия (tenant_id, name) UNIQUE в
// pest --parallel). Str::random(8) суффикс (62^8 ≈ 2e14) гасит коллизию.
'name' => fake()->words(3, true).' '.Str::random(8),
'name' => fake()->unique()->words(3, true),
'type' => 'webhook',
'is_active' => true,
'daily_limit_target' => 10,
@@ -1,64 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
/**
* Per-субъект supplier_projects (эпик переделки миграции проектов, v8.26).
*
* +subject_code SMALLINT NULL (1..89 субъект РФ; NULL = пул «Вся РФ»).
* Старый unique (platform, unique_key) (platform, unique_key, subject_code)
* NULLS NOT DISTINCT пул «Вся РФ» уникален per (platform, unique_key).
*
* Guard: migrate:fresh грузит schema.sql v8.26 (delta уже там) до миграций.
*/
return new class extends Migration
{
public function up(): void
{
if (! Schema::hasColumn('supplier_projects', 'subject_code')) {
DB::statement('ALTER TABLE supplier_projects ADD COLUMN subject_code SMALLINT');
}
DB::statement(<<<'SQL'
DO $$ BEGIN
IF NOT EXISTS (
SELECT 1 FROM pg_constraint WHERE conname = 'chk_supplier_projects_subject_code'
) THEN
ALTER TABLE supplier_projects
ADD CONSTRAINT chk_supplier_projects_subject_code
CHECK (subject_code IS NULL OR (subject_code BETWEEN 1 AND 89)) NOT VALID;
END IF;
END $$;
SQL);
DB::statement('ALTER TABLE supplier_projects VALIDATE CONSTRAINT chk_supplier_projects_subject_code');
DB::statement('DROP INDEX IF EXISTS supplier_projects_platform_unique_key_unique');
DB::statement(
'CREATE UNIQUE INDEX IF NOT EXISTS supplier_projects_platform_key_subject_unique '
.'ON supplier_projects (platform, unique_key, subject_code) NULLS NOT DISTINCT'
);
DB::statement(
'COMMENT ON COLUMN supplier_projects.subject_code IS '
."'Субъект РФ 1..89 (resources/js/constants/regions.ts). NULL = пул «Вся РФ». Эпик миграции проектов v8.26.'"
);
}
public function down(): void
{
DB::statement('DROP INDEX IF EXISTS supplier_projects_platform_key_subject_unique');
DB::statement(
'CREATE UNIQUE INDEX IF NOT EXISTS supplier_projects_platform_unique_key_unique '
.'ON supplier_projects (platform, unique_key)'
);
DB::statement('ALTER TABLE supplier_projects DROP CONSTRAINT IF EXISTS chk_supplier_projects_subject_code');
if (Schema::hasColumn('supplier_projects', 'subject_code')) {
Schema::table('supplier_projects', fn ($t) => $t->dropColumn('subject_code'));
}
}
};
@@ -1,46 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
/**
* M:N pivot между projects (tenant) и supplier_projects (SaaS, shared) v8.26.
*
* Заменяет 3 FK-слота projects.supplier_b{1,2,3}_project_id (которые не вмещают
* per-субъект модель: N субъектов × до 3 платформ = до 3N связей).
* SaaS-level (без RLS, как supplier_projects): пишется sync-флоу, читается
* sharing-флоу через BYPASSRLS-роль crm_supplier_worker.
*/
return new class extends Migration
{
public function up(): void
{
$exists = DB::selectOne("SELECT to_regclass('public.project_supplier_links') AS r");
if ($exists !== null && $exists->r !== null) {
return;
}
DB::unprepared(<<<'SQL'
CREATE TABLE project_supplier_links (
id BIGSERIAL PRIMARY KEY,
project_id BIGINT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
supplier_project_id BIGINT NOT NULL REFERENCES supplier_projects(id) ON DELETE CASCADE,
platform VARCHAR(4) NOT NULL,
subject_code SMALLINT,
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
CONSTRAINT chk_psl_platform CHECK (platform IN ('B1', 'B2', 'B3')),
CONSTRAINT uq_psl_project_supplier UNIQUE (project_id, supplier_project_id)
);
CREATE INDEX idx_psl_supplier_project ON project_supplier_links (supplier_project_id);
CREATE INDEX idx_psl_project ON project_supplier_links (project_id);
SQL);
}
public function down(): void
{
DB::statement('DROP TABLE IF EXISTS project_supplier_links');
}
};
@@ -1,36 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
/**
* deals.subject_code субъект РФ из тега поставщика (raw_payload['tag']) v8.26.
*
* Источник истины региона сделки = тег проекта у поставщика (надёжнее phone-prefix
* для мобильных). Отдельно от deals.region_code (ISO-3166, phone-derived).
* deals партиционирована ADD COLUMN наследуется партициями.
*/
return new class extends Migration
{
public function up(): void
{
if (! Schema::hasColumn('deals', 'subject_code')) {
DB::statement('ALTER TABLE deals ADD COLUMN subject_code SMALLINT');
}
DB::statement(
'COMMENT ON COLUMN deals.subject_code IS '
."'Субъект РФ 1..89 из тега поставщика (raw_payload[tag]). NULL = «Вся РФ»/неизвестно. v8.26.'"
);
}
public function down(): void
{
if (Schema::hasColumn('deals', 'subject_code')) {
Schema::table('deals', fn ($t) => $t->dropColumn('subject_code'));
}
}
};
@@ -1,34 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
/**
* Глобальный тумблер режима экспорта проектов поставщику (v8.26).
* 'batch' (default, прод-безопасно) | 'online'. Резолвится SupplierExportMode (План 3).
*/
return new class extends Migration
{
public function up(): void
{
$exists = DB::table('system_settings')->where('key', 'supplier_export_mode')->exists();
if ($exists) {
return;
}
DB::table('system_settings')->insert([
'key' => 'supplier_export_mode',
'value' => 'batch',
'type' => 'string',
'description' => 'Режим экспорта проектов поставщику: batch (ночной 18:00) | online (сразу при правке).',
'updated_at' => now(),
]);
}
public function down(): void
{
DB::table('system_settings')->where('key', 'supplier_export_mode')->delete();
}
};
@@ -1,32 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
/**
* Бэкофилл pivot project_supplier_links из legacy supplier_b{1,2,3}_project_id (v8.26).
*
* Для каждого ненулевого слота строка pivot (subject_code=NULL: legacy-записи без
* субъекта). Идемпотентно ON CONFLICT DO NOTHING по uq_psl_project_supplier.
*/
return new class extends Migration
{
public function up(): void
{
foreach (['B1' => 'supplier_b1_project_id', 'B2' => 'supplier_b2_project_id', 'B3' => 'supplier_b3_project_id'] as $platform => $col) {
DB::statement(
'INSERT INTO project_supplier_links (project_id, supplier_project_id, platform, subject_code, created_at) '
."SELECT id, {$col}, ?, NULL, NOW() FROM projects WHERE {$col} IS NOT NULL "
.'ON CONFLICT (project_id, supplier_project_id) DO NOTHING',
[$platform]
);
}
}
public function down(): void
{
// Бэкофилл-данные не откатываем точечно (pivot живёт дальше); no-op.
}
};
@@ -1,37 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
/**
* deals.subject_code range CHECK 1..89 defensive parity с supplier_projects.subject_code (v8.26).
*
* Reviewer-finding (Plan 1 code-quality): supplier_projects.subject_code имеет CHECK 1..89,
* deals.subject_code только COMMENT. Malformed webhook tag silent garbage в deals
* downstream report-by-region undercounts. NOT VALID + VALIDATE (squawk-safe), idempotent.
*/
return new class extends Migration
{
public function up(): void
{
DB::statement(<<<'SQL'
DO $$ BEGIN
IF NOT EXISTS (
SELECT 1 FROM pg_constraint WHERE conname = 'chk_deals_subject_code'
) THEN
ALTER TABLE deals
ADD CONSTRAINT chk_deals_subject_code
CHECK (subject_code IS NULL OR (subject_code BETWEEN 1 AND 89)) NOT VALID;
END IF;
END $$;
SQL);
DB::statement('ALTER TABLE deals VALIDATE CONSTRAINT chk_deals_subject_code');
}
public function down(): void
{
DB::statement('ALTER TABLE deals DROP CONSTRAINT IF EXISTS chk_deals_subject_code');
}
};
@@ -1,19 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
return new class extends Migration
{
public function up(): void
{
DB::statement('ALTER TABLE projects DROP COLUMN IF EXISTS archived_at');
}
public function down(): void
{
DB::statement('ALTER TABLE projects ADD COLUMN archived_at TIMESTAMPTZ NULL');
}
};
+53 -221
View File
@@ -204,6 +204,12 @@ parameters:
count: 3
path: app/Jobs/ImportLeadsJob.php
-
message: '#^Parameter \#1 \$array \(array\{string\}\) of array_values is already a list, call has no effect\.$#'
identifier: arrayValues.list
count: 1
path: app/Jobs/Supplier/SyncSupplierProjectsJob.php
-
message: '#^Using nullsafe property access "\?\-\>name" on left side of \?\? is unnecessary\. Use \-\> instead\.$#'
identifier: nullsafe.neverNull
@@ -246,102 +252,6 @@ parameters:
count: 1
path: app/Services/Project/ProjectService.php
-
message: '#^Call to function is_array\(\) with array\<string, mixed\> will always evaluate to true\.$#'
identifier: function.alreadyNarrowedType
count: 1
path: app/Services/Supplier/Channel/AjaxProjectChannel.php
-
message: '#^Parameter \#1 \$array \(array\{string\}\) of array_values is already a list, call has no effect\.$#'
identifier: arrayValues.list
count: 1
path: app/Services/Supplier/SupplierProjectGrouping.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Insights\\ForbiddenDefineFunctions not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Insights\\ForbiddenFinalClasses not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Insights\\ForbiddenNormalClasses not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Insights\\ForbiddenPrivateMethods not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Insights\\ForbiddenTraits not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Insights\\SyntaxCheck not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class NunoMaduro\\PhpInsights\\Domain\\Metrics\\Architecture\\Classes not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\Commenting\\UselessFunctionDocCommentSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\Namespaces\\AlphabeticallySortedUsesSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\TypeHints\\DeclareStrictTypesSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\TypeHints\\DisallowMixedTypeHintSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\TypeHints\\ParameterTypeHintSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\TypeHints\\PropertyTypeHintSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Class SlevomatCodingStandard\\Sniffs\\TypeHints\\ReturnTypeHintSniff not found\.$#'
identifier: class.notFound
count: 1
path: config/insights.php
-
message: '#^Return type \(array\<string, mixed\>\) of method Database\\Factories\\BalanceTransactionFactory\:\:definition\(\) should be compatible with return type \(array\<model property of App\\Models\\BalanceTransaction, mixed\>\) of method Illuminate\\Database\\Eloquent\\Factories\\Factory\<App\\Models\\BalanceTransaction\>\:\:definition\(\)$#'
identifier: method.childReturnType
@@ -408,18 +318,6 @@ parameters:
count: 1
path: tests/Feature/Admin/AdminPricingTiersControllerTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
count: 3
path: tests/Feature/Admin/AdminSupplierIntegrationTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:postJson\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Admin/AdminSupplierIntegrationTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
@@ -432,60 +330,6 @@ parameters:
count: 3
path: tests/Feature/Admin/AdminSuppliersControllerTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:actingAs\(\)\.$#'
identifier: method.notFound
count: 3
path: tests/Feature/Admin/SupplierExportModeEndpointTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Admin/SupplierExportModeEndpointTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:postJson\(\)\.$#'
identifier: method.notFound
count: 2
path: tests/Feature/Admin/SupplierExportModeEndpointTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:actingAs\(\)\.$#'
identifier: method.notFound
count: 4
path: tests/Feature/Admin/SupplierManualQueueTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
count: 2
path: tests/Feature/Admin/SupplierManualQueueTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:postJson\(\)\.$#'
identifier: method.notFound
count: 2
path: tests/Feature/Admin/SupplierManualQueueTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:actingAs\(\)\.$#'
identifier: method.notFound
count: 5
path: tests/Feature/Admin/SupplierProjectsAdminTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
count: 2
path: tests/Feature/Admin/SupplierProjectsAdminTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:postJson\(\)\.$#'
identifier: method.notFound
count: 4
path: tests/Feature/Admin/SupplierProjectsAdminTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
@@ -1653,15 +1497,9 @@ parameters:
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:actingAs\(\)\.$#'
identifier: method.notFound
count: 14
count: 12
path: tests/Feature/Plan5/Projects/ProjectsUpdateTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Project/QueryExceptionRenderTest.php
-
message: '#^Access to an undefined property Pest\\PendingCalls\\TestCall\:\:\$tenant\.$#'
identifier: property.notFound
@@ -1908,42 +1746,6 @@ parameters:
count: 1
path: tests/Feature/Supplier/AutoPauseFlowTest.php
-
message: '#^Access to an undefined property App\\Services\\Supplier\\PlaywrightBridge\:\:\$lastArgs\.$#'
identifier: property.notFound
count: 7
path: tests/Feature/Supplier/Channel/FormProjectChannelTest.php
-
message: '#^Call to an undefined method Illuminate\\Contracts\\Cache\\Repository\:\:lock\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Supplier/CsvReconcileJobTest.php
-
message: '#^Call to an undefined method Mockery\\ExpectationInterface\|Mockery\\HigherOrderMessage\:\:andThrow\(\)\.$#'
identifier: method.notFound
count: 3
path: tests/Feature/Supplier/FailoverProjectChannelLiveSmokeTest.php
-
message: '#^Parameter \#1 \$tier1 of class App\\Services\\Supplier\\Channel\\FailoverProjectChannel constructor expects App\\Services\\Supplier\\Channel\\SupplierProjectChannel, Mockery\\MockInterface given\.$#'
identifier: argument.type
count: 2
path: tests/Feature/Supplier/FailoverProjectChannelLiveSmokeTest.php
-
message: '#^Parameter \#2 \$tier2 of class App\\Services\\Supplier\\Channel\\FailoverProjectChannel constructor expects App\\Services\\Supplier\\Channel\\SupplierProjectChannel, Mockery\\MockInterface given\.$#'
identifier: argument.type
count: 2
path: tests/Feature/Supplier/FailoverProjectChannelLiveSmokeTest.php
-
message: '#^Call to an undefined method Mockery\\ExpectationInterface\|Mockery\\HigherOrderMessage\:\:once\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Supplier/DeleteSupplierProjectJobTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:artisan\(\)\.$#'
identifier: method.notFound
@@ -1980,12 +1782,6 @@ parameters:
count: 1
path: tests/Feature/Supplier/SupplierSessionRefreshCommandTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:mock\(\)\.$#'
identifier: method.notFound
count: 2
path: tests/Feature/Supplier/SyncSupplierProjectJobTest.php
-
message: '#^Access to an undefined property Pest\\PendingCalls\\TestCall\:\:\$tenant\.$#'
identifier: property.notFound
@@ -2106,6 +1902,18 @@ parameters:
count: 1
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 1, workdays\: array\{1, 2, 3, 4, 5\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
count: 3
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 10, workdays\: array\{1, 2, 3, 4, 5\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
count: 6
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 10, workdays\: array\{6, 7\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
@@ -2113,19 +1921,43 @@ parameters:
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Access to an undefined property Pest\\PendingCalls\\TestCall\:\:\$tenant\.$#'
identifier: property.notFound
count: 6
path: tests/Feature/Project/ProjectCreateDedupTest.php
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 30, workdays\: array\{1, 2, 3, 4, 5\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
count: 1
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:fail\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Project/ProjectCreateDedupTest.php
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 4, workdays\: array\{1, 2, 3, 4, 5\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
count: 3
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Call to an undefined method Symfony\\Component\\HttpFoundation\\Response\:\:getData\(\)\.$#'
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 5, workdays\: array\{1, 2, 3, 4, 5\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
count: 1
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Parameter \#4 \$activeLiderraProjects of static method App\\Services\\Supplier\\SupplierQuotaAllocator\:\:allocate\(\) expects Illuminate\\Support\\Collection\<int, stdClass\>, Illuminate\\Support\\Collection\<int, object\{daily_limit\: 7, workdays\: array\{1, 2, 3, 4, 5\}, regions\: array\{\}\}&stdClass\> given\.$#'
identifier: argument.type
count: 3
path: tests/Unit/Supplier/SupplierQuotaAllocatorTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:getJson\(\)\.$#'
identifier: method.notFound
count: 3
path: tests/Feature/Admin/AdminSupplierIntegrationTest.php
-
message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:postJson\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Project/ProjectCreateDedupTest.php
path: tests/Feature/Admin/AdminSupplierIntegrationTest.php
-
message: '#^Call to an undefined method Illuminate\\Contracts\\Cache\\Repository\:\:lock\(\)\.$#'
identifier: method.notFound
count: 1
path: tests/Feature/Supplier/CsvReconcileJobTest.php
@@ -1,270 +0,0 @@
<!DOCTYPE html>
<html><head><meta charset="utf-8"><title>RT Project Form Fixture — Element UI + Vuetify dialog</title>
<style>
/* Minimal stubs so Playwright class-based locators work */
.el-form-item { margin-bottom: 12px; }
.el-form-item__label { display: inline-block; min-width: 140px; }
.el-form-item__content { display: inline-block; }
.el-input__inner { border: 1px solid #cccccc; padding: 4px 8px; }
.el-checkbox { cursor: pointer; margin-right: 8px; }
.el-checkbox__input.is-checked .el-checkbox__inner { background: #409eff; }
.el-checkbox__inner { display: inline-block; width: 14px; height: 14px; border: 1px solid #cccccc; }
.el-switch { cursor: pointer; }
.el-switch.is-checked .el-switch__core { background: #409eff; }
.el-switch__core { display: inline-block; width: 40px; height: 20px; border-radius: 10px; background: #cccccc; }
.el-select-dropdown { position: absolute; background: #ffffff; border: 1px solid #cccccc; z-index: 9999; min-width: 120px; }
.el-select-dropdown__item { padding: 6px 12px; cursor: pointer; }
.el-select-dropdown__item:hover { background: #f5f7fa; }
.el-button { padding: 6px 16px; cursor: pointer; border: 1px solid #cccccc; background: #ffffff; }
.el-input-number .el-input__inner { width: 80px; }
</style>
</head><body>
<!-- Vuetify dialog wrapper — required by manage-project.js locator ".v-dialog--active button:has-text(...)" -->
<div class="v-dialog v-dialog--active v-dialog--persistent" style="padding:16px;">
<form class="el-form el-form--label-left">
<!-- 1. Tag -->
<div class="el-form-item">
<label class="el-form-item__label" for="tag">Тег</label>
<div class="el-form-item__content">
<div class="el-input">
<input type="text" class="el-input__inner" id="tag-fixture">
</div>
</div>
</div>
<!-- 2. Источник данных (B1/B2/B3 checkboxes) — label for="srcrt" -->
<div class="el-form-item">
<label class="el-form-item__label" for="srcrt">Источник данных</label>
<div class="el-form-item__content" id="srcrt-container">
<label class="el-checkbox is-checked" data-platform="B1">
<span class="el-checkbox__input is-checked">
<span class="el-checkbox__inner"></span>
<input type="checkbox" class="el-checkbox__original" checked>
</span>
<span class="el-checkbox__label">B1</span>
</label>
<label class="el-checkbox is-checked" data-platform="B2">
<span class="el-checkbox__input is-checked">
<span class="el-checkbox__inner"></span>
<input type="checkbox" class="el-checkbox__original" checked>
</span>
<span class="el-checkbox__label">B2</span>
</label>
<label class="el-checkbox is-checked" data-platform="B3">
<span class="el-checkbox__input is-checked">
<span class="el-checkbox__inner"></span>
<input type="checkbox" class="el-checkbox__original" checked>
</span>
<span class="el-checkbox__label">B3</span>
</label>
</div>
</div>
<!-- 3. Name — label for="name" -->
<div class="el-form-item">
<label class="el-form-item__label" for="name">Название проекта</label>
<div class="el-form-item__content">
<div class="el-input">
<input type="text" class="el-input__inner" id="name-fixture">
</div>
</div>
</div>
<!-- 4. Type select — label for="type" -->
<div class="el-form-item">
<label class="el-form-item__label" for="type">Источники сбора</label>
<div class="el-form-item__content">
<div class="el-select" id="type-select-container">
<!-- readonly input that shows selected value; clicking it opens dropdown popup in body -->
<div class="el-input">
<input type="text" class="el-input__inner" id="type-select-input" readonly
value="Сайты" placeholder="Выберите" data-current-value="Сайты">
<span class="el-input__suffix"><span class="el-select__caret"></span></span>
</div>
</div>
</div>
</div>
<!-- 5. Slider «Период» — no label-for, no DTO field, leave default -->
<div class="el-form-item">
<label class="el-form-item__label">Период</label>
<div class="el-form-item__content">
<div class="el-slider" aria-valuemin="0" aria-valuemax="24" aria-valuetext="10-18">
<span style="font-size:12px;color:#999999">10-18 (default)</span>
</div>
</div>
</div>
<!-- 6. Switch «Включить» — no label-for; identified by .el-switch in form-item -->
<div class="el-form-item" id="switch-form-item">
<label class="el-form-item__label">Статус</label>
<div class="el-form-item__content">
<div class="el-switch" id="active-switch">
<input type="checkbox" class="el-switch__input" id="active-switch-input">
<span class="el-switch__core"></span>
<span>Включить</span>
</div>
</div>
</div>
<!-- 7. Regions — label for="regions", el-select multiple -->
<div class="el-form-item">
<label class="el-form-item__label" for="regions">Регион</label>
<div class="el-form-item__content">
<div class="el-select el-select--multiple">
<input type="text" class="el-input__inner" id="regions-input" placeholder="Выберите регионы">
</div>
</div>
</div>
<!-- 8. limit_off — no label-for, no DTO field -->
<div class="el-form-item">
<label class="el-form-item__label" for="limit_off">Разделять по проектам</label>
<div class="el-form-item__content">
<label class="el-checkbox">
<span class="el-checkbox__input">
<span class="el-checkbox__inner"></span>
<input type="checkbox" class="el-checkbox__original">
</span>
<span class="el-checkbox__label">Да</span>
</label>
</div>
</div>
<!-- 9. Content (uniqueKey / domains) — label for="content", el-tabs -->
<div class="el-form-item">
<label class="el-form-item__label" for="content">Список сайтов</label>
<div class="el-form-item__content">
<div class="el-tabs">
<div class="el-tabs__header">
<div class="el-tabs__item is-active" data-tab="list">Список</div>
<div class="el-tabs__item" data-tab="file">Файл</div>
</div>
<div class="el-tabs__content">
<textarea class="el-textarea__inner" id="content-textarea" rows="4" style="width:100%"></textarea>
</div>
</div>
</div>
</div>
<!-- 10. Limit — label for="limit", el-input-number -->
<div class="el-form-item">
<label class="el-form-item__label" for="limit">Лимит в день</label>
<div class="el-form-item__content">
<div class="el-input-number">
<span class="el-input-number__decrease">-</span>
<div class="el-input">
<input type="text" class="el-input__inner" id="limit-input" value="10">
</div>
<span class="el-input-number__increase">+</span>
</div>
</div>
</div>
</form><!-- end .el-form -->
<!-- Save/Cancel buttons OUTSIDE form, INSIDE .v-dialog--active -->
<div style="margin-top:16px;">
<button type="button" class="el-button" id="save-btn">Сохранить</button>
<button type="button" class="el-button" id="cancel-btn">Отмена</button>
</div>
</div><!-- end .v-dialog--active -->
<script>
(function() {
'use strict';
// ---- Checkbox toggle behaviour ----
// Click on .el-checkbox toggles .is-checked on itself and .el-checkbox__input child
document.querySelectorAll('#srcrt-container .el-checkbox').forEach(function(cb) {
cb.addEventListener('click', function(e) {
e.preventDefault();
var isChecked = cb.classList.contains('is-checked');
cb.classList.toggle('is-checked', !isChecked);
var cbInput = cb.querySelector('.el-checkbox__input');
if (cbInput) cbInput.classList.toggle('is-checked', !isChecked);
var rawInput = cb.querySelector('input.el-checkbox__original');
if (rawInput) rawInput.checked = !isChecked;
});
});
// ---- Switch toggle behaviour ----
var switchEl = document.getElementById('active-switch');
if (switchEl) {
switchEl.addEventListener('click', function(e) {
e.preventDefault();
var isChecked = switchEl.classList.contains('is-checked');
switchEl.classList.toggle('is-checked', !isChecked);
var inp = document.getElementById('active-switch-input');
if (inp) inp.checked = !isChecked;
});
}
// ---- Type select popup ----
// When input#type-select-input is clicked, create a dropdown in body
var typeInput = document.getElementById('type-select-input');
var typeOptions = ['Сайты', 'Звонки', 'СМС', 'Ретро сайты', 'Ретро звонки'];
function removeDropdown() {
var existing = document.querySelector('body > .el-select-dropdown');
if (existing) existing.remove();
}
if (typeInput) {
typeInput.addEventListener('click', function(e) {
e.stopPropagation();
removeDropdown();
var dropdown = document.createElement('div');
dropdown.className = 'el-select-dropdown el-popper';
dropdown.style.position = 'absolute';
dropdown.style.left = '20px';
dropdown.style.top = '200px';
var ul = document.createElement('ul');
ul.className = 'el-scrollbar__view el-select-dropdown__list';
typeOptions.forEach(function(opt) {
var li = document.createElement('li');
li.className = 'el-select-dropdown__item';
li.textContent = opt;
li.addEventListener('click', function(e2) {
e2.stopPropagation();
typeInput.value = opt;
typeInput.setAttribute('data-current-value', opt);
removeDropdown();
});
ul.appendChild(li);
});
dropdown.appendChild(ul);
document.body.appendChild(dropdown);
});
}
// Close dropdown on outside click
document.addEventListener('click', function() {
removeDropdown();
});
// ---- Save button: POST to /admin/visit/rt-project-save on the same origin ----
// NOTE: NO fetch mock here — the HTTP server (manage-project.test.js) handles
// this route and returns {status:"OK",id:"99001"}. Playwright's waitForResponse
// intercepts real network requests, not mocked fetch.
document.getElementById('save-btn').addEventListener('click', function() {
var payload = {
tag: document.getElementById('tag-fixture') ? document.getElementById('tag-fixture').value : '',
name: document.getElementById('name-fixture') ? document.getElementById('name-fixture').value : '',
type: typeInput ? typeInput.getAttribute('data-current-value') : 'Сайты',
limit: document.getElementById('limit-input') ? document.getElementById('limit-input').value : '10',
};
fetch('/admin/visit/rt-project-save', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(payload),
});
});
})();
</script>
</body></html>
+49 -284
View File
@@ -18,35 +18,11 @@
* 4 invalid input или другая ошибка
*
* Spec §4.3.
*
* KNOWN GAPS (Tier-2 MVP, зафиксированы по recon 2026-05-19):
* - workdays: поле add-project форм НЕ содержит чекбоксы дней недели (только slider «Период»
* часы 0-24). DTO.workdays игнорируется; портал применяет дефолт (все 7 дней).
* Для точной настройки workdays используйте Tier-1 (AJAX).
* - regions: форма требует имена регионов, DTO несёт int[] id. Mapping idname не реализован.
* Tier-2 всегда передаёт пустой массив регионов (нет фильтрации). Регионы должны быть
* настроены вручную или через Tier-1.
*/
const { chromium } = require('playwright');
const TIMEOUT_MS = 90_000;
// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------
/**
* Возвращает локатор form-item по значению атрибута for= у label.
* Стратегия: .el-form-item:has(.el-form-item__label[for="<attrFor>"])
*/
function fieldByFor(page, attrFor) {
return page.locator(`.el-form-item:has(.el-form-item__label[for="${attrFor}"])`);
}
// ---------------------------------------------------------------------------
// Login
// ---------------------------------------------------------------------------
async function login(page, args) {
// skipLogin: args.url — статическая фикстура формы (тестовый режим),
// открываем её напрямую и не логинимся.
@@ -63,301 +39,98 @@ async function login(page, args) {
]);
}
// ---------------------------------------------------------------------------
// fillForm — Element UI label-for локаторы (recon 2026-05-19)
// ---------------------------------------------------------------------------
async function fillForm(page, dto) {
// NOTE: статус active/paused НЕ выставляется через форму. Единственный
// .el-switch на форме — это include/exclude регионов («Включить/Исключить»,
// recon 2026-05-19 row 6), НЕ статус проекта. Статус задаётся дефолтом
// портала (active). dto.active игнорируется в Tier-2; switch не трогаем
// (regions skip — см. ниже). Verified live 2026-05-19.
const activeChecked = await page.locator('input[name=active]').isChecked();
if (activeChecked !== !!dto.active) await page.locator('input[name=active]').click();
// --- 1. Tag ---
if (dto.tag !== undefined && dto.tag !== null) {
await fieldByFor(page, 'tag').locator('input.el-input__inner').fill(String(dto.tag));
}
if (dto.tag) await page.fill('input[name=tag]', dto.tag);
// --- 2. Platforms (srcrt) — B1/B2/B3 checkboxes ---
// Initial: все три checked. Нужно включить только те, что в dto.platforms, остальные выключить.
const platformContainer = fieldByFor(page, 'srcrt');
for (const p of ['B1', 'B2', 'B3']) {
const wanted = (dto.platforms || []).includes(p);
// Identification — по `.el-checkbox__label` textContent (per recon-doc
// 2026-05-19-rt-project-form-locators.md row 2: реальный портал НЕ имеет
// `data-platform`-атрибута, inputs без `name`). Whitespace-tolerant `^\s*B1\s*$`.
const cb = platformContainer.locator('.el-checkbox').filter({
has: page.locator('.el-checkbox__label', { hasText: new RegExp(`^\\s*${p}\\s*$`) }),
}).first();
const cbClass = await cb.getAttribute('class').catch(() => '');
const isChecked = (cbClass || '').includes('is-checked');
if (!!isChecked !== wanted) {
await cb.click();
}
const sel = `input[name="platform[]"][value="${p}"]`;
const checked = await page.locator(sel).isChecked();
if (checked !== wanted) await page.locator(sel).click();
}
// --- 3. Name (label for="name") ---
// В реальном портале dto.name заполняется в поле «Название проекта»,
// а dto.uniqueKey (список сайтов/номеров) — в textarea «content».
// manage-project.js получает dto.name напрямую.
if (dto.name !== undefined) {
await fieldByFor(page, 'name').locator('input.el-input__inner').fill(String(dto.name));
await page.fill('input[name=name]', dto.name);
const signalLabel = { site: 'Сайты', call: 'Звонки', sms: 'СМС' }[dto.signal_type] || 'Сайты';
await page.selectOption('select[name=signal_type]', { label: signalLabel });
if (dto.region_mode === 'exclude') {
await page.locator('input[name=region_mode][value=exclude]').click();
}
// --- 4. Type select (label for="type") ---
// El-select readonly input. Клик открывает popup в body > .el-select-dropdown.
const signalTypeMap = { site: 'Сайты', call: 'Звонки', sms: 'СМС' };
const signalLabel = signalTypeMap[dto.signal_type];
if (!signalLabel) {
throw new Error(
`Unsupported signal_type "${dto.signal_type}". Supported: site, call, sms. ` +
'"Ретро сайты" / "Ретро звонки" are not supported in Tier-2 form channel.',
);
}
// Тип меняем ТОЛЬКО если текущее значение ≠ нужное. Смена типа ремоунтит
// content tab-pane (Сайты/Звонки/СМС — разные поля сбора) → если сразу
// после type-select заполнять content, fill попадёт в detached textarea
// (Vue ещё не закончил ре-рендер) → rt-project-save уходит с пустым
// `content` → портал «Введите домены». Verified live 2026-05-19.
const typeInput = fieldByFor(page, 'type').locator('.el-select input.el-input__inner');
const currentType = (await typeInput.inputValue().catch(() => '')).trim();
if (currentType !== signalLabel) {
await typeInput.click();
// Dropdown рендерится снаружи формы в body — ждём его появления
const dropdownOption = page.locator('.el-select-dropdown__item', {
hasText: new RegExp(`^${signalLabel}$`),
});
await dropdownOption.waitFor({ state: 'visible', timeout: TIMEOUT_MS });
await dropdownOption.click();
// Ждём, пока Vue завершит ре-рендер content tab-pane после смены типа.
await page.waitForTimeout(1000);
if (dto.domains && dto.domains.length) {
await page.fill('textarea[name=domains]', dto.domains.join('\n'));
}
// --- 7. Regions (label for="regions") — SKIP, gap зафиксирован в JSDoc ---
// DTO несёт int[] id; форма требует имена. Mapping не реализован для MVP.
if (dto.regions && dto.regions.length > 0) {
process.stderr.write(
JSON.stringify({
warning: 'regions skipped in Tier-2 form channel: DTO carries int[] ids but form requires region names. ' +
'Region filtering will not be applied. Configure regions manually or use Tier-1.',
regions_received: dto.regions,
}) + '\n',
);
}
await page.fill('input[name=limit]', String(dto.limit));
// --- 9. Content — список сайтов/номеров/отправителей (label for="content") ---
// Вкладка «Список» (default active). dto.domains — массив строк или dto.uniqueKey — строка.
const contentLines = dto.domains && dto.domains.length
? dto.domains.join('\n')
: dto.uniqueKey
? String(dto.uniqueKey)
: null;
if (contentLines) {
const contentField = fieldByFor(page, 'content');
// Вкладка «Список» — default active. Кликаем ТОЛЬКО если она НЕ активна:
// клик по вкладке Element UI ремоунтит tab-pane → textarea детачится,
// и последующий .fill() гонится с ре-рендером (домены теряются →
// rt-project-save уходит с пустым `content` → портал «Введите домены»).
// Verified live 2026-05-19: re-click активной вкладки ломал save.
const listTab = contentField.locator('.el-tabs__item', { hasText: 'Список' }).first();
if ((await listTab.count()) > 0) {
const tabClass = (await listTab.getAttribute('class')) || '';
if (!tabClass.includes('is-active')) {
await listTab.click();
await contentField.locator('textarea.el-textarea__inner')
.waitFor({ state: 'visible', timeout: TIMEOUT_MS });
}
}
const contentTa = contentField.locator('textarea.el-textarea__inner');
await contentTa.fill(contentLines);
// Defensive: убедиться, что значение действительно осело в textarea
// (если поле детачнулось ре-рендером — fill уйдёт в пустоту).
const filledValue = await contentTa.inputValue();
if (filledValue.trim() === '') {
throw new Error(
'Content textarea empty after fill — likely tab/type re-render race; domains lost',
);
}
}
// --- 10. Limit (label for="limit") ---
if (dto.limit !== undefined) {
await fieldByFor(page, 'limit').locator('input.el-input__inner').fill(String(dto.limit));
}
// NOTE: workdays — gap зафиксирован в JSDoc. Форма add-project не содержит
// чекбоксы дней недели. dto.workdays игнорируется.
if (dto.workdays && dto.workdays.length !== 7) {
process.stderr.write(
JSON.stringify({
warning: 'workdays ignored in Tier-2 form channel: add-project form has no workdays field. ' +
'Portal will apply default (all 7 days). Configure workdays manually or use Tier-1.',
workdays_received: dto.workdays,
}) + '\n',
);
for (let d = 1; d <= 7; d++) {
const wanted = (dto.workdays || [1, 2, 3, 4, 5, 6, 7]).includes(d);
const sel = `input[name="workdays[]"][value="${d}"]`;
const checked = await page.locator(sel).isChecked();
if (checked !== wanted) await page.locator(sel).click();
}
}
// ---------------------------------------------------------------------------
// createOp
// ---------------------------------------------------------------------------
async function createOp(page, args) {
await login(page, args);
if (!args.skipLogin) {
await page.goto(
args.url.replace(/\/$/, '') + '/admin/visit/rt',
{ waitUntil: 'load', timeout: TIMEOUT_MS },
);
// Кнопка «Добавить проект» — recon: label [title="Добавить проект"]
await page.locator('button:has-text("Добавить проект")').click();
// Ждём появления формы — label for="name" внутри .el-form
await page.locator('.el-form-item__label[for="name"]').waitFor({
state: 'visible',
timeout: TIMEOUT_MS,
});
await page.goto(args.url.replace(/\/$/, '') + '/admin/visit/rt', { waitUntil: 'load', timeout: TIMEOUT_MS });
await page.click('button:has-text("Добавить проект")');
await page.waitForSelector('#add-project-modal', { state: 'visible', timeout: TIMEOUT_MS });
}
await fillForm(page, args.dto);
const beforeRows = await page.locator('#projects-table tbody tr').count();
await page.click('#save-btn');
await page.waitForFunction(
(before) => document.querySelectorAll('#projects-table tbody tr').length > before,
beforeRows,
{ timeout: TIMEOUT_MS },
);
// Кликаем «Сохранить» + перехватываем ответ rt-project-save
const [saveResponse] = await Promise.all([
page.waitForResponse(
(r) => r.url().endsWith('/admin/visit/rt-project-save') && r.request().method() === 'POST',
{ timeout: TIMEOUT_MS },
),
page.locator('.v-dialog--active button:has-text("Сохранить")').click(),
]);
const body = await saveResponse.json();
if (body.status !== 'OK') {
// DIAG: дамп фактически отправленного тела — для расследования "Введите домены"
const sentBody = saveResponse.request().postData();
process.stderr.write(JSON.stringify({ diag_sent_body: sentBody }) + '\n');
throw new Error(`Portal rejected save: ${body.message || 'unknown error'}`);
}
const externalId = String(body.id ?? '');
if (!externalId) {
throw new Error('Portal returned status=OK but empty id');
}
const newRow = page.locator('#projects-table tbody tr').last();
const externalId = await newRow.getAttribute('data-id');
return { external_id: externalId };
}
// ---------------------------------------------------------------------------
// updateOp
// ---------------------------------------------------------------------------
async function updateOp(page, args) {
await login(page, args);
if (!args.skipLogin) {
await page.goto(
args.url.replace(/\/$/, '') + '/admin/visit/rt',
{ waitUntil: 'load', timeout: TIMEOUT_MS },
);
await page.goto(args.url.replace(/\/$/, '') + '/admin/visit/rt', { waitUntil: 'load', timeout: TIMEOUT_MS });
}
// Найти строку таблицы по externalId и кликнуть кнопку редактирования.
// Реальная таблица портала — Vuetify data-table; строки по data-id или текстовому совпадению.
// Стратегия 1: строка с атрибутом data-id
const rowLocator = page.locator(`tr[data-id="${args.externalId}"], [data-id="${args.externalId}"]`);
const rowCount = await rowLocator.count();
if (rowCount > 0) {
await rowLocator.first().locator('button').first().click();
} else {
// Стратегия 2: найти строку содержащую текст externalId и кликнуть edit-кнопку
await page.locator(`tr:has-text("${args.externalId}")`).first().locator('button').first().click();
}
// Дождаться формы
await page.locator('.el-form-item__label[for="name"]').waitFor({
state: 'visible',
timeout: TIMEOUT_MS,
});
const row = page.locator(`#projects-table tbody tr[data-id="${args.externalId}"]`);
await row.locator('button.edit').click();
await page.waitForSelector('#add-project-modal', { state: 'visible', timeout: TIMEOUT_MS });
await fillForm(page, args.dto);
// Перехватываем ответ rt-project-save при update (тот же endpoint)
const [saveResponse] = await Promise.all([
page.waitForResponse(
(r) => r.url().endsWith('/admin/visit/rt-project-save') && r.request().method() === 'POST',
{ timeout: TIMEOUT_MS },
),
page.locator('.v-dialog--active button:has-text("Сохранить")').click(),
]);
const body = await saveResponse.json();
if (body.status !== 'OK') {
throw new Error(`Portal rejected update: ${body.message || 'unknown error'}`);
}
await page.click('#save-btn');
await page.waitForSelector('#add-project-modal', { state: 'hidden', timeout: TIMEOUT_MS });
return { ok: true };
}
// ---------------------------------------------------------------------------
// listOp
// ---------------------------------------------------------------------------
async function listOp(page, args) {
await login(page, args);
if (!args.skipLogin) {
await page.goto(
args.url.replace(/\/$/, '') + '/admin/visit/rt',
{ waitUntil: 'load', timeout: TIMEOUT_MS },
);
await page.goto(args.url.replace(/\/$/, '') + '/admin/visit/rt', { waitUntil: 'load', timeout: TIMEOUT_MS });
}
// Стратегия 1: Vuex state (если доступен)
const projects = await page.evaluate(() => {
try {
if (window.app && window.app.$store && window.app.$store.state) {
const st = window.app.$store.state;
const list = st.projects || st.rtProjects || st.visitProjects || null;
if (Array.isArray(list)) {
return list.map((p) => ({
id: parseInt(p.id, 10),
name: p.name || p.title || null,
platform: p.platform || null,
signal_type: p.type || p.signal_type || null,
unique_key: p.content || p.unique_key || null,
}));
}
}
} catch (_) { /* Vuex недоступен */ }
return null;
});
if (projects !== null) {
return { projects };
}
// Стратегия 2: DOM-скрейп таблицы
// Реальная таблица портала: строки tr с data-id или стандартные td
const rows = await page.locator('table tbody tr[data-id], .v-data-table tbody tr[data-id]').evaluateAll(
(nodes) => nodes.map((n) => ({
id: parseInt(n.dataset.id || '0', 10),
name: n.querySelector('td:nth-child(2)')
? n.querySelector('td:nth-child(2)').textContent.trim()
: null,
const rows = await page.locator('#projects-table tbody tr').evaluateAll((nodes) =>
nodes.map((n) => ({
id: parseInt(n.dataset.id, 10),
name: n.querySelector('td:nth-child(2)') ? n.querySelector('td:nth-child(2)').textContent : null,
})),
);
if (rows.length > 0) {
return { projects: rows };
}
// Стратегия 3: фикстура / пустая страница — возвращаем пустой массив
return { projects: [] };
return { projects: rows };
}
// ---------------------------------------------------------------------------
// Entry point
// ---------------------------------------------------------------------------
async function run(args) {
const browser = await chromium.launch({ headless: true });
try {
@@ -375,14 +148,8 @@ async function run(args) {
} catch (err) {
process.stderr.write(JSON.stringify({ error: err.message }));
if (err.message.includes('Timeout')) process.exit(3);
if (
err.message.toLowerCase().includes('selector') ||
err.message.toLowerCase().includes('locator')
) process.exit(2);
if (
err.message.toLowerCase().includes('login') ||
err.message.toLowerCase().includes('auth')
) process.exit(1);
if (err.message.toLowerCase().includes('selector') || err.message.toLowerCase().includes('locator')) process.exit(2);
if (err.message.toLowerCase().includes('login') || err.message.toLowerCase().includes('auth')) process.exit(1);
process.exit(4);
} finally {
await browser.close();
@@ -393,10 +160,8 @@ let input = '';
process.stdin.on('data', (c) => { input += c; });
process.stdin.on('end', () => {
let args;
try { args = JSON.parse(input); } catch (e) {
process.stderr.write(JSON.stringify({ error: 'invalid JSON on stdin' }));
process.exit(4);
}
try { args = JSON.parse(input); }
catch (e) { process.stderr.write(JSON.stringify({ error: 'invalid JSON on stdin' })); process.exit(4); }
if (!args.operation || !args.url) {
process.stderr.write(JSON.stringify({ error: 'missing required: operation, url' }));
process.exit(4);
+43 -115
View File
@@ -1,137 +1,65 @@
/**
* Фикстурный тест manage-project.js против локального HTTP-сервера с Element UI фикстурой.
* Фикстурный тест manage-project.js против локального HTML, без живого портала.
*
* Почему HTTP, не file://: manage-project.js перехватывает ответ page.waitForResponse()
* с URL endsWith('/admin/visit/rt-project-save'). Браузер не шлёт network-запросы при
* file://-origin fetch из-за CORS/same-origin ограничений в Chromium.
*
* Runner: встроенный node:test (Node 18+). Запуск: `node --test manage-project.test.js`.
* Runner: встроенный node:test (проект не использует @playwright/test
* в app/playwright только playwright core). Запуск: `node --test manage-project.test.js`.
*/
const { test } = require('node:test');
const assert = require('node:assert');
const { execFile } = require('node:child_process');
const http = require('node:http');
const fs = require('node:fs');
const path = require('node:path');
const SCRIPT = path.resolve(__dirname, 'manage-project.js');
const FIXTURE_PATH = path.resolve(__dirname, 'fixtures', 'rt-form-element-ui.html');
const FIXTURE_URL = 'file://' + path.resolve(__dirname, '../tests/fixtures/supplier-portal/rt-add-project-form.html');
/** Запустить ephemeral HTTP-сервер, отдающий фикстуру и обрабатывающий mock-эндпоинты. */
function startFixtureServer() {
return new Promise((resolve) => {
const html = fs.readFileSync(FIXTURE_PATH, 'utf8');
const server = http.createServer((req, res) => {
// Mock rt-project-save — Playwright перехватывает реальный сетевой запрос
if (req.url && req.url.includes('rt-project-save') && req.method === 'POST') {
// Consume request body (important — don't hang connection)
let body = '';
req.on('data', (c) => { body += c; });
req.on('end', () => {
const payload = JSON.stringify({ status: 'OK', message: '', result: null, id: '99001' });
res.writeHead(200, { 'Content-Type': 'application/json' });
res.end(payload);
});
return;
}
// Default: serve fixture HTML
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
res.end(html);
});
server.listen(0, '127.0.0.1', () => resolve(server));
});
}
/** Спавнить manage-project.js, подать JSON на stdin, вернуть {code, stdout, stderr}. */
function runScript(input) {
return new Promise((resolve, reject) => {
const child = execFile(
'node',
[SCRIPT],
{ timeout: 90_000 },
(err, stdout, stderr) => {
if (err && err.killed) return reject(new Error('Process killed / timed out'));
// err.code — exit code; treat as expected (tests assert on code)
resolve({
code: err ? err.code : 0,
stdout: stdout.toString(),
stderr: stderr.toString(),
});
},
);
const child = execFile('node', [SCRIPT], { timeout: 60000 }, (err, stdout, stderr) => {
if (err && err.code !== undefined && typeof err.code !== 'number') {
return reject(err);
}
resolve({ stdout: stdout.toString(), stderr: stderr.toString() });
});
child.stdin.write(JSON.stringify(input));
child.stdin.end();
});
}
// ---------------------------------------------------------------------------
// Test 1 — createProject через Element UI фикстуру → external_id из mock-response
// ---------------------------------------------------------------------------
test('createProject fills Element UI form and returns external_id from intercept response', async () => {
const server = await startFixtureServer();
try {
const { port } = server.address();
const url = `http://127.0.0.1:${port}`;
test('createProject fills form and returns row id', async () => {
const result = await runScript({
operation: 'create',
login: 'fixture-noop',
password: 'fixture-noop',
url: FIXTURE_URL,
skipLogin: true,
dto: {
tag: 'TEST',
name: 'Test Project',
platforms: ['B1', 'B2'],
signal_type: 'site',
limit: 25,
workdays: [1, 2, 3, 4, 5],
regions: [],
region_mode: 'include',
domains: ['example.com'],
active: true,
},
});
const result = await runScript({
operation: 'create',
url,
skipLogin: true,
dto: {
tag: '_lidpotok',
name: 'example.com',
platforms: ['B1'],
signal_type: 'site',
limit: 5,
workdays: [1, 2, 3, 4, 5],
domains: ['example.com'],
region_mode: 'include',
regions: [],
active: true,
},
});
assert.strictEqual(result.code, 0, `Expected exit 0, got ${result.code}. stderr: ${result.stderr}`);
let out;
try {
out = JSON.parse(result.stdout);
} catch (e) {
assert.fail(`stdout is not valid JSON: ${result.stdout}\nstderr: ${result.stderr}`);
}
assert.strictEqual(out.external_id, '99001', `expected external_id "99001", got ${JSON.stringify(out)}`);
} finally {
server.close();
}
const out = JSON.parse(result.stdout);
assert.ok(out.external_id, 'external_id should be truthy');
assert.match(out.external_id, /^\d+$/, 'external_id should be numeric string');
});
// ---------------------------------------------------------------------------
// Test 2 — listProjects в skipLogin-режиме возвращает массив projects
// ---------------------------------------------------------------------------
test('listProjects returns array (skipLogin mode, fixture page)', async () => {
const server = await startFixtureServer();
try {
const { port } = server.address();
const url = `http://127.0.0.1:${port}`;
test('listProjects returns array', async () => {
const result = await runScript({
operation: 'list',
login: 'fixture-noop',
password: 'fixture-noop',
url: FIXTURE_URL,
skipLogin: true,
});
const result = await runScript({
operation: 'list',
url,
skipLogin: true,
});
// listOp в skipLogin-режиме не навигирует на /admin/visit/rt — просто открывает url.
// Фикстура не содержит Vuex и таблицы с проектами → возвращает {projects: []}.
assert.strictEqual(result.code, 0, `Expected exit 0. stderr: ${result.stderr}`);
let out;
try {
out = JSON.parse(result.stdout);
} catch (e) {
assert.fail(`stdout is not valid JSON: ${result.stdout}`);
}
assert.ok(Array.isArray(out.projects), `expected projects array, got: ${JSON.stringify(out)}`);
} finally {
server.close();
}
const out = JSON.parse(result.stdout);
assert.ok(Array.isArray(out.projects), 'projects should be an array');
});
+4 -23
View File
@@ -34,29 +34,10 @@ async function refresh(args) {
await page.fill(loginSelector, args.login);
await page.fill(passwordSelector, args.password);
// Сабмит + ОЖИДАНИЕ пост-логин перехода.
// Старый Promise.all([waitForLoadState('networkidle'), click]) — гонка:
// логин-страница уже в состоянии networkidle, поэтому waitForLoadState
// резолвился мгновенно (ДО редиректа), и скрипт хватал PHPSESSID
// неаутентифицированной логин-страницы. Ждём, пока логин-форма исчезнет
// из DOM — waitForFunction опрашивает и переживает навигацию.
await page.click(submitSelector);
await page
.waitForFunction(
(sel) => !document.querySelector(sel),
loginSelector,
{ timeout: TIMEOUT_MS },
)
.catch(() => { /* форма осталась — логин отклонён, ловится guard'ом ниже */ });
await page.waitForLoadState('networkidle', { timeout: TIMEOUT_MS }).catch(() => {});
// Verify: логин-форма всё ещё на странице → вход НЕ удался. Не возвращаем
// мусорную (неаутентифицированную) сессию как «успех» (exit 0).
if ((await page.locator(loginSelector).count()) > 0) {
process.stderr.write(JSON.stringify({ error: 'login rejected: still on login page after submit' }));
process.exit(1);
}
await Promise.all([
page.waitForLoadState('networkidle', { timeout: TIMEOUT_MS }),
page.click(submitSelector),
]);
let csrf = null;
try {
-19
View File
@@ -1,19 +0,0 @@
<?php
declare(strict_types=1);
use Rector\Config\RectorConfig;
// Консервативный старт (A1 backend-tooling #64): мёртвый код + качество кода.
// БЕЗ type-declaration наборов и БЕЗ LaravelSetProvider (version-upgrade) на первом
// заходе — их прогоняем вручную при апгрейде Laravel, не как per-commit гейт.
return RectorConfig::configure()
->withPaths([
__DIR__.'/app',
__DIR__.'/database',
__DIR__.'/routes',
])
->withPreparedSets(
deadCode: true,
codeQuality: true,
);
+2 -4
View File
@@ -260,12 +260,10 @@ export interface ApiProject {
}
export async function listProjects(tenantId: number): Promise<ApiProject[]> {
// ProjectController::index() отдаёт { data: ProjectResource::collection(...) }.
// `?? []` — защита от undefined.map в DealsView при нештатном ответе.
const { data } = await apiClient.get<{ data: ApiProject[] }>('/api/projects', {
const { data } = await apiClient.get<{ projects: ApiProject[] }>('/api/projects', {
params: { tenant_id: tenantId },
});
return data.data ?? [];
return data.projects;
}
/**
@@ -6,30 +6,13 @@
*
* Sprint 4 Phase B/3 split DashboardView (audit O-refactor-04 закрытие).
*/
import { computed } from 'vue';
import { useAuthStore } from '../../stores/auth';
const range = defineModel<'today' | '7d' | '30d' | 'custom'>({ required: true });
const auth = useAuthStore();
/** Имя залогиненного пользователя (было захардкожено «Иван»). */
const firstName = computed(() => auth.user?.first_name?.trim() || 'коллега');
/** Приветствие по времени суток (МСК машины пользователя). */
const greeting = computed(() => {
const h = new Date().getHours();
if (h < 6) return 'Доброй ночи';
if (h < 12) return 'Доброе утро';
if (h < 18) return 'Добрый день';
return 'Добрый вечер';
});
</script>
<template>
<header class="page-head">
<div>
<h1 class="text-h4 mb-2 page-greet">{{ greeting }}, <em class="text-primary">{{ firstName }}</em></h1>
<h1 class="text-h4 mb-2 page-greet">Доброе утро, <em class="text-primary">Иван</em></h1>
<div class="page-meta text-body-2 text-medium-emphasis">
<span><span class="num text-primary">+3</span> новых лида с утра</span>
<span class="sep">·</span>
@@ -9,7 +9,6 @@ import { useRouter } from 'vue-router';
import { useAuthStore } from '../../stores/auth';
import { useNotificationsStore } from '../../stores/notifications';
import { useCommandPalette } from '../../composables/useCommandPalette';
import { repositionMenuAfterOpen } from '../../utils/menuRepositionFix';
defineProps<{
pageTitle: string;
@@ -112,7 +111,7 @@ async function handleLogout(): Promise<void> {
</template>
</v-btn>
<v-menu offset="8" :close-on-content-click="false" location="bottom end" @update:model-value="repositionMenuAfterOpen">
<v-menu offset="8" :close-on-content-click="false" location="bottom end">
<template #activator="{ props: bellProps }">
<v-btn
v-bind="bellProps"
@@ -174,7 +173,7 @@ async function handleLogout(): Promise<void> {
</v-card>
</v-menu>
<v-menu offset="8" @update:model-value="repositionMenuAfterOpen">
<v-menu offset="8">
<template #activator="{ props }">
<v-btn v-bind="props" variant="text" size="small" class="user-chip ml-2" aria-label="Меню пользователя">
<v-avatar size="28" color="primary" class="mr-2">
@@ -29,11 +29,11 @@
<v-btn
color="error"
prepend-icon="mdi-delete"
data-testid="bulk-delete"
@click="confirmAndRun('delete')"
prepend-icon="mdi-archive"
data-testid="bulk-archive"
@click="confirmAndRun('archive')"
>
Удалить
Архивировать
</v-btn>
<v-spacer />
@@ -92,10 +92,11 @@ const skipToastText = ref('');
const messages: Record<string, string> = {
pause: 'Приостановить выбранные проекты?',
resume: 'Возобновить выбранные проекты?',
delete: 'Удалить выбранные проекты? Действие необратимо. Проекты со сделками будут пропущены.',
archive:
'Архивировать выбранные проекты?\nДействие необратимо в Plan 5 (восстановление потребует ручного запроса).',
};
async function confirmAndRun(action: 'pause' | 'resume' | 'delete') {
async function confirmAndRun(action: 'pause' | 'resume' | 'archive') {
if (!window.confirm(messages[action])) return;
await runBulk({ action });
}
@@ -9,6 +9,7 @@ const base = {
daily_limit_target: 50,
delivered_today: 32,
is_active: true,
archived_at: null,
sync_status: 'ok' as const,
};
@@ -48,9 +48,9 @@
<template #prepend><v-icon>mdi-refresh</v-icon></template>
<v-list-item-title>Синхронизировать</v-list-item-title>
</v-list-item>
<v-list-item @click="$emit('delete', project)">
<template #prepend><v-icon>mdi-delete</v-icon></template>
<v-list-item-title>Удалить</v-list-item-title>
<v-list-item @click="$emit('archive', project)">
<template #prepend><v-icon>mdi-archive</v-icon></template>
<v-list-item-title>Архивировать</v-list-item-title>
</v-list-item>
</v-list>
</v-menu>
@@ -97,7 +97,7 @@ defineEmits<{
edit: [project: Project];
'toggle-active': [project: Project];
'sync-now': [project: Project];
delete: [project: Project];
archive: [project: Project];
}>();
const typeLabel = computed(() => ({ site: 'Сайт', call: 'Звонок', sms: 'СМС' })[props.project.signal_type]);
@@ -63,10 +63,10 @@ async function onPause(): Promise<void> {
async function onDelete(): Promise<void> {
if (!props.project) return;
const ok = window.confirm(
'Удалить проект? Действие необратимо. Если по проекту есть сделки — удаление будет заблокировано.',
'Архивировать проект? Действие необратимо в Plan 5 (восстановление потребует ручного запроса).',
);
if (!ok) return;
await store.del(props.project.id);
await store.archive(props.project.id);
emit('close');
}
+2 -3
View File
@@ -25,15 +25,14 @@ interface NavItem {
}
const navItems: NavItem[] = [
{ title: 'Тенанты', icon: 'mdi-account-group-outline', to: '/admin/tenants' },
{ title: 'Тенанты', icon: 'mdi-account-group-outline', to: '/admin/tenants', count: 142 },
{ title: 'Биллинг', icon: 'mdi-credit-card-outline', to: '/admin/billing' },
{ title: 'Тарифная сетка', icon: 'mdi-tag-arrow-right', to: '/admin/pricing-tiers' },
{ title: 'Цены поставщиков', icon: 'mdi-currency-rub', to: '/admin/supplier-prices' },
{ title: 'Инциденты', icon: 'mdi-alert-outline', to: '/admin/incidents' },
{ title: 'Инциденты', icon: 'mdi-alert-outline', to: '/admin/incidents', count: 3 },
{ title: 'Impersonation', icon: 'mdi-account-switch', to: '/admin/impersonation' },
{ title: 'Система', icon: 'mdi-cog-outline', to: '/admin/system' },
{ title: 'Интеграция с поставщиком', icon: 'mdi-swap-horizontal', to: '/admin/supplier-integration' },
{ title: 'Проекты у поставщика', icon: 'mdi-format-list-checks', to: '/admin/supplier-projects' },
];
const route = useRoute();
+1 -7
View File
@@ -41,13 +41,7 @@ const navItems = computed(() => [
]);
const currentPageTitle = computed(() => {
// Сначала короткий title из sidebar-nav (Дашборд/Сделки/), затем route.meta.title
// для страниц вне sidebar (Напоминания, Импорт данных), и только потом fallback.
return (
navItems.value.find((i) => i.to === route.path)?.title ??
(route.meta.title as string | undefined) ??
'Страница'
);
return navItems.value.find((i) => i.to === route.path)?.title ?? 'Страница';
});
async function loadNotifications(): Promise<void> {
-1
View File
@@ -168,7 +168,6 @@ const lucideMap: Record<string, Component> = {
'mdi-content-save-outline': Save,
'mdi-credit-card-outline': CreditCard,
'mdi-currency-rub': RussianRuble,
'mdi-delete': Trash2,
'mdi-delete-outline': Trash2,
'mdi-dots-vertical': MoreVertical,
'mdi-download': Download,
-12
View File
@@ -283,18 +283,6 @@ const routes: RouteRecordRaw[] = [
devLabel: 'Admin Supplier Integration',
},
},
{
path: '/admin/supplier-projects',
name: 'admin-supplier-projects',
component: () => import('../views/admin/AdminSupplierProjectsView.vue'),
meta: {
layout: 'admin',
title: 'Проекты у поставщика',
requiresAuth: true,
devIndex: 31,
devLabel: 'Admin Supplier Projects',
},
},
// Error pages: 403/500 явные + catch-all 404 (всегда последний).
{
path: '/403',
+5 -4
View File
@@ -13,6 +13,7 @@ export interface Project {
delivered_today: number;
delivered_in_month?: number;
is_active: boolean;
archived_at: string | null;
region_mask?: number;
region_mode?: string;
regions?: number[]; // Plan 6 — subject codes 1..89; пустой массив = вся РФ
@@ -64,7 +65,7 @@ export const useProjectsStore = defineStore('projects', () => {
return data.data;
}
async function del(id: number) {
async function archive(id: number) {
await axios.delete(`/api/projects/${id}`);
await fetch();
}
@@ -93,7 +94,7 @@ export const useProjectsStore = defineStore('projects', () => {
selectedIds.value.clear();
}
async function bulkAction(action: 'pause' | 'resume' | 'delete') {
async function bulkAction(action: 'pause' | 'resume' | 'archive') {
const ids = Array.from(selectedIds.value);
if (!ids.length) return;
await axios.post('/api/projects/bulk', { action, ids });
@@ -102,7 +103,7 @@ export const useProjectsStore = defineStore('projects', () => {
}
interface BulkPayload {
action: 'pause' | 'resume' | 'delete' | 'update_regions' | 'update_days' | 'update_limit';
action: 'pause' | 'resume' | 'archive' | 'update_regions' | 'update_days' | 'update_limit';
add?: number;
remove?: number;
// Plan 6.5 — update_regions оперирует кодами субъектов (1..89), не bitmask ФО.
@@ -199,7 +200,7 @@ export const useProjectsStore = defineStore('projects', () => {
fetch,
create,
update,
del,
archive,
syncNow,
toggleActive,
toggleSelect,
+2 -35
View File
@@ -5,31 +5,6 @@
<v-btn color="primary" prepend-icon="mdi-plus" @click="openCreate">+ Создать проект</v-btn>
</div>
<v-alert
v-if="showCutoffBanner"
data-testid="cutoff-banner"
type="info"
variant="tonal"
border="start"
class="mb-4"
>
<div class="d-flex justify-space-between align-start gap-2">
<span>
Важно: изменения по проектам (добавление, удаление, лимиты, рабочие дни, регионы)
вносите <strong>до 18:00 МСК</strong>. Изменения после 18:00 применяются при следующей
синхронизации на следующий день.
</span>
<v-btn
data-testid="cutoff-banner-close"
icon="mdi-close"
size="x-small"
variant="text"
aria-label="Скрыть уведомление"
@click="dismissCutoffBanner"
/>
</div>
</v-alert>
<div class="d-flex gap-3 mb-4">
<v-select
v-model="store.filters.signal_type"
@@ -96,7 +71,7 @@
@edit="openEdit"
@toggle-active="store.toggleActive"
@sync-now="(p: Project) => store.syncNow(p.id)"
@delete="(p: Project) => store.del(p.id)"
@archive="(p: Project) => store.archive(p.id)"
/>
</div>
@@ -126,15 +101,6 @@ const createOpen = ref(false);
const editOpen = ref(false);
const editing = ref<Project | null>(null);
// Информационный баннер о сроке внесения изменений (синхронизация с поставщиком в 18:00 МСК).
// Закрытие запоминается, чтобы не показывать повторно.
const CUTOFF_BANNER_KEY = 'projects.cutoffBannerDismissed';
const showCutoffBanner = ref(localStorage.getItem(CUTOFF_BANNER_KEY) !== '1');
function dismissCutoffBanner(): void {
showCutoffBanner.value = false;
localStorage.setItem(CUTOFF_BANNER_KEY, '1');
}
const singleSelectedProject = computed<Project | null>(() => {
if (store.selectedIds.size !== 1) return null;
const [id] = store.selectedIds;
@@ -157,6 +123,7 @@ const typeFilters = [
const statusFilters = [
{ title: 'Активные', value: 'active' },
{ title: 'На паузе', value: 'paused' },
{ title: 'Архивные', value: 'archived' },
];
let searchTimer: ReturnType<typeof setTimeout> | null = null;
@@ -27,38 +27,6 @@ const loading = ref(false);
const reconciling = ref(false);
const error = ref<string | null>(null);
// --- Plan 4 Task 1: глобальный режим экспорта проектов (online|batch) ---
type ExportMode = 'online' | 'batch';
const exportMode = ref<ExportMode>('batch');
const exportModeError = ref<string | null>(null);
const exportModeSaving = ref(false);
async function loadExportMode(): Promise<void> {
try {
const { data } = await axios.get('/api/admin/supplier-integration/export-mode');
if (data?.mode === 'online' || data?.mode === 'batch') {
exportMode.value = data.mode;
}
} catch {
exportModeError.value = 'Не удалось загрузить режим экспорта.';
}
}
async function setExportMode(mode: ExportMode): Promise<void> {
if (exportMode.value === mode) return;
exportModeSaving.value = true;
exportModeError.value = null;
try {
const { data } = await axios.post('/api/admin/supplier-integration/export-mode', { mode });
exportMode.value = data?.mode === 'online' ? 'online' : 'batch';
} catch {
exportModeError.value = 'Не удалось сохранить режим экспорта.';
} finally {
exportModeSaving.value = false;
}
}
async function load(): Promise<void> {
loading.value = true;
error.value = null;
@@ -138,7 +106,6 @@ function formatDate(s: string): string {
onMounted(() => {
void load();
void loadManualQueue();
void loadExportMode();
});
</script>
@@ -146,43 +113,6 @@ onMounted(() => {
<div class="pa-6">
<h1 class="text-h5 mb-4">Интеграция с поставщиком</h1>
<v-card class="mb-4">
<v-card-title>Режим экспорта проектов</v-card-title>
<v-card-text>
<v-alert v-if="exportModeError" type="error" density="compact" class="mb-3">
{{ exportModeError }}
</v-alert>
<div data-testid="export-mode-toggle">
<v-btn-toggle
:model-value="exportMode"
mandatory
color="primary"
density="comfortable"
:disabled="exportModeSaving"
>
<v-btn
data-testid="export-mode-online"
value="online"
@click="setExportMode('online')"
>
Онлайн
</v-btn>
<v-btn
data-testid="export-mode-batch"
value="batch"
@click="setExportMode('batch')"
>
Пакетный
</v-btn>
</v-btn-toggle>
</div>
<p class="text-caption text-medium-emphasis mt-3 mb-0">
Онлайн изменения проекта переносятся к поставщику сразу.
Пакетный ночной синк в 18:00 (SyncSupplierProjectsJob).
</p>
</v-card-text>
</v-card>
<v-card class="mb-4">
<v-card-title>Здоровье резервного канала</v-card-title>
<v-card-text>
@@ -1,211 +0,0 @@
<template>
<div class="admin-supplier-projects-view pa-6">
<h1 class="text-h5 mb-4">Проекты у поставщика</h1>
<p class="text-body-2 text-medium-emphasis mb-4">
Все проекты, заведённые у поставщика crm.bp-gr.ru. Удаление снимает проект
на портале и локальные привязки тенантов (каскадом).
</p>
<v-alert
v-if="fetchError"
type="warning"
variant="tonal"
density="compact"
class="mb-4"
data-testid="projects-fetch-error"
closable
@click:close="fetchError = null"
>
{{ fetchError }}
</v-alert>
<div class="d-flex align-center mb-3">
<v-btn
color="error"
variant="flat"
prepend-icon="mdi-delete-outline"
data-testid="bulk-delete-btn"
:disabled="selected.length === 0"
:loading="deleting"
@click="confirmOpen = true"
>
Удалить выбранные ({{ selected.length }})
</v-btn>
<v-spacer />
<v-btn variant="text" prepend-icon="mdi-refresh" :loading="loading" @click="load">
Обновить
</v-btn>
</div>
<v-card elevation="1">
<v-data-table
:headers="headers"
:items="projects"
:loading="loading"
density="comfortable"
item-value="id"
>
<template #[`item.select`]="{ item }">
<v-checkbox
:model-value="selected.includes(item.id)"
:data-testid="`row-checkbox-${item.id}`"
hide-details
density="compact"
@update:model-value="(v: boolean | null) => toggleRow(item.id, v)"
/>
</template>
<template #[`item.orderers`]="{ item }">
<span v-if="item.orderers.length">{{ item.orderers.join(', ') }}</span>
<span v-else class="text-medium-emphasis"></span>
</template>
<template #[`item.last_delivery_at`]="{ item }">
{{ item.last_delivery_at ? formatDate(item.last_delivery_at) : '—' }}
</template>
</v-data-table>
</v-card>
<v-dialog v-model="confirmOpen" max-width="480">
<v-card>
<v-card-title>Удалить выбранные проекты?</v-card-title>
<v-card-text>
Будет удалено проектов: <strong>{{ selected.length }}</strong>.
Действие снимает проекты у поставщика и локальные привязки.
Отменить нельзя.
</v-card-text>
<v-card-actions>
<v-spacer />
<v-btn variant="text" @click="confirmOpen = false">Отмена</v-btn>
<v-btn
color="error"
variant="flat"
data-testid="confirm-delete-btn"
:loading="deleting"
@click="performDelete"
>
Удалить
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
<v-snackbar
v-model="snackbarOpen"
:timeout="4000"
:color="snackbarColor"
location="bottom right"
data-testid="projects-snackbar"
>
{{ snackbarText }}
</v-snackbar>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import axios from 'axios';
/**
* SaaS-admin «Проекты у поставщика» (Plan 4 Task 3).
*
* Backend: AdminSupplierIntegrationController::projectsIndex / projectsDestroy.
* Список supplier_projects + кто заказывал (orderers) + дата последней поставки;
* bulk-delete выбранных (портал + локально каскадом).
*/
interface SupplierProjectRow {
id: number;
platform: string;
signal_type: string;
unique_key: string;
subject_code: number | null;
subject_name: string | null;
current_limit: number;
supplier_external_id: string | null;
orderers: string[];
last_delivery_at: string | null;
}
const projects = ref<SupplierProjectRow[]>([]);
const selected = ref<number[]>([]);
const loading = ref(false);
const deleting = ref(false);
const fetchError = ref<string | null>(null);
const confirmOpen = ref(false);
const snackbarOpen = ref(false);
const snackbarText = ref('');
const snackbarColor = ref<'success' | 'warning' | 'error'>('success');
const headers = [
{ title: '', key: 'select', sortable: false, width: 56 },
{ title: 'Источник', key: 'unique_key', sortable: true },
{ title: 'Платформа', key: 'platform', sortable: true, width: 110 },
{ title: 'Регион', key: 'subject_name', sortable: true },
{ title: 'Лимит', key: 'current_limit', sortable: true, width: 90 },
{ title: 'Кто заказывал', key: 'orderers', sortable: false },
{ title: 'Последняя поставка', key: 'last_delivery_at', sortable: true, width: 180 },
];
function toggleRow(id: number, value: boolean | null): void {
if (value) {
if (!selected.value.includes(id)) selected.value.push(id);
} else {
selected.value = selected.value.filter((x) => x !== id);
}
}
function formatDate(s: string): string {
return new Date(s).toLocaleString('ru-RU');
}
async function load(): Promise<void> {
loading.value = true;
fetchError.value = null;
try {
const { data } = await axios.get('/api/admin/supplier-integration/projects');
projects.value = Array.isArray(data?.projects) ? data.projects : [];
// Снять выбор с уже удалённых строк.
const ids = new Set(projects.value.map((p) => p.id));
selected.value = selected.value.filter((id) => ids.has(id));
} catch {
fetchError.value = 'Не удалось загрузить список проектов.';
} finally {
loading.value = false;
}
}
async function performDelete(): Promise<void> {
if (selected.value.length === 0) {
confirmOpen.value = false;
return;
}
deleting.value = true;
try {
const { data } = await axios.post('/api/admin/supplier-integration/projects/delete', {
ids: selected.value,
});
const deleted = Number(data?.deleted ?? 0);
const failures = Array.isArray(data?.failures) ? data.failures : [];
if (failures.length > 0) {
snackbarColor.value = 'warning';
snackbarText.value = `Удалено: ${deleted}. Не удалось: ${failures.length}.`;
} else {
snackbarColor.value = 'success';
snackbarText.value = `Удалено проектов: ${deleted}.`;
}
snackbarOpen.value = true;
confirmOpen.value = false;
selected.value = [];
await load();
} catch {
snackbarColor.value = 'error';
snackbarText.value = 'Ошибка при удалении проектов.';
snackbarOpen.value = true;
} finally {
deleting.value = false;
}
}
onMounted(load);
defineExpose({ load, performDelete, toggleRow, projects, selected, confirmOpen });
</script>
@@ -25,6 +25,7 @@ const sampleProject = {
daily_limit_target: 50,
delivered_today: 12,
is_active: true,
archived_at: null,
sync_status: 'ok' as const,
region_mask: 0,
region_mode: 'include' as const,
@@ -86,20 +86,17 @@
/>
<v-autocomplete
:model-value="form.regions"
v-model="form.regions"
:items="selectableRegions"
item-title="name"
item-value="code"
label="Регионы"
:disabled="vsyaRfConfirmed"
label="Регионы (пусто = вся РФ)"
multiple
chips
clearable
density="comfortable"
class="ld-input-quiet"
data-testid="regions-autocomplete"
:error-messages="errors.regions"
@update:model-value="onRegionsChange"
@update:menu="repositionMenuAfterOpen"
>
<template #item="{ props: itemProps, item }">
@@ -111,51 +108,6 @@
</template>
</v-autocomplete>
<v-checkbox
:model-value="vsyaRf"
label="Вся РФ (все регионы)"
density="comfortable"
hide-details
data-testid="vsya-rf-checkbox"
@update:model-value="(v: boolean | null) => (v ? chooseVsyaRf() : cancelVsyaRf())"
/>
<v-alert
v-if="vsyaRf && !vsyaRfConfirmed"
type="warning"
variant="tonal"
density="compact"
class="mt-2"
data-testid="vsya-rf-warning"
>
Вы выбрали всю Россию проект будет получать лиды по всем регионам
(всем субъектам РФ). Подтвердите, что это намеренно.
<div class="mt-2">
<v-btn
size="small"
color="warning"
variant="flat"
data-testid="confirm-vsya-rf"
@click="confirmVsyaRf"
>
Подтверждаю «Вся РФ»
</v-btn>
<v-btn size="small" variant="text" class="ml-2" @click="cancelVsyaRf">
Отмена
</v-btn>
</div>
</v-alert>
<v-chip
v-else-if="vsyaRfConfirmed"
color="success"
size="small"
class="mt-2"
data-testid="vsya-rf-confirmed"
>
Вся РФ подтверждено
</v-chip>
<v-alert
v-if="generalError"
type="error"
@@ -224,38 +176,6 @@ const errors = reactive<Record<string, string[]>>({});
const saving = ref(false);
const generalError = ref<string | null>(null);
// Plan 4 Task 4: обязательный выбор региона + явная «Вся РФ» с подтверждением.
// vsyaRf чекбокс выбран; vsyaRfConfirmed подтверждён через предупреждение.
// На бэке regions=[] (Вся РФ) и «забыл» неотличимы гейт намеренно UI-only.
const vsyaRf = ref(false);
const vsyaRfConfirmed = ref(false);
function chooseVsyaRf(): void {
vsyaRf.value = true;
vsyaRfConfirmed.value = false;
}
function confirmVsyaRf(): void {
vsyaRfConfirmed.value = true;
form.regions = []; // Вся РФ пустой массив субъектов
delete errors.regions;
}
function cancelVsyaRf(): void {
vsyaRf.value = false;
vsyaRfConfirmed.value = false;
}
function onRegionsChange(codes: number[]): void {
form.regions = Array.isArray(codes) ? codes : [];
if (form.regions.length > 0) {
// Взаимоисключение: выбор конкретных субъектов снимает «Вся РФ».
vsyaRf.value = false;
vsyaRfConfirmed.value = false;
delete errors.regions;
}
}
const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
const selectedDays = ref<number[]>([0, 1, 2, 3, 4, 5, 6]);
watch(selectedDays, (days) => {
@@ -271,18 +191,12 @@ watch(
() => props.modelValue,
(open) => {
if (open) generalError.value = null;
if (open) {
delete errors.regions;
}
if (open && props.mode === 'edit' && props.project) {
Object.assign(form, props.project);
form.regions = Array.isArray(props.project.regions) ? [...props.project.regions] : [];
const days: number[] = [];
for (let i = 0; i < 7; i++) if (form.delivery_days_mask & (1 << i)) days.push(i);
selectedDays.value = days;
// Существующий проект с пустыми регионами = «Вся РФ» (предзаполняем подтверждённым).
vsyaRf.value = form.regions.length === 0;
vsyaRfConfirmed.value = form.regions.length === 0;
} else if (open) {
Object.assign(form, {
name: '',
@@ -295,24 +209,14 @@ watch(
delivery_days_mask: 127,
});
selectedDays.value = [0, 1, 2, 3, 4, 5, 6];
vsyaRf.value = false;
vsyaRfConfirmed.value = false;
}
},
{ immediate: true },
);
async function submit() {
saving.value = true;
generalError.value = null;
Object.keys(errors).forEach((k) => delete errors[k]);
// Гейт обязательного региона: нужны либо субъекты, либо подтверждённая «Вся РФ».
if (form.regions.length === 0 && !vsyaRfConfirmed.value) {
errors.regions = ['Выберите регион или подтвердите «Вся РФ»'];
return;
}
saving.value = true;
try {
await ensureCsrfCookie();
if (props.mode === 'edit' && props.project) {
@@ -337,8 +241,6 @@ async function submit() {
function close() {
emit('update:modelValue', false);
}
defineExpose({ chooseVsyaRf, confirmVsyaRf, cancelVsyaRf, onRegionsChange, vsyaRf, vsyaRfConfirmed, form, submit });
</script>
<style scoped>
-8
View File
@@ -154,14 +154,6 @@ Route::middleware('saas-admin')->group(function () {
Route::get('/api/admin/supplier-integration/manual-queue', 'App\Http\Controllers\Api\AdminSupplierIntegrationController@manualQueueIndex');
Route::post('/api/admin/supplier-integration/manual-queue/{id}/resolve', 'App\Http\Controllers\Api\AdminSupplierIntegrationController@manualQueueResolve')
->where('id', '[0-9]+');
// Plan 4 Task 1: глобальный тумблер режима экспорта проектов (online|batch).
Route::get('/api/admin/supplier-integration/export-mode', 'App\Http\Controllers\Api\AdminSupplierIntegrationController@getExportMode');
Route::post('/api/admin/supplier-integration/export-mode', 'App\Http\Controllers\Api\AdminSupplierIntegrationController@setExportMode');
// Plan 4 Task 2: экран «Проекты у поставщика» — список + bulk-delete.
Route::get('/api/admin/supplier-integration/projects', 'App\Http\Controllers\Api\AdminSupplierIntegrationController@projectsIndex');
Route::post('/api/admin/supplier-integration/projects/delete', 'App\Http\Controllers\Api\AdminSupplierIntegrationController@projectsDestroy');
});
// Plan 4 Task 11: tenant charges ledger (read-only + CSV export).
-117
View File
@@ -1,117 +0,0 @@
<?php
declare(strict_types=1);
/**
* ВРЕМЕННЫЙ demo-скрипт разбивает 5 тестовых пользователей на 5 отдельных тенантов.
* Каждый логин = своя компания, данные изолированы.
* Идемпотентный: повторный запуск не дублирует тенанты.
* Запуск: php artisan tinker storage/_demo_split_tenants.php
*/
use App\Models\Project;
use App\Models\Tenant;
use App\Models\User;
use Illuminate\Support\Str;
// -------------------------------------------------------------------
// 1. Проверяем исходное состояние
// -------------------------------------------------------------------
$totalBefore = User::count();
$tenantsBefore = Tenant::count();
echo "=== ДО: {$totalBefore} пользователей, {$tenantsBefore} тенант(ов) ===\n\n";
// -------------------------------------------------------------------
// 2. Описание каждого пользователя и его будущего тенанта
// -------------------------------------------------------------------
$accounts = [
[
'email' => 'admin@demo.local',
'tenant_subdomain' => 'demo', // оставляем существующий тенант
'org_name' => null, // null = взять из существующего
'create_new_tenant' => false,
],
[
'email' => 'manager1@demo.local',
'tenant_subdomain' => 'ivan-demo',
'org_name' => 'Компания Ивана',
'create_new_tenant' => true,
],
[
'email' => 'manager2@demo.local',
'tenant_subdomain' => 'anna-demo',
'org_name' => 'Компания Анны',
'create_new_tenant' => true,
],
[
'email' => 'manager3@demo.local',
'tenant_subdomain' => 'petr-demo',
'org_name' => 'Компания Петра',
'create_new_tenant' => true,
],
[
'email' => 'manager4@demo.local',
'tenant_subdomain' => 'mariya-demo',
'org_name' => 'Компания Марии',
'create_new_tenant' => true,
],
];
// -------------------------------------------------------------------
// 3. Создаём тенанты и переназначаем пользователей
// -------------------------------------------------------------------
foreach ($accounts as $a) {
$user = User::query()->where('email', $a['email'])->firstOrFail();
if (! $a['create_new_tenant']) {
// Demo Admin остаётся в tenant "demo"
$tenant = Tenant::query()->where('subdomain', $a['tenant_subdomain'])->firstOrFail();
echo "SKIP {$user->email} → тенант «{$tenant->organization_name}» (id={$tenant->id}) — без изменений\n";
continue;
}
// Создаём новый тенант, если ещё не существует
$tenant = Tenant::query()->firstOrCreate(
['subdomain' => $a['tenant_subdomain']],
[
'organization_name' => $a['org_name'],
'contact_email' => $user->email,
'webhook_token' => Str::random(64),
'timezone' => 'Europe/Moscow',
'locale' => 'ru',
'is_trial' => true,
'api_key_limit' => 5,
]
);
// Переназначаем пользователя в новый тенант
$user->tenant_id = $tenant->id;
$user->save();
echo "OK {$user->email} → новый тенант «{$tenant->organization_name}» (id={$tenant->id}, subdomain={$tenant->subdomain})\n";
}
// -------------------------------------------------------------------
// 4. Итоговый отчёт
// -------------------------------------------------------------------
echo "\n=== ИТОГО: изоляция тенантов ===\n";
$tenants = Tenant::query()
->whereIn('subdomain', ['demo', 'ivan-demo', 'anna-demo', 'petr-demo', 'mariya-demo'])
->orderBy('id')
->get();
foreach ($tenants as $t) {
$users = User::query()->where('tenant_id', $t->id)->pluck('email')->implode(', ');
$projects = Project::query()->where('tenant_id', $t->id)->count();
echo sprintf(
" Тенант %-12s (id=%-2d) — пользователи: %-40s | проектов: %d\n",
$t->subdomain,
$t->id,
$users ?: '(нет)',
$projects
);
}
echo "\nГотово. Каждый логин теперь в отдельной компании.\n";
echo "Пароль для всех: password\n";
@@ -1,46 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\DB;
uses(DatabaseTransactions::class);
// EnsureSaasAdmin — стаб в testing (см. SupplierManualQueueTest::16); actingAs
// нужен только для прохода middleware-стека auth+admin.
it('GET export-mode returns current value', function (): void {
$this->actingAs(User::factory()->create());
DB::table('system_settings')->updateOrInsert(
['key' => 'supplier_export_mode'],
['value' => 'batch', 'type' => 'string', 'updated_at' => now()],
);
$this->getJson('/api/admin/supplier-integration/export-mode')
->assertOk()
->assertJson(['mode' => 'batch']);
});
it('POST export-mode switches value', function (): void {
$this->actingAs(User::factory()->create());
DB::table('system_settings')->updateOrInsert(
['key' => 'supplier_export_mode'],
['value' => 'batch', 'type' => 'string', 'updated_at' => now()],
);
$this->postJson('/api/admin/supplier-integration/export-mode', ['mode' => 'online'])
->assertOk()
->assertJson(['mode' => 'online']);
expect(DB::table('system_settings')->where('key', 'supplier_export_mode')->value('value'))
->toBe('online');
});
it('POST export-mode rejects invalid value', function (): void {
$this->actingAs(User::factory()->create());
$this->postJson('/api/admin/supplier-integration/export-mode', ['mode' => 'turbo'])
->assertStatus(422);
});
@@ -1,190 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\Project;
use App\Models\SupplierProject;
use App\Models\Tenant;
use App\Models\User;
use App\Services\Supplier\SupplierPortalClient;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\DB;
uses(DatabaseTransactions::class);
// EnsureSaasAdmin — стаб в testing (см. SupplierManualQueueTest::16): обычный
// User::factory + actingAs без guard'а.
it('GET /admin/supplier-integration/projects returns rows with orderers + last delivery', function (): void {
$this->actingAs(User::factory()->create());
$tenant = Tenant::factory()->create(['organization_name' => 'ООО Ромашка']);
$sp = SupplierProject::query()->create([
'platform' => 'B1',
'signal_type' => 'site',
'unique_key' => 'okna.ru',
'subject_code' => 82, // Москва (по конституционному порядку, ст. 65)
'current_limit' => 5,
'current_workdays' => [1, 2, 3, 4, 5, 6, 7],
'current_regions' => null,
'sync_status' => 'ok',
'supplier_external_id' => '777',
]);
$project = Project::factory()->for($tenant)->create();
DB::table('project_supplier_links')->insert([
'project_id' => $project->id,
'supplier_project_id' => $sp->id,
'platform' => 'B1',
'subject_code' => 82,
]);
DB::table('supplier_leads')->insert([
'supplier_project_id' => $sp->id,
'platform' => 'B1',
'raw_payload' => json_encode([]),
'phone' => '+79991234567',
'received_at' => '2026-05-19 10:00:00',
]);
$resp = $this->getJson('/api/admin/supplier-integration/projects')
->assertOk()
->json();
$row = collect($resp['projects'])->firstWhere('id', $sp->id);
expect($row)->not->toBeNull()
->and($row['unique_key'])->toBe('okna.ru')
->and($row['subject_code'])->toBe(82)
->and($row['subject_name'])->toBe('Москва')
->and($row['platform'])->toBe('B1')
->and($row['current_limit'])->toBe(5)
->and($row['orderers'])->toContain('ООО Ромашка')
->and($row['last_delivery_at'])->not->toBeNull();
});
it('GET /projects returns subject_name «РФ» for NULL subject_code', function (): void {
$this->actingAs(User::factory()->create());
$sp = SupplierProject::query()->create([
'platform' => 'B2',
'signal_type' => 'site',
'unique_key' => 'all-russia.example',
'subject_code' => null,
'current_limit' => 0,
'current_workdays' => [1, 2, 3, 4, 5, 6, 7],
'current_regions' => null,
'sync_status' => 'ok',
'supplier_external_id' => '888',
]);
$resp = $this->getJson('/api/admin/supplier-integration/projects')->assertOk()->json();
$row = collect($resp['projects'])->firstWhere('id', $sp->id);
expect($row['subject_code'])->toBeNull()
->and($row['subject_name'])->toBe('РФ');
});
it('POST /projects/delete deletes on portal + locally (pivot cascades)', function (): void {
$this->actingAs(User::factory()->create());
// Мокаем portal-клиент, чтобы не лезть в Redis-сессию (SupplierPortalClient::loadSession()).
$deletedExternalIds = [];
$clientMock = new class($deletedExternalIds) extends SupplierPortalClient
{
/** @var array<int, int> */
public array $calls;
public function __construct(array &$calls)
{
$this->calls = &$calls;
}
public function deleteProject(int $externalId): void
{
$this->calls[] = $externalId;
}
};
app()->instance(SupplierPortalClient::class, $clientMock);
$tenant = Tenant::factory()->create();
$sp = SupplierProject::query()->create([
'platform' => 'B1',
'signal_type' => 'site',
'unique_key' => 'delete-me.ru',
'subject_code' => 77,
'current_limit' => 0,
'current_workdays' => [1, 2, 3, 4, 5, 6, 7],
'current_regions' => null,
'sync_status' => 'ok',
'supplier_external_id' => '999',
]);
$project = Project::factory()->for($tenant)->create();
DB::table('project_supplier_links')->insert([
'project_id' => $project->id,
'supplier_project_id' => $sp->id,
'platform' => 'B1',
'subject_code' => 77,
]);
$this->postJson('/api/admin/supplier-integration/projects/delete', ['ids' => [$sp->id]])
->assertOk()
->assertJson(['deleted' => 1, 'failures' => []]);
expect(SupplierProject::find($sp->id))->toBeNull();
expect($clientMock->calls)->toBe([999]);
expect(DB::table('project_supplier_links')->where('supplier_project_id', $sp->id)->count())->toBe(0);
});
it('POST /projects/delete validates ids array', function (): void {
$this->actingAs(User::factory()->create());
$this->postJson('/api/admin/supplier-integration/projects/delete', ['ids' => []])
->assertStatus(422);
$this->postJson('/api/admin/supplier-integration/projects/delete', [])
->assertStatus(422);
});
it('POST /projects/delete collects failures without aborting batch', function (): void {
$this->actingAs(User::factory()->create());
$clientMock = new class extends SupplierPortalClient
{
public int $callsCount = 0;
public function __construct() {}
public function deleteProject(int $externalId): void
{
$this->callsCount++;
if ($externalId === 555) {
throw new RuntimeException('portal said no');
}
}
};
app()->instance(SupplierPortalClient::class, $clientMock);
$spOk = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'ok.ru',
'subject_code' => 77, 'current_limit' => 0,
'current_workdays' => [1, 2, 3, 4, 5, 6, 7], 'current_regions' => null,
'sync_status' => 'ok', 'supplier_external_id' => '111',
]);
$spBad = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'bad.ru',
'subject_code' => 77, 'current_limit' => 0,
'current_workdays' => [1, 2, 3, 4, 5, 6, 7], 'current_regions' => null,
'sync_status' => 'ok', 'supplier_external_id' => '555',
]);
$resp = $this->postJson('/api/admin/supplier-integration/projects/delete', [
'ids' => [$spOk->id, $spBad->id],
])->assertOk()->json();
expect($resp['deleted'])->toBe(1)
->and(count($resp['failures']))->toBe(1)
->and($resp['failures'][0]['id'])->toBe($spBad->id)
->and($resp['failures'][0]['error'])->toContain('portal said no');
expect(SupplierProject::find($spOk->id))->toBeNull();
expect(SupplierProject::find($spBad->id))->not->toBeNull(); // bad — не удалён локально
});
+5 -4
View File
@@ -94,11 +94,12 @@ it('conversion = доля статуса won в окне', function () {
->assertJsonPath('conversion.value', 25);
});
it('active_projects считает is_active=true + limit из limits', function () {
it('active_projects считает archived_at IS NULL AND is_active=true + limit из limits', function () {
$tenant = Tenant::factory()->create(['limits' => ['max_projects' => 10]]);
Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => true]);
Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => true]);
Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => false]);
Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => null, 'is_active' => true]);
Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => null, 'is_active' => true]);
Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => now(), 'is_active' => true]);
Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => null, 'is_active' => false]);
$this->getJson("/api/dashboard/summary?tenant_id={$tenant->id}")
->assertOk()
->assertJsonPath('active_projects.active', 2)
@@ -36,7 +36,7 @@ it('end-to-end: 1 webhook → 3 deal copies for 3 active tenants', function ():
for ($i = 0; $i < 3; $i++) {
$t = Tenant::factory()->create(['balance_leads' => 100]);
$tenants->push($t);
$project = Project::factory()->create([
$projects->push(Project::factory()->create([
'tenant_id' => $t->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
@@ -49,24 +49,18 @@ it('end-to-end: 1 webhook → 3 deal copies for 3 active tenants', function ():
'region_mode' => 'include',
'daily_limit_target' => 10,
'effective_daily_limit_today' => null,
]);
$projects->push($project);
// v8.26 (Plan 1-2): LeadRouter eligibility — через pivot project_supplier_links,
// не legacy supplier_b1_project_id. Без pivot-связи проект не eligible → 0 сделок.
linkProjectToSupplier($project, $supplier);
]));
}
// 4-й tenant — paused (is_active=false). Связь в pivot есть, чтобы проверялся
// именно фильтр is_active, а не отсутствие связи.
// 4-й tenant — paused
$pausedTenant = Tenant::factory()->create(['balance_leads' => 100]);
$pausedProject = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $pausedTenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'vashinvestor.ru',
'is_active' => false,
]);
linkProjectToSupplier($pausedProject, $supplier);
$vid = 432176649;
$response = $this->postJson('/api/webhook/supplier/test-secret-32chars-aaaaaaaaaaaaaa', [
@@ -27,23 +27,19 @@ test('supplier_projects table exists with required columns', function () {
}
});
test('supplier_projects has unique constraint on (platform, unique_key, subject_code)', function () {
// v8.26 (project-migration-redesign Plan 1): per-субъект экспорт — composite unique
// расширен до (platform, unique_key, subject_code) NULLS NOT DISTINCT. Старый
// 2-колоночный индекс supplier_projects_platform_unique_key_unique заменён.
test('supplier_projects has unique constraint on (platform, unique_key)', function () {
$idx = DB::selectOne(
"SELECT indexdef
FROM pg_indexes
WHERE tablename = 'supplier_projects'
AND indexname = 'supplier_projects_platform_key_subject_unique'"
AND indexname = 'supplier_projects_platform_unique_key_unique'"
);
expect($idx)->not->toBeNull();
expect($idx->indexdef)
->toContain('UNIQUE')
->toContain('platform')
->toContain('unique_key')
->toContain('subject_code');
->toContain('unique_key');
});
test('supplier_projects platform check constraint allows only B1, B2, B3', function () {
@@ -10,18 +10,14 @@ use App\Models\SupplierProject;
use App\Models\Tenant;
use App\Services\Billing\LedgerService;
use App\Services\DuplicateDetector;
use App\Services\LeadDistributor;
use App\Services\LeadRouter;
use App\Services\NotificationService;
use App\Services\RegionTagResolver;
use App\Services\SupplierProjects\SupplierProjectResolver;
use Database\Seeders\PricingTierSeeder;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use Mockery as M;
use Random\Engine\Mt19937;
use Random\Randomizer;
use Tests\Concerns\SharesSupplierPdo;
uses(DatabaseTransactions::class);
@@ -41,13 +37,9 @@ function runRouteJob(int $supplierLeadId): void
app(DuplicateDetector::class),
app(NotificationService::class),
app(LedgerService::class),
app(LeadDistributor::class),
app(RegionTagResolver::class),
);
}
// `linkProjectToSupplier` helper now lives in tests/Pest.php — single source.
it('routes 1 lead to N tenants — creates N deal copies (sharing-model)', function (): void {
$supplier = SupplierProject::factory()->create([
'platform' => 'B1',
@@ -69,7 +61,6 @@ it('routes 1 lead to N tenants — creates N deal copies (sharing-model)', funct
'delivered_today' => 0,
'delivered_in_month' => 0,
]));
linkProjectToSupplier($projects->last(), $supplier);
}
$vid = 432176649;
@@ -117,14 +108,13 @@ it('decrements balance_leads for each tenant by 1', function (): void {
'unique_key' => 'test.ru',
]);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'test.ru',
'is_active' => true,
]);
linkProjectToSupplier($project, $supplier);
$vid = 99;
$lead = SupplierLead::factory()->create([
@@ -155,7 +145,6 @@ it('marks duplicate via DuplicateDetector — no charge, no counter increment',
'is_active' => true,
'delivered_today' => 0,
]);
linkProjectToSupplier($project, $supplier);
DB::statement("SET LOCAL app.current_tenant_id = '{$tenant->id}'");
$master = Deal::create([
@@ -240,7 +229,6 @@ it('handles mixed routing: 3 projects, 1 with pre-existing master (dup), 2 clean
'delivered_today' => 0,
'delivered_in_month' => 0,
]));
linkProjectToSupplier($projects->last(), $supplier);
}
// Tenant #0 имеет master deal с тем же phone в окне 24 ч — будет дубль.
@@ -311,7 +299,6 @@ it('idempotent on retry — second handle() returns early, no ghost duplicate de
'is_active' => true,
'delivered_today' => 0,
]);
linkProjectToSupplier($project, $supplier);
$vid = 7777;
$lead = SupplierLead::factory()->create([
@@ -380,7 +367,6 @@ it('handles partial failure: one project throws, others continue routing', funct
'is_active' => true,
'delivered_today' => 0,
]));
linkProjectToSupplier($projects->last(), $supplier);
}
// Soft-delete tenant #1 — Tenant::firstOrFail() в createDealCopyForProject упадёт.
@@ -417,14 +403,13 @@ it('routes B1 lead whose project name embeds a domain in free text (carmoney/car
'unique_key' => $domain,
]);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => $domain,
'is_active' => true,
]);
linkProjectToSupplier($project, $supplier);
$vid = random_int(100000, 999999);
$lead = SupplierLead::factory()->create([
@@ -524,48 +509,3 @@ it('rejects deal copy if delivered_today >= limit at lock time (Plan 2.5 fix #2
DB::statement("SET LOCAL app.current_tenant_id = '{$tenant->id}'");
expect(Deal::query()->where('source_crm_id', $vid)->count())->toBe(0);
});
it('caps deal creation at 3 recipients and tags deal with subject from payload', function (): void {
// seeded distributor — детерминизм
app()->bind(LeadDistributor::class, fn () => new LeadDistributor(
new Randomizer(new Mt19937(7))
));
$sp = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'cap.ru',
'subject_code' => 82, 'current_limit' => 0, 'sync_status' => 'ok',
]);
// 5 eligible клиентов, привязанных к sp через pivot, с балансом и лимитом
foreach (range(1, 5) as $i) {
$t = Tenant::factory()->create(['balance_leads' => 100]);
$p = Project::factory()->create([
'tenant_id' => $t->id, 'is_active' => true,
'daily_limit_target' => 10, 'delivered_today' => 0, 'delivery_days_mask' => 127,
]);
linkProjectToSupplier($p, $sp);
}
$lead = SupplierLead::factory()->create([
'phone' => '79991234567',
'vid' => 555111,
'raw_payload' => ['project' => 'B1_cap.ru', 'tag' => 'Москва', 'vid' => 555111],
'processed_at' => null,
'supplier_project_id' => null,
'platform' => 'B1',
]);
(new RouteSupplierLeadJob($lead->id))->handle(
app(LeadRouter::class),
app(SupplierProjectResolver::class),
app(DuplicateDetector::class),
app(NotificationService::class),
app(LedgerService::class),
app(LeadDistributor::class),
app(RegionTagResolver::class),
);
$deals = Deal::query()->where('source_crm_id', 555111)->get();
expect($deals)->toHaveCount(3)
->and($deals->pluck('subject_code')->unique()->all())->toBe([82]);
});
@@ -1,22 +0,0 @@
<?php
declare(strict_types=1);
use function Pest\Laravel\get;
// Гейт SaaS-admin зоны (middleware EnsureSaasAdmin). Вне local/testing зона
// закрыта (503), кроме случая включённого временного флага тест-деплоя.
it('blocks saas-admin area outside local/testing without bypass flag', function () {
app()->detectEnvironment(fn () => 'production');
config(['app.saas_admin_test_bypass' => false]);
get('/api/admin/tenants')->assertStatus(503);
});
it('allows saas-admin area when test bypass flag is enabled', function () {
app()->detectEnvironment(fn () => 'production');
config(['app.saas_admin_test_bypass' => true]);
expect(get('/api/admin/tenants')->status())->not->toBe(503);
});
@@ -59,28 +59,26 @@ it('supplier_csv_reconcile_log table exists with required columns and status CHE
]))->toThrow(QueryException::class);
});
it('schema.sql v8.26 has correct metrics — 65 base tables, 123 indexes, 40 RLS policies', function () {
it('schema.sql v8.25 has correct metrics — 64 base tables, 121 indexes, 40 RLS policies', function () {
// Замена destructive `migrate:fresh` (cross-test coupling: после DROP CASCADE остальные
// Feature-тесты в той же сессии видели пустую БД). Static parse `db/schema.sql` —
// источник истины метрик из spec §2.4 / db/CHANGELOG_schema.md v8.26.
// источник истины метрик из spec §2.4 / db/CHANGELOG_schema.md v8.25.
// v8.21 (Sprint 4): +1 таблица import_unknown_statuses, +1 индекс, +1 RLS-политика.
// v8.22 (Plan 6/C9): +1 GIN-индекс idx_projects_regions.
// v8.25 (supplier-failover): +1 таблица supplier_manual_sync_queue, +2 индекса.
// v8.26 (project-migration-redesign Plans 1-3): +1 таблица project_supplier_links (M:N pivot)
// + 2 индекса (supplier_projects_platform_key_subject_unique, idx_psl_*).
$schemaPath = dirname(base_path()).DIRECTORY_SEPARATOR.'db'.DIRECTORY_SEPARATOR.'schema.sql';
expect(is_file($schemaPath) && is_readable($schemaPath))->toBeTrue();
$schema = file_get_contents($schemaPath);
expect($schema)->not->toBeFalse();
// 65 base tables = все CREATE TABLE минус 12 партиций (PARTITION OF).
// 64 base tables = все CREATE TABLE минус 12 партиций (PARTITION OF).
$createTables = preg_match_all('/^CREATE TABLE\b/m', $schema);
$partitionOf = preg_match_all('/CREATE TABLE\s+\w+\s+PARTITION OF\b/m', $schema);
$baseTables = $createTables - $partitionOf;
expect($baseTables)->toBe(65);
expect($baseTables)->toBe(64);
$createIndexes = preg_match_all('/^CREATE\s+(?:UNIQUE\s+)?INDEX\b/m', $schema);
expect($createIndexes)->toBe(123); // v8.26: +2 supplier_projects_platform_key_subject_unique, idx_psl_*
expect($createIndexes)->toBe(121); // v8.25: +2 idx_smsq_status_created, idx_smsq_project
$createPolicies = preg_match_all('/^CREATE\s+POLICY\b/m', $schema);
expect($createPolicies)->toBe(40);
@@ -8,13 +8,10 @@ use App\Models\SupplierProject;
use App\Models\Tenant;
use App\Services\Supplier\Channel\SupplierProjectChannel;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\Concerns\SharesSupplierPdo;
// TestCase auto-bound via tests/Pest.php (->in('Feature')).
// DatabaseTransactions — per-test isolation.
// SharesSupplierPdo — SyncSupplierProjectJob теперь пишет через pgsql_supplier (BYPASSRLS);
// без шаринга PDO записи джоба не видны default-connection ассертам под DatabaseTransactions.
uses(DatabaseTransactions::class, SharesSupplierPdo::class);
uses(DatabaseTransactions::class);
/**
* Хелпер: разрешает SupplierProjectChannel из контейнера и вызывает Job.handle().
@@ -6,34 +6,28 @@ use App\Jobs\SyncSupplierProjectJob;
use App\Models\Project;
use App\Models\Tenant;
use App\Models\User;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Queue;
beforeEach(fn () => Queue::fake());
it('destroy hard-deletes a project with no deals', function () {
it('destroy archives project (sets archived_at, is_active=false)', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$project = Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => true]);
$this->actingAs($user)->deleteJson("/api/projects/{$project->id}")->assertNoContent();
expect(Project::find($project->id))->toBeNull();
$project->refresh();
expect($project->is_active)->toBeFalse();
expect($project->archived_at)->not->toBeNull();
});
it('destroy returns 422 if project has deals', function () {
it('destroy returns 409 if already archived', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$project = Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => true]);
DB::table('deals')->insert([
'tenant_id' => $tenant->id, 'project_id' => $project->id,
'phone' => '79990001100', 'status' => 'new',
'received_at' => now(), 'created_at' => now(),
]);
$project = Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => now()]);
$this->actingAs($user)->deleteJson("/api/projects/{$project->id}")->assertStatus(422);
expect(Project::find($project->id))->not->toBeNull();
$this->actingAs($user)->deleteJson("/api/projects/{$project->id}")->assertStatus(409);
});
it('sync re-dispatches SyncSupplierProjectJob', function () {
@@ -87,16 +81,16 @@ it('bulk filters out cross-tenant ids silently', function () {
expect($pB->fresh()->is_active)->toBeTrue();
});
it('bulk delete removes project with no deals', function () {
it('bulk archive sets archived_at on multiple', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$p1 = Project::factory()->create(['tenant_id' => $tenant->id]);
$this->actingAs($user)->postJson('/api/projects/bulk', [
'action' => 'delete', 'ids' => [$p1->id],
])->assertOk()->assertJsonPath('updated', 1);
'action' => 'archive', 'ids' => [$p1->id],
])->assertOk();
expect(Project::find($p1->id))->toBeNull();
expect($p1->fresh()->archived_at)->not->toBeNull();
});
it('bulk rejects > 500 ids', function () {
@@ -16,7 +16,7 @@ it('returns paginated list of active projects for current tenant', function () {
$response->assertOk();
$response->assertJsonStructure([
'data' => [['id', 'name', 'signal_type', 'signal_identifier', 'daily_limit_target',
'delivered_today', 'is_active', 'sync_status']],
'delivered_today', 'is_active', 'archived_at', 'sync_status']],
'meta' => ['current_page', 'per_page', 'total'],
]);
expect($response->json('meta.total'))->toBe(3);
@@ -45,24 +45,23 @@ it('isolates projects per tenant (RLS)', function () {
expect($response->json('meta.total'))->toBe(2);
});
it('returns all projects by default (archive feature removed in v8.27)', function () {
it('excludes archived projects by default', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
Project::factory()->create(['tenant_id' => $tenant->id]);
Project::factory()->create(['tenant_id' => $tenant->id]);
Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => now()]);
$response = $this->actingAs($user)->getJson('/api/projects');
expect($response->json('meta.total'))->toBe(2);
expect($response->json('meta.total'))->toBe(1);
});
it('status=active returns only is_active=true projects', function () {
it('returns archived when status=archived requested', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => true]);
Project::factory()->create(['tenant_id' => $tenant->id, 'is_active' => false]);
Project::factory()->create(['tenant_id' => $tenant->id, 'archived_at' => now()]);
$response = $this->actingAs($user)->getJson('/api/projects?status=active');
$response = $this->actingAs($user)->getJson('/api/projects?status=archived');
expect($response->json('meta.total'))->toBe(1);
});
@@ -141,18 +140,19 @@ it('search is case-insensitive for Cyrillic substrings', function () {
expect($partial->json('meta.total'))->toBe(1);
});
it('show returns 200 for any project by id', function () {
it('show returns 200 for archived project (read access preserved)', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$project = Project::factory()->create([
'tenant_id' => $tenant->id,
'archived_at' => now(),
'signal_type' => 'site',
'signal_identifier' => 'myproject.ru',
'signal_identifier' => 'archived.ru',
]);
$response = $this->actingAs($user)->getJson("/api/projects/{$project->id}");
$response->assertOk();
expect($response->json('data.id'))->toBe($project->id);
expect($response->json('data'))->not->toHaveKey('archived_at');
expect($response->json('data.archived_at'))->not->toBeNull();
});
@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Queue;
beforeEach(fn () => Queue::fake());
it('updates name without resync (name is local-only)', function () {
it('updates name+daily_limit without resync', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$project = Project::factory()->create([
@@ -19,43 +19,12 @@ it('updates name without resync (name is local-only)', function () {
]);
$this->actingAs($user)->patchJson("/api/projects/{$project->id}", [
'name' => 'New name',
'name' => 'New name', 'daily_limit_target' => 50,
])->assertOk();
expect($project->fresh()->name)->toBe('New name');
Queue::assertNotPushed(SyncSupplierProjectJob::class);
});
it('changing daily_limit_target triggers resync (poster must see new limit immediately)', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$project = Project::factory()->create([
'tenant_id' => $tenant->id, 'signal_type' => 'site',
'signal_identifier' => 'a.ru', 'daily_limit_target' => 10,
]);
$this->actingAs($user)->patchJson("/api/projects/{$project->id}", [
'daily_limit_target' => 50,
])->assertOk();
expect($project->fresh()->daily_limit_target)->toBe(50);
Queue::assertPushed(SyncSupplierProjectJob::class);
});
it('changing delivery_days_mask triggers resync (poster must see new days immediately)', function () {
$tenant = Tenant::factory()->create();
$user = User::factory()->create(['tenant_id' => $tenant->id]);
$project = Project::factory()->create([
'tenant_id' => $tenant->id, 'signal_type' => 'site',
'signal_identifier' => 'a.ru', 'delivery_days_mask' => 31,
]);
$this->actingAs($user)->patchJson("/api/projects/{$project->id}", [
'delivery_days_mask' => 63, // +Сб
])->assertOk();
expect($project->fresh()->delivery_days_mask)->toBe(63);
Queue::assertPushed(SyncSupplierProjectJob::class);
Queue::assertNotPushed(SyncSupplierProjectJob::class);
});
it('changing sms_senders triggers resync', function () {
@@ -2,6 +2,7 @@
declare(strict_types=1);
use App\Models\Project;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Schema;
@@ -10,6 +11,15 @@ use Illuminate\Support\Facades\Schema;
// DatabaseTransactions — изоляция; also ensures DB connection is bootstrapped.
uses(DatabaseTransactions::class);
it('projects table does NOT have archived_at column (feature removed in v8.27)', function () {
expect(Schema::hasColumn('projects', 'archived_at'))->toBeFalse();
it('projects table has archived_at column nullable timestamp', function () {
expect(Schema::hasColumn('projects', 'archived_at'))->toBeTrue();
$type = Schema::getColumnType('projects', 'archived_at');
// PostgreSQL TIMESTAMPTZ → Doctrine/Laravel reports 'timestamptz' (not 'timestamp').
expect($type)->toBe('timestamptz');
});
it('Project model has archived_at in fillable and casts it to datetime', function () {
$project = new Project;
expect(in_array('archived_at', $project->getFillable(), true))->toBeTrue();
expect($project->getCasts()['archived_at'] ?? null)->toBe('datetime');
});
@@ -1,48 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\Project;
use App\Models\Tenant;
use App\Services\Project\ProjectService;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Support\Facades\Queue;
beforeEach(function () {
Queue::fake();
$this->tenant = Tenant::factory()->create(['balance_leads' => 100]);
});
function makeCall(array $over = []): array
{
return array_merge([
'name' => 'Проект A', 'signal_type' => 'call', 'signal_identifier' => '79991110000',
'daily_limit_target' => 5, 'regions' => [], 'delivery_days_mask' => 31,
], $over);
}
it('blocks duplicate source within tenant with human message', function () {
app(ProjectService::class)->create($this->tenant, makeCall());
expect(fn () => app(ProjectService::class)
->create($this->tenant, makeCall(['name' => 'Проект B'])))
->toThrow(HttpResponseException::class);
});
it('allows same source for a different tenant (sharing)', function () {
$other = Tenant::factory()->create(['balance_leads' => 100]);
app(ProjectService::class)->create($this->tenant, makeCall());
$p = app(ProjectService::class)->create($other, makeCall(['name' => 'Проект B']));
expect($p)->toBeInstanceOf(Project::class);
});
it('blocks duplicate name within tenant with human message (not SQL)', function () {
app(ProjectService::class)->create($this->tenant, makeCall());
try {
app(ProjectService::class)
->create($this->tenant, makeCall(['name' => 'Проект A', 'signal_identifier' => '79992220000']));
$this->fail('expected HttpResponseException');
} catch (HttpResponseException $e) {
$body = $e->getResponse()->getData(true);
expect($body['errors']['name'][0] ?? '')->not->toContain('SQLSTATE');
}
});
@@ -1,40 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\Project;
use App\Models\Tenant;
use App\Services\Project\ProjectService;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Queue;
beforeEach(fn () => Queue::fake());
it('hard-deletes an empty project', function () {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = app(ProjectService::class)->create($tenant, [
'name' => 'Empty', 'signal_type' => 'call', 'signal_identifier' => '79991110000',
'daily_limit_target' => 5, 'regions' => [], 'delivery_days_mask' => 31,
]);
app(ProjectService::class)->delete($project);
expect(Project::find($project->id))->toBeNull();
});
it('blocks delete when project has deals', function () {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = app(ProjectService::class)->create($tenant, [
'name' => 'WithDeals', 'signal_type' => 'call', 'signal_identifier' => '79991110000',
'daily_limit_target' => 5, 'regions' => [], 'delivery_days_mask' => 31,
]);
DB::table('deals')->insert([
'tenant_id' => $tenant->id, 'project_id' => $project->id, 'phone' => '79990001122',
'status' => 'new', 'received_at' => now(), 'created_at' => now(),
]);
expect(fn () => app(ProjectService::class)->delete($project))
->toThrow(HttpResponseException::class);
expect(Project::find($project->id))->not->toBeNull();
});
@@ -1,28 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\Tenant;
use App\Services\Project\ProjectService;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Support\Facades\Queue;
beforeEach(fn () => Queue::fake());
it('blocks update that collides source with another project of same tenant', function () {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$svc = app(ProjectService::class);
$a = $svc->create($tenant, ['name' => 'A', 'signal_type' => 'call', 'signal_identifier' => '79991110000', 'daily_limit_target' => 5, 'regions' => [], 'delivery_days_mask' => 31]);
$b = $svc->create($tenant, ['name' => 'B', 'signal_type' => 'call', 'signal_identifier' => '79992220000', 'daily_limit_target' => 5, 'regions' => [], 'delivery_days_mask' => 31]);
expect(fn () => $svc->update($b, ['signal_identifier' => '79991110000']))
->toThrow(HttpResponseException::class);
});
it('allows update keeping same source on the same project', function () {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$svc = app(ProjectService::class);
$a = $svc->create($tenant, ['name' => 'A', 'signal_type' => 'call', 'signal_identifier' => '79991110000', 'daily_limit_target' => 5, 'regions' => [], 'delivery_days_mask' => 31]);
$updated = $svc->update($a, ['signal_identifier' => '79991110000', 'daily_limit_target' => 7]);
expect($updated->daily_limit_target)->toBe(7);
});
@@ -1,17 +0,0 @@
<?php
declare(strict_types=1);
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Route;
it('renders QueryException as human JSON message, not SQLSTATE', function () {
Route::get('/_test/boom-query', function () {
throw new QueryException('pgsql', 'SELECT 1', [], new Exception('SQLSTATE[23505] duplicate key'));
});
$res = $this->getJson('/_test/boom-query');
$res->assertStatus(422);
expect($res->json('message'))->not->toContain('SQLSTATE');
expect($res->json('message'))->toContain('Не удалось');
});
+101 -74
View File
@@ -19,74 +19,63 @@ beforeEach(function (): void {
DB::statement("SELECT set_config('app.current_tenant_id', '0', true)");
});
// `linkProjectToSupplier` helper now lives in tests/Pest.php — single source.
it('returns project linked via pivot to the supplier_project', function (): void {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$sp = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'r.ru',
'subject_code' => 82, 'current_limit' => 0, 'sync_status' => 'ok',
]);
$project = Project::factory()->create([
'tenant_id' => $tenant->id, 'is_active' => true,
'daily_limit_target' => 10, 'delivered_today' => 0, 'delivery_days_mask' => 127,
]);
linkProjectToSupplier($project, $sp);
$matched = app(LeadRouter::class)->matchEligibleProjects($sp);
expect($matched)->toHaveCount(1)
->and($matched->first()->id)->toBe($project->id);
});
it('excludes project NOT linked to this supplier_project', function (): void {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$sp = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'r2.ru',
'subject_code' => 82, 'current_limit' => 0, 'sync_status' => 'ok',
]);
Project::factory()->create([
'tenant_id' => $tenant->id, 'is_active' => true,
'daily_limit_target' => 10, 'delivered_today' => 0, 'delivery_days_mask' => 127,
]); // не линкуем
expect(app(LeadRouter::class)->matchEligibleProjects($sp))->toHaveCount(0);
});
it('excludes inactive project, project at limit, and zero-balance tenant', function (): void {
$sp = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'r3.ru',
'subject_code' => 82, 'current_limit' => 0, 'sync_status' => 'ok',
it('returns matching active projects for B1 site supplier_project (sharing across tenants)', function (): void {
$supplier = SupplierProject::factory()->create([
'platform' => 'B1',
'signal_type' => 'site',
'unique_key' => 'vashinvestor.ru',
]);
$t1 = Tenant::factory()->create(['balance_leads' => 100]);
$inactive = Project::factory()->create(['tenant_id' => $t1->id, 'is_active' => false, 'daily_limit_target' => 10, 'delivered_today' => 0, 'delivery_days_mask' => 127]);
linkProjectToSupplier($inactive, $sp);
$tenant1 = Tenant::factory()->create(['balance_leads' => 100]);
$tenant2 = Tenant::factory()->create(['balance_leads' => 100]);
$atLimit = Project::factory()->create(['tenant_id' => $t1->id, 'is_active' => true, 'daily_limit_target' => 5, 'delivered_today' => 5, 'delivery_days_mask' => 127]);
linkProjectToSupplier($atLimit, $sp);
$project1 = Project::factory()->create([
'tenant_id' => $tenant1->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'vashinvestor.ru',
'is_active' => true,
'daily_limit_target' => 10,
'delivered_today' => 0,
'delivery_days_mask' => 127,
'region_mask' => 255,
'region_mode' => 'include',
]);
$t0 = Tenant::factory()->create(['balance_leads' => 0, 'balance_rub' => 0]);
$broke = Project::factory()->create(['tenant_id' => $t0->id, 'is_active' => true, 'daily_limit_target' => 10, 'delivered_today' => 0, 'delivery_days_mask' => 127]);
linkProjectToSupplier($broke, $sp);
$project2 = Project::factory()->create([
'tenant_id' => $tenant2->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'vashinvestor.ru',
'is_active' => true,
'daily_limit_target' => 10,
'delivered_today' => 0,
'delivery_days_mask' => 127,
'region_mask' => 255,
'region_mode' => 'include',
]);
expect(app(LeadRouter::class)->matchEligibleProjects($sp))->toHaveCount(0);
$router = app(LeadRouter::class);
$matched = $router->matchEligibleProjects($supplier, '79991234567');
expect($matched)->toHaveCount(2);
expect($matched->pluck('id')->all())->toEqualCanonicalizing([$project1->id, $project2->id]);
});
it('skips paused project (is_active=false)', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => false,
]);
linkProjectToSupplier($project, $supplier);
$router = app(LeadRouter::class);
expect($router->matchEligibleProjects($supplier))->toHaveCount(0);
expect($router->matchEligibleProjects($supplier, '79991234567'))->toHaveCount(0);
});
it('skips project where today is not in delivery_days_mask', function (): void {
@@ -98,43 +87,44 @@ it('skips project where today is not in delivery_days_mask', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
'delivery_days_mask' => $maskWithoutToday,
]);
linkProjectToSupplier($project, $supplier);
$router = app(LeadRouter::class);
expect($router->matchEligibleProjects($supplier))->toHaveCount(0);
expect($router->matchEligibleProjects($supplier, '79991234567'))->toHaveCount(0);
});
it('skips project where delivered_today >= effective_daily_limit_today', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
'effective_daily_limit_today' => 5,
'delivered_today' => 5,
]);
linkProjectToSupplier($project, $supplier);
$router = app(LeadRouter::class);
expect($router->matchEligibleProjects($supplier))->toHaveCount(0);
expect($router->matchEligibleProjects($supplier, '79991234567'))->toHaveCount(0);
});
it('falls back to daily_limit_target when effective_daily_limit_today is null', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
@@ -142,10 +132,28 @@ it('falls back to daily_limit_target when effective_daily_limit_today is null',
'daily_limit_target' => 10,
'delivered_today' => 5,
]);
linkProjectToSupplier($project, $supplier);
$router = app(LeadRouter::class);
expect($router->matchEligibleProjects($supplier))->toHaveCount(1);
expect($router->matchEligibleProjects($supplier, '79991234567'))->toHaveCount(1);
});
it('skips project where region_mode=include and region_mask does not include phone district', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
'region_mask' => 1, // только Центральный округ
'region_mode' => 'include',
]);
$router = app(LeadRouter::class);
// 78121234567 = СПб (Северо-Западный, бит 2)
expect($router->matchEligibleProjects($supplier, '78121234567'))->toHaveCount(0);
});
it('skips project where tenant has zero in BOTH balance_leads AND balance_rub (Plan 4 dual-balance)', function (): void {
@@ -154,16 +162,16 @@ it('skips project where tenant has zero in BOTH balance_leads AND balance_rub (P
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 0, 'balance_rub' => '0.00']);
$project = Project::factory()->create([
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
]);
linkProjectToSupplier($project, $supplier);
$router = app(LeadRouter::class);
expect($router->matchEligibleProjects($supplier))->toHaveCount(0);
expect($router->matchEligibleProjects($supplier, '79991234567'))->toHaveCount(0);
});
it('includes project when balance_leads=0 BUT balance_rub > 0 (Plan 4 dual-balance rub-only tenant)', function (): void {
@@ -174,37 +182,56 @@ it('includes project when balance_leads=0 BUT balance_rub > 0 (Plan 4 dual-balan
$project = Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
]);
linkProjectToSupplier($project, $supplier);
$router = app(LeadRouter::class);
$eligible = $router->matchEligibleProjects($supplier);
$eligible = $router->matchEligibleProjects($supplier, '79991234567');
expect($eligible)->toHaveCount(1);
expect($eligible->first()->id)->toBe($project->id);
});
it('routes through correct FK based on platform (B2 → supplier_b2_project_id)', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B2', 'signal_type' => 'site']);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => null,
'supplier_b2_project_id' => $supplier->id,
'supplier_b3_project_id' => null,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
]);
$router = app(LeadRouter::class);
expect($router->matchEligibleProjects($supplier, '79991234567'))->toHaveCount(1);
});
it('orders results by created_at ASC (deterministic, spec §6 step 4)', function (): void {
$supplier = SupplierProject::factory()->create(['platform' => 'B1', 'signal_type' => 'site']);
$projectsCreated = collect();
for ($i = 0; $i < 3; $i++) {
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$project = Project::factory()->create([
'tenant_id' => $tenant->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
'created_at' => now()->subDays(3 - $i),
]);
linkProjectToSupplier($project, $supplier);
$projectsCreated->push($project);
$projectsCreated->push(
Project::factory()->create([
'tenant_id' => $tenant->id,
'supplier_b1_project_id' => $supplier->id,
'signal_type' => 'site',
'signal_identifier' => 'example.com',
'is_active' => true,
'created_at' => now()->subDays(3 - $i),
])
);
}
$router = app(LeadRouter::class);
$matched = $router->matchEligibleProjects($supplier);
$matched = $router->matchEligibleProjects($supplier, '79991234567');
expect($matched->pluck('id')->all())->toBe($projectsCreated->pluck('id')->all());
});
@@ -11,10 +11,8 @@ use App\Models\SupplierProject;
use App\Models\Tenant;
use App\Services\Billing\LedgerService;
use App\Services\DuplicateDetector;
use App\Services\LeadDistributor;
use App\Services\LeadRouter;
use App\Services\NotificationService;
use App\Services\RegionTagResolver;
use App\Services\SupplierProjects\SupplierProjectResolver;
use Database\Seeders\PricingTierSeeder;
use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -49,7 +47,6 @@ function makeFlowWithBalance(array $balance): array
'effective_daily_limit_today' => 10, 'delivered_today' => 0,
'delivery_days_mask' => 127, 'region_mask' => 255,
]);
linkProjectToSupplier($project, $supplierProject);
$lead = SupplierLead::factory()->create([
'vid' => random_int(100_000_000, 999_999_999),
'phone' => '79991234567',
@@ -69,8 +66,6 @@ function runJob(int $leadId): void
app(DuplicateDetector::class),
app(NotificationService::class),
app(LedgerService::class),
app(LeadDistributor::class),
app(RegionTagResolver::class),
);
}
@@ -156,14 +151,12 @@ it('sharing-flow isolation: tenant A on zero paused, tenant B with balance recei
'daily_limit_target' => 10, 'effective_daily_limit_today' => 10,
'delivered_today' => 0, 'delivery_days_mask' => 127, 'region_mask' => 255,
]);
linkProjectToSupplier($projectA, $supplierProject);
$projectB = Project::factory()->create([
'tenant_id' => $tenantB->id, 'signal_type' => 'site', 'signal_identifier' => 'example.com',
'supplier_b1_project_id' => $supplierProject->id, 'is_active' => true,
'daily_limit_target' => 10, 'effective_daily_limit_today' => 10,
'delivered_today' => 0, 'delivery_days_mask' => 127, 'region_mask' => 255,
]);
linkProjectToSupplier($projectB, $supplierProject);
$lead = SupplierLead::factory()->create([
'vid' => random_int(100_000_000, 999_999_999),
'phone' => '79991234567',
@@ -1,37 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\Project;
use App\Models\SupplierProject;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\DB;
use Tests\Concerns\SharesSupplierPdo;
uses(DatabaseTransactions::class, SharesSupplierPdo::class);
it('backfills pivot rows from legacy supplier_b{1,2,3}_project_id slots', function (): void {
$sp1 = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'site', 'unique_key' => 'bf.ru',
'subject_code' => null, 'current_limit' => 0, 'sync_status' => 'ok',
]);
$sp3 = SupplierProject::query()->create([
'platform' => 'B3', 'signal_type' => 'site', 'unique_key' => 'bf.ru',
'subject_code' => null, 'current_limit' => 0, 'sync_status' => 'ok',
]);
$project = Project::factory()->create([
'supplier_b1_project_id' => $sp1->id,
'supplier_b3_project_id' => $sp3->id,
]);
// Симулируем «до бэкофилла»: pivot пуст.
DB::table('project_supplier_links')->where('project_id', $project->id)->delete();
// Запуск логики бэкофилла повторно (миграция идемпотентна).
require_once base_path('database/migrations/2026_05_20_104000_backfill_project_supplier_links.php');
(include base_path('database/migrations/2026_05_20_104000_backfill_project_supplier_links.php'))->up();
$rows = DB::table('project_supplier_links')->where('project_id', $project->id)->get();
expect($rows)->toHaveCount(2)
->and($rows->pluck('platform')->sort()->values()->all())->toBe(['B1', 'B3']);
});
@@ -1,20 +0,0 @@
<?php
declare(strict_types=1);
use App\Models\Deal;
use Illuminate\Database\QueryException;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Schema;
use Tests\Concerns\SharesSupplierPdo;
uses(DatabaseTransactions::class, SharesSupplierPdo::class);
it('deals has nullable subject_code column', function (): void {
expect(Schema::hasColumn('deals', 'subject_code'))->toBeTrue();
});
it('rejects subject_code out of 1..89 range', function (): void {
expect(fn () => Deal::factory()->create(['subject_code' => 90]))
->toThrow(QueryException::class);
});
@@ -1,58 +0,0 @@
<?php
declare(strict_types=1);
use App\Jobs\Supplier\DeleteSupplierProjectJob;
use App\Jobs\Supplier\SyncSupplierProjectsJob;
use App\Models\Project;
use App\Models\SupplierProject;
use App\Models\Tenant;
use App\Services\Supplier\SupplierPortalClient;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Bus;
use Illuminate\Support\Facades\DB;
use Tests\Concerns\SharesSupplierPdo;
uses(DatabaseTransactions::class, SharesSupplierPdo::class);
it('deletes donor at supplier when no consumers remain', function (): void {
$sp = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'call', 'unique_key' => '79991110000',
'supplier_external_id' => '555', 'current_limit' => 1,
]);
$mock = Mockery::mock(SupplierPortalClient::class);
$mock->shouldReceive('deleteProject')->once()->with(555);
app()->instance(SupplierPortalClient::class, $mock);
(new DeleteSupplierProjectJob([$sp->id]))->handle(app(SupplierPortalClient::class));
expect(SupplierProject::find($sp->id))->toBeNull();
});
it('does NOT delete donor at supplier when other consumers remain; re-syncs', function (): void {
Bus::fake([SyncSupplierProjectsJob::class]);
$tenant = Tenant::factory()->create(['balance_leads' => 100]);
$sp = SupplierProject::query()->create([
'platform' => 'B1', 'signal_type' => 'call', 'unique_key' => '79991110001',
'supplier_external_id' => '556', 'current_limit' => 1,
]);
$other = Project::factory()->create(['tenant_id' => $tenant->id]);
DB::table('project_supplier_links')->insert([
'project_id' => $other->id,
'supplier_project_id' => $sp->id,
'platform' => 'B1',
'subject_code' => null,
]);
$mock = Mockery::mock(SupplierPortalClient::class);
$mock->shouldNotReceive('deleteProject');
app()->instance(SupplierPortalClient::class, $mock);
(new DeleteSupplierProjectJob([$sp->id]))->handle(app(SupplierPortalClient::class));
expect(SupplierProject::find($sp->id))->not->toBeNull();
Bus::assertDispatched(SyncSupplierProjectsJob::class);
});
@@ -1,76 +0,0 @@
<?php
declare(strict_types=1);
use App\Exceptions\Supplier\SupplierClientException;
use App\Exceptions\Supplier\SupplierTransientException;
use App\Mail\SupplierCriticalAlertMail;
use App\Models\Project;
use App\Models\SupplierManualSyncQueue;
use App\Models\Tenant;
use App\Services\Supplier\Channel\Exceptions\TierEscalatedException;
use App\Services\Supplier\Channel\FailoverProjectChannel;
use App\Services\Supplier\Channel\SupplierProjectChannel;
use App\Services\Supplier\Dto\SupplierProjectDto;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Mail;
uses(RefreshDatabase::class);
test('Tier-1 fail + Tier-2 fail → Tier-3 escalation creates manual queue row + queues alert mail', function (): void {
Mail::fake();
config(['services.supplier.alert_email' => 'ops@liderra.local']);
$tenant = Tenant::factory()->create();
$project = Project::factory()->for($tenant)->create();
$tier1 = mock(SupplierProjectChannel::class);
$tier1->shouldReceive('listProjects')->andReturn([]); // dedup-сверка: нет совпадений
$tier1->shouldReceive('createProject')->andThrow(new SupplierClientException('Tier-1 mock fail'));
$tier2 = mock(SupplierProjectChannel::class);
$tier2->shouldReceive('createProject')->andThrow(new RuntimeException('Tier-2 manage-project.js selector break'));
$channel = new FailoverProjectChannel($tier1, $tier2, app(Mailer::class));
$dto = new SupplierProjectDto(
platform: 'B1', signalType: 'site', uniqueKey: 'failover-smoke.example',
limit: 1, workdays: [1, 2, 3, 4, 5], regions: [], regionsReverse: false, status: 'active',
);
expect(fn () => $channel->createProjectForLiderra($project, $dto))
->toThrow(TierEscalatedException::class);
expect(SupplierManualSyncQueue::where('project_id', $project->id)->count())->toBe(1);
Mail::assertQueued(SupplierCriticalAlertMail::class, fn ($m) => $m->alertType === 'manual_required');
});
test('Tier-1 transient fail (portal unreachable) bypasses Tier-2 and goes straight to Tier-3', function (): void {
Mail::fake();
config(['services.supplier.alert_email' => 'ops@liderra.local']);
$tenant = Tenant::factory()->create();
$project = Project::factory()->for($tenant)->create();
$tier1 = mock(SupplierProjectChannel::class);
$tier1->shouldReceive('listProjects')->andReturn([]);
$tier1->shouldReceive('createProject')->andThrow(new SupplierTransientException('Connection refused'));
$tier2 = mock(SupplierProjectChannel::class);
$tier2->shouldNotReceive('createProject'); // КЛЮЧЕВОЕ — transient НЕ должен попасть в tier-2
$channel = new FailoverProjectChannel($tier1, $tier2, app(Mailer::class));
$dto = new SupplierProjectDto(
platform: 'B1', signalType: 'site', uniqueKey: 'transient-smoke.example',
limit: 1, workdays: [1, 2, 3, 4, 5], regions: [], regionsReverse: false, status: 'active',
);
expect(fn () => $channel->createProjectForLiderra($project, $dto))
->toThrow(TierEscalatedException::class);
$row = SupplierManualSyncQueue::where('project_id', $project->id)->first();
expect($row->failure_reason)->toBe('portal_unreachable');
});

Some files were not shown because too many files have changed in this diff Show More