Zimin A.N.
2020af99b7
Phase 1 на скелете Phase 0 (e438c4c). Делает workflow рабочим end-to-end:
maker submit → reviewer approve/reject → COPY → live record + outbox event.
Backend:
- DictionaryRecordService:
* requireApprovalGate() — pre-check на create/update/close. Throws 409
draft_required если dict.approval_required=true с pointer на drafts API.
* applyApprovedCreate/Update/Close — public bypass methods для DraftService.
Обходят approval check (drafts уже прошли review). Schema validation
повторяется ON APPROVE — schema может measure'ся между submit и approve
(failure modes #2 из design doc).
* createDirect/updateDirect/closeDirect — internal helpers (private),
extract'ed из public методов.
- DraftService:
* approve(draftId, comment) — SERIALIZABLE tx. Validates pending status,
self-approve guard (D3 maker-checker), dispatches на applyApproved*
based on draft.operation. Marks draft APPROVED + reviewer fields
(D4=A: kept в таблице для compliance).
* reject(draftId, comment) — non-blank reason required (compliance).
Marks REJECTED + reviewer fields. Никаких applyApproved calls.
* withdraw(draftId) — maker-only. 403 not_draft_maker если другой user.
Marks WITHDRAWN.
* Constructor split: production-ctor (с recordService) + test-ctor
(без recordService — для unit tests submit/list path). @Autowired
отмечает canonical для Spring.
- DraftController endpoints:
* POST /api/v1/drafts/{id}/approve?comment=
* POST /api/v1/drafts/{id}/reject?comment=
* DELETE /api/v1/drafts/{id} — withdraw
DTO surface — admin UI токglet'ы для approval policy:
- DictionaryResponse: +approvalRequired, +approvalMinRole.
- CreateDictionaryRequest: optional Boolean approvalRequired, String
approvalMinRole (null = no change в update).
- DictionaryDefinitionService.create + updateSchema: применяют поля.
- DictionaryDefinitionService.findById — added (нужно DraftService.approve
чтобы взять def name по id).
Tests:
- DraftServiceTest 13 unit tests (+7 new для Phase 1):
* approve dispatches CREATE/UPDATE/CLOSE per draft.operation
* approve blocked при self-approve (maker == reviewer)
* approve 409 если draft уже approved/rejected
* reject marks с reason; reject 400 если reason пустой
* withdraw marks WITHDRAWN; 403 если не maker
* + 6 Phase 0 tests от прошлого commit'а сохранены
TrackingRecordService stub — extends DictionaryRecordService с null deps,
overrides applyApproved* для записи calls в list. Verifies dispatch без
real DB.
Verify:
- mvn -pl ordinis-rest-api -am test: 119/119 PASS (+7 new).
- mvn -P e2e -pl ordinis-app -am test: 20/20 PASS — approval gate не
ломает existing flow когда approval_required=false (default).
Phase 2 (next): admin UI reviewer queue + diff viewer + status badges.
Phase 3: e2e/integration tests + per-dict opt-in soak.
Source: ~/.gstack/projects/claude/zimin-main-design-approval-workflow-v2-20260507-121632.md
Ordinis
MDM сервис для НСИ ЦУОД ОДХ (Оперативное и Долговременное Хранение). Часть линейки Terravault. Ордо/порядок (от лат. ordo) — упорядоченные классификаторы и справочные данные.
ЦУОД — anchor-клиент v1, второй клиент = свой config bundle, без code change.
Maven multimodule
ordinis/
├── ordinis-domain JPA entities, JSONB types, bitemporal model
├── ordinis-validation JSON Schema validator (networknt)
├── ordinis-events-api DTO для Kafka (semver shared module)
├── ordinis-outbox Outbox pattern + @Scheduled poller
├── ordinis-rest-api Admin write API (CRUD, bundle import)
├── ordinis-app Spring Boot main: writer side
├── ordinis-read-api Read service (PG replica + scope filtering)
├── ordinis-projection-writer Опц.: Kafka → Redis projection (feature-flagged)
├── ordinis-cuod-bundle ЦУОД config: JSON Schema, seed, Grafana dashboards
└── ordinis-migrations Liquibase changelogs → Helm pre-upgrade Job (1-shot)
Стек
- Java 21, Spring Boot 3.4
- PostgreSQL 18 + PostGIS 3.6 + btree_gist (EXCLUSION CONSTRAINT)
- Apache Kafka 4.2 (KRaft, SASL SCRAM-SHA-512)
- Hibernate Envers (tx-time) + valid_from/valid_to (effective-time) — bitemporal
- Liquibase
- Spring Cloud Config + Spring Cloud Vault (Kubernetes auth)
- Micrometer + Prometheus
- LogstashEncoder JSON stdout → Loki через Alloy
- OpenTelemetry → Tempo (OTLP gRPC)
Архитектурные принципы
- Generic dictionary engine + ЦУОД config bundle (Approach B). Engine не знает про "КА"/"наземные станции" — узнаёт через JSON Schema из bundle
- Bitemporal: Envers для tx-time + valid_from/valid_to для effective-time + EXCLUSION CONSTRAINT
- 3 scope-топика Kafka (
public/internal/restricted) — изоляция через ACL, не через filter в consumer - System boundary: 3 deployable делят БД (master+replica). Внешние consumers — только REST/Kafka, никогда прямо в БД
- Tiered performance: 1k RPS из коробки (PG replica + Caffeine). 10k+ RPS включается per-dictionary через Redis projection
- Audit log в БД (compliance), технические логи в Loki
Build
mvn clean install # все модули
mvn -pl ordinis-app -am package -DskipTests # только app + transitive
docker build -f ordinis-app/Dockerfile -t ordinis-app:0.1.0 .
docker build -f ordinis-migrations/Dockerfile -t ordinis-migrations:0.1.0 ordinis-migrations/
Связанные репо
- terravault/ordinis-infra — k8s манифесты, helm values
- terravault/ordinis-config — Spring Cloud Config (feature flags, business params)