@puca/puca-core 14.17.0 → 15.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/analise-dual-write-vs-outbox-original.md +146 -0
- package/analise-dual-write-vs-outbox.md +264 -0
- package/dist/core/services/auth.service.d.ts +2 -0
- package/dist/core/services/auth.service.js +22 -11
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.js +6 -7
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.js +2 -0
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/domain-life-cycle.service.d.ts +3 -1
- package/dist/core/services/domain-life-cycle.service.js +11 -1
- package/dist/core/services/domain-life-cycle.service.js.map +1 -1
- package/dist/core/services/incremental-search-v2.service.d.ts +11 -6
- package/dist/core/services/incremental-search-v2.service.js +12 -3
- package/dist/core/services/incremental-search-v2.service.js.map +1 -1
- package/dist/core/services/incremental-search.service.d.ts +7 -2
- package/dist/core/services/incremental-search.service.js +4 -1
- package/dist/core/services/incremental-search.service.js.map +1 -1
- package/dist/core/services/index.d.ts +2 -0
- package/dist/core/services/index.js +5 -3
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.table-dictionary.helper.d.ts +2 -2
- package/dist/core/services/install.table-dictionary.helper.js +15 -11
- package/dist/core/services/install.table-dictionary.helper.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.d.ts +8 -2
- package/dist/core/services/job-executor/job-executor.service.js +16 -5
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/core/services/llm/llm.service.d.ts +1 -0
- package/dist/core/services/llm/llm.service.js +114 -66
- package/dist/core/services/llm/llm.service.js.map +1 -1
- package/dist/core/services/logger.js +2 -1
- package/dist/core/services/logger.js.map +1 -1
- package/dist/core/services/mcp/mcp-server.service.d.ts +9 -0
- package/dist/core/services/mcp/mcp-server.service.js.map +1 -1
- package/dist/core/services/migration/migration.service.js +46 -54
- package/dist/core/services/migration/migration.service.js.map +1 -1
- package/dist/core/services/plugin.service.d.ts +2 -2
- package/dist/core/services/plugin.service.js +2 -2
- package/dist/core/services/plugin.service.js.map +1 -1
- package/dist/core/services/transaction-outbox/transaction-outbox.service.d.ts +20 -0
- package/dist/core/services/transaction-outbox/transaction-outbox.service.js +33 -0
- package/dist/core/services/transaction-outbox/transaction-outbox.service.js.map +1 -0
- package/dist/essential/mq/mq.service.d.ts +6 -2
- package/dist/essential/mq/mq.service.js +25 -6
- package/dist/essential/mq/mq.service.js.map +1 -1
- package/dist/helpers/json-stringify-omitting-transaction.d.ts +1 -0
- package/dist/helpers/json-stringify-omitting-transaction.js +12 -0
- package/dist/helpers/json-stringify-omitting-transaction.js.map +1 -0
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +8 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.js +20 -4
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
- package/dist/orm/services/cache-repository/on-table-change.service.d.ts +6 -1
- package/dist/orm/services/cache-repository/on-table-change.service.js +15 -3
- package/dist/orm/services/cache-repository/on-table-change.service.js.map +1 -1
- package/dist/orm/services/cache.service.d.ts +4 -3
- package/dist/orm/services/cache.service.js +8 -21
- package/dist/orm/services/cache.service.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +1 -0
- package/dist/orm/services/repository-factory.js +3 -0
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.js +36 -36
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/secondary-database/secondary-database.service.d.ts +6 -0
- package/dist/orm/services/secondary-database/secondary-database.service.js +25 -2
- package/dist/orm/services/secondary-database/secondary-database.service.js.map +1 -1
- package/dist/packages/crm/crm.service.d.ts +19 -1
- package/dist/packages/crm/crm.service.js +23 -3
- package/dist/packages/crm/crm.service.js.map +1 -1
- package/dist/packages/flow/flow.service.d.ts +18 -1
- package/dist/packages/flow/flow.service.js +12 -2
- package/dist/packages/flow/flow.service.js.map +1 -1
- package/dist/packages/index.js +2 -2
- package/dist/packages/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
# Análise: dual-write que a outbox (mqService / JobExecutor / secondaryDatabase) não resolve sozinha
|
|
2
|
+
|
|
3
|
+
**Data:** 2026-09-04
|
|
4
|
+
**Fonte:** `relatorio-dual-write-notificacoes.md` (snapshot git `9ee973c`; o arquivo não está no working tree atual de `master`).
|
|
5
|
+
**Mecanismo avaliado:** `TransactionOutboxService.enqueue` via
|
|
6
|
+
|
|
7
|
+
- `mqService.publish` / `sendToQueue` (`engine: mqService`)
|
|
8
|
+
- `JobExecutor.add` (`engine: jobExecutor`)
|
|
9
|
+
- `secondaryDatabase.publish` (`engine: secondaryDatabase`)
|
|
10
|
+
|
|
11
|
+
**Critério:** dual-write banco ↔ Rabbit/Bull/Redis pub some só quando o INSERT em `transaction_outbox` entra na **mesma** transação Postgres da mutação. Sem `options.transaction`, o enqueue usa `getPseudoTransaction()` (autocommit separado) e o dual-write continua.
|
|
12
|
+
|
|
13
|
+
Este arquivo lista o que **não fecha** só com esse envelope, ou que **precisa de mais alteração** além de “passar `{ transaction }` na chamada”. A lista do que **fecha** está no chat desta análise.
|
|
14
|
+
|
|
15
|
+
---
|
|
16
|
+
|
|
17
|
+
## 1. Não são esses três engines (outbox desta tarefa não aplica)
|
|
18
|
+
|
|
19
|
+
| Ocorrência no relatório | Por quê |
|
|
20
|
+
|---|---|
|
|
21
|
+
| `emitChange` + handlers (`cache-repository-redis.ts`) | Fan-out **in-process** depois do Redis `.change`. Não publica para fora. |
|
|
22
|
+
| `notification.service` / `followers.service` | Canal **HTTP** próprio. |
|
|
23
|
+
| `email.service` (Elastic Email) | HTTP. |
|
|
24
|
+
| `web-socket.service` | UI efêmera; publicar antes do commit mostraria estado que pode dar rollback. |
|
|
25
|
+
| `monitor.ts` (Influx / Discord) | Telemetria. |
|
|
26
|
+
| Hooks CRUD `afterUpdate` / `afterCommit` **em si** | Orquestração in-process. Dual-write só se o app daí chamar MQ/job/Redis pub. |
|
|
27
|
+
| §5.4 overrides `afterCommit` sem MQ/job (phone, email, address, indicator, interaction, etc.) | Outro canal (HTTP CRM, e-mail). |
|
|
28
|
+
|
|
29
|
+
**Mais alteração possível (fora deste envelope):** outbox de HTTP, ou mover o side-effect para um job/MQ já envelopado.
|
|
30
|
+
|
|
31
|
+
---
|
|
32
|
+
|
|
33
|
+
## 2. São MQ/Bull/Redis pub, mas o envelope sozinho não fecha
|
|
34
|
+
|
|
35
|
+
### 2.1 Hook CRUD `afterCommit` zera a transação
|
|
36
|
+
|
|
37
|
+
**Relatório:** §5.1 e §5.2 (rule, posting-fin/contract/sale `callFlowOnEntityChange`, person, task, product, card).
|
|
38
|
+
|
|
39
|
+
`CrudBaseService` anula `afterUpdateArgs.args.transaction` antes de `afterCommit` (TX já commitou). Qualquer `publish`/`add` aí cai em pseudo-TX.
|
|
40
|
+
|
|
41
|
+
**O que falta:** tirar o enqueue do `afterCommit` e fazê-lo com a TX **ainda aberta** (`afterUpdate`, ou código antes de `commit()`). Não recolocar `{ transaction }` no afterCommit esperando `after.args.transaction`.
|
|
42
|
+
|
|
43
|
+
Delete CRUD **não tem** `afterCommit`.
|
|
44
|
+
|
|
45
|
+
### 2.2 Fechamento async de exercício (`close-exercise-{pid}`)
|
|
46
|
+
|
|
47
|
+
**Relatório:** §5.1 hop `FinancialExercisesService.afterCommit` → `scheduleCloseExerciseJob` → `closeExerciseJob.add`.
|
|
48
|
+
|
|
49
|
+
O path async só existe quando **não há** TX na request. Enqueue no afterCommit = pseudo-TX. Enqueue no `beforeUpdate` = job fantasma se o save falhar.
|
|
50
|
+
|
|
51
|
+
**O que falta:** wrap de TX própria (`async-close-exercise`), persistir `closed` + outbox no mesmo commit, job no `afterUpdate`. Não é só `add({ transaction })`.
|
|
52
|
+
|
|
53
|
+
### 2.3 `callFlowOnEntityChange` em `DEVELOPMENT`
|
|
54
|
+
|
|
55
|
+
**Relatório:** posting-fin, contract, sale.
|
|
56
|
+
|
|
57
|
+
Em DEV o afterCommit chama `callFlowOnEntityChangeProcess` **in-process**, não `JobExecutor.add`.
|
|
58
|
+
|
|
59
|
+
**O que falta:** aceitar dual-write leve em DEV, ou unificar DEV com o job/outbox (muda timing e deixa o flow dentro do commit se for síncrono na TX).
|
|
60
|
+
|
|
61
|
+
### 2.4 Payload de job com a TX viva (`RuleService`)
|
|
62
|
+
|
|
63
|
+
`onAfterUpdateJob.add(after)` serializava o objeto `After` inteiro, inclusive `args.transaction`.
|
|
64
|
+
|
|
65
|
+
**O que falta:** no enqueue, TX só em `opts.transaction`; no payload do Bull, `transaction: null` (como o afterCommit antigo, que já zerava).
|
|
66
|
+
|
|
67
|
+
### 2.5 `crud-front-base`: fila `${table}.update` **antes** do write
|
|
68
|
+
|
|
69
|
+
**Relatório:** seção 2.
|
|
70
|
+
|
|
71
|
+
`sendToQueue` dispara o comando **sem** a entidade ter sido gravada neste processo; o write é no consumer. Outbox com TX da request atual não acopla a um INSERT que ainda não aconteceu.
|
|
72
|
+
|
|
73
|
+
**O que falta:** outro desenho (gravar intenção na mesma TX, ou tratar como command-queue e não como dual-write pós-persistência).
|
|
74
|
+
|
|
75
|
+
### 2.6 Incremental Search / Typesense (`JobExecutor.add`)
|
|
76
|
+
|
|
77
|
+
**Relatório:** seção 2 — pode ocorrer antes do commit se houver `transactionId` externo.
|
|
78
|
+
|
|
79
|
+
`incremental-search.service.ts` / `v2` não aceitam `transaction` no `update`/`delete`. O envelope existe, mas o caller não tem como acoplar.
|
|
80
|
+
|
|
81
|
+
**O que falta:** plumbear `transaction` (e `key`) da mutação até o `add`.
|
|
82
|
+
|
|
83
|
+
### 2.7 Clients `flow.service.onEntityChange` e `crm.service.addInteraction`
|
|
84
|
+
|
|
85
|
+
**Relatório:** seção 2 e §5.3 (`billing-document` chama `flowService.onEntityChange` no afterCommit).
|
|
86
|
+
|
|
87
|
+
Hoje `sendToQueue` **sem** `transaction`. O envelope resolve só se a API do client receber a TX do caller.
|
|
88
|
+
|
|
89
|
+
**O que falta:** `onEntityChange({ ..., transaction })` / `addInteraction(..., { transaction })` e todos os call sites relevantes. O `onEntityChange` no cancelamento de NF (~1860) continua afterCommit/HTTP+MQ sem TX.
|
|
90
|
+
|
|
91
|
+
### 2.8 `PersonService.enforceType` (`on-person-change`)
|
|
92
|
+
|
|
93
|
+
**Relatório:** o publish do hook CRUD está em §5.2; estes outros publishes (~1492 / ~1506) **não** estavam na lista.
|
|
94
|
+
|
|
95
|
+
**O que falta:** passar a TX do caller quando existir; senão documentar como gap. Não mistura com o publish do CRUD.
|
|
96
|
+
|
|
97
|
+
### 2.9 E-mail de cobrança e boleto no posting-fin
|
|
98
|
+
|
|
99
|
+
**Relatório:** §5.3 `afterConfirmation` (o mesmo afterCommit que publicava `on-posting-fin-created`).
|
|
100
|
+
|
|
101
|
+
`sendEmail` e `paymentDocumentService.createPaymentDocument` não são mq/job/Redis pub.
|
|
102
|
+
|
|
103
|
+
**O que falta:** outbox HTTP/plugin, ou job envelopado **depois** de persistir o documento interno na mesma TX. Não mover e-mail/boleto para dentro da TX aberta (efeito no mundo externo com rollback possível).
|
|
104
|
+
|
|
105
|
+
### 2.10 Jobs no **consumer** do card (não dual-write da TX original)
|
|
106
|
+
|
|
107
|
+
**Relatório:** §5.2 — `createSubCards` / `replyChangesOnCrm` / `notifyCardParent` / `etl` depois de `card-service.afterCommit`.
|
|
108
|
+
|
|
109
|
+
São encadeamento de fila. Se o `sendToQueue` original for para a outbox na TX do card, esses `.add` no worker são outro ciclo (o worker já está fora da TX da entidade).
|
|
110
|
+
|
|
111
|
+
**O que falta (só se quiser atomicidade worker ↔ Bull):** o processamento do consumer precisaria de TX própria + outbox; não é o dual-write do save do card.
|
|
112
|
+
|
|
113
|
+
### 2.11 `cache.service.invalidate` (Redis `${prefix}-invalidate`)
|
|
114
|
+
|
|
115
|
+
**Relatório:** seção 2 / tabela §3 — “soft”, fora da tarefa.
|
|
116
|
+
|
|
117
|
+
Agora `secondaryDatabase.publish` **entra** na outbox, mas o invalidate usa overload com **callback** e **sem** `transaction`. Continua dual-write (mutação vs INSERT outbox autocommit), e o callback assume publish síncrono no Redis.
|
|
118
|
+
|
|
119
|
+
**O que falta:** API async + TX nos call sites; aceitar latência do relay; revisar callers que esperam invalidate imediato no mesmo tick.
|
|
120
|
+
|
|
121
|
+
### 2.12 `report.service` e `llm/token-budget` (cron)
|
|
122
|
+
|
|
123
|
+
**Relatório:** não são dual-write de entidade.
|
|
124
|
+
|
|
125
|
+
Repeat/cron no `JobExecutor.add` via outbox é outro problema (job recorrente vs row única de outbox / `jobId` estável). Não usar o envelope como se fosse “gravei entidade X”.
|
|
126
|
+
|
|
127
|
+
---
|
|
128
|
+
|
|
129
|
+
## 3. Ajustes transversais (não são ocorrências do relatório, mas bloqueiam o objetivo)
|
|
130
|
+
|
|
131
|
+
| Tema | Por quê importa |
|
|
132
|
+
|---|---|
|
|
133
|
+
| **`key` de idempotência** | `ON CONFLICT (idempotency_key) DO NOTHING` + Bull `jobId`. `key` só com `puca_pid` impede o **segundo** update da mesma entidade enquanto a row existir. `pid + transaction.getID()` é o formato para “todo save dispara”. Sem schema, o dual-write some e a regra de negócio muda. |
|
|
134
|
+
| **Não serializar `Transaction` no payload** | Além da rule: qualquer `add(after)` / `sendToQueue(after)` no `afterUpdate` (TX viva) precisa omitir a TX do JSON. |
|
|
135
|
+
| **Timing vs afterCommit local** | Enqueue na TX + drain no relay: consumidores MQ podem correr **antes** de e-mail/WS/sync que ainda estão no afterCommit do mesmo pod (person sync, task WS, posting-fin e-mail). |
|
|
136
|
+
|
|
137
|
+
---
|
|
138
|
+
|
|
139
|
+
## 4. Lembrete: o que já está no caminho certo no core
|
|
140
|
+
|
|
141
|
+
Não é gap do envelope, desde que continue **antes** do `commit()` com `{ transaction }`:
|
|
142
|
+
|
|
143
|
+
- `repository` insert/update/delete → `OnTableChangeService.publish` (Rabbit `table-event-listener` **e** Redis `${table}.change` via outbox).
|
|
144
|
+
- `migration.service` (incluindo `_alterTableDropColumn`): o publish “na hora” deixa de ser dual-write inverso porque a row de outbox dá rollback junto com o DDL.
|
|
145
|
+
|
|
146
|
+
`OnTableChange` ignora `tableName === 'transaction_outbox'` para não recircular.
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
# Análise: dual-write que a outbox (mqService / JobExecutor / secondaryDatabase) não resolve sozinha
|
|
2
|
+
|
|
3
|
+
**Data:** 2026-09-04
|
|
4
|
+
**Fonte:** `relatorio-dual-write-notificacoes.md` (snapshot git `9ee973c`; o arquivo não está no working tree atual de `master`).
|
|
5
|
+
**Mecanismo avaliado:** `TransactionOutboxService.enqueue` via
|
|
6
|
+
|
|
7
|
+
- `mqService.publish` / `sendToQueue` (`engine: mqService`)
|
|
8
|
+
- `JobExecutor.add` (`engine: jobExecutor`)
|
|
9
|
+
- `secondaryDatabase.publish` (`engine: secondaryDatabase`)
|
|
10
|
+
|
|
11
|
+
**Critério:** dual-write banco ↔ Rabbit/Bull/Redis pub some só quando o INSERT em `transaction_outbox` entra na **mesma** transação Postgres da mutação. Sem `options.transaction`, o enqueue usa `getPseudoTransaction()` (autocommit separado) e o dual-write continua.
|
|
12
|
+
|
|
13
|
+
Este arquivo lista o que **não fecha** só com esse envelope, ou que **precisa de mais alteração** além de “passar `{ transaction }` na chamada”. A lista do que **fecha** está no chat desta análise.
|
|
14
|
+
|
|
15
|
+
Itens marcados `[Resolvido]` tiveram o texto movido para a seção **Decisões acordadas** no final, para a numeração não mudar.
|
|
16
|
+
|
|
17
|
+
---
|
|
18
|
+
|
|
19
|
+
## 1. Não são esses três engines (outbox desta tarefa não aplica)
|
|
20
|
+
|
|
21
|
+
| Ocorrência no relatório | Status |
|
|
22
|
+
|---|---|
|
|
23
|
+
| 1.1 `emitChange` + handlers (`cache-repository-redis.ts`) | [Resolvido] |
|
|
24
|
+
| 1.2 `notification.service` / `followers.service` | [Resolvido] |
|
|
25
|
+
| 1.3 `email.service` (Elastic Email) | [Resolvido] |
|
|
26
|
+
| 1.4 `web-socket.service` | [Resolvido] |
|
|
27
|
+
| 1.5 `monitor.ts` (Influx / Discord) | [Resolvido] |
|
|
28
|
+
| 1.6 Hooks CRUD `afterUpdate` / `afterCommit` **em si** | [Resolvido] |
|
|
29
|
+
| 1.7 §5.4 overrides `afterCommit` sem MQ/job (phone, email, address, indicator, interaction, etc.) | [Resolvido] |
|
|
30
|
+
|
|
31
|
+
---
|
|
32
|
+
|
|
33
|
+
## 2. São MQ/Bull/Redis pub, mas o envelope sozinho não fecha
|
|
34
|
+
|
|
35
|
+
### 2.1 [Resolvido]
|
|
36
|
+
|
|
37
|
+
### 2.2 [Resolvido]
|
|
38
|
+
|
|
39
|
+
### 2.3 [Resolvido]
|
|
40
|
+
|
|
41
|
+
### 2.4 [Resolvido]
|
|
42
|
+
|
|
43
|
+
### 2.5 [Resolvido]
|
|
44
|
+
|
|
45
|
+
### 2.6 [Resolvido]
|
|
46
|
+
|
|
47
|
+
### 2.7 [Resolvido]
|
|
48
|
+
|
|
49
|
+
### 2.8 [Resolvido]
|
|
50
|
+
|
|
51
|
+
### 2.9 [Resolvido]
|
|
52
|
+
|
|
53
|
+
### 2.10 [Resolvido]
|
|
54
|
+
|
|
55
|
+
### 2.11 [Resolvido]
|
|
56
|
+
|
|
57
|
+
### 2.12 [Resolvido]
|
|
58
|
+
|
|
59
|
+
---
|
|
60
|
+
|
|
61
|
+
## 3. Ajustes transversais (não são ocorrências do relatório, mas bloqueiam o objetivo)
|
|
62
|
+
|
|
63
|
+
| Tema | Status |
|
|
64
|
+
|---|---|
|
|
65
|
+
| 3.1 **`key` de idempotência** | [Resolvido] |
|
|
66
|
+
| 3.2 **Não serializar `Transaction` no payload** | [Resolvido] |
|
|
67
|
+
| 3.3 **Timing vs afterCommit local** | [Resolvido] |
|
|
68
|
+
|
|
69
|
+
---
|
|
70
|
+
|
|
71
|
+
## 4. [Removido]
|
|
72
|
+
|
|
73
|
+
---
|
|
74
|
+
|
|
75
|
+
## Decisões acordadas (itens resolvidos)
|
|
76
|
+
|
|
77
|
+
Texto original de cada item + decisão. A numeração na seção de origem permanece.
|
|
78
|
+
|
|
79
|
+
### 1.1 `emitChange` + handlers (`cache-repository-redis.ts`)
|
|
80
|
+
|
|
81
|
+
**Original:** fan-out **in-process** depois do Redis `.change`. Não publica para fora. A outbox dos três engines não aplica.
|
|
82
|
+
|
|
83
|
+
**Decisão:** adicionar suporte ao padrão outbox no `emitChange` / handlers, no mesmo modelo de `mqService`, `JobExecutor` e `secondaryDatabase` (enqueue na TX da mutação; o relay/drain dispara o fan-out).
|
|
84
|
+
|
|
85
|
+
### 1.2 `notification.service` / `followers.service`
|
|
86
|
+
|
|
87
|
+
**Original:** canal **HTTP** próprio.
|
|
88
|
+
|
|
89
|
+
**Decisão:** não chamar HTTP na TX da mutação. Enfileirar via `JobExecutor.add` (com `transaction` + `key` de idempotência); o worker faz o HTTP.
|
|
90
|
+
|
|
91
|
+
### 1.3 `email.service` (Elastic Email)
|
|
92
|
+
|
|
93
|
+
**Original:** HTTP.
|
|
94
|
+
|
|
95
|
+
**Decisão:** igual a 1.2 — `JobExecutor` na TX; o job envia o e-mail depois do commit (via relay).
|
|
96
|
+
|
|
97
|
+
### 1.4 `web-socket.service`
|
|
98
|
+
|
|
99
|
+
**Original:** UI efêmera; publicar antes do commit mostraria estado que pode dar rollback.
|
|
100
|
+
|
|
101
|
+
**Decisão:** manter / mover o envio WS para o **afterCommit** (não outbox). É efeito de UI, não consistência banco↔fila.
|
|
102
|
+
|
|
103
|
+
### 1.5 `monitor.ts` (Influx / Discord)
|
|
104
|
+
|
|
105
|
+
**Original:** telemetria.
|
|
106
|
+
|
|
107
|
+
**Decisão:** ignorar. Fora do escopo de dual-write transacional.
|
|
108
|
+
|
|
109
|
+
### 1.6 Hooks CRUD `afterUpdate` / `afterCommit` **em si**
|
|
110
|
+
|
|
111
|
+
**Original:** orquestração in-process. Dual-write só se o app daí chamar MQ/job/Redis pub.
|
|
112
|
+
|
|
113
|
+
**Decisão:** ignorar nesta lista do item 1. O que importa é o call site (caso a caso nas seções 2+).
|
|
114
|
+
|
|
115
|
+
### 1.7 §5.4 overrides `afterCommit` sem MQ/job (phone, email, address, indicator, interaction, etc.)
|
|
116
|
+
|
|
117
|
+
**Original:** outro canal (HTTP CRM, e-mail).
|
|
118
|
+
|
|
119
|
+
**Decisão:** mover o side-effect para `JobExecutor` com `key` de idempotência (`idempotency_key`), enqueue na TX ainda aberta (`afterUpdate` / `transaction` da mutação).
|
|
120
|
+
|
|
121
|
+
### 2.1 Hook CRUD `afterCommit` zera a transação
|
|
122
|
+
|
|
123
|
+
**Original:** `CrudBaseService` anula `afterUpdateArgs.args.transaction` antes de `afterCommit` (TX já commitou). Qualquer `publish`/`add` aí cai em pseudo-TX. Faltava tirar o enqueue do `afterCommit` e fazê-lo com a TX ainda aberta. Delete CRUD não tem `afterCommit`.
|
|
124
|
+
|
|
125
|
+
**Decisão:**
|
|
126
|
+
|
|
127
|
+
- Parar de usar o `afterCommit` da classe CRUD (`CrudBaseService`).
|
|
128
|
+
- Enqueue (MQ / JobExecutor / Redis pub) no `afterUpdate`, com a TX ainda aberta.
|
|
129
|
+
- O que precisar rodar **depois** do commit (WS, e-mail já persistido, etc.) usa o `afterCommit` da **transação** (`transaction.afterCommit`), não o hook da classe.
|
|
130
|
+
|
|
131
|
+
### 2.3 `callFlowOnEntityChange` em `DEVELOPMENT`
|
|
132
|
+
|
|
133
|
+
**Original:** em DEV o afterCommit chama `callFlowOnEntityChangeProcess` **in-process**, não `JobExecutor.add`. Alternativas: aceitar dual-write leve em DEV, ou unificar DEV com o job/outbox.
|
|
134
|
+
|
|
135
|
+
**Decisão:** aceitar dual-write em DEV. Produção continua no job/outbox.
|
|
136
|
+
|
|
137
|
+
### 2.4 Payload de job com a TX viva (`RuleService`)
|
|
138
|
+
|
|
139
|
+
**Original:** `onAfterUpdateJob.add(after)` serializava o objeto `After` inteiro, inclusive `args.transaction`. Faltava: no enqueue, TX só em `opts.transaction`; no payload do Bull, `transaction: null`.
|
|
140
|
+
|
|
141
|
+
**Decisão:** serializar a TX no payload **já é um bug**. Corrigir primeiro: payload nunca carrega `Transaction`; a TX viva só entra em `options.transaction` do `add`/`publish`/`sendToQueue`.
|
|
142
|
+
|
|
143
|
+
### 2.6 Incremental Search / Typesense (`JobExecutor.add`)
|
|
144
|
+
|
|
145
|
+
**Original:** pode ocorrer antes do commit se houver `transactionId` externo. `incremental-search.service.ts` / `v2` não aceitam `transaction` no `update`/`delete`. O envelope existe, mas o caller não tem como acoplar. Faltava plumbear `transaction` (e `key`) da mutação até o `add`.
|
|
146
|
+
|
|
147
|
+
**Decisão:** o caminho é `JobExecutor` (já é o engine). Expor / plumbear `transaction` + `key` até o `add`, para o enqueue entrar na TX da mutação — não um segundo `add` autocommit.
|
|
148
|
+
|
|
149
|
+
### 2.7 Clients `flow.service.onEntityChange` e `crm.service.addInteraction`
|
|
150
|
+
|
|
151
|
+
**Original:** `sendToQueue` **sem** `transaction`. O envelope resolve só se a API do client receber a TX do caller. Call sites (ex.: `onEntityChange` no cancelamento de NF) continuam afterCommit/HTTP+MQ sem TX.
|
|
152
|
+
|
|
153
|
+
**Decisão:** não HTTP/MQ direto no caller. Mover para `JobExecutor.add` com TX + `key`; o job dispara o fluxo (`onEntityChange` / `addInteraction`) depois do drain.
|
|
154
|
+
|
|
155
|
+
### 2.8 `PersonService.enforceType` (`on-person-change`)
|
|
156
|
+
|
|
157
|
+
**Original:** o publish do hook CRUD está em §5.2; estes outros publishes (~1492 / ~1506) **não** estavam na lista. Faltava passar a TX do caller quando existir.
|
|
158
|
+
|
|
159
|
+
**Decisão:** mover esses publishes para `JobExecutor` com TX + `key`. Não misturar com o publish do CRUD `on-person-change`.
|
|
160
|
+
|
|
161
|
+
### 2.9 E-mail de cobrança e boleto no posting-fin
|
|
162
|
+
|
|
163
|
+
**Original:** `sendEmail` e `paymentDocumentService.createPaymentDocument` não são mq/job/Redis pub. Não mover e-mail/boleto para dentro da TX aberta (efeito no mundo externo com rollback possível).
|
|
164
|
+
|
|
165
|
+
**Decisão:** `JobExecutor` na TX (depois de persistir o documento interno, se houver). O worker envia e-mail / gera boleto **depois** do commit, via outbox — não HTTP síncrono na TX aberta.
|
|
166
|
+
|
|
167
|
+
### 2.11 `cache.service.invalidate` (Redis `${prefix}-invalidate`)
|
|
168
|
+
|
|
169
|
+
**Original:** `secondaryDatabase.publish` entra na outbox, mas o invalidate usa overload com **callback** e **sem** `transaction`. Continua dual-write (mutação vs INSERT outbox autocommit), e o callback assume publish síncrono no Redis. Faltava API async + TX nos call sites; aceitar latência do relay.
|
|
170
|
+
|
|
171
|
+
**Decisão:** implementar outbox transaction no `invalidate` (passar `transaction`, enqueue na mesma TX, drain pelo relay). Callers deixam de esperar invalidate imediato no mesmo tick.
|
|
172
|
+
|
|
173
|
+
### 3.1 `key` de idempotência
|
|
174
|
+
|
|
175
|
+
**Original:** `ON CONFLICT (idempotency_key) DO NOTHING` + Bull `jobId`. `key` só com `puca_pid` impede o **segundo** update da mesma entidade enquanto a row existir. `pid + transaction.getID()` é o formato para “todo save dispara”. Sem schema, o dual-write some e a regra de negócio muda.
|
|
176
|
+
|
|
177
|
+
**Decisão:** no `RuleService`, não passar `key` no `add` do `onAfterUpdateJob`. Sem `key`, o enqueue gera UUID; cada save enfileira um job novo e o segundo update da mesma regra não é descartado.
|
|
178
|
+
|
|
179
|
+
### 3.2 Não serializar `Transaction` no payload
|
|
180
|
+
|
|
181
|
+
**Original:** além da rule: qualquer `add(after)` / `sendToQueue(after)` no `afterUpdate` (TX viva) precisa omitir a TX do JSON.
|
|
182
|
+
|
|
183
|
+
**Decisão:** transação **nunca** pode ser serializada (payload de job, MQ, Redis, logs). TX só como objeto vivo em `options.transaction` no enqueue.
|
|
184
|
+
|
|
185
|
+
### 2.2 Fechamento async de exercício (`close-exercise-{pid}`)
|
|
186
|
+
|
|
187
|
+
**Original (relatório §5.1):** hop `FinancialExercisesService.afterCommit` → `scheduleCloseExerciseJob` → `closeExerciseJob.add`.
|
|
188
|
+
|
|
189
|
+
O path async só existe quando **não há** TX na request. Enqueue no afterCommit = pseudo-TX. Enqueue no `beforeUpdate` = job fantasma se o save falhar.
|
|
190
|
+
|
|
191
|
+
**O que faltava no texto antigo:** wrap de TX própria (`async-close-exercise`), persistir `closed` + outbox no mesmo commit, job no `afterUpdate`. Não é só `add({ transaction })`.
|
|
192
|
+
|
|
193
|
+
**Como o processo funciona hoje** (`puca-fin/api/src/business/fin/financial-exercises/financial-exercises.service.ts` + `exercise-closing.service.ts`):
|
|
194
|
+
|
|
195
|
+
Quando o usuário muda o exercício de `open` → `closed`, o `beforeUpdate` escolhe um de dois caminhos:
|
|
196
|
+
|
|
197
|
+
1. **Síncrono** — a request já veio com `transactionId` (`args.transaction` preenchido; testes e2e). Aí o código chama `exerciseClosingService.closeExercise({ transaction })` **na mesma request**. Todos os lançamentos de encerramento entram nessa transação. **Não é o fluxo da tela.**
|
|
198
|
+
|
|
199
|
+
2. **Assíncrono** — tela normal, sem `transactionId`, `args.transaction` é `undefined`. A request **não** fecha o exercício. Ela só:
|
|
200
|
+
- valida (`validateBeforeClose`);
|
|
201
|
+
- conta contas de receita/despesa e calcula timeout;
|
|
202
|
+
- pega lock Redis `financial_exercises_company_{filial}`;
|
|
203
|
+
- guarda `pendingAsyncCloseExercise` no `context`;
|
|
204
|
+
- o CRUD persiste **apenas** `puca_pid` + `status: closed` e **commita**.
|
|
205
|
+
|
|
206
|
+
Em seguida o hook `afterCommit` **da classe** CRUD roda **já sem transação**:
|
|
207
|
+
|
|
208
|
+
- `scheduleCloseExerciseJob` → `closeExerciseJob.add({ key: 'close-exercise-{puca_pid}' })` — isso grava na `transaction_outbox` em **outro** commit (autocommit);
|
|
209
|
+
- toast “fechamento em andamento”;
|
|
210
|
+
- se o `add` der erro: solta o lock e faz outro `update` para `status: open`;
|
|
211
|
+
- `flushExercisesCache()`.
|
|
212
|
+
|
|
213
|
+
Os lançamentos (`closeExercise`: contas, postings, equação patrimonial) **não** estão nesse `afterCommit`. Rodam **depois**, no worker Bull `ExerciseClosingService.closeExercise`, que abre a transação `exercise-closing`.
|
|
214
|
+
|
|
215
|
+
**Por que é dual-write:** commit 1 = exercício `closed` no Postgres. Commit 2 = row de outbox / job no Bull. Se a API cair entre os dois, fica `closed` e o job nunca entra. O `catch` que reabre o status só cobre exceção na hora do `add`, não crash.
|
|
216
|
+
|
|
217
|
+
**Decisão (confirmada):**
|
|
218
|
+
|
|
219
|
+
1. No `beforeUpdate`, **depois** de decidir async vs síncrono (async = a request **não** vinha com transação):
|
|
220
|
+
`const autoCommit = !args.transaction`
|
|
221
|
+
`args.transaction = args.transaction || this.transactionFactory.get({ name: '...' })`
|
|
222
|
+
O `if` que chama `closeExercise` na request continua olhando “já vinha transação”, não a TX recém-criada.
|
|
223
|
+
2. Mover `closeExerciseJob.add` do `afterCommit` da classe para o `afterUpdate`, com `{ transaction: args.transaction, key: 'close-exercise-{puca_pid}' }`.
|
|
224
|
+
3. Se `autoCommit`, `commit()` no fim (o CRUD não commita `args.transaction`). Toast / cache em `args.transaction.afterCommit` **antes** desse commit.
|
|
225
|
+
4. Worker inalterado. `closeExercise` (lançamentos) **não** entra nessa TX.
|
|
226
|
+
|
|
227
|
+
### 2.10 Jobs no consumer do card
|
|
228
|
+
|
|
229
|
+
**Original:** `createSubCards` / `replyChangesOnCrm` / `notifyCardParent` / `etl` no worker de `card-service.afterCommit`.
|
|
230
|
+
|
|
231
|
+
**Decisão:** mover só esses quatro `JobExecutor.add` para o `afterUpdate` do `CardService`, com `after.args.transaction ||` TX nova. Tirar os `.add` do consumer para não duplicar. Não mover e-mail / script / `taskService.add` do `asyncAfterCommit` para essa TX.
|
|
232
|
+
|
|
233
|
+
### 2.12 `report.service` e `llm/token-budget` (cron)
|
|
234
|
+
|
|
235
|
+
**Original:** repeat/cron vs row única de outbox / `jobId` estável.
|
|
236
|
+
|
|
237
|
+
**Decisão:** ok usar o envelope. O relay dá `DELETE` na row depois do dispatch; a `key` estável (`budget-consolidation`) re-registra o cron no Bull sem ficar presa num `ON CONFLICT` eterno. Relatório (`PrivateAsyncTemp`) é o mesmo `JobExecutor.add` pontual.
|
|
238
|
+
|
|
239
|
+
### 2.5 `crud-front-base`: fila `${table}.update` **antes** do write
|
|
240
|
+
|
|
241
|
+
**Original:** `sendToQueue` dispara o comando **sem** a entidade ter sido gravada neste processo; o write é no consumer. Outbox com TX da request atual não acopla a um INSERT que ainda não aconteceu.
|
|
242
|
+
|
|
243
|
+
**Decisão:** **não é dual-write.** Neste processo não houve write no banco: o POST com header `puca-async: true` só coloca o payload na fila `${table}.update`; quem grava é o consumer (`_update`). Deixar como está.
|
|
244
|
+
|
|
245
|
+
### 3.3 Timing vs afterCommit local (pessoa)
|
|
246
|
+
|
|
247
|
+
**Original:** enqueue na TX + drain no relay: consumidores MQ podem correr **antes** de e-mail/WS/sync que ainda estão no afterCommit do mesmo pod (person sync, task WS, posting-fin e-mail).
|
|
248
|
+
|
|
249
|
+
No `PersonService` (`puca-crm/api/src/services/person.service.ts`) isso é:
|
|
250
|
+
|
|
251
|
+
1. `afterUpdate` (transação ainda aberta): sincroniza e-mails/telefones do `context` e **já** chama `mqService.publish('on-person-change')`.
|
|
252
|
+
2. A transação commita. O `puca-relay` pode publicar no Rabbit **na hora**.
|
|
253
|
+
3. `afterCommit` da classe (sem transação): `updateCompany` (repository `puca_base_api_company` com `transaction: null`), `syncEmail`, `syncPhone`, `syncAddress`, `generateInteraction` (`interactionService.update` sem `transaction`), Typesense.
|
|
254
|
+
|
|
255
|
+
Um consumer de `on-person-change` pode ler a pessoa **sem** filial/contatos/interação deste save.
|
|
256
|
+
|
|
257
|
+
**Decisão:** no `PersonService.afterUpdate`, **tudo na mesma** `after.args.transaction`, nesta ordem:
|
|
258
|
+
|
|
259
|
+
1. Manter o sync de e-mail/telefone que já está no `afterUpdate` (listas do `context`).
|
|
260
|
+
2. Trazer para o `afterUpdate` **com transação**: `updateCompany`, `syncEmail`, `syncPhone`, `syncAddress`, `generateInteraction`.
|
|
261
|
+
3. Incremental Search / Typesense via `JobExecutor.add` com `transaction` + `key` (item 2.6).
|
|
262
|
+
4. **Por último** `mqService.publish('on-person-change', …, { transaction, key })`.
|
|
263
|
+
|
|
264
|
+
O `afterCommit` da classe **não** faz mais esses syncs. O relay só emite `on-person-change` depois do commit em que pessoa + company + contatos + interação já existem no Postgres. Typesense (índice) ainda pode atrasar em relação ao evento: o drain do relay ordena por `puca_key`, não pela ordem do enqueue.
|
|
@@ -69,6 +69,8 @@ export declare class AuthService {
|
|
|
69
69
|
}): Promise<string>;
|
|
70
70
|
private getPucaUserPassword;
|
|
71
71
|
private getUserRepository;
|
|
72
|
+
private looksLikeEmail;
|
|
73
|
+
private findActiveUserByField;
|
|
72
74
|
validatePassword(username: string, password: string): Promise<User & {
|
|
73
75
|
billing_mode?: string;
|
|
74
76
|
}>;
|
|
@@ -433,18 +433,16 @@ class AuthService {
|
|
|
433
433
|
tableName: 'puca_base_api_system_user',
|
|
434
434
|
});
|
|
435
435
|
}
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
throw this.defaultAuthError();
|
|
441
|
-
}
|
|
436
|
+
looksLikeEmail(identifier) {
|
|
437
|
+
return identifier.includes('@');
|
|
438
|
+
}
|
|
439
|
+
async findActiveUserByField(field, value) {
|
|
442
440
|
const repository = this.getUserRepository();
|
|
443
|
-
|
|
441
|
+
return repository.findOneWhere({
|
|
444
442
|
fields: ['puca_pid', 'username', 'password', 'billing_mode'],
|
|
445
443
|
args: {
|
|
446
444
|
active: true,
|
|
447
|
-
|
|
445
|
+
[field]: value
|
|
448
446
|
},
|
|
449
447
|
where: {
|
|
450
448
|
and: [{
|
|
@@ -455,14 +453,27 @@ class AuthService {
|
|
|
455
453
|
operator: interfaces_1.ConditionalOperator.equals,
|
|
456
454
|
v2: '$active'
|
|
457
455
|
}, {
|
|
458
|
-
v1: '
|
|
456
|
+
v1: field === 'email'
|
|
457
|
+
? { function: 'lower', args: ['email'] }
|
|
458
|
+
: 'username',
|
|
459
459
|
operator: interfaces_1.ConditionalOperator.equals,
|
|
460
|
-
v2:
|
|
460
|
+
v2: `$${field}`
|
|
461
461
|
}]
|
|
462
462
|
},
|
|
463
463
|
user: null,
|
|
464
464
|
disablePermissionSystem: true
|
|
465
465
|
});
|
|
466
|
+
}
|
|
467
|
+
async validatePassword(username, password) {
|
|
468
|
+
var _a;
|
|
469
|
+
const normalizedUsername = (_a = username === null || username === void 0 ? void 0 : username.toLowerCase()) === null || _a === void 0 ? void 0 : _a.trim();
|
|
470
|
+
if (!normalizedUsername || !password) {
|
|
471
|
+
throw this.defaultAuthError();
|
|
472
|
+
}
|
|
473
|
+
let user = await this.findActiveUserByField('username', normalizedUsername);
|
|
474
|
+
if (!user && this.looksLikeEmail(normalizedUsername)) {
|
|
475
|
+
user = await this.findActiveUserByField('email', normalizedUsername);
|
|
476
|
+
}
|
|
466
477
|
if (!user) {
|
|
467
478
|
throw this.defaultAuthError();
|
|
468
479
|
}
|
|
@@ -488,7 +499,7 @@ class AuthService {
|
|
|
488
499
|
}];
|
|
489
500
|
const passwordStrategy = estrategies.find(e => e.apply());
|
|
490
501
|
const hashInputPassword = passwordStrategy.useHash ? await this.computePasswordHash({
|
|
491
|
-
username:
|
|
502
|
+
username: user.username,
|
|
492
503
|
password,
|
|
493
504
|
}) : password;
|
|
494
505
|
const databasePassword = await passwordStrategy.exec();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/core/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/core/services/auth.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,oCAAmC;AACnC,iCAAgC;AAChC,mCAAmC;AAQnC,qCAAkC;AAGlC,qDAA2D;AAE3D,iDAAgE;AAKnD,QAAA,4BAA4B,GAAG,CAAC,CAAA;AAM7C,SAAgB,gCAAgC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;QAClE,OAAO,CAAC,CAAA;KACT;IACD,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,GAAG,EAAE,EAAE,CAAC,CAAA;IACxE,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;AAC/C,CAAC;AAND,4EAMC;AAIM,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAgB,EAAE;IACvE,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,OAAO,iBAAiB,CAAA;KACzB;IACD,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,OAAO,cAAc,CAAA;KACtB;IACD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AARY,QAAA,wBAAwB,4BAQpC;AAEM,MAAM,0BAA0B,GAAG,CAAC,OAAiB,EAAsB,EAAE;IAClF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,OAAO,OAAO,CAAC,aAAa,CAAA;KAC7B;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE;QAC5B,OAAO,OAAO,CAAC,UAAU,CAAA;KAC1B;IACD,OAAO,OAAO,CAAC,OAAO,CAAA;AACxB,CAAC,CAAA;AARY,QAAA,0BAA0B,8BAQtC;AAEM,MAAM,wBAAwB,GAAG,CAAC,IAAsB,EAAE,MAAc,EAAsB,EAAE;IACrG,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,IAAI,CAAC,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC,CAAA;AAC/C,CAAC,CAAA;AALY,QAAA,wBAAwB,4BAKpC;AASD,MAAa,WAAW;IAKtB,YAA6B,iBAAoC,EAAE,MAAc;QAApD,sBAAiB,GAAjB,iBAAiB,CAAmB;QAHhD,UAAK,GAAG,IAAI,GAAG,EAA4E,CAAA;QAC3F,mBAAc,GAAG,IAAI,GAAG,EAA2B,CAAA;QAGlE,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAClD,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,OAAO,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IAEO,oBAAoB,CAAC,OAAe,EAAE,IAAU;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAChD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE;YACpB,OAAM;SACP;QACD,MAAM,SAAS,GAAoB,EAAE,CAAA;QACrC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,eAAe,EAAE;gBACjD,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAC1B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;aACrB;iBAAM;gBACL,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aACvB;SACF;QACD,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;SAC5C;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SACpC;IACH,CAAC;IAEO,YAAY,CAAC,OAAe,EAAE,MAAqB;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAChD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE;YACpB,OAAM;SACP;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;QACnD,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;SAC5C;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SACpC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EACnB,OAAO,EACP,eAAe,EACf,MAAM,EACN,SAAS,GAMV;;QACC,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAA;QAC7C,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,eAAe,EAAE;YACjD,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;;YACtC,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,EAAE;gBAClC,IAAI,OAAO,EAAE;oBACX,OAAM;iBACP;gBACD,OAAO,GAAG,IAAI,CAAA;gBACd,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAC1B,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAClC,OAAO,CAAC,OAAO,CAAC,CAAA;YAClB,CAAC,CAAA;YAED,MAAM,MAAM,GAAkB;gBAC5B,eAAe;gBACf,KAAK;gBACL,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;aAClD,CAAA;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;YACtD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAGzC,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAA;YAC5C,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,eAAe,EAAE;gBAC/C,MAAM,CAAC,IAAI,CAAC,CAAA;aACb;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE;gBAC3B,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAA;gBAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;qBAChD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,UAAU,CAAC;qBACxC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAE5B,OAAO,qBAAqB,WAAW,CAAC,MAAM,KAAK,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9E,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,KAAK,CAAC,CAAA;QAET,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO;YAC7D,SAAS,EAAE,2BAA2B;YACtC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAA;QACF,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAO;YACxE,SAAS,EAAE,2BAA2B;YACtC,OAAO,EAAE,CAAC;SACX,CAAC,CAAA;QACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC;YACpD,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,cAAc,CAAC;YAC/E,IAAI,EAAE;gBACJ,MAAM,EAAE,IAAI;aACb;YACD,KAAK,EAAE;gBACL,EAAE,EAAE;oBACF,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;iBAC5B;gBACD,QAAQ,EAAE,gCAAmB,CAAC,MAAM;gBACpC,EAAE,EAAE,SAAS;aACd;YACD,IAAI,EAAE,IAAI;YACV,uBAAuB,EAAE,IAAI;SAC9B,CAAC,CAAA;QACF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAClF,mBAAmB,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;;YACvD,MAAM,MAAM,GAAG,GAAG,EAAE;;gBAClB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;oBAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,mCACxB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,GAC7B,IAAI,CACR,CAAA;iBACF;qBAAM;oBACL,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAA;iBAC7D;gBACD,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,IAAI,CAAA;gBAClD,IAAI,WAAW,EAAE;oBACf,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;iBACjD;YACH,CAAC,CAAA;YAED,IAAI,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YAClC,IAAI,MAAM,KAAK,KAAK,EAAE;gBACpB,MAAM,GAAG,IAAI,CAAA;aACd;YACD,IAAI,CAAC,MAAM,EAAE;gBACX,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;gBAC3B,OAAM;aACP;YAED,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAClC,MAAM,wBAAwB,GAAG,CAAC,IAAI,CACpC,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAC3C,CAAC,IAAI,CAAC,eAAe,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;gBACzD,CAAC,IAAI,CAAC,YAAY,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CACpD,CAAA;YACD,IAAI,wBAAwB,EAAE;gBAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,+BAA+B,IAAI,CAAC,QAAQ,6BAA6B,CAAC,CAAA;gBAGnG,CAAC,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aAC1C;iBAAM;gBACL,MAAM,cAAc,GAClB,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,MAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,MAAK,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,0CAAE,QAAQ,CAAA,CAAC;oBACrE,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe,MAAK,SAAS,IAAI,IAAI,CAAC,eAAe,MAAK,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,0CAAE,eAAe,CAAA,CAAC;oBAC1F,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,MAAK,SAAS,IAAI,IAAI,CAAC,YAAY,MAAK,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,0CAAE,YAAY,CAAA,CAAC,CAAA;gBACnF,MAAM,iBAAiB,GAAG,cAAc,CAAC,CAAC,CAAC,gCAAgC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;gBACjF,IAAI,iBAAiB,GAAG,CAAC,EAAE;oBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,MAAM,EACN,2CAA2C,iBAAiB,KAAK,EACjE,QAAQ,CACT,CAAA;oBACD,UAAU,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;iBACtC;qBAAM;oBACL,MAAM,EAAE,CAAA;iBACT;gBACD,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE;oBACvB,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;oBAC3B,CAAC,CAAC,WAAW,GAAG,IAAI,CAAA;iBACrB;aACF;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC5B,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE;YAC9D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAC1B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;aACtB;YACD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SACpC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,GAG/B;QACC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACrC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAA;SACZ;QACD,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;YAC/C,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,GAAG,CAAC,kBAAkB,EAAE;YAC1B,KAAK,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAA;SAChC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,KAAoB;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACrC,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAA,EAAE;YAChB,OAAM;SACP;QACD,IAAI,KAAK,CAAC,WAAW,EAAE;YACrB,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YAC/B,KAAK,CAAC,WAAW,GAAG,IAAI,CAAA;SACzB;QACD,KAAK,CAAC,IAAI,mCACL,KAAK,CAAC,IAAI,GACV,KAAK,CACT,CAAA;QACD,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;CACF;AA/OD,kCA+OC;AAED,MAAa,WAAW;IAGtB,YACmB,MAAc,EACd,aAA4B,EAC5B,iBAAoC,EACpC,mBAAwC,EACxC,WAAwB,EACxB,gBAAkC,EAClC,WAAwB,EACxB,cAA8B;QAP9B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAE/C,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IAC/D,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,EACzB,UAAU,EACa;QACvB,MAAM,wBAAwB,GAAG,KAAK,EAAE,UAAkB,EAAE,EAAE;YAC5D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;YAC5E,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACtE,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC1C,CAAC,CAAA;QAED,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC,CAAC,IAAI,CAAA;QAEjF,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YACpE,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC,CAAA;QAED,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,MAAM,QAAQ,EAAE,CAAA;SACxB;QAED,IAAI,UAAU,KAAK,iBAAiB,EAAE;YACpC,OAAO,MAAM,QAAQ,EAAE,CAAA;SACxB;QAED,OAAO,MAAM,wBAAwB,CAAC,UAAU,CAAC,IAAI,MAAM,wBAAwB,CAAC,iBAAiB,CAAC,CAAA;IACxG,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,KAAa;QACtC,IAAI;YACF,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAa,CAAC;SACtC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;YACnC,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,KAAa,EAAE,SAAiB;QACpD,IAAI;YACF,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE;gBAC3C,UAAU,EAAE,CAAC,OAAO,CAAC;aACtB,CAAC,CAAA;YACF,OAAO,CAAC,CAAC,OAAO,CAAA;SACjB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;YAC9B,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa;QACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAG/C,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;YAC3D,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAA;YACrE,OAAO,IAAI,CAAA;SACZ;QAGD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACxC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC/C,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,yBAAyB,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;YACzF,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;YAC3C,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvE,kBAAkB,EAAE,IAAI;YACxB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAA;QAEF,IAAI,CAAC,SAAS,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAA;YAC9D,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,YAAY,GAAG,IAAA,gCAAwB,EAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QACtE,MAAM,cAAc,GAAG,IAAA,kCAA0B,EAAC,OAAO,CAAC,CAAA;QAE1D,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,YAAY,KAAK,cAAc,EAAE;YAC7D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;YACvB,MAAM,UAAU,GAAG,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAA;YACjF,MAAM,gBAAgB,GAAG,GAAG,IAAI,IAAI,IAAI,UAAU,GAAG,oCAA4B,CAAA;YAEjF,IAAI,gBAAgB,EAAE;gBACpB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAC1B,CAAC,EACD,IAAI,CAAC,IAAI,CAAC,CAAC,oCAA4B,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,CAC9D,CAAA;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iBAAiB,EACjB,iCAAiC,EACjC,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,CAC7D,CAAA;gBACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC;oBACpD,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;oBAC9B,eAAe,EAAE,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,SAAS,EAAE,WAAW;iBACvB,CAAC,CAAA;gBACF,IAAI,OAAO,EAAE;oBACX,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAC3E,kBAAkB,EAAE,IAAI;wBACxB,cAAc,EAAE,IAAI;qBACrB,CAAC,CAAA;oBACF,YAAY,GAAG,IAAA,gCAAwB,EAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;iBACvE;aACF;YAED,IAAI,YAAY,KAAK,cAAc,EAAE;gBACnC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;gBAC/D,OAAO,IAAI,CAAA;aACZ;SACF;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,qCAA0B;aAC5C,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;aACnB,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACjD,OAAO,CAAC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC;QAClD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,CAAU;;QACrC,MAAM,OAAO,GAAsC,CAAQ,CAAA;QAC3D,MAAM,KAAK,GAAG,MAAC,CAAA,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;eAC3C,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;eAChC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;eACpC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;eACpC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAW,0CAAE,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;QACtE,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACtD;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,MAAc;QACxC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACvC,OAAO,IAAI,CAAA;SACZ;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACvF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACrC,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;YACnB,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC;IAEO,gBAAgB;QACtB,OAAO,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,EAAU;QAC3B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,EACxB,QAAQ,EACR,QAAQ,GAIT;QACC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,CAAA;QACjD,IAAI,GAAG,KAAK,aAAa,EAAE;YACzB,OAAO,QAAQ,CAAA;SAChB;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QAC/E,IAAI,CAAC,YAAY,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,sDAAsD,CAAC,CAAC;SACjG;QAED,OAAO,IAAA,mBAAU,EAAC,MAAM,CAAC;aACtB,MAAM,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,GAAG,QAAQ,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC;aAC9E,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IACxE,CAAC;IAEO,iBAAiB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO;YAC9C,SAAS,EAAE,2BAA2B;SACvC,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,UAAkB;QACvC,OAAO,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,KAA2B,EAAE,KAAa;QAC5E,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC5C,OAAO,UAAU,CAAC,YAAY,CAAC;YAC7B,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC;YAC5D,IAAI,EAAE;gBACJ,MAAM,EAAE,IAAI;gBACZ,CAAC,KAAK,CAAC,EAAE,KAAK;aACf;YACD,KAAK,EAAE;gBACL,GAAG,EAAE,CAAC;wBACJ,EAAE,EAAE;4BACF,QAAQ,EAAE,UAAU;4BACpB,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;yBAC5B;wBACD,QAAQ,EAAE,gCAAmB,CAAC,MAAM;wBACpC,EAAE,EAAE,SAAS;qBACd,EAAE;wBACD,EAAE,EAAE,KAAK,KAAK,OAAO;4BACnB,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE;4BACxC,CAAC,CAAC,UAAU;wBACd,QAAQ,EAAE,gCAAmB,CAAC,MAAM;wBACpC,EAAE,EAAE,IAAI,KAAK,EAAE;qBAChB,CAAC;aACH;YACD,IAAI,EAAE,IAAI;YACV,uBAAuB,EAAE,IAAI;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;;QACvD,MAAM,kBAAkB,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,EAAE,0CAAE,IAAI,EAAE,CAAA;QAC1D,IAAI,CAAC,kBAAkB,IAAI,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;QAED,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAA;QAC3E,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE;YACpD,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;SACrE;QACD,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,CAAA;QAEzD,MAAM,WAAW,GAAG,CAAC;gBACnB,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,KAAK,aAAa;gBAC1C,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,KAAK,IAAI,EAAE;oBACf,OAAO,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAA;gBACzC,CAAC;aACF,EAAE;gBACD,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,WAAW;gBAC1C,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ;gBACxB,IAAI,EAAE,KAAK,IAAI,EAAE;oBACf,OAAO,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAA;gBAC1D,CAAC;aACF,EAAE;gBACD,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;gBACjB,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,KAAK,IAAI,EAAE;oBACf,OAAO,IAAI,CAAC,QAAQ,CAAA;gBACtB,CAAC;aACF,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QACzD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC;YAClF,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ;SACT,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEd,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACtD,IAAI,GAAG,iBAAiB,EAAE,KAAK,GAAG,gBAAgB,EAAE,EAAE;YACpD,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;QAED,OAAO,IAAwC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAAU,EAAE,MAAc;QACpD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QACtE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QACnE,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAS,CAAC;QAEjD,MAAM,QAAQ,GAAa;YACzB,OAAO,EAAE,CAAC;YACV,MAAM;YACN,MAAM;YACN,aAAa,EAAE,IAAI;YACnB,IAAI,kCACC,OAAO,KACV,KAAK,EAAE,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACvE,SAAS,EAAE,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,GAChF;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B;SACF,CAAC;QAEF,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,qCAA0B;aAC7C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;aACpB,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClD,QAAQ,CAAC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC;QACnD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,qBAAqB,CAAC,QAAkB;QAC9C,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,qCAA0B;aAC7C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;aACpB,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClD,QAAQ,CAAC,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,QAAgB;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,IAAU;QACpD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAA,EAAE;YACnB,OAAM;SACP;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACjE,OAAM;SACP;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC5C,MAAM,UAAU,CAAC,MAAM,CAAC;YACtB,MAAM,EAAE;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI;gBACrB,YAAY,EAAE,IAAI;aACX;YACT,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAU;YACvC,uBAAuB,EAAE,IAAI;SAC9B,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YACxC,QAAQ,EAAE,IAAI;YACd,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,+BAA+B,EAC/B,sCAAsC,IAAI,CAAC,QAAQ,kBAAkB,CACtE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,QAAgB;;QAC1D,IAAI;YACF,MAAM,kBAAkB,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,EAAE,0CAAE,IAAI,EAAE,CAAA;YAC1D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAClD,QAAQ,EAAE,kBAAkB;gBAC5B,QAAQ;aACT,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC,CAAC;YAE/F,IAAI,QAAkB,CAAA;YACtB,IAAI;gBACF,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CACxC,iCAAiC,EACjC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,EAC9C,GAAG,EACH,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAC9D,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,gDAAgD,EAAE,CAAC,CAAC,CAAA;gBAC5F,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;aACnE;YAED,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,IAAI,CAAA;aACZ;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACzE,kBAAkB,EAAE,IAAI;gBACxB,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC7F,OAAO,IAAI,CAAA;aACZ;YAED,MAAM,IAAI,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC;YAErD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YACrC,OAAO,QAAQ,CAAA;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CACF;AArbD,kCAqbC"}
|
|
@@ -121,15 +121,14 @@ class CrudBaseService {
|
|
|
121
121
|
await this.afterUpdate(afterUpdateArgs);
|
|
122
122
|
}
|
|
123
123
|
if (this.afterCommit) {
|
|
124
|
-
const
|
|
124
|
+
const shouldUsePseudoTransaction = !args.transaction;
|
|
125
|
+
const transaction = args.transaction || this._repositoryFactory.getPseudoTransaction();
|
|
126
|
+
transaction.afterCommit(async () => {
|
|
125
127
|
afterUpdateArgs.args.transaction = null;
|
|
126
128
|
await this.afterCommit(afterUpdateArgs);
|
|
127
|
-
};
|
|
128
|
-
if (
|
|
129
|
-
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
await handler();
|
|
129
|
+
});
|
|
130
|
+
if (shouldUsePseudoTransaction) {
|
|
131
|
+
await transaction.commit();
|
|
133
132
|
}
|
|
134
133
|
}
|
|
135
134
|
return result;
|