solution-erp/docs/changelog/migration-todos.md

Migration To-dos — Atomic Roadmap

Tick [x] khi xong. Phase 0-8 đã DONE — collapsed. Detail xem session logs trong docs/changelog/sessions/. Active work: Phase 9 (UAT + Ops + carry over PE PDF export + Tests Phase 3-5).

✅ Phase 0-5 + Tier 3 — Done (2026-04-21..22)

Phase	Focus	Trạng thái
0 Draft	Scaffold .NET 10 + 2 Vite + parse FORM/QT + docs	✅
1 Alpha Core	Auth + 12 role + Permission Matrix + 3 master CRUD + Contract draft	✅
2 Form Engine	OpenXml + ClosedXML render + LibreOffice PDF + DynamicForm	✅
3 Workflow	State machine 9 phase + RG-001 code gen + SLA job + attachments + SignalR realtime	✅
4 Reporting	Dashboard KPI + Excel export + MyDashboard role-aware + brand identity #1F7DC1	✅
5 Production	CI/CD Gitea Actions + 3 IIS site + Let's Encrypt + Security headers + Users CRUD	✅
Tier 3	Versioned workflow + 3-panel layout + 4-bảng overhaul + 4 master catalogs + 16 demo users + RolesPage CRUD + 7 demo HĐ varied	✅

Detail chi tiết: docs/changelog/sessions/2026-04-21-*.md + 2026-04-22-0300-tier3-feature-complete.md + 2026-04-23-*.md.

✅ Phase 6 — Module Duyệt NCC (tiền-HĐ) — Done

Iter 1 (2026-04-23)

• Migration 12 AddPurchaseEvaluations — 10 bảng (Header/Suppliers/Details/Quotes/Approvals/Changelogs/Attachments/WorkflowDefinitions/Steps/StepApprovers)
• Domain — 2 enum (Type A/B, Phase 7-state) + Policy record + Registry + FromDefinition builder
• Seed — 13 menu Pe_/PeWf_ + 2 WorkflowDefinition v01 (QT-DN-A 3-step, QT-DN-B 5-step)
• Application CQRS ~900 LOC — Create/Update/Transition/List/Inbox/Get/Delete + Supplier CRUD + Detail CRUD + Quote Upsert + SelectWinner + Changelog
• PurchaseEvaluationWorkflowService — policy guard + approval + notification + changelog
• PurchaseEvaluationsController — 17 endpoint REST
• FE 2 app — Types + PurchaseEvaluationsListPage 3-panel + Create page + PeDetailTabs + PeWorkflowPanel + Menu resolver Pe_*
• Kế thừa HĐ — CreateContractFromEvaluationCommand (guard DaDuyet + SelectedSupplier + !ContractId) → Contract draft. FE CreateContractDialog pick ContractType.
• Migration 13 AddPurchaseEvaluationCodeSequences — atomic MaPhieu sequence PE/{YYYY}/{A|B}/{Seq:D3}
• Demo PE seed — 4 phiếu varied phase (A-001/A-002/A-003/B-001) + Pe_* permission defaults 7 role × 9 menu key

Session log: 2026-04-23-2300-purchase-evaluations.md + 2026-04-24-1030-pe-polish-demo-maphieu-perms.md.

Iter 2 — UX polish (2026-04-24)

• Rename menu "Phương Án" → "Giải pháp" + backfill DB (zero breaking change)
• Menu tree inheritance extend Pe_/PeWf_ (GetMyMenuTreeQuery + 4 root)
• Accordion mutex Pe_* groups + sidebar w-72 + label nowrap
• NavLink active check query string (queryMatches helper) — fix 2 leaf cùng highlight
• PE detail flat layout: Panel 2 = 4 section (Thông tin/NCC/Hạng mục/Bảng so sánh), Panel 3 += Approvals + Changelog
• Upload file đính kèm per-NCC (SupplierAttachmentsCell) + Bảng so sánh tổng (GeneralAttachmentsSection, supplierRowId=null) + enum ComparisonTable=4
• readOnly mode menu "Duyệt" (pendingMe=1) — hide Sửa/Xóa/Thêm/Edit/Upload/Delete, giữ download + transition + comment
• Contract: move Lịch sử điều chỉnh Panel 2 → Panel 3 (Chi tiết HĐ full-width)
• Demo email rebrand @solutionerp.local → @solutions.com.vn + BackfillUserEmailDomainAsync (idempotent rename 4 field Email/NormalizedEmail/UserName/NormalizedUserName)

Session log: 2026-04-24-chot-session-3-pe-polish.md.

✅ Domain rebrand .huypham.vn → .solutions.com.vn (2026-04-24)

• 18 file repo (FE env + scripts + CI/CD + docs + skill + code comments)
• scripts/migrate-domains.ps1 (ASCII-only #30) — 3 IIS binding + 3 cert Let's Encrypt + auto HTTPS + redirect
• CI/CD auto rebuild BE CORS + FE bundle VITE_API_BASE_URL
• E2E verified 3 domain live + preflight OK

Sub: api.solutions.com.vn · admin.solutions.com.vn · eoffice.solutions.com.vn. Old .huypham.vn vẫn fallback (chưa remove — Phase 9 Ops).

📝 Phase 7 — PE feature gap + Budget BE (Session 4 partial done)

A. PE feature gap (3 task — phần lớn đóng ở Phase 8 S5)

• PE Workflow admin designer UI /system/pe-workflows/:typeCode — done S5 (5d94bb4)
  • BE Application/PurchaseEvaluations/PeWorkflowAdminFeatures.cs (mirror WorkflowAdminFeatures.cs)
  • Api/Controllers/PeWorkflowsController.cs
  • FE fe-admin/src/pages/system/PeWorkflowsPage.tsx + PeWorkflowDesigner.tsx
  • Route /system/pe-workflows/:typeCode (menu PeWf_* + resolver đã sẵn)
• Ý kiến 4 phòng ban (Phê duyệt / P.CCM / P.MuaHàng / SM-PM) ở tab Thông tin — done S5 (5d94bb4, Migration 15)
  • Option A: 4 text field + signoff date + UserId vào header
  • Option B: dùng PurchaseEvaluationApprovals với roleKind extra field
  • Chốt: dùng Migration 15 AddPurchaseEvaluationDepartmentOpinions (separate table UNIQUE PEId+Kind, 4 box sign-off 2x2 grid OpinionBox như Excel mẫu) — tốt hơn Option A/B vì audit qua Changelog + Upsert preserve chữ ký cũ khi text-only edit.
• Export phiếu PDF/Excel — tái dùng IDocumentConverter + template PE-TrinhDuyet.docx → carry over Phase 9 (user pending — không quan trọng lắm)

B. Optional polish (carry over Phase 9 — làm khi UAT phát sinh)

• Auto-map PE Details → Contract per-type Details khi gen HĐ (phức tạp vì 7 schema khác nhau)
• Payment terms tách field từ JSON → 6 column (Tạm ứng/TT tạm/Quyết toán/Bảo hành/Hạn mức/Đánh giá)
• Matrix Quotes bulk paste từ Excel
• fe-user Inbox thêm section "Phiếu Duyệt NCC chờ tôi"

C. Ops (carry over Phase 9 — Hard blockers)

• Remove binding cũ .huypham.vn sau verify stable: ssh vietreport-vps ; cd C:\solution-erp\scripts ; .\migrate-domains.ps1 -RemoveOld -SkipCert
• win-acme scheduled task fix unhealthy (cert expire 2026-06-18)
• UAT thật 1 tuần với 2-3 user (30 demo user — 16 sample + 14 Solutions thật)
• SMTP config → Email outbox
• Rotate credentials (admin + 30 demo + SA + vrapp + JWT)
• Schedule SQL backup Task Scheduler

D. Module Ngân sách (Budget) — Session 4 ✅ partial done

• Migration 14 AddBudgets — 4 bảng (Budgets/BudgetDetails/BudgetApprovals/BudgetChangelogs) + index BudgetId nullable trên Contract & PurchaseEvaluation
• Domain — Budget (Header) + BudgetDetail (flat row) + BudgetApproval + BudgetChangelog + enum BudgetPhase 5-state + BudgetEntityType Header/Detail/Workflow
• BudgetPolicy.Default hardcoded simple 3-step (Drafter→CCM→CEO + Reject từ ChoCCM/ChoCEO về DangSoanThao)
• Application CQRS ~340 LOC — Create + UpdateDraft + Transition + List + GetDetail + Delete (only DangSoanThao/TuChoi) + Detail CRUD (auto-recompute TongNganSach) + ListChangelogs
• BudgetsController 11 endpoint REST
• Menu seed Budgets root + 3 leaf (Bg_List/Bg_Create/Bg_Pending) order=27 icon Wallet
• 14 demo user Solutions thật — PRO 5 + CCM 7 + ISO 1 + CEO 1 (pwd User@123456). Reconcile pattern (gotcha #38 4-field rename). Tổng 30 user (16 sample cũ + 14 Solutions thật mới).

Session log: 2026-04-28-chot-session-4-budget.md.

E. Pending migrations

• AddPePaymentTermFields (nếu chốt UX tách field — JSON blob → 6 column)
• AddPurchaseEvaluationDepartmentOpinions ✅ migration 15 (S5)
• AddBudgetCodeSequences (nếu chốt format MaNganSach atomic — hiện Random.Shared)
• AddBudgetVersionedWorkflow (nếu user cần admin config UI thay vì hardcoded BudgetPolicy.Default)

✅ Phase 8 — Budget FE + PE/HD integration (Session 5 done)

A. FE Budget pages — done ✅

• fe-admin/src/types/budget.ts (BudgetPhase 5-state enum + DTO types)
• fe-admin/src/pages/budgets/BudgetsListPage.tsx (3-panel [340px_1fr_360px] + filter Phase/Năm + ?phase=Pending alias + readOnly mode + BudgetDetailPage fullpage mobile)
• fe-admin/src/pages/budgets/BudgetCreatePage.tsx (form Header — Tên/Năm/Dự án/Phòng ban/Mô tả)
• fe-admin/src/components/budgets/BudgetDetailTabs.tsx (Section Thông tin Header + Section Hạng mục table CRUD inline auto-compute ThanhTien=KL×ĐG)
• fe-admin/src/components/budgets/BudgetWorkflowPanel.tsx (Panel 3 timeline activePhases + nextPhases buttons + Dialog comment + Approvals/Changelog)
• Mirror tất cả sang fe-user/
• App.tsx routes /budgets, /budgets/new, /budgets/:id cả 2 app
• Menu resolver Bg_* (Bg_List → /budgets, Bg_Pending → /budgets?phase=Pending, Bg_Create → /budgets/new)

B. PE/Contract → Budget integration — done ✅

• PE form + Select "Ngân sách" filter Phase=DaDuyet, ProjectId match, BE validate
• Contract form (Header + Edit) tương tự, EditForm read-only link card khi !isDraft
• PE Detail Hạng mục thêm cột "NS link · Δ" — match per-row qua groupCode|itemCode + footer aggregate (xanh dưới / đỏ vượt / xám khớp)
• PE Detail UI restructure 4 section đánh số match form spec PHIẾU TRÌNH KÝ
• BE: BudgetSummaryDto shared + Create/Update PE+Contract commands + BudgetId? + GetQueries load Budget
• CreateContractFromEvaluation carry forward pe.BudgetId → contract.BudgetId

C. PE Workflow Designer admin UI — done ✅

• BE PeWorkflowAdminFeatures.cs ~250 LOC mirror Contract pattern
• BE PeWorkflowsController 2 endpoint reuse policy Workflows.*
• FE PeWorkflowsPage.tsx ~500 LOC + designer dialog (clone/edit/+Role/+User)
• App.tsx route /system/pe-workflows/:typeCode

D. Ý kiến 4 phòng ban — done ✅

• Migration 15 AddPurchaseEvaluationDepartmentOpinions (UNIQUE PEId+Kind)
• Domain entity + enum PeDepartmentKind (PheDuyet/Ccm/MuaHang/SmPm)
• BE Upsert (sign=true → set SignedAt+UserId, sign=false giữ chữ ký cũ) + Delete + 2 endpoint
• FE Section "5. Ý kiến 4 phòng ban (sign-off)" 2x2 grid OpinionBox

E. Tests Phase 1-2-3mini + CI optimize — done ✅

• Phase 1 — tests/SolutionErp.Domain.Tests/ (xUnit + FluentAssertions 7.2): 54 test policy state machine (Contract WF + PE WF + Budget) + Registry + FromDefinition versioned + UserKindApprover
• Phase 2 — tests/SolutionErp.Infrastructure.Tests/ (EF SQLite + TestApplicationDbContext override nvarchar(max) → TEXT): 17 test code generator format + sequence + year boundary + persistence verify
• Phase 3 mini — tests/.../Application/PeWorkflowAdminTests.cs: 6 test CreatePeWorkflowDefinitionCommand versioning (auto-increment + deactivate cũ + EvaluationType independence + steps/approvers persistence)
• CI gate .gitea/workflows/deploy.yml — 2 step dotnet test trước build, fail → no deploy
• Total 77 test pass / ~3s
• CI manual checkout bypass github.com — fix gotcha #39 (act_runner TCP timeout 21s)
• CI path filter docs-only skip — gotcha #41 (paths-ignore behavior)
• Tests Phase 3 full — Opinion Upsert + Budget link validation (cần Identity UserManager setup helper)
• npm junction cache CI optimize (rollback ở a21790d — gotcha #40 chưa debug)

📝 Phase 9 — UAT + Ops + carry over (Session 6+ active)

✅ Session 9 done (2026-05-04) — Chunk E-bis complete (FE 2-stage + HĐ/Budget mirror + 6 test)

User chỉ thị "làm hết cho xong tính năng luôn" sau Session 8 close bug fix anh Kiệt phía BE PE. Session 9 đóng toàn bộ pending Chunk E-bis (defer từ session 8).

• Chunk E2 — FE Workflow Panel PE hiển thị progress 2-stage timeline per phase × dept (commit f8eebd5). Component DeptApprovalsSection group by phase × dept, highlight amber khi current phase có Review nhưng chưa Confirm, badge fuchsia "bypass" khi NV.CanBypassReview. Cả fe-admin + fe-user (rule §3.9).
• Chunk E3 — FE UserManager toggle CanBypassReview (commit 4380bdc). UserDto BE thêm field CanBypassReview. UsersPage column "Bypass" + button ShieldCheck (icon highlight fuchsia khi enabled). Endpoint backend đã có sẵn từ Session 8 Chunk E1. fe-user KHÔNG có UsersPage (admin-only).
• Chunk E4 — HĐ 2-stage logic mở rộng (commit b6f5a16). ContractWorkflowService thêm UserManager<User> DI + mirror toàn bộ logic 2-stage từ PE service (sau policy guard, trước gen mã HĐ). ContractDepartmentApprovalFeatures.cs (List query mirror PE pattern). Endpoint GET /contracts/{id}/department-approvals. FE WorkflowHistoryPanel section "Tiến trình duyệt 2-cấp phòng ban" insert giữa WorkflowSummaryCard và Lịch sử duyệt.
• Chunk E5 — Budget 2-stage logic mở rộng (commit 1fc439b). TransitionBudgetCommandHandler thêm INotificationService + IDateTime DI + mirror 2-stage logic. BudgetDepartmentApprovalFeatures.cs + endpoint. FE BudgetWorkflowPanel section "Tiến trình duyệt 2-cấp phòng ban". Note: low-priority cho Budget (ít user duyệt budget per dept) nhưng giữ consistent UX 3 module.
• Chunk E6 — 6 test 2-stage + IdentityFixture helper (commit 8353fe8). IdentityFixture (Common/) setup ServiceProvider với Identity stack đầy đủ — DbContext SQLite shared connection + AddIdentityCore + AddRoles + AddEntityFrameworkStores. Single shared scope cho fixture lifetime đảm bảo DbContext + UserManager đồng instance. Helper CreateUserAsync(email, name, deptId, roles, canBypassReview) reusable. 6 test PeTwoStageApprovalTests: NV_Review_Blocks_Phase_Transition (đóng bug anh Kiệt — test chính xác) / TPB_Confirm_After_NV_Review_Allows_Transition / NV_With_BypassReview_Allows_Transition_With_IsBypassed_True / Admin_Skips_TwoStage_Logic_Entirely / Reject_Sets_RejectedFromPhase_And_Forces_DangSoanThao / Resume_After_Reject_Jumps_Back_To_RejectedPhase. Tests Contract + Budget 2-stage skipped — logic identical PE, ROI thấp; pattern reusable nếu UAT phát hiện regression riêng. Total 77→83 test pass.

Stats sau session 9:

• BE LOC: ~13750 → ~14400 (+650, gồm Contract + Budget 2-stage logic + 2 List feature + Test fixture)
• API endpoints: ~131 → ~133 (+2 List dept-approvals HĐ/Budget)
• Tests: 77 → 83 (+6 PE 2-stage)
• Schema không đổi (Migration 16 đã có sẵn từ session 8)
• 5 commit per-chunk pushed → 1 CI run trigger qua HEAD = 8353fe8

Pending còn lại Phase 9: chỉ Hard blockers Ops (UAT thật / SMTP / Rotate creds / SQL backup). Feature 2-stage đầy đủ.

✅ Session 8 done (2026-05-04) — Migration 16: 2-stage dept approval + smart reject + lock edit

Bối cảnh: Anh Kiệt (FDC) báo bug PE workflow: NV.PRO tạo phiếu → duyệt được hết phase. Phân quyền sai vì policy chỉ check role, không check Stage 2-cấp.

3 ràng buộc gộp 1 migration:

• Lock edit khi Phase != DangSoanThao — 17 handler thêm guard (Contract Detail × 15 qua helper EnsureContractType, PE Detail × 5 qua helper mới PurchaseEvaluationDraftGuard, Budget Detail × 3 inline). KHÔNG lock Comment + Attachment + Opinion (workflow design intent).

• Smart reject + Resume — Decision=Reject → entity.RejectedFromPhase = currentPhase + force targetPhase=DangSoanThao. Resume: Drafter trình từ DangSoanThao + RejectedFromPhase != null → jump tới phase đã reject + clear field. Bypass policy guard ở resume.

• 2-stage dept approval (PE only v1) — User.DepartmentId != null + role guard:

  • DeptManager (TPB) → Stage=Confirm trực tiếp
  • User.CanBypassReview=true → Stage=Confirm + IsBypassed=true
  • Else (NV) → Stage=Review only, BLOCK transition cho đến khi TPB confirm
  • Schema: 3 bảng *DepartmentApprovals UNIQUE (TargetId, Phase, Dept, Stage)

• Migration 16 AddTwoStageDeptApprovalAndSmartReject — 4 ALTER + 3 CREATE TABLE + 12 indexes + FK Cascade

• Endpoint mới: GET /api/purchase-evaluations/{id}/department-approvals (List), PATCH /api/users/{id}/bypass-review (toggle)

• Notify TPB cùng dept khi NV review (best effort, fail non-critical)

• Verify: Build pass + 77 test pass + Migration applied LocalDB OK + schema verified qua sqlcmd

• 5 commit per-chunk: 5fe61cc (A) · 14f3c9f (B) · 9747f8c (C) · a532ba6 (D) · current (E1)

Session log: 2026-05-04-1230-chot-session-8-2-stage-dept-approval.md.

Pending Chunk E-bis ✅ TẤT CẢ DONE ở Session 9 (xem section trên):

• FE Workflow Panel hiển thị progress 2-stage timeline (E2 — PE) + HĐ (E4) + Budget (E5)
• FE UserManager toggle CanBypassReview checkbox (E3)
• HĐ 2-stage mở rộng (E4)
• Budget 2-stage mở rộng (E5)
• Tests 2-stage logic Service-layer (E6 — 6 test PE + IdentityFixture)

✅ Session 6 done (2026-04-30 — pure docs work)

• MD audit + compact — STATUS -27%, HANDOFF -32%, migration-todos -35%, archive 51 row Phase 0-7 cũ
• 3 skill refresh — form-engine Phase 2 MVP → Tier 3 feature-complete, permission-matrix 12 menu → ~60 + inheritance roots, ef-core-migration 24 DbSet → 52 bảng
• Rule mới rules.md §7 — Khi nào viết test (timing rule 5-row table)
• Rule mới rules.md §6.4 — Audit + compact MD định kỳ (cadence + checklist + anti-pattern)
• rules.md §9.4 — Mở rộng skill audit cross-ref §6.4

A. Hard blockers (chờ user / ops)

• UAT thật 1 tuần với 2-3 user (30 demo: 16 sample + 14 Solutions thật)
• SMTP config → Email outbox (BLOCKED chờ user cấp host/user/pass)
• Rotate credentials (admin + 30 demo + SA + vrapp + JWT secret + Gitea runner token)
• Schedule SQL backup daily Task Scheduler

B. PE feature gap còn lại

• Export phiếu PDF/Excel — IDocumentConverter + template PE-TrinhDuyet.docx (user pending — không quan trọng lắm)

C. Optional polish (làm khi UAT phát sinh)

• Budget MaNganSach atomic sequence + migration AddBudgetCodeSequences
• Budget versioned workflow + migration AddBudgetVersionedWorkflow
• Payment terms PE tách field (JSON → 6 column)
• Auto-map PE Details → Contract Details khi gen HĐ
• Matrix Quotes bulk paste từ Excel
• fe-user Inbox thêm section "Phiếu Duyệt NCC chờ tôi"

D. Tests Phase 3-5 (làm khi gặp bug recurring để justify ROI)

• Phase 3 — Application handler tests (CQRS + EF InMemory) ~15 test
• Phase 4 — API smoke tests (WebApplicationFactory) ~7 test
• Phase 5 — FE Vitest cho lib utility (queryMatches, fmtMoney) ~10 test

E. Ops chưa xong

• Remove binding cũ .huypham.vn sau verify stable
• win-acme scheduled task fix unhealthy (cert expire 2026-06-18)

🔁 Skill governance (recurring)

Quy tắc: docs/rules.md §9. Audit định kỳ mỗi đầu tháng — workflow §9.4.

• Setup ban đầu — 6 skill (3 domain + 3 ops), rules §9 ← 661f859
• Audit 2026-05-01 — log docs/changelog/skill-audit-2026-05.md
• Audit 2026-06-01
• Audit 2026-07-01

Cron task solution-erp-skill-audit-monthly fire 9:00 AM ngày 1 mỗi tháng.

📦 Post-launch (Phase 10+ — future)

• Email outbox (MailKit + SMTP) — blocked chờ SMTP config
• E-signature integration (VNPT CA hoặc FPT CA)
• Tích hợp Bravo / SAP ERP import NCC
• Mobile app (React Native?) cho BOD duyệt ngoài giờ
• AI: gợi ý điền form dựa HĐ cũ, OCR scan HĐ đối tác
• Multi-tenant nếu có công ty thứ 2