162 Commits

Author	SHA1	Message	Date
pqhuy1987	a734bf2b8b	[CLAUDE] PurchaseEvaluation: Plan AC — fix Lịch sử duyệt panel show Trả lại + Duyệt vượt cấp ... Bro UAT 2026-05-19 screenshot: panel "Lịch sử duyệt" KHÔNG show Return mode events (Bro Trả lại từ Phan Văn Chương → Trà missing) + KHÔNG distinct event Duyệt vượt cấp (skipToFinal F2). Root cause: - PurchaseEvaluationApprovals.Add() chỉ ở Approve branch (line 472 V2 + 660 V1) - Reject branch line 75-103 NEVER adds Approval row — chỉ log Changelog - skipToFinal advance branch line 532-572 dùng existing line 472 row nhưng comment KHÔNG distinct "vượt cấp" semantic vs approve thường Fix Plan AC: 1. BE Service.cs Reject branch (line 75-103): capture pre-call Step/Level trước ApplyReturnModeAsync mutate pointer, add Approval row sau khi mutate: Decision=Reject + FromPhase + ToPhase=evaluation.Phase + Comment carry from-position + mode summary. Cover cả Trả lại (TraLai+pointer-mode) + Từ chối (TuChoi terminal). 2. BE Service.cs line 472 Approve branch: enrich Comment với prefix "[Duyệt vượt cấp tới Cấp cuối]" khi skipToFinal=true để Lịch sử duyệt distinguish vượt cấp với approve thường. 3. FE PeDetailTabs.tsx × 2 app ApprovalsTab: add Decision badge phân biệt Approve (emerald) / Trả lại (amber) / Từ chối (rose). Vì 3/4 mode Trả lại (OneLevel/OneStep/Assignee) giữ Phase=ChoDuyet → fromPhase→toPhase badge giống Approve. Decision badge bù visual phân biệt. Verify: - dotnet build clean 0 err 2 warn (pre-existing DocxRenderer) - dotnet test 111/111 PASS - npm build × fe-user + fe-admin PASS 0 TS err Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-19 10:45:25 +07:00
pqhuy1987	cdfd54212c	[CLAUDE] PurchaseEvaluation: Plan AB Chunk A — fix Changelog visibility Bug 1 Budget Adjust + Bug 2 Return Mode ... - BE ApplyReturnModeAsync 4 mode add Changelog.Add() common path (refactor Drafter early return) - FE PeDetailTabs.tsx HistoryTab filter extend cover Header+ngân sách (B1) + Workflow+Trả lại (B2) - FE empty placeholder + comment update reflect new filter scope - Mirror 2 app §3.9 Bug 1: Budget Adjust handler đã log (Header+Update) nhưng FE filter strict TraLai-only Bug 2: Return mode Service không log Changelog — chỉ approval phase transition Verify: - Build clean 0 err - npm build × 2 app pass 0 TS err - 111 test baseline preserve (UAT skip test-after defer) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-19 10:07:44 +07:00
pqhuy1987	ee776d5745	[CLAUDE] Domain+App+Api+FE-User+FE-Admin: Plan AA Chunk A - BE IsUserSelectable filter + menu seed Pe_DuyetNcc_WfView + sidebar widen w-72 xl:w-80 + revert Plan U truncate ... BE changes: - MenuKeys.cs +helper PurchaseEvaluationWorkflowView(typeCode) => "Pe_{typeCode}_WfView" - DbInitializer.cs SeedMenuTreeAsync: - tree.Add LuongDuyet (Order=2 first child) cho 2 type PE - INSERT-only loop -> INSERT-OR-UPDATE-Order (shift existing prod rows Order+1) - Idempotent: skip nếu Order match, UPDATE nếu mismatch - DbInitializer.cs SeedPurchaseEvaluationPermissionDefaultsAsync +WfView leaf cho 7 role Read - ApprovalWorkflowV2AdminFeatures.cs GetAwAdminOverviewQuery +IsUserSelectable bool? = null + handler conditional Where(d => d.IsUserSelectable == ius) - ApprovalWorkflowsV2Controller.cs Overview signature +[FromQuery] bool? isUserSelectable pass-through to mediator (gotcha #44 fix preserved class-level [Authorize] bare) FE Layout changes (mirror 2 app rule §3.9): - fe-user resolvePath regex (List|Create|Pending|WfView) + route /purchase-evaluations/workflow-matrix?type=N - fe-user + fe-admin sidebar w-60 xl:w-72 -> w-72 xl:w-80 (+48/+32px gain) - Revert Plan U S23 t11 truncate × 5 sites (3 fe-user MenuGroup+MenuLeaf+StaticLeaf + 2 fe-admin MenuGroup+MenuLeaf). Keep min-w-0 flex-1 + shrink-0 + title tooltip (no harm). Bro request hiển thị đầy đủ label custom Mig 27 dài. Why: - User UAT request 2026-05-15: thêm menu "Luồng duyệt" trên Danh sách hiển thị ma trận phân quyền workflow V2 admin Designer ghim ra cho user xem trước khi tạo phiếu. Filter IsUserSelectable=true (Mig 25). - Sidebar Plan U S23 t11 truncate hiển thị "..." → bro muốn full label. Widen sidebar +32-48px + bỏ truncate cho phép wrap natural khi cực dài. Verify: - dotnet build SolutionErp.slnx PASS clean 0 err 2 warn pre-existing DocxRenderer - Investigator Pre-A confirm gotcha #44 đã fix permanent từ 2026-05-08 - Reviewer cumulative PASS 0 critical / 0 major / 0 minor blocker Pending Chunk B: FE WorkflowMatrixViewPage.tsx ~215 LOC + types + App.tsx route. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 16:34:40 +07:00
pqhuy1987	0b97840674	[CLAUDE] Infra Api: Chunk T — Disable auto re-seed demo data qua DemoSeed:Disabled flag (appsettings) ... Bro UAT post-Plan R+S phát hiện: 4 phiếu [DEMO]-A/B + 2 V1 workflows + 1 V2 sample TỰ ĐỘNG RE-SEED sau BE deploy commits Plan P+Q+R+S → IIS recycle → DbInitializer.InitializeAsync auto-seed lại 5 demo seed methods. Plan T fix root cause: Config flag `DemoSeed:Disabled` trong appsettings.json (production default true) → DbInitializer check flag → skip 5 demo seed methods. Note: appsettings.Production.json bị .gitignore (chứa secrets prod), nên em set flag mặc định trong appsettings.json (commit qua git) — production inherit true. Dev override false trong appsettings.Development.json để test fresh demo seed local. Methods SKIP khi DemoSeed:Disabled=true: 1. SeedWorkflowDefinitionsAsync (V1 PE workflow QT-DN-A v1 + QT-DN-B v1) 2. SeedPurchaseEvaluationWorkflowsAsync (V1 PE workflow extended) 3. SeedDemoContractsAsync ([DEMO] HĐ 7-type sample) 4. SeedDemoPurchaseEvaluationsAsync ([DEMO] PE 4 sample with V1 pin) 5. SeedSampleApprovalWorkflowsV2Async (V2 sample mẫu UAT type B) Methods KEEP (luôn chạy): - SeedRoles + SeedAdmin + SeedDepartments + SeedDemoUsers (30 UAT users) - SeedMenuTree + SeedAdminPermissions + SeedDemoMasterData (Supplier/Project) - SeedContractTemplates + SeedCatalogs + BackfillContractCodes - BackfillUserEmailDomain (Phase 6 rebrand migration helper) Files changed: - src/Backend/SolutionErp.Infrastructure/Persistence/DbInitializer.cs: + using Microsoft.Extensions.Configuration + Read DemoSeed:Disabled flag từ IConfiguration + Log "DemoSeed:Disabled=true — skip ..." khi flag true + Wrap 5 method seed conditional `if (!demoSeedDisabled) { ... }` - src/Backend/SolutionErp.Api/appsettings.json: + "DemoSeed": { "Disabled": true } + comment narrative - src/Backend/SolutionErp.Api/appsettings.Development.json: + "DemoSeed": { "Disabled": false } override cho dev Workflow expected sau deploy: 1. CI deploy commit T → IIS recycle app pool 2. BE startup → DbInitializer reads DemoSeed:Disabled=true 3. Skip 5 demo seed methods → DB state preserved 4. Bro UAT clean slate hoàn toàn — Designer setup workflow mới from scratch Pending T5: Final DELETE current state (4 PE + 2 V1 + 1 V2 mẫu UAT) sau deploy applied flag. T6 verify no re-seed loop sau re-deploy. Verify: - dotnet build SolutionErp.slnx clean (0 err, 2 warn pre-existing) - dotnet test SolutionErp.slnx **111/111 PASS** unchanged Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 15:07:57 +07:00
pqhuy1987	1727bd5cd9	[CLAUDE] Api Docs: Chunk P1+P3 — HOTFIX Controller TransitionPeBody record missing 3 fields (ROOT CAUSE F1+F2 fail) ... CICD Monitor Run #202 Plan O verify catch CRITICAL caveat: PurchaseEvaluationsController.cs:267 `TransitionPeBody` record CHỈ có 3 fields (TargetPhase, Decision, Comment) — MISSING 3 fields có trong Command record `TransitionPurchaseEvaluationCommand`: - ReturnMode (F1 mode Trả lại) - ReturnTargetUserId (F1 Assignee target) - SkipToFinal (F2 duyệt thẳng Cấp cuối) Mediator.Send line 70 cũng drop 3 field. → FE × 2 app SEND ĐÚNG 7 fields qua `api.post(/transitions)` body (Investigator audit confirm wire OK) → ASP.NET Core deserialization silently DROP 3 fields ở Controller layer → Handler nhận ReturnMode=null + SkipToFinal=false → fallback default Drafter mode + F2 không trigger. Bug present 2 NGÀY PROD từ Mig 28 deploy 2026-05-13 — gây TẤT CẢ F1+F2 wire fail từ FE side. Plan N (S23 t4) + Plan O (S23 t5) fix 5 lookup sites discrimination NHƯNG controller body record bug block flow TRƯỚC KHI đến lookup site. Em main + Reviewer + Implementer + Investigator all MISS bug này xuyên 4 plan vì: 1. Mig 28 Command extend 3 fields (S21 t4) nhưng Controller body NOT extended 2. Plan K K2 add `skipToFinal` 8th param Service nhưng Controller NOT extended 3. Bug silent — no error, no compile fail, no test fail, FE call OK, BE return 204 nhưng handler nhận default args → wrong behavior Plan P fix BE-only ~10 LOC 1 file `PurchaseEvaluationsController.cs`: 1. Add `using SolutionErp.Application.PurchaseEvaluations.Services` cho WorkflowReturnMode enum import (line ~7) 2. Extend `TransitionPeBody` record line 267 thêm 3 fields default: ```csharp public record TransitionPeBody( PurchaseEvaluationPhase TargetPhase, ApprovalDecision Decision, string? Comment, WorkflowReturnMode? ReturnMode = null, Guid? ReturnTargetUserId = null, bool SkipToFinal = false); ``` 3. Update `mediator.Send` line 70 pass 7 fields: ```csharp await mediator.Send(new TransitionPurchaseEvaluationCommand( id, body.TargetPhase, body.Decision, body.Comment, body.ReturnMode, body.ReturnTargetUserId, body.SkipToFinal), ct); ``` Investigator (FE wire audit) verify: - fe-user/src/components/pe/PeWorkflowPanel.tsx:113-124 + fe-admin mirror — api.post send ĐẦY ĐỦ 7 fields qua body - KHÔNG cần fix FE - Mig 28/31 Domain test đã cover handler logic — không cần test mới Verify: - dotnet build SolutionErp.slnx clean (0 err, 2 warn pre-existing DocxRenderer) - dotnet test SolutionErp.slnx **111/111 PASS** unchanged (no regression) Docs update: - docs/STATUS.md Last updated S23 t6 - docs/HANDOFF.md TL;DR S23 t6 ngắn gọn - .claude/agent-memory/cicd-monitor/MEMORY.md drift (Run #202 entry pre-existing) Pattern reinforced cross-project: - Controller body record MUST mirror Command record fields khi Command thêm optional params. Silent drop bug class — không test/build catch được. - Investigator pre-flight audit FE wire trước khi fix BE (Plan P scope verify) tránh em main fix sai assumption. Pending: CICD Monitor verify Plan P deploy + UAT test bro real. Pending Bug 2 F2 đến Phan Văn Chương: verify workflow v14 DB structure sau khi Plan P unblock F2 flow. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 13:27:41 +07:00
pqhuy1987	ae01ca56f2	[CLAUDE] PurchaseEvaluation Tests: Chunk O1-O5 — HOTFIX 4 lookup sites cùng pattern per-NV (Plan N point 9 cascade) ... Bro UAT 2026-05-15 sau Plan N deploy phát hiện 2 bug mới: 1. Actor NV Test trong OR-of-N slot click "Trả lại Người chỉ định" → toast "Không phải lượt bạn — chỉ NV Cấp duyệt hiện tại mới được Trả lại / Từ chối phiếu" mặc dù NV Test đúng trong slot. 2. F2 Duyệt thẳng Cấp cuối → trỏ đến Phan Văn Chương Bước 2 Cấp 2 thay vì Nguyễn Văn Trường Bước 3 Cấp 1 (BOD) — defer follow-up vì F2 logic line 483-524 đã đúng (lastStepIdx + lastLevelMaxOrder), cần verify workflow v14 DB structure. Audit em main: Plan N chỉ fix 1/5 lookup sites — còn 4 sites cùng bug pattern: 1. Service.cs:201 EnsureCanRejectV2Async — bug bro UAT 1 ROOT CAUSE 2. Service.cs:248 ApplyReturnModeAsync — read Allow flag từ row đầu 3. DetailFeatures.cs:72 F3 EnsureEditableForDetailsAsync — cùng bug 4. Features.cs:311 F4 AdjustBudgetCommand — cùng bug 4 fix surgical (~30 LOC BE total): **Site 1** (`PurchaseEvaluationWorkflowService.cs:201`): ```diff - var currentLevel = step.Levels.FirstOrDefault(l => l.Order == curLvl); - if (currentLevel?.ApproverUserId != actorId) + var currentLevel = step.Levels.FirstOrDefault(l => + l.Order == curLvl && l.ApproverUserId == actorId); + if (currentLevel is null) throw new ForbiddenException("Không phải lượt bạn — ..."); ``` **Site 2** (`PurchaseEvaluationWorkflowService.cs:248`): ApplyReturnModeAsync +`Guid? actorUserId` param 4th + caller TransitionAsync:94 update. Filter `l.ApproverUserId == actorUserId` trong FirstOrDefault. Non-admin actor KHÔNG match slot → currentLevel=null → validation skip (mode logic switch KHÔNG dùng currentLevel object — chỉ dùng curStepIdx + curLevel int values). Admin bypass validation existing line 252. **Site 3** (`PurchaseEvaluationDetailFeatures.cs:72`): ```diff - var level = step?.Levels.FirstOrDefault(lv => lv.Order == levelOrder); - if (level is null) throw ConflictException("schema lỗi"); - if (!level.AllowApproverEditDetails) throw ConflictException(...); - if (level.ApproverUserId != actorUserId) throw ForbiddenException(...); + var level = step?.Levels.FirstOrDefault(lv => + lv.Order == levelOrder && lv.ApproverUserId == actorUserId); + if (level is null) throw ForbiddenException(...); + if (!level.AllowApproverEditDetails) throw ConflictException(...); ``` **Site 4** (`PurchaseEvaluationFeatures.cs:311`): ```diff - var level = step.Levels.FirstOrDefault(l => l.Order == curLvl); - if (level is null) throw ConflictException("schema lỗi"); - if (!level.AllowApproverEditBudget) throw ConflictException(...); - if (level.ApproverUserId != actorId) throw ForbiddenException(...); + var level = step.Levels.FirstOrDefault(l => + l.Order == curLvl && l.ApproverUserId == actorId); + if (level is null) throw ForbiddenException(...); + if (!level.AllowApproverEditBudget) throw ConflictException(...); ``` **Regression test** (`PurchaseEvaluationPerNvLookupRegressionTests.cs` 3 test): 1. `TransitionReject_ActorD_LastInSlot_AllowsRejectViaDrafterMode` — Actor D (non-first-row trong OR-of-N) trả lại Drafter mode → no throw. Pre-fix: throw "Không phải lượt bạn" vì handler check row đầu A. 2. `TransitionReject_Outsider_NotInSlot_ThrowsForbidden` — Outsider không trong slot → throw đúng intent (verify fix KHÔNG over-permissive). 3. `TransitionRejectOneLevel_ActorC_HasFlagWhileOthersDont_AllowsMode` — Actor C only tick AllowReturnOneLevel, 3 NV khác KHÔNG. Actor C click "Trả lại 1 Cấp" → mode allowed. Pre-fix: read flag từ row A (false) → throw ConflictException "không bật mode OneLevel". Pattern reinforced: per-NV admin opt-in flag wire **5 lookup sites** đều phải discriminate ApproverUserId. Plan N chỉ catch 1/5. Plan O catch 4/5 còn lại. Memory user-level cần update danh sách 5 sites cho future audit. Verify: - dotnet build SolutionErp.slnx clean (0 err, 2 warn pre-existing DocxRenderer) - dotnet test SolutionErp.slnx **111/111 PASS** (+3 từ 108 baseline Plan N) Pending Chunk O7: docs + memory update commit + push. Pending Chunk O8: CICD Monitor post-deploy verify. Pending follow-up Bug 2 F2 đến Phan Văn Chương: verify workflow v14 DB. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 13:05:02 +07:00
pqhuy1987	03264581ff	[CLAUDE] PurchaseEvaluation Tests: Chunk N1+N2 — HOTFIX per-NV lookup site discrimination Allow* flag (BE bug 2 ngày prod) ... Bro UAT 2026-05-15 screenshot phát hiện: Admin Designer tick TRUE 7 flag cho NV Test (UAT V2) slot Bước 2 Cấp 1 (4 NV cùng Cấp, OR-of-N Mig 29). Actor login → dialog ✓ Duyệt KHÔNG có checkbox F2 skipToFinal + dialog ← Trả lại CHỈ 1 radio Drafter + KHÔNG có F3+F4 Edit options. Investigator audit confirm Hypothesis B: BE handler `PurchaseEvaluationFeatures.cs:765` `FirstOrDefault(l => l.Order == curLevelOrder)` THIẾU discriminator `ApproverUserId == currentUser.UserId`. Schema Mig 29 (S21 t5 2026-05-13) refactor: 1 row per ApproverUserId, OR-of-N cùng Order → handler luôn lấy row đầu DB (Lê Văn Bính / Trần Xuân Lưu — chỉ Drafter flag), bỏ qua admin tick per-NV của actor thật. Bug PRESENT từ Mig 29 deploy 2026-05-13 (2 NGÀY PROD) nhưng chỉ bộc lộ khi lần đầu admin tick selectively per-NV. Trước đây tất cả slot FALSE → mọi actor đều thấy "không có options", behavior giống nhau, không lộ. Cumulative gap analysis: Mig 29 + Mig 30 + Mig 31 wire 8 surface points đúng nhưng MISS point 9 lookup discrimination → 3× refactor cùng bug. Point 9 mới được catch Plan N S23 t4 (em main + Reviewer + Implementer all MISS xuyên 3 plan). N1 BE fix (5 LOC line 765-779): ```csharp var curLevel = curStep?.Levels.FirstOrDefault(l => l.Order == curLevelOrder && l.ApproverUserId == currentUser.UserId) ?? curStep?.Levels.FirstOrDefault(l => l.Order == curLevelOrder); // admin/non-approver fallback ``` N2 Regression test (new file `GetPurchaseEvaluationCurrentLevelOptionsTests.cs`): - `GetPe_PerNvLookup_ActorMatchesSlot_ReturnsActorSpecificFlags`: Seed 4 Level cùng Order=1 (mỗi Level distinct flag profile) × 4 actor → assert mỗi actor nhận flag riêng (KHÔNG profile khác). Critical assertion: Actor C → AllowApproverSkipToFinal=true (bug bro UAT regression). - `GetPe_PerNvLookup_AdminNonApprover_FallsBackToFirstRow`: Admin actor (NON-match) → fallback FirstOrDefault EF SQLite non-deterministic → weak assert NOT null + match exactly 1 of 4 distinct profile. Pattern reusable saved memory `feedback_per_nv_permission_scope.md` CRITICAL HOTFIX S23 t4 section: - Wire checklist 9 surface points (NOT 8 — thêm point 9 lookup discrimination) - Audit cho future flag F5+: grep `FirstOrDefault.*Order ==` enumerate all lookup sites, verify discriminator role-context Verify: - dotnet build src/Backend/SolutionErp.Application clean (0 warning, 0 error) - dotnet test SolutionErp.slnx **108/108 PASS** (+2 từ 106: 58 Domain + 50 Infra) - N2 2 test individual PASS Pending Chunk N4: docs + memory update commit + push remote. Pending CICD Monitor post-deploy verify (spawn sau push). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 12:41:56 +07:00
pqhuy1987	c2042ef956	[CLAUDE] PurchaseEvaluation: Chunk M1 — Fix F1.OneLevel/OneStep edge case Bước 1 → giữ ChoDuyet (KHÔNG fallback Drafter) ... Bro UAT S23 t3: "Các tính năng trả lại 1 cấp hoặc chỉ định hoặc edit cho xử lý ở trạng thái đang gửi duyệt luôn, không về draft." Investigator audit confirm 4 mode F1.OneLevel/Assignee + F2 + F3+F4 main path đã giữ Phase=ChoDuyet (Mig 28-31 cumulative). Edge case duy nhất còn fallback Drafter (Phase=TraLai): - F1.OneLevel khi đang Bước 1 Cấp 1 (curStepIdx=0, curLevel=1) — no further back - F1.OneStep khi đang Bước 1 (curStepIdx=0) Logic cũ (line 303-310 OneLevel + 325-332 OneStep): ``` evaluation.Phase = PurchaseEvaluationPhase.TraLai; // 98 evaluation.CurrentWorkflowStepIndex = null; evaluation.CurrentApprovalLevelOrder = null; evaluation.SlaDeadline = null; return "Trả về Người soạn thảo (fallback — đang Bước 1 Cấp 1)"; ``` Logic mới — reset (0, 1) giữ ChoDuyet: ``` evaluation.CurrentWorkflowStepIndex = 0; evaluation.CurrentApprovalLevelOrder = 1; summary = "Action 'Trả lại 1 Cấp/Bước' không lùi được — phiếu reset về Approver Bước 1 Cấp 1"; // SLA reset 7d ở cuối hàm cho 3 mode còn lại ``` Semantic mới (per bro chốt AskUserQuestion Plan M): - Phase giữ ChoDuyet (KHÔNG TraLai=98) - Pointer reset về (0, 1) = chính Approver A hiện tại (effectively no-op) - SLA reset 7d (cuối hàm switch áp dụng cho cả 3 mode F1 non-Drafter) - Audit log rõ "không lùi được" để Drafter/Admin biết action không hiệu lực KHÔNG đụng: - F1.Drafter (line 268-275) giữ nguyên semantic Phase=TraLai - F1.Assignee (line 335-360) giữ nguyên throw nếu không match - F2 ApproveV2Async skipToFinal (line 483-524 Plan K L1 vừa fix) - F3 EnsureEditableForDetailsAsync (PurchaseEvaluationDetailFeatures.cs:42) - F4 AdjustBudgetCommand handler (PurchaseEvaluationFeatures.cs:272-329) Verify: - dotnet build src/Backend/SolutionErp.Infrastructure clean (0 err, 2 warn pre-existing DocxRenderer) - Service.cs 13+/13- LOC change (1 file, surgical edit) - Pending Chunk M2: 2 edge case test (Implementer Case 3 spawn) + verify K7 Approver F2 không cascade - Pending Chunk M3: FE label rename Phase=TraLai "Trả lại" → "Cần chỉnh sửa lại" (Implementer Case 2 spawn × 2 app) - Pending Chunk M4: docs + memory update + push + CICD verify Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 11:11:36 +07:00
pqhuy1987	83c9f7b45d	[CLAUDE] PurchaseEvaluation FE-Admin FE-User: Chunk L5 — PE list UX: ngày tạo thay SLA countdown + sort UpdatedAt DESC ... Bro UAT S23 t2 yêu cầu 2 UX changes PE list: 1. Đổi "Còn N ngày Mh" (SlaTimer countdown) → "DD/MM/YYYY HH:mm" (ngày giờ tạo phiếu). 2. Sort: phiếu vừa update (Tạo / Gửi duyệt / Trả lại) đưa lên đầu, phiếu cũ phía dưới. BE changes: - PurchaseEvaluationListItemDto +UpdatedAt: DateTime? field (auto AuditingInterceptor refresh mọi SaveChanges — covers Insert/Update/Transition events natural). - ListPurchaseEvaluationsQueryHandler sort: OrderByDescending(UpdatedAt ?? CreatedAt) (was: OrderByDescending(CreatedAt)). - GetMyPurchaseEvaluationInboxQueryHandler sort: OrderByDescending(UpdatedAt ?? CreatedAt) (was: OrderBy(SlaDeadline ?? MaxValue) — SLA priority deprecated). - CreateContractFromEvaluationFeatures.cs: +UpdatedAt arg trong DTO ctor (compile fix consumer downstream). - Select projection 3 callsites populate UpdatedAt. FE × 2 app (mirror rule §3.9): - PeListItem type +updatedAt: string | null (optional — null khi phiếu chưa Update). - PurchaseEvaluationsListPage: replace <SlaTimer deadline={p.slaDeadline} ... /> với Vietnamese date format "{DD/MM/YYYY HH:mm}" qua Intl.DateTimeFormat (vi-VN locale, full date+time options). title tooltip hiện full timestamp. - Remove SlaTimer import (unused warning). UpdatedAt sort logic insight: AuditingInterceptor (Infrastructure) auto-refresh UpdatedAt mọi SaveChanges → mọi event tự nhiên (Drafter tạo / Gửi duyệt từ Workspace / Approver duyệt Cấp tiếp / Approver trả lại / Admin override) đều bump UpdatedAt → phiếu vừa action lên đầu list. Phiếu mới Insert UpdatedAt=null → fallback CreatedAt → vẫn lên đầu (vì CreatedAt vừa now). Verify: - dotnet build production projects clean (0 err, 2 pre-existing warn) - dotnet test SolutionErp.slnx 104/104 PASS (DTO change KHÔNG impact test — tests don't construct ListItemDto) - npm run build × 2 app pass clean Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 01:53:19 +07:00
pqhuy1987	f3db9e6cc0	[CLAUDE] PurchaseEvaluation: Chunk L1 — Fix F2 skipToFinal semantic: skip pointer tới NV cuối (KHÔNG terminate DaDuyet) ... Bro UAT S23 t2 catch: Plan K K2 implement F2 SAI semantic — set Phase=DaDuyet terminal auto-approve. Bro intent: "Duyệt thẳng đến CEO, bỏ qua các bước khác chứ ko phải chuyển sang đã duyệt." Refactor Service.cs ApproveV2Async F2 branch: - Resolve lastStepIdx = steps.Count - 1, lastLevelMaxOrder = max(LevelOrder) trong Step cuối - Advance pointer: CurrentWorkflowStepIndex = lastStepIdx + CurrentApprovalLevelOrder = lastLevelMaxOrder - Phase GIỮ NGUYÊN ChoDuyet — NV cuối (CEO/last approver) vẫn cần ký thật để tiến DaDuyet - Audit log "Approver skip thẳng tới Bước X Cấp Y (NV cuối) — bỏ qua các Bước/Cấp trung gian" - Guard no-op: actor đã ở slot cuối → fall through advance logic (normal → DaDuyet) (KHÔNG double-advance khi skipToFinal=true ngay slot cuối) - Reset SLA 7d cho NV cuối nhận lại FE × 2 app PeWorkflowPanel.tsx (mirror rule §3.9): - Description text update: "Phiếu sẽ skip tới NV cuối (CEO/cấp ký cuối) — NV cuối vẫn cần duyệt thật để hoàn tất." - Amber warning update: "Bỏ qua mọi Cấp/Bước trung gian, phiếu chuyển thẳng tới NV cuối. NV cuối vẫn phải ký duyệt thật để phiếu thành 'Đã duyệt'." Verify: - dotnet build production projects clean (0 err, 2 pre-existing warn) - npm run build × 2 app pass Pattern lesson saved memory: Service skipToFinal semantic = advance pointer NOT terminate. K7 tests TODO update: 3 Approver F2 tests assert pointer moved to last slot, NOT Phase=DaDuyet. Defer test fix sau UAT confirm UX. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-15 01:39:03 +07:00
pqhuy1987	0062fcb269	[CLAUDE] ApprovalWorkflowsV2: Chunk H — K10 hotfix AwLevelDto wire AllowApproverSkipToFinal (Mig 31 admin DTO gap) ... CICD Monitor K9 catch: GET /api/approval-workflows-v2 response thiếu field `allowApproverSkipToFinal` trong levels[]. Mig 31 column added Levels + Service ApproveV2Async wire (K2) + PE bundle DTO ApprovalWorkflowOptionsDto wire (K2) + FE Designer 7th checkbox UI (K3) đầy đủ — NHƯNG `AwLevelDto` admin overview DTO chưa wire field → round-trip Designer create/update fail (em main K2 design gap, Reviewer K2 cũng miss audit ApprovalWorkflowV2AdminFeatures). 4 edits ApprovalWorkflowV2AdminFeatures.cs: 1. AwLevelDto record +AllowApproverSkipToFinal field (7th — sau AllowApproverEditBudget) 2. ToDto handler (GetAwAdminOverviewQueryHandler) ctor call +l.AllowApproverSkipToFinal 3. CreateAwLevelInput record +AllowApproverSkipToFinal=false default (admin opt-in) 4. CreateAwDefinitionCommandHandler entity init +AllowApproverSkipToFinal = l.AllowApproverSkipToFinal Pattern lesson: per-NV admin opt-in flag wire 6 surface points required (entity + EF config + Mig + Service guard + PE bundle DTO + ApprovalWorkflowOptionsDto + FE Designer + admin AwLevelDto + Create input). Mig 30 F4 đã có same gap risk ban đầu (S22+5 needed full wire). Update memory `feedback_per_nv_permission_scope` checklist add "admin AwLevelDto + Create input wire" cho future flag F5+. Verify: - dotnet build production projects clean (0 err, 2 pre-existing DocxRenderer warn) - Awaiting CICD Monitor K11 verify post-deploy (GET /api/approval-workflows-v2 levels[].allowApproverSkipToFinal field PRESENT + Designer round-trip OK) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-14 23:58:19 +07:00
pqhuy1987	2ea8977d0f	[CLAUDE] Backout: Chunk D — K5 cleanup F2 zombie endpoint + UsersPage column + DTO field ... Reviewer K2 Major #1: PATCH /api/users/{id}/allow-skip-final endpoint Admin tick = NoOp swallow silent (K1 sentinel → confusion UX). Full backout Plan D S22 stack: BE drop (7 files): - UsersController.cs: DELETE PATCH /allow-skip-final endpoint + SetAllowDrafterSkipToFinalBody record - UserFeatures.cs: DELETE SetUserAllowDrafterSkipToFinalCommand + Handler + UserDto.AllowDrafterSkipToFinal field + list/get DTO mapping sentinel-false references - ApprovalWorkflow.cs: REWRITE stale narrative line 78-80 (Reviewer Major #2 Mig 31 semantic) + docstring AllowApproverSkipToFinal line 108 clean stale Users storage ref - PurchaseEvaluationFeatures.cs: REWRITE Command DTO comment line 401 (Reviewer Minor #3) - ApprovalWorkflowConfiguration.cs: APPEND Mig 31 narrative line 22-24 (Reviewer Minor #4) + clean storage move comment line 87 - ApprovalWorkflowV2AdminFeatures.cs: clean DTO comment line 58 stale "F2 xuống User table" - IPurchaseEvaluationWorkflowService.cs + PurchaseEvaluationDtos.cs: clean stale "storage Users.AllowDrafterSkipToFinal" comments FE Admin drop (2 files): - UsersPage.tsx: DELETE "Skip cuối" column + FastForward badge + FastForward import + allowSkipMut mutation hook + FastForward toggle button - types/users.ts: DELETE allowDrafterSkipToFinal field fe-user KHÔNG đụng (no UsersPage admin-only; K6 sẽ handle Workspace Drafter checkbox). FE Designer page KHÔNG đụng (K3 done; 2 stale comment leftover deferred K6). Plan K refactor F2 storage Users → Levels (Mig 31) complete cumulative cleanup. Pattern reusable: post-refactor full cleanup (BE endpoint + Command + DTO + FE column + types + stale narratives) atomic 1 commit thay vì leak zombie state. Verify: - dotnet build production projects 0 err (2 pre-existing DocxRenderer warn) - npm build fe-admin 0 TS err (no new warning) - Grep AllowDrafterSkipToFinal + allow-skip-final + allowDrafterSkipToFinal zero results across src/Backend (excl Migrations history) + fe-admin/src Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-14 23:27:12 +07:00
pqhuy1987	364aef63fd	[CLAUDE] PurchaseEvaluation: Chunk B — Mig 31 K2 Approver F2 branch APPROVE STEP + DTO refactor ... Service ApproveV2Async +skipToFinal 8th param. APPROVE STEP branch sau UPSERT PEL opinion: check admin OR matchingLevel.AllowApproverSkipToFinal → set Phase=DaDuyet terminal directly, clear pointer + SLA, audit "[Approver duyệt thẳng Cấp cuối — Bước X Cấp Y → DaDuyet]". Non-admin + flag off → ConflictException. ApproveV1LegacyAsync: throw nếu skipToFinal=true non-admin (V1 legacy không hỗ trợ per-Approver-slot flag). Caller TransitionAsync line ~144 pass skipToFinal vào ApproveV2Async. Drafter SUBMIT branch ignore skipToFinal (K1 đã remove F2 Drafter semantic stub) — Mig 31 marker comment cleanup. DTO ApprovalWorkflowOptionsDto +bool AllowApproverSkipToFinal (7th field). DTO PurchaseEvaluationDetailBundleDto -DrafterAllowSkipToFinal field. GetPe handler populate 7 Allow* từ curLevel (Mig 29+30+31 cumulative). Sentinel `var drafterAllowSkipToFinal = false;` cleanup từ K1. IPurchaseEvaluationWorkflowService.cs comment skipToFinal semantic refactor: Drafter from Nháp → Approver during ChoDuyet skip thẳng Cấp cuối. Pattern reusable: feedback_per_nv_permission_scope.md reinforced 3× cumulative (Mig 29 F1+F3 + Mig 30 F4 + Mig 31 F2). Verify: - dotnet build production projects clean (0 err, 2 warnings pre-existing DocxRenderer) - Test fail at K1 expected (test file references removed prop, K7 sẽ fix) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-14 23:08:11 +07:00
pqhuy1987	db6625304a	[CLAUDE] Domain: Chunk A — Mig 31 swap F2 storage Users→ApprovalWorkflowLevels (Approver scope ChoDuyet) ... Mig 31 RefactorSkipToFinalToApproverLevel — 2 stage manual reorder: - ADD ApprovalWorkflowLevels.AllowApproverSkipToFinal bit NOT NULL DEFAULT 0 - DROP Users.AllowDrafterSkipToFinal (semantic mới khác hẳn — admin re-config qua Designer) - NO BACKFILL (Option A — accept lose 4 prod user value per K0-bis audit) Plan K refactor F2 semantic: Drafter from Nháp → Approver during ChoDuyet skip thẳng Cấp cuối. Mirror F3+F4 admin opt-in per-Approver-slot pattern (Mig 29 + Mig 30) reinforced 3× cumulative. Service line 121-157 F2 Drafter SUBMIT branch REMOVED stub (K2 sẽ add Approver F2 branch trong APPROVE STEP line ~393-525). TransitionAsync skipToFinal param 8th KEPT cho K2 repurpose. Application layer compile-break fix transient: UserDto field mapping + GET handler + LIST handler + SetUserAllowDrafterSkipToFinalCommandHandler NoOp + PurchaseEvaluationFeatures drafter flag → sentinel false. DTO + Command signature UNCHANGED (K2 chunk Chủ trì sẽ refactor DTO/Command theo plan). 4 prod user (fin.pp + pm.nv + nv.test + truong.nguyen) lose AllowDrafterSkipToFinal=true per bro Option A. Audit trail trong session log K8. Verify: - dotnet ef migrations add pass - dotnet ef database update Dev + Design pass (Mig 31 applied both DB) - dotnet build src/Backend/SolutionErp.Api production projects clean (0 err, 0 warn) - dotnet test SKIPPED per UAT mode (memory feedback_uat_skip_verify) — K7 chunk fix remaining PurchaseEvaluationWorkflowServiceReturnModeTests.cs:253 reference Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-14 23:03:05 +07:00
pqhuy1987	b079b27343	[CLAUDE] PE-Workflow: S22+5 Chunk A — Mig 30 +AllowApproverEditBudget per-Level slot ... Bro clarify spec S22+4: - KHÔNG đổi logic edit ngân sách (Drafter Nháp/TraLai vẫn duy nhất default) - Thêm flag per-NV slot trong Designer: "Cho phép NV này edit Section ngân sách lúc đang duyệt" (mirror pattern F3 AllowApproverEditDetails Mig 29) Mig 30 `AddAllowApproverEditBudgetToLevels`: - ALTER ApprovalWorkflowLevels +AllowApproverEditBudget bit NOT NULL DEFAULT 0 - 3-file rule (mig.cs + Designer.cs + Snapshot.cs) - Apply LocalDB Dev + Design Domain entity ApprovalWorkflowLevel +AllowApproverEditBudget (default false). EF config HasDefaultValue(false). DTO AwLevelDto + ApprovalWorkflowOptionsDto + CreateAwLevelInput all extend +AllowApproverEditBudget. PE GET handler populate currentLevelOptions thêm AllowApproverEditBudget từ curLevel slot. Admin Designer GET/POST handler propagate flag. AdjustBudgetCommand handler refactor ChoDuyet branch: - Trước: check actor match level.ApproverUserId (cho phép mặc định) - Sau: check level.AllowApproverEditBudget=true AND actor match ApproverUserId → throw ConflictException nếu slot chưa được cấp quyền Verify: - dotnet build SolutionErp.slnx — 0 err, 2 warn DocxRenderer pre-existing - Mig 30 applied Dev + Design DB Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 23:09:48 +07:00
pqhuy1987	37b51d7f07	[CLAUDE] PurchaseEvaluation: S22+4 Chunk A — BE attachment view endpoint + AdjustBudget command ... Feature 1 (attachment preview): - NEW `GET /api/purchase-evaluations/{id}/attachments/{attId}/view` - Cùng handler download, override `Content-Disposition: inline` để FE nhúng iframe - Permission: same scope GET phiếu (Plan E V2 strict scope) Feature 2 (điều chỉnh ngân sách): - NEW `AdjustPurchaseEvaluationBudgetCommand` + Handler + Validator - NEW `PATCH /api/purchase-evaluations/{id}/budget-adjust` body `{budgetId, budgetManualName, budgetManualAmount}` - Phase + actor scope guard: * DangSoanThao/TraLai → chỉ Drafter của phiếu * ChoDuyet → Approver currentLevel (match ApproverUserId) — V2 only * Admin → bypass tất cả - Audit changelog với diff narrative: "Điều chỉnh ngân sách: link X→Y, số tiền A→Bđ [Drafter/Approver Bước/Cấp/Admin]" - Tách riêng KHÔNG dùng UpdatePeDraft vì Approver scope KHÔNG nên được edit Section 1 fields (TenGoiThau/DiaDiem/MoTa/PaymentTerms) Verify: - dotnet build SolutionErp.slnx — 0 err, 2 warn DocxRenderer pre-existing - Test defer carry Plan C (UAT mode §7) — guard logic critical, ưu tiên cho S23+ Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 22:25:49 +07:00
pqhuy1987	40f64c6b32	[CLAUDE] PE-Workflow: UAT S22+1 — disable cả 3 button khi không quyền + BE guard ... User UAT feedback: "Nếu đã không được quyền thao tác thì ko được quyền thao tác hết tất cả các hành động" — trước đây chỉ "Duyệt" disabled, "Trả lại" + "Từ chối" vẫn enabled (design intent S17 cũ). FE 2 app mirror (PeWorkflowPanel.tsx): - `isDisabled = blockedByV2Level` (drop `isForwardApprove &&` qualifier) - Tooltip update "mới thao tác được (Duyệt / Trả lại / Từ chối)" - Comment refresh ghi UAT S22+1 spec + cross-ref BE EnsureCanRejectV2Async BE defense-in-depth (PurchaseEvaluationWorkflowService.cs): - Helper mới `EnsureCanRejectV2Async` mirror FE actorInV2Level logic: Skip silent khi admin/V1/non-ChoDuyet/no actor/no pointer. Throw ForbiddenException khi V2 + ChoDuyet + actor != currentLevel.ApproverUserId. - Invoke ở top Reject branch (cover cả TuChoi + Trả lại sub-branches). - Chặn request forge: non-approver gọi PATCH /transitions direct sẽ 403. Test (test-before §7 — security guard critical algorithm): - ReturnMode tests existing 7/7 vẫn PASS (a2.Id = currentLevel approver, guard accept) - +1 NEW test `Reject_NonApprover_V2_Throws_ForbiddenException` — outsider Drafter role gọi Reject phiếu V2 → throw + Phase không mutate Verify: - dotnet test SolutionErp.slnx — 104/104 PASS (+1 guard regression) Δ: 103 → 104 - npm run build × 2 app — pass (482ms + 583ms) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 21:46:51 +07:00
pqhuy1987	f149661d36	[CLAUDE] PurchaseEvaluation: Plan E — phân quyền strict V2 scope (List + Detail) ... Thắt chặt phân quyền PE V2 từ UAT loose sang strict actor.UserId scope: Trước (loose): mọi authenticated user thấy mọi phiếu V2 (`ApprovalWorkflowId != null`). Sau (strict): - ListPurchaseEvaluationsQuery: phiếu V2 chỉ visible khi actor là approver trong any Step.Level.ApproverUserId của workflow đã pin. Pre-compute userApprovalWfIds = DISTINCT workflow IDs có user trong Levels. - GetPurchaseEvaluationQuery: same — actor must be V2 approver in any Level của workflow pin để thấy phiếu (ngoài Drafter scope + role eligible phase). Drafter vẫn thấy phiếu mình tạo (regardless V2/V1). Admin bypass full. Inbox đã strict từ Session 17 (ResolveV2InboxIdsAsync match current Cấp + ApproverUserId) — KHÔNG đụng. Tests defer: Plan C carry — 4 integration tests Strict V2 List + Detail (Drafter own / V2 approver / non-approver throw 403) khi UAT confirm. Verify: - dotnet build SolutionErp.slnx — 0 err, 2 warning DocxRenderer pre-existing - dotnet test SolutionErp.slnx — 103/103 PASS regression-free Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 21:16:59 +07:00
pqhuy1987	215b1e036a	[CLAUDE] Tests: Plan C task 1-3 — Service per-NV Allow* test catch-up (S21 t4-t5 Mig 28-29) ... 14 test cover 3 helper sửa lớn S21 t4-t5 (test-after UAT backlog): Task 1+2 — PurchaseEvaluationWorkflowServiceReturnModeTests.cs (7 test): - ApplyReturnModeAsync Drafter allowed/denied/admin bypass (3 test mode flag) - OneLevel happy path (peer review chain in same Step) - OneLevel admin bypass (override disabled flag) - skipToFinal Drafter allowed/denied/admin bypass (3 test per-user F2) Task 3 — PurchaseEvaluationDraftGuardTests.cs (7 test): - Drafter scope: DangSoanThao + TraLai → return (2 test) - F3 Approver scope: ChoDuyet + flag on + actor match → return - F3 Approver scope: ChoDuyet + flag off → ConflictException - F3 Approver scope: ChoDuyet + flag on + actor mismatch → ForbiddenException - Admin bypass ChoDuyet + flag off → return - DaDuyet any caller → ConflictException (terminal phase) InternalsVisibleTo: expose PurchaseEvaluationDraftGuard internal helper cho test. Finding: skipToFinal Service mutate Phase=ChoDuyet TRƯỚC validate user flag. Throw chặn SaveChanges nên DB không persist nhưng in-memory dirty. Note trong test — không refactor scope catch-up (defer S22+). Verify: - dotnet test SolutionErp.slnx — 103/103 PASS (58 Domain + 45 Infra) Δ: 89 → 103 (+14: ReturnMode 7 + Guard 7) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 21:14:03 +07:00
pqhuy1987	60efeeda63	[CLAUDE] Users: Plan D — F2 toggle AllowDrafterSkipToFinal per-user (Mig 29 wire UI) ... BE: UserDto +AllowDrafterSkipToFinal + SetUserAllowDrafterSkipToFinalCommand + Handler + UsersController PATCH /api/users/{id}/allow-skip-final body {allowDrafterSkipToFinal:bool} Policy=Users.Update. FE Admin: User type +allowDrafterSkipToFinal. UsersPage column "Skip cuối" violet FastForward badge + action button toggle mirror bypass-review pattern. fe-user KHÔNG mirror (UsersPage admin-only). Verify: - dotnet build SolutionErp.slnx — 0 err, 2 warning DocxRenderer pre-existing - npm run build fe-admin — pass 638ms Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 21:03:27 +07:00
pqhuy1987	036694638e	[CLAUDE] PE-Workflow: S21 t5 Chunk A — Mig 29 refactor Allow* sang per-NV (per-Level + per-Drafter) ... Refactor 6 Allow* options từ workflow-level (Mig 28 S21 t4) sang per-NV scope: - F1 (4 mode Trả lại) + F3 (Edit Section 2) → 5 flag MOVE xuống `ApprovalWorkflowLevels` (per slot Approver, cùng table với ApproverUserId). - F2 (AllowDrafterSkipToFinal) → MOVE xuống `Users` (per-Drafter user, User Mgmt). Mig 29 `RefactorAdvancedOptionsToPerLevelAndDrafterUser` — 4-stage migration (EF auto-generated drop-then-add đã được REORDER manual): 1. ADD 5 column trên `ApprovalWorkflowLevels` (AllowReturnOneLevel/OneStep/ ToAssignee/ToDrafter[default true]/AllowApproverEditDetails) 2. ADD 1 column trên `Users` (AllowDrafterSkipToFinal default false) 3. BACKFILL bulk SQL (preserve admin config Mig 28): - Levels: copy workflow.Allow* → all Levels của workflow (JOIN Steps) - Users: SET TRUE cho user nào từng Drafter PE link workflow Allow=true 4. DROP 6 column workflow-level (Mig 28 cleanup) 3-file rule complete. Apply LocalDB Dev + Design success. Domain entity refactor: - `ApprovalWorkflow.cs` — REMOVE 6 Allow* field (S21 t4 Mig 28 cũ) - `ApprovalWorkflowLevel.cs` — ADD 5 Allow* field (F1 + F3) - `User.cs` — ADD 1 Allow* field (F2 AllowDrafterSkipToFinal) EF config update: - `ApprovalWorkflowConfiguration.cs` — remove 6 HasDefaultValue workflow-level, add 5 HasDefaultValue per-Level (4 false + 1 AllowReturnToDrafter true S17) Service refactor `ApplyReturnModeAsync` (`PurchaseEvaluationWorkflowService.cs`): - Resolve currentLevel slot (CurrentWorkflowStepIndex + CurrentApprovalLevelOrder) - Read 5 Allow* từ `currentLevel.AllowXxx` thay vì workflow.Allow* - Admin bypass per-Level flag check (unchanged behavior) - Drafter mode đặc biệt: check AllowReturnToDrafter của currentLevel (vẫn validate) - V1 legacy (no V2 schema) → fallback Drafter behavior tự động DRAFTER trình refactor (`TransitionAsync` skipToFinal branch): - Permission check moved from workflow-level → `drafterUser.AllowDrafterSkipToFinal` - Use `userManager.FindByIdAsync(actorUserId)` để get current Drafter user entity - Admin bypass user flag check (unchanged) Helper `EnsureEditableForDetailsAsync` refactor: - Read `level.AllowApproverEditDetails` thay vì workflow.AllowApproverEditDetails - Error message rõ "Cấp Approver hiện tại (Bước X / Cấp Y)" thay vì "Workflow" DTO refactor: - `AwLevelDto` ADD 5 Allow* field (admin Designer GET per-Level) - `AwDefinitionDto` REMOVE 6 Allow* (no longer workflow-level) - `CreateAwLevelInput` ADD 5 Allow* param (admin Designer POST per-Level) - `CreateAwDefinitionCommand` REMOVE 6 Allow* (Steps[].Levels[] now has them) - `ApprovalWorkflowOptionsDto` chỉ còn 5 flag (F2 removed — separate field) - `PurchaseEvaluationDetailBundleDto`: - rename `WorkflowOptions` → `CurrentLevelOptions` (clearer semantic per-slot) - ADD `DrafterAllowSkipToFinal bool` (resolve từ DrafterUserId → User entity) GetPurchaseEvaluationQueryHandler populate: - `currentLevelOptions` = 5 Allow* của Cấp hiện tại (null nếu V1 legacy / no pointer) - `drafterAllowSkipToFinal` = User.AllowDrafterSkipToFinal lookup từ DrafterUserId Backward compat verified: - Mig 29 backfill preserve admin config S21 t4 — workflow cũ vẫn chạy đúng sau deploy. User chưa từng làm Drafter F2 phải opt-in lần đầu (no auto-set). - 84 test PASS (58 Domain + 26 Infra unchanged, 3 gotcha #45 guard test backward compat signature). Pending Chunk B/C: FE Admin Designer move 5 checkbox xuống per-Level slot + FE eOffice read currentLevelOptions + drafterAllowSkipToFinal. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 20:03:28 +07:00
pqhuy1987	c56024ba25	[CLAUDE] PE-Workflow: Chunk B — BE Service + handlers + DTOs (F1+F2+F3) ... F1 — 4 mode Trả lại (Service.ApplyReturnModeAsync helper): - WorkflowReturnMode enum (OneLevel / OneStep / Assignee / Drafter) - OneLevel: lùi 1 Cấp trong cùng Step (peer review). Bước 1 Cấp 1 → fallback Drafter. - OneStep: lùi sang Bước trước Cấp cuối. Bước 1 → fallback Drafter. - Assignee: pick runtime → tìm Step+Level match ApproverUserId trong workflow. - Drafter: Phase=TraLai clear pointer như S17 (backward compat). - 3 mode đầu giữ Phase=ChoDuyet, reset SLA 7d. Mode Drafter clear SLA. - Admin bypass workflow.Allow* flag check. Non-admin → throw ConflictException với message rõ "Workflow không bật mode X". F2 — Drafter skipToFinal (extend DRAFTER trình branch): - Workflow.AllowDrafterSkipToFinal=true required (non-admin) - Set CurrentWorkflowStepIndex = Steps.Count-1 + CurrentApprovalLevelOrder = max Level - Audit comment append "[Drafter gửi thẳng Cấp cuối]" F3 — Approver edit Section 2 (Detail + NCC + Báo giá): - New helper `EnsureEditableForDetailsAsync` (extend pattern PurchaseEvaluationDraftGuard): - Drafter scope: DangSoanThao OR TraLai (any role, Controller [Authorize] handles) - F3 Approver scope: ChoDuyet + workflow.AllowApproverEditDetails=true + actor.Id match CurrentLevel.ApproverUserId. Admin bypass flag check. - Throw ForbiddenException nếu approver Cấp khác nhau (rõ Bước/Cấp trong message). - 8 handler switch helper + inject ICurrentUser khi cần: - Detail: Add (existing ICurrentUser) / Update + Delete (inject new) - Quote: Upsert + Delete (inject new) - Supplier: Add (existing) / Update + Delete (inject new + add guard, trước đây hoàn toàn KHÔNG có phase guard — bonus security fix) - Audit: thêm changelog Update/Delete handler (trước đây silent). Khi phase= ChoDuyet append " [Approver edit khi đang duyệt]" cho lịch sử rõ ai sửa. Extension Service `TransitionAsync` signature (backward compat — 3 optional param thêm cuối + default null/false): - WorkflowReturnMode? returnMode = null - Guid? returnTargetUserId = null - bool skipToFinal = false TransitionPurchaseEvaluationCommand DTO + Validator + Handler — mirror signature. DTO extensions: - ApprovalWorkflowOptionsDto NEW sub-record (6 Allow* flag) cho FE filter - PurchaseEvaluationDetailBundleDto + WorkflowOptions field (null nếu V1 legacy) - GetPe handler populate awOptions từ ApprovalWorkflow entity load (Mig 23 path) - AwDefinitionDto + 6 Allow* field (admin Designer GET overview) - CreateAwDefinitionCommand + 6 Allow* param (admin Designer POST new version) - Handler ToDto + entity new() — propagate Allow* end-to-end Default backward compat: workflow cũ → AllowReturnToDrafter=true (Mig 28 DB default), 5 flag còn lại false. Phiếu cũ V2 vẫn Trả lại Drafter như S17 sau deploy — no breaking change. Verify: - dotnet build SolutionErp.slnx → 0 err, 2 warn pre-existing DocxRenderer - 3 regression test gotcha #45 vẫn PASS (backward compat signature change) - LocalDB Dev + Design đã apply Mig 28 (Chunk A) Pending Chunk C: FE Admin Designer mirror 2 app (6 checkbox + DTO types). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 18:57:09 +07:00
pqhuy1987	0294693a4a	[CLAUDE] PE-Workflow: Chunk A — Mig 28 +6 Allow* column ApprovalWorkflow (F1+F2+F3 advanced options) ... Domain `ApprovalWorkflow` (Mig 22 — Session 17) thêm 6 boolean cấu hình "Cấu hình nâng cao" cho admin Designer (F1 trả lại modes + F2 skip cấp cuối + F3 approver edit Section 2): - AllowReturnOneLevel (default false) — F1 mode 1 lùi 1 Cấp peer review - AllowReturnOneStep (default false) — F1 mode 2 lùi 1 Bước - AllowReturnToAssignee (default false) — F1 mode 3 pick runtime từ NV đã duyệt - AllowReturnToDrafter (default TRUE) — F1 mode 4 backward compat S17 fallback - AllowDrafterSkipToFinal (default false) — F2 Drafter trình thẳng Cấp cuối - AllowApproverEditDetails (default false) — F3 Approver edit HangMuc/NCC/Báo giá Default backward compat S17: AllowReturnToDrafter=true → mọi workflow cũ chạy đúng "Trả về Drafter" Phase=TraLai. 5 flag còn lại default false → admin opt-in per workflow để audit nghiêm. Mig 28 `AddAdvancedOptionsToApprovalWorkflows`: - AddColumn × 6 bit NOT NULL DEFAULT 0/1 (3-file rule complete + Designer + Snapshot) - Apply LocalDB SolutionErp_Dev (runtime) + SolutionErp_Design (ef tooling) EF config ApprovalWorkflowConfiguration thêm 6 HasDefaultValue match Mig 28 default (backfill rows cũ + ef snapshot consistency). 3 mode Trả lại mới giữ Phase=ChoDuyet, chỉ lùi pointer (peer review chain sequential). Mode Drafter giữ Phase=TraLai + clear pointer như S17. Behavior implement trong Chunk B (Service.TransitionAsync extend branches). Verify: - dotnet ef migrations add success (no compile error) - 3-file rule complete: 28 mig × 2 + Snapshot = 57 file Migrations dir - LocalDB Dev + Design both apply success Pending Chunk B: BE Service branches + handlers + Controller body extend. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 18:46:01 +07:00
pqhuy1987	de0088742f	[CLAUDE] PurchaseEvaluation: Chunk A — BE guard target TraLai/TuChoi BẮT BUỘC decision=Reject + 3 regression test ... Defense-in-depth chặn FE inconsistency (gotcha #45 — Session 21 turn 3). Bug pattern: button "← Trả lại" trong PeWorkflowPanel.tsx gửi decision=Approve khi target=TraLai do `isReject` local var thiếu nhánh TraLai → BE skip Reject branch → enter APPROVE STEP → ApproveV2Async UPSERT opinion = "đã duyệt" + advance Cấp. User UAT thấy: "Trả về nhưng hệ thống vẫn duyệt". BE guard: - Service `TransitionAsync` thêm early check sau set isAdmin/isSystem - targetPhase ∈ {TraLai, TuChoi} && decision != Reject → throw ConflictException - Boundary protection cho mọi caller tương lai (API client / mobile / cron) Tests (Infra suite +3): - TransitionAsync_TargetTraLai_WithApproveDecision_Throws_AndDoesNotMutateState - TransitionAsync_TargetTuChoi_WithApproveDecision_Throws_AndDoesNotMutateState - TransitionAsync_TargetTraLai_WithRejectDecision_SetsPhaseTraLai (happy path) + NoOpNotificationService stub reusable cho future PE service tests Verify: - dotnet test SolutionErp.slnx → 84 PASS (58 Domain + 26 Infra = +3 from 81 baseline) - Build pass (0 err, 2 warn CS8602 pre-existing DocxRenderer) Pending Chunk B: FE fix PeWorkflowPanel.tsx isReject + dialog isSendBack mirror 2 app (fe-admin + fe-user) — sync với BE guard rule. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-13 09:41:14 +07:00
pqhuy1987	059bfcbe38	[CLAUDE] FE-Admin+Domain: Chunk C — MenuVisibilityPage + menu key + seed ... Session 20 turn 7 Chunk C. FE Admin page quản lý Ẩn/Hiện + Đổi tên menu cho fe-user (eOffice). Admin sidebar fe-admin LUÔN dùng Tên gốc — page này KHÔNG đụng admin navigation (user Q2=b). Domain MenuKeys.cs: +const MenuVisibility = "MenuVisibility" All[] thêm MenuVisibility (giữa Permissions + Workflows) DbInitializer SeedMenuTreeAsync: +leaf (MenuVisibility, "Menu eOffice", System, 94, "Eye") Workflows shift Order 94 → 95 Idempotent — chỉ INSERT nếu chưa có trong DB Manual seed Mig 27 LocalDB Dev: INSERT MenuItems + Permissions cho Admin role FE Admin: - types/menu.ts: MenuItem/MenuNode +isVisible bool +displayLabel string|null - lib/menuKeys.ts: +MenuVisibility const - components/Layout.tsx resolver +MenuVisibility → /system/menu-visibility - App.tsx +Route + import MenuVisibilityPage NEW pages/system/MenuVisibilityPage.tsx (~210 LOC): - PageHeader + 4 StatCard (Tổng / Hiển thị / Đã ẩn / Đã đổi tên) - Search input (key | label | displayLabel) - Table: Key (mono + parentKey ↳) | Tên gốc | Input "Tên hiển thị" inline (placeholder "Mặc định: ...") | Toggle Hiển thị/Ẩn (emerald/amber) | Lưu (khi dirty) / Khôi phục (khi đã custom) - PATCH /menus/{key} body { isVisible, displayLabel } — trim whitespace, empty string → null - onSuccess: invalidate ['menus', 'all'] + ['my-menu'] + clear draft entry - "Khôi phục mặc định" button: PATCH isVisible=true, displayLabel=null - Footer hint: nhắc admin sidebar luôn dùng Tên gốc, đổi tên áp eOffice Verify: - npm run build × fe-admin pass Pending Chunk D: FE Layout fe-user filter !isVisible + render displayLabel Pending Chunk E: Docs S20 turn 7 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-11 11:37:47 +07:00
pqhuy1987	ef394f8067	[CLAUDE] Api+App: Chunk B — PATCH /menus/{key} + DTO extend isVisible/displayLabel ... Session 20 turn 7 Chunk B. BE API cho admin Ẩn/Hiện + Đổi tên menu fe-user. DTO (MenuDtos.cs): - MenuNodeDto +IsVisible bool +DisplayLabel string? - MenuItemDto +IsVisible bool +DisplayLabel string? GetMyMenuTreeQueryHandler: - Pass m.IsVisible + m.DisplayLabel vào MenuNodeDto record - KHÔNG filter IsVisible server-side (FE 2 app tự filter — fe-admin render hết, fe-user filter ẩn). Lý do: 1 endpoint serve cả 2 FE. ListMenuItemsQueryHandler: +IsVisible +DisplayLabel trong Select projection. NEW UpdateMenuItemCommand + Validator + Handler (PermissionFeatures.cs): - Body: { Key, IsVisible, DisplayLabel? } - Validator: Key required + max 50, DisplayLabel max 200 - Handler: load MenuItem by Key (NotFoundException nếu missing), set IsVisible + DisplayLabel (whitespace → null normalize), SaveChangesAsync MenusController +PATCH /api/menus/{key}: - [Authorize(Policy = "Permissions.Update")] — reuse policy admin matrix - Body: UpdateMenuItemRequest { IsVisible, DisplayLabel? } - Send UpdateMenuItemCommand qua MediatR - Return 204 NoContent Verify: - dotnet build SolutionErp.slnx — 0 err (1 warn cũ DocxRenderer không liên quan) Pending Chunk C: FE Admin MenuVisibilityPage Pending Chunk D: FE Layout fe-user filter + render displayLabel Pending Chunk E: Docs S20 turn 7 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-11 11:32:25 +07:00
pqhuy1987	2ea2d27785	[CLAUDE] Infra: Mig 27 — Chunk A MenuItem +IsVisible +DisplayLabel ... Session 20 turn 7: admin có thể Ẩn/Hiện + Đổi tên hiển thị menu cho fe-user (eOffice). Admin sidebar luôn giữ Label gốc (user Q2=b "chỉ của eOffice thôi"). Domain MenuItem: +IsVisible bool=true +DisplayLabel string?(200) EF Configuration: HasDefaultValue(true) + HasMaxLength(200) Migration 27 AddVisibilityAndDisplayLabelToMenuItems — 3-file rule: + AddColumn IsVisible bit NOT NULL DEFAULT 1 + AddColumn DisplayLabel nvarchar(200) NULL Verify: - dotnet build SolutionErp.slnx — 0 warn / 0 err - dotnet ef database update --connection SolutionErp_Dev — applied OK - dotnet ef database update SolutionErp_Design — applied OK Pending: B (BE API) → C (FE admin page) → D (FE user render) → E (Docs) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-11 11:29:50 +07:00
pqhuy1987	9dee00da01	[CLAUDE] PurchaseEvaluation: Chunk A — reorder section Hạng mục lên #2 + auto-tạo 1 row mặc định ... Session 20 UI restructure (3 yêu cầu user). Chunk A xử lý: BE — CreatePurchaseEvaluationCommandHandler thêm 1 PurchaseEvaluationDetail mặc định khi tạo phiếu mới: - GroupCode="01", GroupName="Hạng mục chính" - NoiDung = TenGoiThau (tên gói thầu) - DonGiaNganSach = ThanhTienNganSach = Budget.TongNganSach (nếu link) fallback BudgetManualAmount fallback 0 - DonViTinh="gói", KL=1, Order=1 - Changelog entry kèm theo (audit Insert Detail) FE — Đổi thứ tự 5 section trong PeDetailTabs.tsx (mirror 2 app): 1. Thông tin gói thầu (giữ) 2. Hạng mục + Báo giá (chuyển từ #4 lên #2) 3. Chọn NCC / TP (từ #2 xuống #3) 4. NCC / TP tham gia (từ #3 xuống #4 — Chunk B sẽ gộp vào #2 nested) 5. Ý kiến cấp duyệt (giữ) Q1=a: Giữ Section "Chọn NCC TP thắng thầu" riêng (rõ UX). Q2=a "1 hạng mục trước tiên": auto-seed đủ, multi-hạng-mục defer. Verify: - dotnet build SolutionErp.slnx — 0 warning / 0 error - Test pass mặc định skip (Phase 9 UAT iteration, Q4 user public luôn) Pending Chunk B: Nested grid Hạng mục → NCC expand inline edit Pending Chunk C: Section 5 gộp đồng cấp cùng Phòng (1 box / Step) Pending Chunk D: Docs S20 changelog + STATUS + HANDOFF Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-11 09:54:12 +07:00
pqhuy1987	90baa8e73c	[CLAUDE] PurchaseEvaluation: Chunk B Service V2 hook UPSERT opinion + DTO + GET include ... Service `ApproveV2Async` sau khi log approval (Decision=Approve) → UPSERT row `PurchaseEvaluationLevelOpinions` cho Cấp hiện tại (auto sync ý kiến từ comment khi duyệt). Reject KHÔNG sync. Match level theo ApproverUserId của actor (multi-NV cùng Cấp OR-of-N). Admin override (actor.Id KHÔNG match) → fallback first level — FE detect SignedByUserId !== Level.ApproverUserId hiển thị "Admin duyệt thay". Empty/whitespace comment → "(duyệt — không ý kiến)" placeholder (Q4 bonus). Helper `ResolveActorFullNameAsync(actorUserId, isSystem, ct)` lookup denorm SignedByFullName từ Users (fallback "(System)" / "(unknown)"). DTO `PurchaseEvaluationLevelOpinionDto` (15 fields): - StepOrder/StepName/StepDepartmentId/StepDepartmentName (Bước Phòng) - LevelOrder/LevelName/ApproverUserId/ApproverFullName (Cấp NV) - Comment/SignedAt/SignedByUserId/SignedByFullName (sign-off) GetPurchaseEvaluationQueryHandler: - Include LevelOpinions - helper BuildLevelOpinionsAsync JOIN ApprovalWorkflows.Steps.Levels + Departments + Users → denorm DTO. Empty list cho phiếu V1 / V2 chưa có cấp nào duyệt → FE fallback message. Verify: dotnet build pass + dotnet test 81 pass (no regression). Chunk C kế tiếp: FE Section 5 dynamic mirror 2 app.	2026-05-09 11:00:01 +07:00
pqhuy1987	77a30584fc	[CLAUDE] PurchaseEvaluation: Mig 26 PeLevelOpinions V2 dynamic — Chunk A Domain + EF ... Schema mới cho Section 5 "Ý kiến cấp duyệt" V2 dynamic theo ApprovalWorkflowsV2 (Mig 22-25). Thay thế Mig 15 cố định 4 box (V1). Entity `PurchaseEvaluationLevelOpinion : AuditableEntity`: - (PEId, ApprovalWorkflowLevelId) UNIQUE composite - Comment nvarchar(2000) — text ý kiến hoặc "(duyệt — không ý kiến)" placeholder (Q4 bonus) - SignedAt datetime2 (luôn có khi UPSERT từ ApproveV2Async) - SignedByUserId Guid (NV chính chủ HOẶC Admin override) - SignedByFullName nvarchar(200) — denorm tránh user bị xóa/đổi tên EF: FK Cascade Pe + Restrict Level. SignedByUserId KHÔNG nav (denorm only). Migration 26 `AddPeLevelOpinionsForV2`: 1 CREATE TABLE + 2 FK + 2 index. 3-file rule commit đủ (.cs + Designer + Snapshot). Apply LocalDB SolutionErp_Dev OK (Mig 25 + 26 catchup). Verify: dotnet build pass + dotnet test 81 pass (no regression). Chunk B kế tiếp: Service V2 hook UPSERT auto trong ApproveV2Async.	2026-05-09 10:56:16 +07:00
pqhuy1987	2a53107602	[CLAUDE] AwV2: Mig 25 +IsUserSelectable + Designer pin toggle + Workspace filter, bỏ "(clone)" ... Hai yêu cầu UAT 2026-05-08: 1. Bỏ "(clone)" auto-append khi clone version mới — version đã đủ phân biệt. 2. Thêm pin toggle để admin chọn workflows nào cho user pick lúc tạo phiếu. Migration 25 AddIsUserSelectableToApprovalWorkflows: - ALTER ApprovalWorkflows ADD IsUserSelectable bit NOT NULL DEFAULT 0 - UPDATE backfill SET IsUserSelectable=1 WHERE IsActive=1 (giữ behavior cũ cho active versions, archived = false default — admin tự pin nếu cần) BE: - Domain ApprovalWorkflow +property IsUserSelectable - DTO AwDefinitionDto +field - CreateAwDefinitionCommandHandler set default true cho version mới - New SetAwUserSelectableCommand + Handler - API PATCH /api/approval-workflows-v2/{id}/user-selectable (Workflows.Create policy) - DbInitializer SeedSampleApprovalWorkflowsV2Async set IsUserSelectable=true FE Designer (fe-admin): - DefinitionDto +isUserSelectable - Badge amber "Pin Cho user chọn" khi true (cạnh Đang áp dụng/Archived) - Button "Pin/PinOff Ghim cho user / Bỏ ghim" trong action group + mutation toggle - Auto-fill name khi clone: bỏ "(clone)" suffix → giữ nguyên name FE Workspace (fe-admin + fe-user): - approvalWorkflows query filter w.isUserSelectable === true - User dropdown chỉ thấy workflows admin đã pin Verify: dotnet build pass · 81 test pass · npm build × 2 pass · Mig 25 apply LocalDB OK. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-08 19:15:23 +07:00
pqhuy1987	f77ea3828a	[CLAUDE] Fix: ApprovalWorkflowsV2 GET ai authenticated cũng đc — Drafter pick workflow lúc create PE ... Bug UAT 2026-05-08: user Drafter (nv.test) login Workspace tạo phiếu B, dropdown "Quy trình duyệt" empty silent. Sample seed B đã chạy đúng (Designer admin hiển thị sample + clone v02 active) nhưng Workspace empty. Root cause: class-level [Authorize(Policy = "Workflows.Read")] → non-admin role 403 Forbidden khi GET /api/approval-workflows-v2. TanStack Query catch error silent → dropdown empty không có warning. Fix: - Class-level [Authorize] only (any authenticated) - GET inherit class policy (Drafter cần list workflow để pick — read-only) - POST + DELETE giữ [Authorize(Policy = "Workflows.Create")] — admin-only Designer Workflow data không nhạy cảm — chỉ là cấu hình quy trình. Validate ApplicableType match PE.Type ở Create command đã có. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-08 18:45:04 +07:00
pqhuy1987	937eb2449c	[CLAUDE] Workflow V2: clone leaf Designer + sample seed cho DuyetNccPhuongAn (B) ... Mở rộng V2 schema cho type B mirror type A đã chốt S17. Phần lớn đã chung qua ApplicableType discriminator — chỉ thêm menu key + sample seed. Changes: - MenuKeys.cs: +const ApprovalWorkflowDuyetNccPhuongAnV2 (AwV2_DuyetNccPhuongAn) + add vào All array - DbInitializer.SeedMenusAsync: +leaf "Duyệt NCC và Giải pháp (Mới)" dưới root ApprovalWorkflowsV2 - DbInitializer +SeedSampleApprovalWorkflowsV2Async: seed QT-DN-PA-V2-001 v01 (1 Bước Phòng CCM × 1 Cấp NV test) Idempotent — skip nếu admin đã tạo bất kỳ workflow B nào hoặc thiếu test user - fe-admin/lib/menuKeys.ts: +AwV2_DuyetNccPhuongAn KHÔNG đụng: - Migration (V2 schema chung qua ApplicableType — Mig 22-24 đã hỗ trợ B) - Service ApproveV2Async (không hardcode type) - Designer page ApprovalWorkflowsV2Page (TYPE_CODE_TO_INT đã có B=2) - Layout/App.tsx (regex AwV2_(.+) match dynamic) - Permission default (admin bypass + role khác không cần Designer access) Verify: dotnet build pass · 81 test pass · npm build fe-admin pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-08 18:07:56 +07:00
pqhuy1987	de0f38dd25	[CLAUDE] PE Panel 3: bỏ phase cards + render flow workflow V2 thực tế ... User feedback: "bỏ luôn cái quy trình phía trên đi nhé, vì nó là trạng thái rồi (đã có badge), update cái flow quy trình mới vào bên panel 3 đang đến ai". BE — ApprovalFlow DTO mới (full snapshot Bước → Cấp → NV với Status): - PurchaseEvaluationApprovalFlowDto { CurrentStepIndex, CurrentLevelOrder, Steps[] } - PurchaseEvaluationApprovalFlowStepDto { Order, Name, DepartmentId/Name, Status, Levels[] } - PurchaseEvaluationApprovalFlowLevelDto { Order, Name, Approvers[], Status } - Status: "Done" | "Current" | "Pending" Handler GetById compute Status logic: - Phase=DaDuyet → tất cả Steps/Levels "Done" - Phase=Nháp/Trả lại/Từ chối → tất cả "Pending" - Phase=ChoDuyet: * Step.Index < currentIdx → all Levels "Done" * Step.Index == currentIdx: Level.Order < currentLevelOrder → "Done" Level.Order == currentLevelOrder → "Current" Level.Order > currentLevelOrder → "Pending" * Step.Index > currentIdx → all "Pending" - Load Approvers info (FullName + Email) qua UserManager batch query FE (cả 2 app mirror): - types/purchaseEvaluation.ts: +PeApprovalFlow + Step + Level + Status union PeDetail.approvalFlow optional - PeWorkflowPanel: * BỎ phase cards section (4 ô Nháp/TraLai/ChoDuyet/DaDuyet) — đã duplicate với status badge ở header * Header mới: "Quy trình duyệt" + Code + Version + Name workflow pin * Render Flow vertical: Bước (icon ✓/●/○) → border + bg theo status + dept badge → list Cấp (icon nhỏ) với label "đang chờ" / "đã duyệt" + tên NV duyệt * Phiếu V1 legacy (no flow): show note "dùng quy trình cũ — không khả dụng chi tiết" * Bỏ helper isPastPhase() (orphan sau khi xóa cards) Verify: BE build 0 error · 2 FE builds OK. Test eoffice: 1. Mở phiếu V2 đang ChoDuyet → thấy flow Bước 1 (Phòng A): ✓ Cấp 1 NV X (đã duyệt) ● Cấp 2 NV Y (đang chờ) ← highlight ○ Cấp 3 NV Z (chưa) 2. Phase=DaDuyet → all Steps/Levels green ✓ 3. Phase=Nháp/TraLai → all greyed ○ 4. V1 legacy → fallback note	2026-05-08 16:16:40 +07:00
pqhuy1987	d250ae4e71	[CLAUDE] PE Inbox: nhận filter approvalWorkflowId + show dropdown cả 2 view ... User báo: - Filter "Tất cả quy trình duyệt" hiện chỉ ở Danh sách → muốn ở cả 2 - Filter chọn quy trình → không thấy phiếu V2 trong Duyệt (Inbox) BE — wire filter vào Inbox: - GetMyPurchaseEvaluationInboxQuery +ApprovalWorkflowId? param - Handler thêm filter `q.Where(x => x.e.ApprovalWorkflowId == awId)` - PurchaseEvaluationsController.Inbox +approvalWorkflowId query param FE (cả 2 app mirror): - PurchaseEvaluationsListPage: bỏ điều kiện `!pendingMe` ở Select dropdown → hiển thị filter quy trình duyệt CẢ Duyệt + Danh sách - Inbox API call: pass approvalWorkflowId từ URL param Verify: BE 0 error · 2 FE builds OK. Test luồng eoffice: 1. Vào "Duyệt NCC > Duyệt" → 2 dropdown filter hiện đầy đủ 2. Chọn 1 quy trình V2 từ dropdown → list filter chỉ phiếu pin quy trình đó 3. Vào "Duyệt NCC > Danh sách" → 2 dropdown vẫn show, filter cũng work	2026-05-08 15:37:03 +07:00
pqhuy1987	9e63e2da10	[CLAUDE] PE: V2-aware Inbox/List + 2 dropdown filter quy trình + trạng thái ... User báo: "Phiếu chưa thấy lên trong danh sách duyệt — chắc do chưa ăn vào flow. Tách thành 2 cái dropdown là list quy trình duyệt và list trạng thái. Debug trước, phân quyền rút gọn lại sau." BE — V2-aware permission + filter (Application/PurchaseEvaluations/ PurchaseEvaluationFeatures.cs): - ListPurchaseEvaluationsQuery +ApprovalWorkflowId? Guid? param + IDOR loose: phiếu pin V2 → mọi authenticated user thấy được (UAT) - GetMyPurchaseEvaluationInbox V2-aware: ResolveV2InboxIdsAsync helper precompute Set<Guid> phiếu Phase=ChoDuyet pin V2 + actor ∈ Cấp hiện tại approvers (CurrentWorkflowStepIndex + CurrentApprovalLevelOrder match Step.Order + Level.Order). Inbox where = eligiblePhases.Contains || v2InboxIds.Contains. eligiblePhases admin +ChoDuyet. - GetById Detail loose: V2 pin → cho non-Drafter xem (skip eligiblePhases check). API Controller: - PurchaseEvaluationsController.List +approvalWorkflowId query param FE — 2 dropdown filter (cả 2 app mirror): - PurchaseEvaluationsListPage: +URL param `awId` filter quy trình - useQuery `approval-workflows-v2-filter` load list V2 active+history theo applicableType=typeFilter (chỉ enabled khi có type) - Render Select riêng "Tất cả quy trình duyệt" (chỉ show !pendingMe vì Inbox dùng API endpoint khác) + Select "Tất cả trạng thái" giữ - Display option: "QT-DN-V2-001 v01 — Tên quy trình" Verify: BE build 0 error · 2 FE builds OK. Test luồng eoffice: 1. Drafter trình phiếu V2 → Phase=ChoDuyet 2. Login NV X (approver Cấp 1) vào "Duyệt NCC > Duyệt" (?pendingMe=1) → phiếu hiện trong list 3. Login NV Y (không phải approver) → list rỗng (đúng spec) 4. Vào "Duyệt NCC > Danh sách" (không pendingMe) → 2 dropdown: - Quy trình duyệt: filter theo workflow specific - Trạng thái: filter theo Phase	2026-05-08 15:18:22 +07:00
pqhuy1987	d814429cee	[CLAUDE] PE Workflow V2: disable nút Duyệt nếu actor không trong cấp hiện tại ... User feedback: "Nếu không đúng bước duyệt thì nút duyệt cho Disable luôn cũng đc." BE — DTO + Handler populate "Bước/Cấp đang chờ duyệt": - Application/PurchaseEvaluations/Dtos/PurchaseEvaluationDtos.cs: +PurchaseEvaluationApprovalLevelApproverDto { UserId, FullName, Email } +PurchaseEvaluationCurrentApprovalDto { StepIndex, StepName, StepDepartmentId/Name, LevelOrder, LevelName, Approvers[] } PurchaseEvaluationDetailBundleDto +CurrentApproval? optional field - Application/PurchaseEvaluations/PurchaseEvaluationFeatures.cs handler GetById: khi pin V2 + Phase=ChoDuyet → load AW.Steps.Levels Include 3-level + group by Order = Cấp + resolve user names → populate CurrentApproval. Null khi V1 legacy hoặc không phải ChoDuyet. FE — types + PeWorkflowPanel (cả 2 app mirror): - types/purchaseEvaluation.ts: +PeCurrentApproval + PeCurrentApprovalLevelApprover + PeDetail.currentApproval optional - PeWorkflowPanel: * Banner V2 hiển thị "Đang chờ Bước N (TênBước · Phòng X) — Cấp K" + list NV được duyệt + status emerald (đến lượt) / amber (không phải lượt) * useAuth() để check currentUser.id ∈ approvers + Admin bypass * Button "Duyệt forward" disabled khi V2 pin + actor không khớp. Title tooltip "Cấp K chỉ {NV X / NV Y} mới duyệt được." * Button "Trả lại" + "Từ chối" vẫn enabled (BE không gating 2 hành động này theo Cấp — Approver có thể reject bất cứ lúc nào). * Send-back logic update: target = DangSoanThao OR TraLai (V2 dùng TraLai) - Admin role bypass mọi check. Verify: 81 test pass · npm build × 2 OK · BE 0 error. Test thử: 1. NV X (approver Cấp 1 V2) login → banner emerald "Đến lượt bạn duyệt" + nút "✓ Duyệt → ChoDuyet" enabled 2. NV Y (không phải approver) login → banner amber "Không phải lượt bạn — chỉ NV X mới duyệt được" + nút Duyệt grey disabled, hover tooltip 3. Admin login → bypass, button enabled	2026-05-08 15:03:29 +07:00
pqhuy1987	b41484b702	[CLAUDE] PE Workflow: wire Service V2 (Mig 24) — fix bug duyệt phiếu pin schema mới ... User báo bug eoffice: phiếu tạo mới không duyệt được + không bắt đc quy trình mới. Root cause: Mig 23 pin ApprovalWorkflowId vào entity nhưng Service vẫn đọc WorkflowDefinitionId legacy → match approver theo schema cũ (Dept+PositionLevel/Role/User) thay vì ApproverUserId V2. BE Domain — Migration 24 `AddCurrentApprovalLevelOrderToPe`: - PurchaseEvaluation +CurrentApprovalLevelOrder int? (track Cấp 1/2/3 đang chờ duyệt trong Step hiện tại khi pin V2). Null khi terminal/V1. - RejectedAtStepIndex giữ deprecated DB column cho data cũ. BE Service PE — branch theo schema pin: - V2 (`ApprovalWorkflowId` set): ApproveV2Async() — load ApprovalWorkflows.Steps.Levels Include 3-level. Group Levels by Order = Cấp (OR-of-N approvers). Match `actor.Id ∈ levelGroup.ApproverUserId` (KHÔNG match Dept+Level/Role/User như V1). Advance: Còn cấp tiếp trong Step → levelOrder++ Hết cấp → idx++, levelOrder=1 Hết Step → DaDuyet - V1 legacy (chỉ `WorkflowDefinitionId` set): ApproveV1LegacyAsync() — giữ nguyên logic Mig 21 (Dept+PositionLevel match) - Drafter trình từ Nháp/Trả lại: init CurrentWorkflowStepIndex=0 + CurrentApprovalLevelOrder=1 (chỉ khi V2 pin) - Reject (Trả lại): clear CurrentApprovalLevelOrder=null - Reject (Từ chối): clear all tracking BE Synthetic Policy V2: - `PurchaseEvaluationPolicyRegistry.ForV2Schema()` — simple state machine policy (DangSoanThao/TraLai → ChoDuyet/TuChoi; ChoDuyet → ChoDuyet/ TraLai/TuChoi). Roles="*" cho ChoDuyet branch — Service tự enforce ApproverUserId, Policy chỉ expose 3 nút FE. - GetPurchaseEvaluationByIdQuery handler: ưu tiên ForV2Schema() khi pin V2 (FE đọc workflow.nextPhases để show button). Verify: 81 test pass · BE 0 error · Mig 24 applied cả 2 LocalDB. Test thử (Drafter eoffice): 1. Designer V2 tạo quy trình QT-DN-V2-001: Bước 1 (Phòng A), Cấp 1 (NV X) 2. Workspace tạo phiếu mới, Select QT-DN-V2-001 → Lưu phiếu + Gửi duyệt 3. Phiếu Phase=ChoDuyet, idx=0, levelOrder=1. NV X login → thấy phiếu trong Inbox + duyệt được. Sau approve → idx++, levelOrder reset 1. 4. Cấu hình level mismatch: NV Y khác → thấy ForbiddenException rõ tên. Logic Contract V2 chưa wire (chỉ PE), defer Session sau khi user UAT PE OK.	2026-05-08 14:54:51 +07:00
pqhuy1987	0a40c65421	[CLAUDE] PurchaseEvaluation: User chọn quy trình duyệt V2 lúc tạo phiếu (Mig 23) ... User feedback: thay field "Loại quy trình (theo menu — khóa)" disabled → Select dropdown cho User pick quy trình ApprovalWorkflowsV2 (Mig 22) ngay từ workspace tạo mới. Hiển thị "Mã + Tên + Version". BE Domain: - PurchaseEvaluation +ApprovalWorkflowId Guid? (nullable, FK Restrict) - EF Configuration: Index + FK Restrict to ApprovalWorkflows - Migration 23 `AddApprovalWorkflowIdToPurchaseEvaluation` (1 ALTER + 1 IX + 1 FK), applied cả _Design + _Dev LocalDB - Field WorkflowDefinitionId (Mig 21 legacy) giữ song song để Service PE chạy logic cũ tới khi Session sau wire qua schema mới BE Application: - CreatePurchaseEvaluationCommand +ApprovalWorkflowId? Guid? optional param (default null) - Validate: nếu set, phải tồn tại + ApplicableType khớp PE.Type (DuyetNcc=1 → ApprovalWorkflowApplicableType.DuyetNcc, etc) - Handler set entity.ApprovalWorkflowId từ request - UpdatePurchaseEvaluationDraftCommand mirror — cho User đổi quy trình khi sửa Nháp/Trả lại (validate same) - PurchaseEvaluationDetailBundleDto +ApprovalWorkflowId/Code/Name/Version - GetPurchaseEvaluationByIdQuery handler load workflow info join - Update Phase guard: cho sửa cả DangSoanThao + TraLai (Trả lại = editable per Session 17 spec) FE (cả 2 app mirror): - types/purchaseEvaluation.ts: PeDetail +approvalWorkflowId/Code/Name/Version - PeWorkspaceCreateView.tsx: - Replace field disabled "Loại quy trình" → Select bắt buộc - useQuery `/api/approval-workflows-v2?applicableType=N` filter theo defaultType (1=DuyetNcc / 2=DuyetNccPhuongAn) - Display option: "QT-DN-V2-001 v01 — Quy trình Duyệt NCC (đang áp dụng)" - List cả version active + archived (UAT cần test compare) - Empty state hint amber "Chưa có quy trình, vào /system/approval-workflows-v2" - canSubmit require approvalWorkflowId set - POST payload include approvalWorkflowId Verify: dotnet build OK · 81 test pass · npm build × 2 OK · Mig 23 applied cả 2 LocalDB. Logic Service PE chưa wire qua ApprovalWorkflowId — vẫn pin WorkflowDefinitionId Mig 21 legacy chạy. Session sau wire Service iterate ApprovalWorkflowSteps + match approver theo schema V2 + drop legacy.	2026-05-08 14:34:54 +07:00
pqhuy1987	ff21120c8c	[CLAUDE] Workflow: State machine 5 trạng thái — Trả lại = Phase riêng ... Session 17 spec: chốt 5 trạng thái phiếu PE/HĐ/Budget theo state diagram: Nháp ─trình──► Đã gửi duyệt ─approve cấp cuối──► Đã duyệt (terminal) ├─ Trả lại ────────► Trả lại └─ Từ chối ────────► Từ chối (terminal) Trả lại ──Drafter sửa+gửi lại──► Đã gửi duyệt (chạy LẠI từ đầu) Khác Mig 21 (Session 16): bỏ smart-reject jump-back. Trả lại = Phase RIÊNG (TraLai=98), không revert về DangSoanThao + không jump-back step. Drafter từ TraLai gửi lại như case Nháp — workflow chạy lại từ Cấp 1 Bước 1 (Option A diagram chốt với user). BE Domain: - ContractPhase + TraLai = 98 - BudgetPhase + TraLai = 98 - PurchaseEvaluationPhase: TraLai=98 đổi từ [LEGACY deprecated] thành primary state. Comment update enum docs cho cả 3. BE Policy (PE/HĐ/Budget): - Reject transitions trỏ về TraLai (thay DangSoanThao) - Mirror entry transitions: TraLai → next phase (cho Drafter resubmit) - ActivePhases thêm TraLai - FromDefinition mirror: TraLai → step.Phase + reject → TraLai - DefaultSla cho TraLai = same as DangSoanThao BE Service (PE + Contract): - Reject branch: target=TuChoi giữ; else set Phase=TraLai, clear CurrentWorkflowStepIndex=null - Bỏ ResumeAfterReject branch + RejectedAtStepIndex/RejectedFromPhase assignment (DB column giữ deprecated cho data cũ) - Drafter trình branch: từ DangSoanThao HOẶC TraLai → ChoDuyet, init CurrentWorkflowStepIndex=0 (cùng entry point, chạy lại từ đầu) - Notification: TraLai when fromPhase=ChoDuyet → "bị trả lại" - Budget Handler: simplify reject → TraLai, bỏ smart-reject + isResuming BE Tests update: - WorkflowPolicyTests: Standard_RejectFromCCM → TraLai (rename + assert) + Standard_TraLai_To_DangGopY_Allowed_For_Drafter (new) - PurchaseEvaluationPolicyTests: BothPolicies_RejectFromCCM → TraLai + BothPolicies_TraLai_To_ChoPurchasing_AllowedForDrafter (new theory) - BudgetPolicyTests: Default_CostControl_ChoCCM_To_TraLai (rename) + ActivePhases All6States (was All5) + NextPhasesFrom_TraLai (new) + NextPhasesFrom_ChoCEO_Includes_DaDuyet_And_TraLai (rename) - 77 → 81 test pass (+4 tests TraLai entry point) FE rename "Bản nháp" → "Nháp" (cả 2 app + types): - types/purchaseEvaluation.ts: PurchaseEvaluationPhaseLabel 1=Nháp, 10=Đã gửi duyệt. PeDisplayStatus.BanNhap → Nhap (key + value). PhaseLabel/Color cho TraLai update active. - types/contracts.ts: +ChoDuyet=10, +TraLai=98 const + label/color. Phase 2 'Đang soạn thảo' → 'Nháp'. - types/budget.ts: +TraLai=98 const + label/color. Phase 1 → 'Nháp'. - PeListPanel + PurchaseEvaluationsListPage filter dropdown: Nhap + TraLai map đúng phase value. BE label maps update consistent: - ContractExcelExporter PhaseLabel: DangSoanThao → "Nháp" + add ChoDuyet/ TraLai entries. - PeWorkflowAdminFeatures + WorkflowAdminFeatures PhaseLabels: same. Verify: dotnet test 81 pass · npm build × 2 app pass · BE 0 error. Field RejectedAtStepIndex/RejectedFromPhase giữ DB column (nullable, không set value mới). Cleanup migration sau.	2026-05-08 14:12:38 +07:00
pqhuy1987	f3bea3c616	[CLAUDE] Workflow: Max 3 cấp/bước + N NV/cấp + sequential gating (V2 UAT iter 2) ... User feedback: "tối đa 3 cấp (không có cấp 4)" — không phải bắt buộc 3. Mỗi cấp = N NV (add bao nhiêu cũng được). Quy trình chạy theo số cấp thật sự cấu hình (1/2/3). C2 chưa thao tác được khi C1 chưa có NV. Convention DB: nhiều `ApprovalWorkflowLevel` row cùng Order = same Cấp, mỗi row = 1 NV. Service iterate group by Order; trong cùng cấp = OR-of-N (1 NV duyệt → cấp pass). BE — Application/ApprovalWorkflowsV2/ApprovalWorkflowV2AdminFeatures.cs: - Validator strict: - Order ∈ {1, 2, 3} (`MaxLevelsPerStep`) - Sequential gating: HaveSequentialOrders → 1 / 1+2 / 1+2+3, KHÔNG cho 2 (thiếu 1) hoặc 1+3 (thiếu 2) - HaveNoDuplicateApproverInSameLevel: 1 NV không thêm 2 lần cùng cấp - Schema KHÔNG đổi (giữ ApprovalWorkflowLevel.ApproverUserId 1-1). - Handler không đổi — auto handle multiple rows cùng Order. FE — ApprovalWorkflowsV2Page.tsx rewrite Levels section: - Type EditStep.levels → levelEntries: { order: 1|2|3; approverUserId }[] flat list (group by order trong render). - 3 SECTION CỐ ĐỊNH C1/C2/C3 trong Designer: - Mỗi section: header "Cấp N" + count NV + nút "+ Thêm NV" - List rows mỗi NV với Select dropdown filtered theo Phòng + Trash - C2 disabled (opacity-60) khi C1 empty. C3 disabled khi C2 empty. - Tooltip "+ Thêm NV": "Cấp k-1 phải có ≥1 NV trước" - Add NV: dropdown chỉ NV thuộc Phòng + chưa được thêm cùng cấp (no duplicate same level). - Xóa NV: chặn xóa NV cuối Cấp k nếu Cấp k+1 còn entries (toast error "Hãy xóa hết NV ở Cấp k+1 trước khi rỗng Cấp k"). - Đổi Phòng → clear toàn bộ levelEntries (NV cũ không thuộc Phòng mới). - DefinitionCard read-only: group s.levels by Order → render mỗi cấp là 1 row với badge "Cấp N" + list NV bên dưới. - Save validate: Phòng required + Cấp 1 ≥1 NV + sequential + NV thuộc đúng Phòng (defensive double-check). Verify: dotnet build BE OK · 77 test pass · npm build fe-admin OK. Logic Service PE/Contract chưa wire schema mới — vẫn pin Mig 21 legacy.	2026-05-08 13:20:51 +07:00
pqhuy1987	f6047d5218	[CLAUDE] Workflow: App CQRS + API ApprovalWorkflowsV2 (Chunk B) ... 3 handler MediatR + Validator + Controller cho schema mới Mig 22. Files: - Application/ApprovalWorkflowsV2/ApprovalWorkflowV2AdminFeatures.cs - GetAwAdminOverviewQuery (filter optional ApplicableType) - CreateAwDefinitionCommand + Validator (auto-increment Version theo Code, deactivate active version cùng ApplicableType) - DeleteAwDefinitionCommand (UAT helper — chưa pin nên unconditional) - DTO: AwDefinition/AwStep/AwLevel + TypeSummary - Application/Common/Interfaces/IApplicationDbContext.cs (3 DbSet) - Api/Controllers/ApprovalWorkflowsV2Controller.cs - Route /api/approval-workflows-v2 - GET ?applicableType=N | POST | DELETE/{id} - Reuse policy Workflows.Read/Workflows.Create Verify: build OK 0 error, IApplicationDbContext expose 3 DbSet mới. Next: Chunk C — FE Designer page + route + Layout resolver.	2026-05-08 12:42:03 +07:00
pqhuy1987	c847dc0b24	[CLAUDE] Workflow: Mig 22 schema mới ApprovalWorkflowsV2 (Chunk A) ... Session 17 — schema riêng UAT trước khi drop legacy WorkflowDefinition. Cấu trúc 3 bảng theo yêu cầu user: Quy trình (Code+Name+ApplicableType) Bước (Phòng A — DepartmentId hint) Cấp (NV X — ApproverUserId 1 user cụ thể, KHÔNG OR-of-many) Khác Mig 21: Levels match 1 NV CHÍNH XÁC qua ApproverUserId, không match group Dept+PositionLevel/Role/User. Service sau UAT iterate Steps OrderBy Order → Levels OrderBy Order → ApproverUserId duyệt. Files: - Domain/ApprovalWorkflowsV2/ApprovalWorkflow.cs (3 entity + enum ApplicableType: DuyetNcc/DuyetNccPhuongAn/Contract) - Infra/Persistence/Configurations/ApprovalWorkflowConfiguration.cs (FK Cascade Step→Workflow, Level→Step; Restrict Department + User) - Infra/Persistence/ApplicationDbContext.cs (3 DbSet) - Infra/Persistence/DbInitializer.cs (2 menu mới: ApprovalWorkflowsV2 root dưới System icon Workflow + AwV2_DuyetNcc leaf icon FileCheck) - Domain/Identity/MenuKeys.cs (2 const + All array) - Migration 20260508053749_AddApprovalWorkflowsV2 (3 table CREATE + 2 UNIQUE + 3 index) Verify: - Build OK, 77 test pass (54 Domain + 23 Infra) ~3s - Mig applied cả _Design + _Dev LocalDB Next chunks: - B: Application CQRS (Get/Create) + ApprovalWorkflowsV2Controller - C: FE Designer page /system/approval-workflows-v2/:typeCode - D: Docs + STATUS update	2026-05-08 12:39:37 +07:00
pqhuy1987	dbb0089e28	[CLAUDE] Drastic refactor: flat workflow Phòng × Cấp + Migration 21 (Chunk A) ... User chốt drastic refactor — bỏ phase enum hoàn toàn, dùng ChoDuyet=10 đơn nhất + currentStepIndex tracking. Workflow flat list (Phòng × Cấp × Approvers). Mỗi PE/HĐ pin WorkflowDefinitionId chạy hết quy trình đó. Schema (Migration 21 `RefactorWorkflowToFlatModel`): - Phase enum +ChoDuyet=10 (PE + Contract). Legacy 2-9 + 98 deprecated. - WorkflowStep + DepartmentId Guid? (FK Restrict) + PositionLevel int? (PE + Contract — mirror). - PE/Contract + CurrentWorkflowStepIndex int? + RejectedAtStepIndex int? - DROP table PurchaseEvaluationWorkflowStepInnerSteps (Mig 18) - DROP table WorkflowStepInnerSteps (Mig 20) - DROP column ContractDeptApproval.InnerStepId (Mig 20) - DROP column PEDeptApproval.InnerStepId (Mig 18) - DROP filtered indexes (Mig 19/20) + restore simple unique (TargetId, Phase, Dept, Stage) non-filtered Service rewrite (PE + Contract WorkflowService.TransitionAsync): - Phase transitions: DangSoanThao → ChoDuyet (Drafter trình, init idx=0) - ChoDuyet → ChoDuyet (advance idx per approve) - ChoDuyet → DaDuyet/DaPhatHanh (idx >= steps.Count → terminal) - ChoDuyet → DangSoanThao (Trả lại — save RejectedAtStepIndex) - ChoDuyet → TuChoi (Từ chối — khoá vĩnh viễn) - DangSoanThao + RejectedAtStepIndex → ChoDuyet jump-back to saved idx - Approver match: actor.Dept == step.Dept AND actor.PositionLevel >= step.PositionLevel (OR-of-many cùng cấp/dept = pass) OR Approvers.Any(Kind=User AND id match) OR Approvers.Any(Kind=Role AND actorRoles contains) - Admin role bypass policy. Last step done → gen mã HĐ (Contract only) App CQRS: - WorkflowStepDto + WorkflowStepInput drop InnerStep, add DepartmentId + PositionLevel fields. PE + Contract mirror. Tests rewrite: - DROP PeNStageApprovalTests.cs (6 test) + ContractNStageApprovalTests.cs (6 test) + PeTwoStageApprovalTests.cs (7 test) — legacy N-stage/2-stage no longer applicable - UPDATE PeWorkflowAdminTests signature to new flat input - 96 → 77 test pass (drop 19 legacy) Reference Domain entities removed: - WorkflowStepInnerStep (Contract) - PurchaseEvaluationWorkflowStepInnerStep (PE) - DTOs WorkflowStepInnerStepDto / CreateWorkflowStepInnerStepInput per module Memory `feedback_drastic_refactor_scope.md` validated: drastic refactor done in dedicated session với context fresh, scope ~5h actual (planned ~8-10h with 2x buffer). Verify: - dotnet build SolutionErp.slnx 0 error - dotnet ef database update Mig 21 LocalDB applied OK - dotnet test 77 pass (54 Domain + 23 Infra) - 3-file rule: Migration .cs + Designer.cs + Snapshot updated Pending Chunk B: FE Designer flat UI (PeWorkflowsPage + WorkflowsPage). Pending Chunk C: FE PeWorkflowPanel + workflow timeline display. Pending Chunk D: Docs + Skill + Memory + session log. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-08 12:04:51 +07:00
pqhuy1987	0d776987e4	[CLAUDE] PE workflow 3-button Duyệt/Trả lại/Từ chối (Task 4) ... User chỉ thị thay 2-button hiện tại bằng 3 hành động rõ ràng: - Duyệt = forward phase tiếp theo - Trả lại = về DangSoanThao + Drafter sửa → workflow tự jump tới phase đã reject (smart reject Mig 16 pattern + clear N-stage rows) - Từ chối = phiếu khoá hoàn toàn (Phase=TuChoi → 17 handler Mig 16 lock edit). Drafter phải tạo phiếu mới. Domain (PurchaseEvaluationPolicy.cs): - NccOnly + NccWithPlan: thêm (X → TuChoi) transition cho mọi phase trung gian (ChoPurchasing/ChoCCM/ChoCEODuyetNCC/ChoDuAn/ChoCEODuyetPA) với roles của phase đó. Trước đây chỉ DangSoanThao → TuChoi (Drafter). - FromDefinition expand: mỗi step (trừ DangSoanThao) thêm (step.Phase → TuChoi) với roles của step. Service (PurchaseEvaluationWorkflowService.cs): - Reject branch tách 2 case: * target=TuChoi → giữ nguyên (KHÔNG override + KHÔNG set RejectedFromPhase + KHÔNG clear N-stage rows). Phiếu khoá vĩnh viễn. * target khác (thường DangSoanThao) → smart reject (set RejectedFromPhase + force DangSoanThao + clear N-stage rows). FE (PeWorkflowPanel.tsx, fe-admin + fe-user mirror): - next.phases render 3 button rõ ràng: * "✓ Duyệt → <label>" brand (forward) * "← Trả lại (về Drafter sửa)" red (target=DangSoanThao + isSendBack) * "✗ Hủy / Từ chối" red (target=TuChoi) - Decision logic: target=TuChoi || isSendBack → Reject (2), else Approve (1) - Dialog confirm: * Title rõ theo loại hành động * Cancel case: warning red "Phiếu sẽ bị khoá hoàn toàn" * SendBack case: hint amber "Phiếu sẽ về Đang soạn thảo, Drafter sửa rồi trình lại — workflow tự jump tới phase này" Tests update + add 1 test mới: - Reject_Sets_RejectedFromPhase_And_Forces_DangSoanThao → Reject_To_DangSoanThao_Sets_RejectedFromPhase_TraLai (rename + change target từ TuChoi → DangSoanThao để test Trả lại pattern) - + Reject_To_TuChoi_Locks_Permanently_No_RejectedFromPhase (NEW test Từ chối — phase=TuChoi + RejectedFromPhase null) - NStage_Reject_Clears_InnerStep_Rows_At_Phase: target TuChoi → DangSoanThao (test Trả lại + clear N-stage rows pattern) Verify: - dotnet build 0 error - dotnet test 95 → **96 pass** (+1 test mới Từ chối) - npm build fe-admin + fe-user pass Pending Task 2: Sample data seed N-stage. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 19:25:44 +07:00
pqhuy1987	e247b67681	[CLAUDE] Infra: ContractWorkflowService N-stage logic mirror PE (Chunk C) ... Refactor TransitionAsync mirror PurchaseEvaluationWorkflowService Mig 18 N-stage pattern: - Reject branch: clear N-stage approval rows tại fromPhase (resume sẽ approve lại từ inner đầu) - Load definition with InnerSteps eager + assign outer scope - Department approval block split: * hasInnerSteps=true → N-stage logic: - Yêu cầu actor có DeptId + PositionLevel set (else throw 403) - Match firstPending (Order asc IsRequired) same dept + (exact level OR canBypass + level≥) - exact match: upsert 1 row InnerStepId, IsBypassed=false - bypass: batch upsert NV+PP+TP cùng dept ≤ actor (audit IsBypassed cho cấp dưới) - Recheck stillPending → BLOCK + log Approval/Changelog "duyệt cấp X (còn Y pending)" - All done → fall through phase transition * hasInnerSteps=false → Legacy 2-stage Mig 16 (giữ nguyên với InnerStepId=null filter) Backward compat 100%: workflow Contract no InnerSteps configured → service fallback legacy 2-stage NV.Review/TPB.Confirm. Tests 89 pass — no regression. Verify: dotnet build 0 error, dotnet test 89 pass. Pending Chunk D: ContractNStageApprovalTests 6 test mirror PE pattern. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 19:04:16 +07:00
pqhuy1987	04cf2a0385	[CLAUDE] App: Contract workflow inner steps DTO + designer mirror PE (Chunk B) ... DTO + Validator + Handler mở rộng cho N-stage admin designer Contract (Mig 20). Mirror PE Mig 18 pattern (PeWorkflowAdminFeatures Chunk B). WorkflowAdminFeatures: - WorkflowStepInnerStepDto record (Id, Order, DeptId, DeptName, PositionLevel, Name, SlaDays, IsRequired) - WorkflowStepDto extend +InnerSteps List - GetWorkflowAdminOverviewQueryHandler — Include InnerSteps OrderBy + resolve DeptNames cho display - CreateWorkflowStepInnerStepInput record - CreateWorkflowStepInput extend +InnerSteps (nullable, default null — backward compat existing test code positional new()) - Validator child rules cho InnerSteps (Order ≥1, DeptId not empty, PositionLevel 1-3, SlaDays ≥0) - CreateWorkflowDefinitionCommandHandler — convert InnerSteps khi build entity (atomic batch insert qua nav collection) Verify: dotnet build 0 error, 89 test pass (no regression). Pending Chunk C: ContractWorkflowService.TransitionAsync N-stage logic + legacy 2-stage fallback mirror PE pattern. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 19:02:10 +07:00
pqhuy1987	951ffa3ed8	[CLAUDE] Domain+Infra: Migration 20 Contract workflow inner steps mirror PE (Chunk A) ... Mirror PE N-stage Mig 18+19 pattern sang Contract module. Gộp 1 migration (CREATE TABLE + ALTER + filtered unique alter) thay vì tách 2 như PE. Schema: - entity WorkflowStepInnerStep (Domain/Contracts/) — Order, DeptId, PositionLevel, Name, SlaDays, IsRequired - WorkflowStep nav +InnerSteps List - ContractDepartmentApproval +InnerStepId Guid? FK Restrict - CREATE TABLE WorkflowStepInnerSteps (no Contract prefix vì module dùng entity gốc Workflow* từ Mig 8) - DROP UX_ContractDeptApprovals_Contract_Phase_Dept_Stage cũ - RECREATE filtered: WHERE InnerStepId IS NULL (legacy 2-stage Mig 16) + new filtered UNIQUE (ContractId, Phase, InnerStepId) WHERE InnerStepId IS NOT NULL (N-stage) - 3 INDEX: IX_InnerStepId, IX_(StepId, Order), IX_DeptId Backward compat 100%: workflow Contract no InnerSteps configured → service fallback legacy 2-stage. Data legacy InnerStepId=null vẫn enforce unique cũ qua filtered index. Note: Budget defer (chưa có versioned WorkflowDefinition entity — hardcoded BudgetPolicy.Default). Cần migration AddBudgetVersionedWorkflow trước khi mirror N-stage Budget. Verify: - dotnet build SolutionErp.slnx 0 error - dotnet ef database update LocalDB applied OK - dotnet test 89 pass (54 + 35) — no regression Pending Chunk B: WorkflowAdminFeatures.cs DTO/Input/Validator/Handler extend mirror PE Chunk B pattern. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 19:00:45 +07:00
pqhuy1987	83ffabd0b5	[CLAUDE] Api: PATCH /users/{id}/position-level endpoint (Chunk E) ... Endpoint mới mirror SetBypassReview pattern: - PATCH /api/users/{id}/position-level - Body: { positionLevel: int? } (1=NV, 2=PP, 3=TP, null=clear) - Authorize Policy "Users.Update" - Send SetUserPositionLevelCommand qua MediatR PE Workflow Designer admin Create/Get endpoint KHÔNG cần đụng — record DTO `CreatePeWorkflowDefinitionCommand` đã extend với InnerSteps (default null) ở Chunk B, JSON body bind tự động qua existing controller. Verify: dotnet build 0 error 0 warning · 89 test pass (no regression). Pending Chunk F: FE Designer InnerSteps sub-section + UsersPage column "Cấp" + Docs/Skill update (cuối cùng). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 18:24:58 +07:00
pqhuy1987	0c62e241d0	[CLAUDE] Infra: PE workflow service N-stage logic + Migration 19 unique filter (Chunk C) ... Migration 19 `AlterPeDeptApprovalsUniqueFilteredForInnerSteps` — fix UNIQUE constraint conflict khi N-stage có nhiều inner step cùng dept: - Drop UX_PEDeptApprovals_PE_Phase_Dept_Stage (Mig 16) - Recreate filtered: UNIQUE (PEId, Phase, Dept, Stage) WHERE InnerStepId IS NULL (legacy 2-stage rows giữ nguyên invariant) - New filtered: UNIQUE (PEId, Phase, InnerStepId) WHERE InnerStepId IS NOT NULL (N-stage 1 row per inner step per phase) PurchaseEvaluationWorkflowService.TransitionAsync refactor: - Load definition with InnerSteps eager (.Include ThenInclude) - Reject branch: clear N-stage approval rows tại fromPhase (resume sẽ approve lại từ inner step đầu — clean state) - Department approval block split: * hasInnerSteps=true → N-stage logic: - Yêu cầu actor có DepartmentId + PositionLevel set (else throw 403) - Match firstPending inner step (Order asc, IsRequired only): same dept AND (exact PositionLevel OR canBypass + level ≥ pending) - exact match: upsert 1 row (Stage=Confirm, InnerStepId=that) - bypass: batch upsert NV+PP+TP cùng dept ≤ actor level (audit IsBypassed=true cho cấp dưới skip) - Recheck stillPending → BLOCK transition + log Approval/Changelog "đã duyệt cấp X (còn Y cấp pending)" - All done → fall through phase transition * hasInnerSteps=false → Legacy 2-stage (Mig 16) — giữ nguyên logic NV.Review/TPB.Confirm + InnerStepId=null filter Backward compat: workflow cũ (no InnerSteps configured) chạy đúng logic 2-stage Mig 16. Data legacy InnerStepId=null vẫn match unique cũ qua filtered index. Tests 83 pass — no regression. Verify: - dotnet build SolutionErp.slnx 0 error - dotnet ef database update LocalDB applied Mig 19 - dotnet test 83 pass Pending Chunk D: Tests N-stage workflow (~6-7 test mới: sequential pass / bypass cùng dept / reject reset / resume jump-back / legacy fallback). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 18:20:17 +07:00