99 Commits

Author	SHA1	Message	Date
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	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	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
pqhuy1987	13ab533fe7	[CLAUDE] Domain+Infra: Migration 18 PE workflow inner steps + User.PositionLevel (Chunk A) ... N-stage workflow approval — mỗi WorkflowStep cha (= 1 phase) cấu hình được chuỗi InnerSteps con theo Department × PositionLevel với Order sequential. Phase 9+ feature, mở rộng từ 2-stage Mig 16. Schema: - enum PositionLevel { NhanVien=1, PhoPhong=2, TruongPhong=3 } (Domain/Identity) - ALTER Users + PositionLevel int? NULL (admin/system user vẫn null) - CREATE TABLE PurchaseEvaluationWorkflowStepInnerSteps: Id PK, PurchaseEvaluationWorkflowStepId FK Cascade, Order int, DepartmentId FK Restrict, PositionLevel int, Name nvarchar(200), SlaDays int?, IsRequired bit - ALTER PurchaseEvaluationDepartmentApprovals + InnerStepId Guid? FK Restrict (null cho data legacy 2-stage Review/Confirm Mig 16) Backward compat: step KHÔNG có InnerSteps → service fallback logic 2-stage Stage=Review|Confirm cũ (Chunk C). Data Mig 16 hiện có giữ nguyên, InnerStepId=null. Verify: - dotnet build SolutionErp.slnx pass (0 error, 2 pre-existing warning DocxRenderer) - dotnet ef database update LocalDB applied OK - dotnet test SolutionErp.slnx 83 pass (54 Domain + 29 Infra) — no regression - 3-file rule: Migration.cs + Designer.cs + Snapshot updated Pending Chunk B: Application CQRS — extend CreatePeWorkflowDefinitionCommand với InnerSteps DTO + UpdateUserPositionLevelCommand. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 18:11:42 +07:00
pqhuy1987	ecd5f7e9d9	[CLAUDE] Domain+Infra: Migration 17 — manual budget fields cho PE + HĐ ... Chunk 1/5 — DB schema + Domain layer cho fallback "user nhập số tiền ngân sách tay khi chưa link Budget entity" (UAT request 2026-05-07). Áp cho cả PE + HĐ (mirror logic per user Q3 chốt). Migration 17 `AddManualBudgetFieldsToPeAndContract` — 4 ALTER: - PurchaseEvaluations.BudgetManualName nvarchar(200) NULL - PurchaseEvaluations.BudgetManualAmount decimal(18,2) NULL - Contracts.BudgetManualName nvarchar(200) NULL - Contracts.BudgetManualAmount decimal(18,2) NULL Validation Q2: cả 2 cùng null OK (PE/HĐ chưa có ngân sách gì cả). KHÔNG XOR với BudgetId — tạm thời cho phép cả 2 cùng có (BE prefer BudgetId nếu set vì có Phase=DaDuyet guarantee, manual chỉ là fallback hiển thị/note). Files: ~ Domain/PurchaseEvaluations/PurchaseEvaluation.cs — 2 property mới ~ Domain/Contracts/Contract.cs — 2 property mới ~ Infrastructure/Persistence/Configurations/PurchaseEvaluationConfiguration.cs — HasMaxLength(200) + HasPrecision(18,2) ~ Infrastructure/Persistence/Configurations/ContractConfiguration.cs — same + Migration 17 .cs + .Designer.cs (3-file rule per ef-core-migration skill) ~ ApplicationDbContextModelSnapshot.cs (auto-overwrite) Verify: - dotnet ef migrations add → 3 file gen sạch (4 AddColumn Up + 4 DropColumn Down) - dotnet ef database update → applied LocalDB OK - dotnet test SolutionErp.slnx → 83 pass (54 Domain + 29 Infra) — không regression Next: Chunk 2 App CQRS Create/Update commands + DTO + AutoMapper. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 12:30:59 +07:00
pqhuy1987	b6f5a16420	[CLAUDE] Infra+App+Api+FE: Chunk E4 — HĐ 2-stage dept approval (mirror PE) ... Mở rộng 2-stage logic từ PE sang Contract workflow (Migration 16 đã có schema): BE Service: - ContractWorkflowService thêm UserManager<User> DI - Mirror logic 2-stage từ PurchaseEvaluationWorkflowService.TransitionAsync Sau policy guard, trước gen mã HĐ: - User.DepartmentId != null + actor không admin/system + KHÔNG resume - DeptManager (TPB) → Stage=Confirm trực tiếp - CanBypassReview=true → Stage=Confirm + IsBypassed=true - Else (NV) → Stage=Review only, BLOCK transition - Insert ContractDepartmentApproval row (UPSERT theo UNIQUE) - Block transition khi chưa có Stage=Confirm: - Insert ContractApproval (FromPhase=ToPhase=fromPhase, [Review NV] comment) - Insert ContractChangelog "đã review, chờ TPB confirm" - Notify TPB cùng dept (UserManager filter DeptManager role) - Return early — phase KHÔNG đổi App + Api: - ContractDepartmentApprovalFeatures.cs (List query mirror PE) - ContractsController endpoint GET /contracts/{id}/department-approvals FE (cả fe-admin + fe-user): - types/contracts.ts thêm ApprovalStage const + ContractDepartmentApproval type - WorkflowHistoryPanel section "Tiến trình duyệt 2-cấp phòng ban": - Group by phase × dept, show Review NV + Confirm TPB - Highlight amber "chờ TPB confirm" khi current phase có Review chưa Confirm - Badge fuchsia "bypass" khi NV.CanBypassReview=true - Insert giữa WorkflowSummaryCard và Lịch sử duyệt - Mirror cả 2 app (rule §3.9) Use case mirror PE: HĐ ở phase DangGopY (P.CCM) — nv.cao (NV) duyệt thì phase KHÔNG đổi (Review only), chờ ccm.tran (TPB) confirm mới sang DangXetDuyet. Build: BE pass + FE pass cả 2 + 77 test pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-04 13:43:05 +07:00
pqhuy1987	3c4931687a	[CLAUDE] App+Api+Docs: Chunk E1 — List endpoint + Bypass-review + Notify TPB + chốt session 8 ... 3 endpoint mới + Notify TPB + Docs update để chốt session 8. Application: - PurchaseEvaluationDepartmentApprovalFeatures.cs (NEW): * ListPeDepartmentApprovalsQuery + DTO PeDepartmentApprovalDto * Join Departments (lấy Name) + lookup Users.FullName denorm cho FE timeline - UserFeatures.cs: SetUserBypassReviewCommand + Handler dùng UserManager.UpdateAsync - IApplicationDbContext: thêm DbSet<User> Users + DbSet<Role> Roles (cần cho lookup) Api: - PurchaseEvaluationsController: GET /api/purchase-evaluations/{id}/department-approvals - UsersController: PATCH /api/users/{id}/bypass-review (Authorize Users.Update) Infra: - PurchaseEvaluationWorkflowService: notify TPB cùng dept khi NV review. Query db.Users.Where(DeptId match + IsActive) → UserManager.GetRolesAsync filter DeptManager → notifications.NotifyAsync. Best effort fail non-critical. Docs: - STATUS.md: Recently Done thêm row session 8 + Phase header update count 52→55 tables, 15→16 migrations, 128→131 endpoints - HANDOFF.md: TL;DR session 8 + 8 cảnh báo session 9 (FE chưa làm, test flow anh Kiệt, smart reject test, lock edit test, ...) - migration-todos.md: Phase 9 done section đầy đủ 3 ràng buộc + pending Chunk E-bis - CLAUDE.md: count 52→55 + migration 16 description - session log: 2026-05-04-1230-chot-session-8-2-stage-dept-approval.md (full report) Verify final: - Build pass 0 warning 0 error - 77 unit test pass (54 Domain + 23 Infra) - Migration 16 applied LocalDB OK + schema verified Total session 8 cumulative: 5 commit per-chunk: - 5fe61cc (A: Migration 16 schema) - 14f3c9f (B: Lock edit guards 17 handler) - 9747f8c (C: Smart reject + Resume 3 module) - a532ba6 (D: PE 2-stage logic) - (current E1: List + Notify + Bypass + Docs) Pending Chunk E-bis (defer cho session 9 sau UAT PE): - FE Workflow Panel hiển thị 2-stage timeline - FE UserManager toggle CanBypassReview - HĐ + Budget 2-stage extension - Tests Phase 3 mini cho 2-stage Service-layer logic Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-04 12:42:47 +07:00
pqhuy1987	a532ba6fc3	[CLAUDE] Infra: Chunk D — PE 2-stage dept approval (đóng bug anh Kiệt báo) ... Ràng buộc 3 (Phase 9) scope tối giản: chỉ PE workflow trước. Đóng bug "NV duyệt được hết phase" anh Kiệt báo trong chat FDC. Logic 2-stage trong PurchaseEvaluationWorkflowService.TransitionAsync, chèn sau policy guard, trước phase transition: 1. Detect approving phase với role thuộc phòng ban: - decision == Approve - target != DangSoanThao && != TuChoi - Không reject + không resume + không admin/system - actorUserId != null + actor.DepartmentId != null 2. Stage detection: - DeptManager (TPB) → Stage=Confirm trực tiếp (TPB tự confirm được) - User.CanBypassReview=true → Stage=Confirm + IsBypassed=true (NV bypass) - Else (NV thường) → Stage=Review only 3. Upsert PurchaseEvaluationDepartmentApproval row: - UNIQUE (PEId, PhaseAtApproval, DepartmentId, Stage) đảm bảo 1 row - UPDATE in-place khi user click Duyệt lần 2 (đổi comment) - ApproverRoleSnapshot: "TPB" / "NV(bypass)" / "NV" denorm cho audit 4. Check Stage=Confirm tồn tại cho (PEId, fromPhase, deptId): - hasConfirm = vừa insert Stage=Confirm OR đã có sẵn - !hasConfirm → BLOCK phase transition: * Insert PEApproval row (FromPhase=ToPhase=fromPhase, Decision=Approve, Comment="[Review NV] ...") để track audit * Insert Changelog "NV X đã review phase Y, chờ TPB confirm" * Return early — Phase KHÔNG đổi - hasConfirm → tiếp tục normal phase transition logic 5. Skip 2-stage hoàn toàn khi: - Decision=Reject (smart reject Chunk C đã handle) - Resume after reject (target đã pinned) - Admin role hoặc System (auto-approve) - actorUserId == null hoặc actor.DepartmentId == null Bug fix verified theo flow anh Kiệt: - User long.chau (NV.PRO, role=Procurement, DepartmentId=PRO) tạo phiếu - long.chau click Duyệt phase ChoPurchasing → ChoCCM: - actor.DepartmentId=PRO → 2-stage logic active - role=Procurement, không có DeptManager → Stage=Review - hasConfirm=false → BLOCK transition - Insert PEDeptApproval(PE, ChoPurchasing, PRO, Review) - Phase giữ nguyên ChoPurchasing - TPB.PRO (tra.bui có role DeptManager + DeptId=PRO) click Duyệt: - role=DeptManager → Stage=Confirm - hasConfirm=true (vừa insert) → ALLOW transition - Phase chuyển ChoPurchasing → ChoCCM - NV CCM lặp pattern tương tự ở phase ChoCCM - Cuối cùng CEO/AuthSigner duyệt ChoCEODuyetNCC → DaDuyet (CEO không thuộc dept cụ thể nên bypass 2-stage) Pending Chunk E: - TODO notify TPB cùng dept khi NV review (best effort, chưa implement) - List endpoint GET /api/purchase-evaluations/{id}/department-approvals cho FE hiển thị progress 2-stage - UserManager API PATCH /api/users/{id}/bypass-review - FE Workflow Panel update + UserManager toggle HĐ + Budget 2-stage scope sẽ làm sau khi PE verify UAT (per default chốt trước đó). Verify: - Build pass (2 warning DocxRenderer cũ) - 77 unit test pass — Domain policy chưa đụng Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-04 12:26:18 +07:00
pqhuy1987	9747f8cbf5	[CLAUDE] Infra+App: Chunk C — Smart reject + Resume after reject (3 module) ... Ràng buộc 2 (Phase 9): khi reject, trả về Drafter (DangSoanThao) + lưu phase nguồn. Drafter sửa lại + trình lại → quay về phase đã reject (skip phase trung gian). Logic flow: 1. Reject (Decision=Reject): - entity.RejectedFromPhase = currentPhase // snapshot phase đang reject - targetPhase override = DangSoanThao // force về Drafter - Approval row: FromPhase=X, ToPhase=DangSoanThao, Decision=Reject - Notification cho Drafter 2. Resume after reject (Decision=Approve, fromPhase=DangSoanThao, RejectedFromPhase != null): - targetPhase override = entity.RejectedFromPhase!.Value - entity.RejectedFromPhase = null // clear field - Skip policy guard (Drafter có quyền trình lại sau khi sửa) - Approval row: FromPhase=DangSoanThao, ToPhase=ResumePhase, Decision=Approve 3. Normal transition (chưa reject hoặc đã clear): - Logic cũ giữ nguyên — policy guard check + transition Pattern unified cho 3 module: - ContractWorkflowService.TransitionAsync: 2 case detect + override - PurchaseEvaluationWorkflowService.TransitionAsync: tương tự - TransitionBudgetCommandHandler.Handle: tương tự (Budget không có service riêng, logic ở handler) Files: - src/Backend/SolutionErp.Infrastructure/Services/ContractWorkflowService.cs - src/Backend/SolutionErp.Infrastructure/Services/PurchaseEvaluationWorkflowService.cs - src/Backend/SolutionErp.Application/Budgets/BudgetFeatures.cs Verify: - Build pass (2 warning DocxRenderer cũ, không liên quan) - 77 unit test pass — Domain policy không đổi, tests giữ nguyên Note: Approval history giờ track đầy đủ cycle reject→sửa→resume: Approval 1: DangGopY → DangSoanThao, Decision=Reject (CCM reject) Approval 2: DangSoanThao → DangGopY, Decision=Approve (Drafter resume) UI có thể detect "đã từng reject" qua RejectedFromPhase != null hoặc qua Approval history (Decision=Reject row gần nhất). Hiển thị banner đỏ "Phiếu đã bị reject từ phase X, lý do: Y" cho Drafter. Smart reject hoàn tất Ràng buộc 2. Còn Ràng buộc 3 (2-stage dept approval) ở Chunk D. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-04 12:20:21 +07:00
pqhuy1987	5c200978cb	[CLAUDE] Domain+Infra: Migration 16 — 2-stage dept approval + smart reject schema ... Chunk A của feature 2-stage department approval (Phase 9). 3 ràng buộc gộp 1 migration để rollback atomic. Schema changes: 1. Smart reject (3 ALTER): - Contracts.RejectedFromPhase int NULL - PurchaseEvaluations.RejectedFromPhase int NULL - Budgets.RejectedFromPhase int NULL Lưu phase nguồn khi reject để Drafter trình lại quay về đúng phase (skip phase trung gian đã duyệt) thay vì đi tuần tự từ DangSoanThao. 2. Bypass per-user (1 ALTER): - Users.CanBypassReview bit NOT NULL DEFAULT 0 Khi true → NV được duyệt thay TPB (skip Stage Review, đẩy thẳng Stage Confirm). Audit qua DepartmentApproval.IsBypassed=true. 3. 2-stage dept approval (3 CREATE TABLE): - ContractDepartmentApprovals - PurchaseEvaluationDepartmentApprovals - BudgetDepartmentApprovals Schema (chung): - Id, *Id FK Cascade, PhaseAtApproval int, DepartmentId FK - Stage enum (1=Review NV, 2=Confirm TPB) - ApproverUserId, ApproverRoleSnapshot, Comment, ApprovedAt - IsBypassed bit (mark NV bypass) - AuditableEntity (CreatedAt/By/UpdatedAt/By/IsDeleted/...) Indexes: - UNIQUE (TargetId, PhaseAtApproval, DepartmentId, Stage) - Single: TargetId, DepartmentId, ApproverUserId Files: - Domain: 4 entity update (Contract/PE/Budget/User add field) + 1 enum mới ApprovalStage + 3 entity DepartmentApproval mới - Infrastructure: 3 EntityConfiguration update + 1 file mới DepartmentApprovalsConfiguration với 3 config classes - IApplicationDbContext: thêm 3 DbSet - ApplicationDbContext: thêm 3 DbSet - Migration 16: 3 file (.cs + Designer.cs + Snapshot.cs) — 3-file rule Verify: - Build pass (2 warning DocxRenderer cũ, không liên quan) - 77 unit test pass (54 Domain + 23 Infra) — Domain policy chưa update, test pass nguyên không regression Note: KHÔNG khác PurchaseEvaluationDepartmentOpinion (Migration 15) — Opinion là sign-off block "Ý kiến 4 phòng ban" trên header phiếu. DepartmentApproval mới là 2-stage approval workflow per phase. Tổng sau Migration 16: 55 bảng (52+3), 16 migration. Chunk B-E sẽ implement Application + FE + Tests. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-04 12:11:53 +07:00
pqhuy1987	5d94bb449a	[CLAUDE] PE: Workflow designer admin UI + Ý kiến 4 phòng ban (P1 Session 5) ... ==== Task 1: PE Workflow Designer admin ==== BE (mirror Contract WorkflowAdminFeatures pattern): - Application/PurchaseEvaluations/PeWorkflowAdminFeatures.cs ~250 LOC: - GetPeWorkflowAdminOverviewQuery → list 2 EvaluationType (DuyetNcc / DuyetNccPhuongAn) với Active + History versions + count phiếu đang dùng - CreatePeWorkflowDefinitionCommand + Validator: auto-increment Version per Code, deactivate Active cũ trong cùng EvaluationType (1 active per type invariant) - DTOs: PeWorkflowStepApproverDto / PeWorkflowStepDto / PeWorkflowDefinitionDto / PeWorkflowTypeSummaryDto / PeWorkflowAdminOverviewDto - Phase validation 1..7 (state thường, không bao gồm 99=TuChoi) - Api/Controllers/PeWorkflowsController.cs: 2 endpoint GET /api/pe-workflows + POST. Reuse policy "Workflows.Read" + "Workflows.Create" (admin chung quyền cho cả 2 nhóm WF). FE: - pages/system/PeWorkflowsPage.tsx ~500 LOC mirror WorkflowsPage: - Landing 2-card grid khi /system/pe-workflows (chưa pick type) - TypePanel khi /system/pe-workflows/:typeCode (DuyetNcc / DuyetNccPhuongAn) - DefinitionCard read-only view với active badge + version + steps + approvers (Role/User chip) - PeWorkflowDesigner dialog: clone từ existing, edit Code/Name/Description, add/remove steps, +Role / +User approvers per step, save → version mới + deactivate cũ - App.tsx route /system/pe-workflows + /system/pe-workflows/:typeCode - Layout đã có resolver PeWf_<Code> → /system/pe-workflows/<code> từ session 3 ==== Task 2: Ý kiến 4 phòng ban PE ==== Domain: - PurchaseEvaluationDepartmentOpinion entity (AuditableEntity) — PEId + Kind + Opinion text + SignedAt + UserId + UserName denorm - PeDepartmentKind enum (PheDuyet / Ccm / MuaHang / SmPm) - PE entity + collection navigation DepartmentOpinions Infrastructure: - PurchaseEvaluationDepartmentOpinionConfiguration EF: UNIQUE(PEId, Kind) — max 1 row per phòng ban per phiếu (UPDATE in-place) - ApplicationDbContext + IApplicationDbContext DbSet - Migration 15 AddPurchaseEvaluationDepartmentOpinions (15 migration total / 52 DB tables) Application: - PeDepartmentOpinionFeatures.cs: UpsertPeDepartmentOpinionCommand (sign=true → set SignedAt+UserId, sign=false chỉ lưu text giữ chữ ký cũ) + DeletePeDepartmentOpinionCommand - DTO bundle update: + DepartmentOpinions list trong PurchaseEvaluationDetailBundleDto - GetPurchaseEvaluationQueryHandler load DepartmentOpinions + KindLabel resolution API: - POST /api/purchase-evaluations/{id}/opinions (upsert) - DELETE /api/purchase-evaluations/{id}/opinions/{kind} FE: - types/purchaseEvaluation.ts: + PeDepartmentKind enum + PeDepartmentKindLabel + PeDepartmentOpinion type + departmentOpinions vào bundle - PeDetailTabs Section "5. Ý kiến 4 phòng ban (sign-off)" — 2x2 grid OpinionBox per kind: - Read mode (readOnly menu Duyệt): hiển thị text + chữ ký - Edit mode: textarea + 2 button "Lưu text" / "Lưu & Ký" - Badge "Đã ký" emerald + tên người ký + ngày khi signedAt != null ==== Task 3: User seed verify ==== Seed `SeedDemoUsersAsync` đã match đúng user list authoritative (5 PRO TPB+NV / 7 CCM TPB+NV / 1 ISO / 1 CEO) từ prior commit. DbInitializer reconcile sẽ tự sync khi API restart. Typo trong list user (soluttions / trương) đã fixed sensibly trong seed. ==== Build verify ==== - dotnet build clean (0 error) - fe-admin TS build pass (1 module mới PeWorkflowsPage) - fe-user TS build pass (PE detail mirror) Total: 8 file mới (BE 4 + FE 1 + Migration 2 + 1 Domain) + 13 file modified. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-29 11:17:14 +07:00
pqhuy1987	a05c57b081	[CLAUDE] Domain+App+Api: Module Ngan sach (Budget) - 4 bang + workflow simple ... User request: 'Them cho tao 4 bang luu ve ngan sach: Header / Chi tiet / Quy trinh duyet / Lich su thay doi'. Domain (5 file + 1 enum): - Budget (header) — Aggregate root, AuditableEntity. Field: MaNganSach, TenNganSach, Description, NamNganSach, ProjectId FK, DepartmentId?, DrafterUserId, Phase (BudgetPhase 5-state), TongNganSach (sum auto tu Details), SlaDeadline, SlaWarningSent. - BudgetDetail — flat row pattern (GroupCode/GroupName + Item + KhoiLuong/DonGia/ThanhTien). 18,4 precision KhoiLuong, 18,2 money. - BudgetApproval — workflow history (FromPhase/ToPhase/Decision/Comment) - BudgetChangelog — audit log unified (EntityType: Header/Detail/Workflow) - BudgetPhase enum 5 state: DangSoanThao(1) → ChoCCM(2) → ChoCEO(3) → DaDuyet(4) | TuChoi(99) - BudgetPolicy hardcoded (no versioned WF, simple default per user confirm 'tam thoi don gian'): Drafter/DeptManager → CCM → CEO/ AuthorizedSigner. Reject path back to DangSoanThao. Migration 14 AddBudgets: - 4 bang moi: Budgets + BudgetDetails + BudgetApprovals + BudgetChangelogs - Index: Phase+IsDeleted, ProjectId, NamNganSach, SlaDeadline, MaNganSach unique filtered. Cascade delete child. - +2 cot FK ngoai bang (per user 'lien ket ca 3'): * Contracts.BudgetId Guid? + index * PurchaseEvaluations.BudgetId Guid? + index Cho phep doi chieu chi phi HD/PE vs ngan sach goi thau. Application CQRS (BudgetFeatures.cs ~340 line): - CreateBudget + UpdateBudgetDraft + TransitionBudget + ListBudgets (filter Phase/Project/Year + search + paging) + GetBudget bundle (Header + Details + Approvals + Workflow summary) - DeleteBudget (only DangSoanThao/TuChoi) - AddBudgetDetail + UpdateBudgetDetail + DeleteBudgetDetail (auto recompute TongNganSach = sum Details.ThanhTien) - ListBudgetChangelogs Api: BudgetsController 11 endpoint REST /api/budgets: - GET / /{id} /{id}/changelogs - POST / /{id}/transitions /{id}/details - PUT /{id} /{id}/details/{detailId} - DELETE /{id} /{id}/details/{detailId} DbContext + IApplicationDbContext: 4 DbSet new (Budgets/Details/ Approvals/Changelogs). MenuKeys + DbInitializer: 4 menu key (Budgets root + Bg_List/Create/ Pending leaves) seed dau order=27 'Ngan sach' icon Wallet. Auto-grant admin permission via SeedAdminPermissionsAsync (MenuKeys.All). MaNganSach format don gian 'NS-YYYYMM-NNNN' Random.Shared (chua atomic sequence - user said 'tam thoi chua co'). Workflow chua versioned, hardcode BudgetPolicy.Default. Tuong lai admin config qua UI: them BudgetWorkflowDefinition tables tuong tu PE.	2026-04-28 11:37:45 +07:00
pqhuy1987	8097892d20	[CLAUDE] Infra: them 14 demo users Solutions company (PRO 5 + CCM 7 + ISO 1 + CEO 1) ... User cung cap danh sach nhan vien thuc te. Add vao SeedDemoUsersAsync, idempotent (FindByEmail trong reconcile pattern). Pass = User@123456 (matching demo pattern, policy 12 char + digit + lower + upper + special). PRO (5): - tra.bui — Bui Le Thuy Tra — TP Cung ung (Procurement+DeptManager) - phuong.nguyen — Nguyen Thi Bich Phuong (Procurement+Drafter) - thanh.lethanh — Le Thanh Binh (Procurement+Drafter) - long.chau — Chau Ta Kim Long (Procurement+Drafter) - duy.nguyen — Nguyen Van Duy (Procurement+Drafter) CCM (7): - chuong.phan — Phan Van Chuong — TP Kiem soat Chi phi (CostControl+DeptManager) - binh.le — Le Van Binh (CostControl) - luu.tran — Tran Xuan Luu (CostControl) - nguyen.ho — Ho Thi Nu Nguyen (CostControl) - anh.nguyen — Nguyen Thi Kim Anh (CostControl) - tring.le — Le Tu Dang Trinh (CostControl) — giu literal user provided - truong.le — Le Tran Dang Truong (CostControl) ISO (1): - long.nguyen — Nguyen Hoang Chanh Long — Dep HRA, role HrAdmin (dong dau HD) CEO (1): - truong.nguyen — Nguyen Van Truong — Dep BOD, role Director (ASCII fix tu 'truong.nguyen' co dau) Email typo fix: - 'phuong.nguyen@soluttions.com' → 'phuong.nguyen@solutions.com.vn' - 'truong.nguyen' co dau → 'truong.nguyen' ASCII (KHONG conflict voi truong.le CCM) Reconcile pattern dam bao: neu user da exist (email collision), update dept/position/role thay vi error. Pass khong overwrite cho existing user.	2026-04-28 10:51:56 +07:00
pqhuy1987	a336997cfe	[CLAUDE] PE: section Bang so sanh + rename demo email @solutions.com.vn ... PART A: Section 'Bang so sanh' (file tong ho so so sanh) User request: 'theo them cho thong tin ve Bang so sanh, cho dinh kem file so sanh tong len'. BE: - PurchaseEvaluationAttachmentPurpose.ComparisonTable = 4 (new enum value) Backend validator IsInEnum pass, khong can migration (int column). FE types (2 app): - PeAttachmentPurpose.ComparisonTable + Label '4: Bang so sanh'. FE PeDetailTabs: - Them section thu 4 'Bang so sanh (file tong)' sau 'Hang muc + Bao gia'. - Component GeneralAttachmentsSection: upload KHONG truyen supplierRowId (BE luu NULL) → purpose=ComparisonTable default. Filter attachments co supplierRowId===null de render. - Card layout khac SupplierAttachmentsCell: full-width card + brand color + purpose chip + date. Upload button to hon ([+ Tai len bang so sanh]). - readOnly hide upload + delete, giu download. PART B: Demo email rebrand @solutionerp.local → @solutions.com.vn User request: 'tao nguoi dung demo theo email cua ben nay'. BE DbInitializer: - Rename 18 email in source: AdminEmail const + 17 demo users (bod/pm/ccm/pro/fin/act/equ/hra/qs/nv) — keep password + role unchanged. - Them BackfillUserEmailDomainAsync (idempotent): scan user co email @solutionerp.local, rename sang @solutions.com.vn, update Email + NormalizedEmail + UserName + NormalizedUserName. Skip neu co conflict user da ton tai voi email moi. Chay truoc SeedAdmin de tranh tao duplicate admin. Admin permission tao user da co san qua /system/users page. Comment input khi duyet da co san o PeWorkflowPanel (Ghi chu tuy chon Textarea) + ContractDetailContent (Yeu cau sua / Duyet tiep dialog).	2026-04-24 15:08:00 +07:00
pqhuy1987	7ee105df12	[CLAUDE] PE: rename menu + workflow Phuong An -> Giai phap ... User request session 3 mở đầu: đổi label menu: 'Quy trình Duyệt NCC - Phương Án' -> 'Duyệt NCC và Giải pháp' 'Quy trình Duyệt NCC' -> 'Duyệt NCC' (bỏ prefix 'Quy trình') Giữ nguyên (không breaking): - Enum value PurchaseEvaluationType.DuyetNccPhuongAn = 2 - Menu key Pe_DuyetNccPhuongAn_* (FK ref) - typeCode string 'DuyetNccPhuongAn' (URL routing) - Policy name 'NccWithPlan' + WorkflowDefinition.Code QT-DN-B Changed (display-only): - DbInitializer SeedMenuTreeAsync peTypeLabels: 2 entry - DbInitializer SeedPurchaseEvaluationWorkflowsAsync WF name B - PurchaseEvaluationPolicy.cs NccWithPlan Description - fe-admin + fe-user types PurchaseEvaluationTypeLabel[2] Backfill existing DB (seed idempotent skip-if-exists không update): - MenuItems Pe_DuyetNcc group + Pe_DuyetNccPhuongAn group + PeWf_* leaf → UPDATE Label nếu khác expected - WorkflowDefinitions QT-DN-B v01 → UPDATE Name Replace 'Phương Án' → 'và Giải pháp' Run mỗi start API — idempotent, fast no-op sau lần đầu.	2026-04-24 10:43:26 +07:00
pqhuy1987	c48ac2116d	[CLAUDE] PurchaseEvaluation: demo seed 4 phieu + MaPhieu atomic sequence + Pe_* perm defaults ... Polish session tiep cua PE module skeleton (commit 2c6f0ca..3990066): 3 task A (MISSING in MVP) khac STATUS.md In Progress: 1. Demo PE data seed (SeedDemoPurchaseEvaluationsAsync) - 4 phieu varied A/B x phase: A-001 DangSoanThao (mo), A-002 ChoCEODuyetNCC (winner+9 quotes), A-003 DaDuyet (chua tao HD, PaymentTerms JSON), B-001 ChoDuAn (5-step giua chung). - Idempotent: skip-if-[DEMO]-exists. - Approval history dung policy A (3-step) hoac B (5-step). 2. MaPhieu atomic sequence — Migration 13 - Format PE/{YYYY}/{TypeLetter}/{Seq:D3} (vd PE/2026/A/001). - PurchaseEvaluationCodeSequence entity (Prefix PK). - IPurchaseEvaluationCodeGenerator + impl SERIALIZABLE transaction (mirror ContractCodeGenerator 1:1). - Replace Random.Shared trong CreatePurchaseEvaluationCommandHandler. - Migration AddPurchaseEvaluationCodeSequences (1 bang). 3. Pe_* permission defaults - SeedPurchaseEvaluationPermissionDefaultsAsync — 7 role business x 9 menu key. - Drafter/DeptManager/Procurement: R+C+U; CostControl/PM/Director/AuthorizedSigner: R+U. - DeptManager them Delete (xoa nhap). - Idempotent per-(roleId x menuKey). Build: 0 error, 2 warning (pre-existing DocxRenderer). Files: 4 new + 8 modified (1 migration + entity + generator + DI + 2 ctx + 2 features). Resolves: STATUS.md In Progress §A — 3 item PE MISSING. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-24 10:41:17 +07:00
pqhuy1987	0048a2e83a	[CLAUDE] Docs: STATUS + HANDOFF domain migration E2E done (huypham.vn → solutions.com.vn)	2026-04-24 10:25:41 +07:00
pqhuy1987	a6676658a4	[CLAUDE] Infra: SeedDemoUsersAsync robust reconcile pattern + 16 demo users ... User feedback: prod chỉ thấy admin user, 13 demo seed cũ chưa apply → fix robust + add thêm. ## Vấn đề trước - Skip-if-exists pattern: nếu user nào đó tạo fail trước đó → never retry - Không log error chi tiết khi CreateAsync hoặc AddToRoleAsync fail - Không tự sửa khi user exists nhưng thiếu dept/position/roles (drift) - 1 exception abort cả batch ## Fix: RECONCILE PATTERN Mỗi run, per-user: - **Nếu chưa có** → CreateAsync + AddToRoleAsync với detailed error log - **Nếu đã có** → verify + fix nếu drift: * DepartmentId mismatch → update * Position mismatch → update * FullName mismatch → update * !IsActive → reactivate * Roles missing → AddToRoleAsync supplement - **Try-catch per-user** → 1 fail không abort 15 còn lại - **Detailed logging** — counts created/fixed/failed cuối cùng ## 16 demo users (3 thêm) Trước 13 → giờ 16: - BOD (3) — bod.huynh + bod.le + **bod.tran** (Phó GĐ Kỹ thuật NĐUQ thứ 2) - PM (2) — pm.nguyen + **pm.le** (GĐ Vinhomes Ocean Park) - TPB (6) — CCM/PRO/FIN/ACT/EQU/HRA — 1 mỗi (giữ nguyên) - Drafter (5) — qs.hoang + qs.ngo + nv.cao + nv.dinh + **nv.truong** (NV CCM, làm cho ccm.tran) Bổ sung: NĐUQ thứ 2 (test multi-AuthorizedSigner), PM thứ 2 (test multi-project), Drafter trong CCM (test cùng dept với CCM TPB). ## Build dotnet build BE pass (0 error). ## Note deploy Khi deploy lên prod: - HĐ user đã có → reconcile (sửa dept/position/role nếu drift) - 13 user cũ chưa được tạo → CreateAsync với password User@123456 - 3 user mới (bod.tran, pm.le, nv.truong) → tạo mới - Log: "Demo users reconcile xong: X created, Y fixed, Z failed. (Total demo: 16, password=User@123456 — ⚠ rotate prod)" Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-24 10:20:43 +07:00
pqhuy1987	4678d192e2	[CLAUDE] App+Api: PurchaseEvaluation CQRS + Controller + WorkflowService ... Application (4 file, ~900 lines): - IPurchaseEvaluationWorkflowService + PurchaseEvaluationDtos - PurchaseEvaluationFeatures: Create / UpdateDraft / Transition / List / Inbox / GetDetail (bundle Suppliers+Details+Quotes+Approvals+Workflow) / Delete / ListChangelogs. IDOR filter role-based phase eligibility. - PurchaseEvaluationSupplierFeatures: Add / Update / Remove supplier (N:M Phiếu × Supplier). Block remove nếu còn Quote FK reference. - PurchaseEvaluationDetailFeatures: Add/Update/Delete hạng mục + Upsert/Delete Quote + SelectWinner (set SelectedSupplierId). Infrastructure: - PurchaseEvaluationWorkflowService: policy load pinned definition → guard role + transition rules. Emit Notification drafter khi state-change. Tạo PurchaseEvaluationApproval + Changelog row. Api: - PurchaseEvaluationsController ~15 endpoint: CRUD phiếu, N:M supplier, hạng mục CRUD, Quote upsert, SelectWinner, Changelog list. Route /api/purchase-evaluations. DI: đăng ký IPurchaseEvaluationWorkflowService scoped. Skip MVP: Attachments upload, Admin PeWorkflows designer UI (sẽ phase sau — framework versioned WF table đã sẵn, designer pattern copy từ HĐ).	2026-04-23 16:43:47 +07:00
pqhuy1987	2c6f0cabfb	[CLAUDE] Domain+Infra: PurchaseEvaluation module — 10 bảng + 2 workflow seed (migration 12) ... Module Duyệt NCC (tiền-HĐ): phiếu trình duyệt so sánh giá N NCC × M hạng mục trước khi ký HĐ. 2 quy trình: A DuyetNcc (3-step: Purchasing→CCM→CEO), B DuyetNccPhuongAn (5-step: Purchasing→DựÁn→CCM→CEO PA→CEO NCC). Domain (7 core + 3 workflow admin): - PurchaseEvaluation (header, AuditableEntity, pin WorkflowDefinitionId, SelectedSupplierId, PaymentTerms JSON, ContractId? FK kế thừa) - PurchaseEvaluationSupplier (N:M Phiếu × Supplier + contact + payment term) - PurchaseEvaluationDetail (hạng mục + ngân sách, group A.I/A.II/...) - PurchaseEvaluationQuote (báo giá per NCC per hạng mục + IsSelected) - PurchaseEvaluationApproval (workflow history, reuse ApprovalDecision) - PurchaseEvaluationChangelog (audit log, reuse ChangelogAction) - PurchaseEvaluationAttachment (file upload — báo giá NCC + spec...) - PurchaseEvaluationWorkflowDefinition/Step/StepApprover (config y như HĐ, tách table riêng vì Phase là PurchaseEvaluationPhase enum riêng) Policy: - PurchaseEvaluationPolicy record + PurchaseEvaluationPolicies.NccOnly/ NccWithPlan (default hardcoded) + FromDefinition(def) build runtime policy từ DB admin-authored. Default SLA: soạn 3d, step 1-2d, CEO 1d. EF: 10 configurations với index phase+isDeleted, SupplierId, ProjectId, SlaDeadline, WorkflowDefinitionId, ContractId. UX index (PeId, SupplierId) + (DetailId, SupplierId). HasQueryFilter soft delete cho header. Migration 12 AddPurchaseEvaluations tạo 10 bảng. Idempotent seed: - SeedMenuTreeAsync +13 menu item (Pe_* root + 2 group + 6 action leaf + PeWorkflows root + 2 admin leaf) - SeedPurchaseEvaluationWorkflowsAsync seed QT-DN-A-v01 + QT-DN-B-v01	2026-04-23 16:37:55 +07:00
pqhuy1987	bcdc00706c	[CLAUDE] Infra: Mở rộng seed master (15 NCC + 8 Project) + backfill demo HĐ ... User feedback: thêm master data NCC + Project + cập nhật HĐ đang thiếu/ trùng nhau. ## SeedDemoMasterDataAsync — per-code idempotent Trước: skip toàn bộ nếu Suppliers + Projects table đã có row → không add được seed mới khi expand list. Sau: per-Code check — add từng item nếu Code chưa tồn tại, skip nếu có. Cho phép expand seed list theo thời gian mà không clobber data admin đã add manual. ## 15 demo suppliers (5 SupplierType × 3 entities) - NhaCungCap (5): VLXD-ABC, Xi măng Hà Tiên, Thép Hòa Phát, Cadivi Điện, Tiền Phong Cấp thoát nước - NhaThauPhu (4): Thăng Long XD, Cô Công Cơ khí, MEP Hà Nội, Next Stage Nội thất - ToDoi (3): Hoàng Nam (cốp pha), Bắc Ninh (xây trát), Hà Trang (ốp lát) - DonViDichVu (3): Clean Pro, Hồng Phát Vận chuyển, Long An Bảo vệ - ChuDauTu (3): Vingroup, Sun Group, Masterise Homes Đầy đủ TaxCode + Phone + Email + ContactPerson + Address. ## 8 demo projects (đa dạng quy mô + giai đoạn) - FLOCK01 (sẵn) + SKYGARDEN (sẵn) + INDUSTRIAL (sẵn) - VHOMES-OP (Vinhomes Ocean Park 3, 350B) - ECOPARK-VL (Ecopark Văn Lâm, 180B) - BWTOWER (Văn phòng BW Tower 25 tầng, 95B) - WAREHOUSE-LB (Kho vận Long Biên, 32B) - RESORT-PQ (Resort 5* Phú Quốc 250 phòng, 220B) ## Backfill demo HĐ supplier + project Vấn đề trước: 7 demo HĐ tất cả dùng cùng 1 supplier (FirstOrDefault) + cùng 1 project → list nhìn không thực tế. DemoSupplierByType + DemoProjectByType maps mới: | ContractType | Supplier | Project | |---|---|---| | HopDongThauPhu | NTP-XD (thầu phụ) | FLOCK01 | | HopDongGiaoKhoan | TD-NEHOANG (tổ đội) | FLOCK01 | | HopDongNhaCungCap | NCC-XIMANG | VHOMES-OP | | HopDongDichVu | DV-VANCHUYEN | RESORT-PQ | | HopDongMuaBan | NCC-DIEN | BWTOWER | | HopDongNguyenTacNCC | NCC-THEP | ECOPARK-VL | | HopDongNguyenTacDichVu | DV-CLEAN | WAREHOUSE-LB | SeedDemoContractsAsync 2 path: 1. Lần đầu (no [DEMO] HĐ): tạo mới với supplier+project diverse per type 2. Đã có [DEMO] HĐ: gọi BackfillDemoContractsSupplierProjectAsync — loop từng demo HĐ, update supplier_id + project_id nếu mismatch với map (idempotent, log count updated) Match đúng business: HĐ thầu phụ → NTP, HĐ NCC → NCC supplier, HĐ DV → DV supplier, HĐ chủ đầu tư (BypassCCM) → CDT supplier (admin tự gán). ## Build dotnet build BE pass (0 error) ## Note deploy Lần CI/CD deploy `e8XXXXX` lên prod sẽ: - Add 10 supplier mới + 5 project mới (existing 5+3 giữ nguyên) - Backfill 7 demo HĐ → switch sang đúng supplier + project per type - Log: "Seeded 10 demo suppliers", "Seeded 5 demo projects", "Backfill [DEMO] contracts supplier+project: 6 updated." (6 vì FLOCK01 vẫn dùng cho ThauPhu/GiaoKhoan unchanged) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 15:54:39 +07:00
pqhuy1987	4edcd588d8	[CLAUDE] Domain+Infra: User-kind approver runtime guard + Warning 20% SLA ... ## User-kind approver guard Trước: WorkflowDefinition Designer cho admin pick User cụ thể vào step approver, nhưng runtime guard bỏ qua (User-kind treat như DeptManager fallback per skill doc). Bây giờ: enable đầy đủ. WorkflowPolicy + UserTransitions parallel dict (default null cho hardcoded Standard/SkipCcm, populated qua FromDefinition khi WorkflowStepApprover Kind=User). IsTransitionAllowed signature update: (from, to, actorRoles, actorUserId?) - Check Role first (existing behavior) - Fallback User-kind: actorUserId.ToString() có trong UserTransitions[(from,to)]? ContractWorkflowService.TransitionAsync dùng IsTransitionAllowed thay inline check. Error message thêm "{N} user explicit" nếu policy có User-kind approvers cho transition đó. FromDefinition cũng update: nếu step CHỈ có User-kind (không Role), không fallback DeptManager nữa — guard sẽ check user-level. Chỉ fallback DeptManager nếu step thiếu cả 2. ## Warning 20% SLA SlaExpiryJob.ProcessWarningsAsync mới — chạy trước ProcessAsync (auto-approve quá hạn): - Pull Contracts WHERE !SlaWarningSent && SlaDeadline > now && Phase NOT IN (DaPhatHanh, TuChoi, DangDongDau) - Per phase, threshold = 20% × default SLA (vd Soạn thảo 7 ngày → 33.6h remaining trigger warning; In ký 1 ngày → 4.8h) - Compute remaining = SlaDeadline - now; nếu remaining <= threshold + còn slot → notify Drafter via INotificationService - Set SlaWarningSent = true để chỉ warning 1 lần per phase (reset trong TransitionAsync khi chuyển phase mới) - NotificationType.SlaWarning (đã có trong enum) + title icon ⚠ ## Build dotnet build BE pass (0 error) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 15:11:34 +07:00
pqhuy1987	8bc9565127	[CLAUDE] Infra: SeedDemoContractsAsync — 7 HĐ varied phases để UAT-ready ... User feedback: làm hết task pending. Phase 1: seed sample HĐ data để admin login thấy ngay E2E hoạt động full (không cần tự tạo từ đầu). ## Idempotent guard Skip nếu đã có bất kỳ HĐ nào tên bắt đầu "[DEMO]" — admin có thể xóa demo + create thật bình thường, restart không clobber. ## 7 demo HĐ — covering 7 ContractTypes + 4-5 phases khác nhau | # | Type | Final Phase | Tên HĐ | Giá trị | Details | |---|---|---|---|---|---| | 1 | ThauPhu | DangSoanThao | Thi công móng + cột tầng 1 — FLOCK 01 | 850M | 3 hạng mục (đào, đổ BT, lắp thép) | | 2 | GiaoKhoan | DangGopY | Khoán nhân công xây + trát + sơn | 320M | 3 công việc + 2 comments demo | | 3 | NhaCungCap | DangInKy | Cung cấp xi măng + sắt thép Q2/2026 | 1.2B | 3 SP (xi măng, thép D14/D18) | | 4 | DichVu | DangTrinhKy | Thuê cẩu tháp 6 tháng | 540M | 1 DV (cẩu tháp Liebherr) | | 5 | MuaBan | DaPhatHanh | Mua máy phát điện 250kVA | 850M | 2 SP có VAT 10% | | 6 | NguyenTacNCC | DangGopY | HĐ nguyên tắc cung cấp vật tư 2026 | 0 (framework) | 2 SP với khung giá min/max | | 7 | NguyenTacDV | DangSoanThao | HĐ nguyên tắc bảo trì TB 2026 | 0 (framework) | 1 DV với SLA | ## Workflow simulation Loop transition phases tới finalPhase, insert ContractApproval row mỗi phase với ApproverUserId mapping đúng role: - DangKiemTraCCM → ccm.tran (CostControl) - DangTrinhKy + DangDongDau → bod.huynh (Director) - DaPhatHanh → hra.dang (HrAdmin) - Khác → qs.hoang (Drafter — soạn thảo + đàm phán + in ký) SkipCcm policy (DichVu/MuaBan/NguyenTacNcc/NguyenTacDv) bỏ DangKiemTraCCM khỏi flow. Mã HĐ auto gen qua codeGen.GenerateAsync (RG-001 format đầy đủ). ## Demo data gồm - 7 Contracts (Header) - ~14 Details rows (3+3+3+1+2+2+1) - ~30 ContractApprovals (workflow history per phase) - 2 ContractComments (demo conversation CCM↔Drafter) ## Build dotnet build BE pass (0 error) ## Login test sau deploy Admin → /my-contracts hoặc /contracts → thấy 7 [DEMO] HĐ với mã RG-001 + varied phases. Click bất kỳ HĐ → Panel 2 thấy Tổng quan + Chi tiết + Lịch sử duyệt full content. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 15:06:34 +07:00
pqhuy1987	330d529c92	[CLAUDE] Domain+App+Infra: Role ShortName + User Department/Position + 13 demo users (migration 11) ... User feedback: chi tiết hóa Users/Phòng ban + gán roles. Roles label tiếng Việt có Mã (ShortName) + Tên đầy đủ (Description). ## Entity changes ### Role (Domain/Identity/Role.cs) + ShortName (max 50) — Mã viết tắt VN: QTV/BOD/CCM/PRO/FIN/... + Description (đã có) — Tên đầy đủ VN - Identity Name = code English giữ nguyên (FK + [Authorize] attr) ### User (Domain/Identity/User.cs) + DepartmentId Guid? FK Departments (Restrict — không xóa dept nếu user reference) + Position string? max 200 — chức vụ free text ## Migration 11: AddRoleShortNameAndUserDepartment 3-file rule. Apply LocalDB OK. DB total: 36 tables (không tăng — chỉ thêm cột vào existing). ## Seed VN labels (12 roles) | Code | ShortName | Description | |---|---|---| | Admin | QTV | Quản trị viên hệ thống | | Drafter | NV.PB | Nhân viên phòng ban (soạn thảo HĐ) | | DeptManager | TPB | Trưởng phòng ban | | ProjectManager | PM | Giám đốc dự án | | Procurement | PRO | Phòng Cung ứng | | CostControl | CCM | Phòng Kiểm soát chi phí | | Finance | FIN | Phòng Tài chính | | Accounting | ACT | Phòng Kế toán | | Equipment | EQU | Phòng Thiết bị | | Director | BOD | Ban Giám đốc | | AuthorizedSigner | NĐUQ | Người được Ủy quyền ký HĐ | | HrAdmin | HRA | Phòng Nhân sự - Hành chính | SeedRolesAsync idempotent + backfill (existing role thiếu ShortName/ Description → update). ## Seed 13 demo users Default password: User@123456 (warn log để rotate prod). Coverage full org chart: - bod.huynh (Tổng GĐ — Director, BOD dept) - bod.le (Phó GĐ NĐUQ — AuthorizedSigner, BOD dept) - pm.nguyen (PM FLOCK 01 — ProjectManager, PM dept) - ccm.tran (TPB CCM — CostControl + DeptManager, CCM dept) - pro.pham (TPB PRO — Procurement + DeptManager, PRO dept) - fin.do, act.vu, equ.bui, hra.dang (TPB respective dept) - qs.hoang, qs.ngo (Drafter — QS dept) - nv.cao, nv.dinh (Drafter — PRO/FIN dept) Idempotent (skip nếu email đã tồn tại). ## DTOs + Commands updated - RoleDto + ShortName field - UserDto + DepartmentId/DepartmentName/Position - CreateUserCommand + DepartmentId/Position params (defaults null) - UpdateUserCommand + DepartmentId/Position - ListUsersQueryHandler load dept names denormalize per page - UpdateUserCommandHandler set UpdatedAt ## Note FE updates (UsersPage dept dropdown + role label VN) ở commit kế tiếp. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 14:24:12 +07:00
pqhuy1987	e27c54702a	[CLAUDE] Domain+App+Api: 4 master catalogs cho Details (migration 10) ... User feedback: thêm Master Data cho phần Chi tiết (line items) — autocomplete khi user nhập field thay vì gõ tay free text. ## 4 entities mới (Domain/Master/Catalogs/) | Entity | Bảng | Dùng cho HĐ Detail | |---|---|---| | UnitOfMeasure | UnitsOfMeasure | Tất cả 7 type (DonViTinh) | | MaterialItem | MaterialItems | NCC + Mua bán + Nguyên tắc NCC (MaSP/TenSP) | | ServiceItem | ServiceItems | Dịch vụ + Nguyên tắc DV (MaDichVu/TenDichVu) | | WorkItem | WorkItems | Thầu phụ + Giao khoán (HangMuc/MaCongViec) | Common pattern: Code unique (filter IsDeleted=0) + Name + Category + DefaultUnit + AuditableEntity (soft delete) + IsActive flag. ## Migration 10: AddMasterCatalogs 3-file rule (gotcha #17). Total DB: 32 → 36 tables. Apply LocalDB OK. ## Seed defaults (idempotent — skip per-table nếu có row) - 20 UnitsOfMeasure: m2, m3, kg, tấn, lít, ngc (ngày công), giờ, gói, ... - 15 MaterialItems demo: xi măng PCB40, cát vàng, đá 1x2, thép D10, gạch 4 lỗ, sơn lót, ống PVC... - 10 ServiceItems demo: vận chuyển, bảo trì, tư vấn, kiểm định, vệ sinh... - 15 WorkItems demo: đào móng, đổ bê tông, xây tường, trát, lát gạch, sơn nước, lắp điện, lắp nước, thấm chống... ## CQRS (Application/Master/Catalogs/CatalogsFeatures.cs ~290 dòng) Mỗi catalog 5 handlers (List filter q+category, Create với unique code guard, Update, Delete soft). FluentValidation max length per spec EF. ## Controller (Api/Controllers/CatalogsController.cs) 13 endpoints: - GET /api/catalogs/{units|materials|services|work-items} - POST /api/catalogs/{kind} (Admin role) - PUT /api/catalogs/{kind}/{id} (Admin role) - DELETE /api/catalogs/{kind}/{id} (Admin role) Read open cho mọi role (FE Details add form autocomplete cần list). ## Menu (5 mới) - Catalogs (group, Master parent, order 24, "Library" icon) - CatalogUnits "Đơn vị tính" (Ruler) - CatalogMaterials "Vật tư / SP" (Package) - CatalogServices "Dịch vụ" (Wrench) - CatalogWorkItems "Hạng mục công việc" (ListChecks) Admin auto-grant tất cả CRUD action (qua SeedAdminPermissionsAsync loop MenuKeys.All). ## Build dotnet build BE pass (0 error) ## Note FE admin page CatalogsPage + datalist autocomplete trong Details form sẽ ở commit kế tiếp. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 12:21:39 +07:00
pqhuy1987	51449d6b9d	[CLAUDE] App+Infra: Mã HĐ gen ngay tại CreateContract + backfill HĐ legacy ... User feedback: HĐ phải có mã ngay khi tạo (không đợi đến DangDongDau như cũ). HĐ đã tạo trước đây nhưng chưa có mã → backfill tự động. ## Thay đổi ### CreateContractCommandHandler (App) - Inject IContractCodeGenerator - Load supplier + project FULL (cần Code, không chỉ check tồn tại như trước) - Call codeGenerator.GenerateAsync TRƯỚC khi db.Contracts.Add — entity chưa tracked nên GenerateAsync internal SaveChangesAsync chỉ save SEQ (không kèm contract chưa tracked) - Set entity.MaHopDong = result trước khi Add → INSERT contract đã có mã - Changelog summary include mã: "Tạo HĐ {mã} — {tên}" ### Trade-off documented - Mã gen sớm → HĐ TuChoi sẽ "wasted" 1 mã (gap trong sequence) - Acceptable vì user cần mã reference vào tài liệu/giấy tờ ngay từ đầu ### ContractWorkflowService.TransitionAsync (Infra) - Giữ logic cũ `if MaHopDong is null → gen` ở DangDongDau - Update comment: nominal flow skip vì mã đã có; defensive cho HĐ legacy hoặc HĐ tạo bằng path khác (seed/import) ### DbInitializer.BackfillContractCodesAsync (Infra) - Chạy 1 lần trước WarnDefaultAdminPasswordAsync - Idempotent: count Contracts WHERE MaHopDong IS NULL → skip nếu 0 - Loop từng HĐ: load supplier+project → GenerateAsync → SaveChangesAsync - Skip + log warning nếu missing supplier/project (legacy data corruption) - Try-catch per HĐ, log success/failed count cuối cùng ## Build dotnet build BE pass (0 error, 2 pre-existing DocxRenderer warning) ## Note Khi deploy lên prod, DbInitializer chạy startup → backfill HĐ cũ tự động. Log line "Backfill mã HĐ: X HĐ thiếu mã, đang gen..." sẽ xuất hiện ở Logs/log-{date}.txt để verify. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 11:36:59 +07:00
pqhuy1987	71c035d31e	[CLAUDE] App+Infra: IChangelogService + log Workflow/Contract/Comment/Attachment ... User decision B (log cả 3): mọi thay đổi liên quan HĐ ghi vào unified ContractChangelogs để render tab Lịch sử FE. ## IChangelogService (Application/Common/Interfaces/) 5 methods: - LogContractChangeAsync — Header insert/update - LogDetailChangeAsync — line item insert/update/delete - LogWorkflowTransitionAsync — phase change (parallel với ContractApprovals) - LogCommentAddedAsync — góp ý mới - LogAttachmentAsync — upload/delete file KHÔNG SaveChanges trong service — caller chịu trách nhiệm save atomic cùng business changes (pattern giống INotificationService). ## ChangelogService impl - Resolve actor qua ICurrentUser → UserManager.FindByIdAsync - Denormalize UserName (FullName ?? Email) cho log readable - null UserId = system action (vd SLA auto-approve) - DI: AddScoped trong DependencyInjection.cs ## Wiring vào handlers hiện tại - ContractWorkflowService.TransitionAsync — LogWorkflowTransitionAsync sau khi insert ContractApproval - CreateContractCommandHandler — LogContractChangeAsync(Insert) - UpdateContractDraftCommandHandler — diff GiaTri/TenHopDong/NoiDung/ TemplateId trước update, log update với fieldChangesJson nếu có thay đổi - AddCommentCommandHandler — LogCommentAddedAsync - UploadContractAttachmentCommandHandler — LogAttachmentAsync(Insert) - DeleteContractAttachmentCommandHandler — LogAttachmentAsync(Delete) Build: dotnet build BE pass (0 error, 2 pre-existing warning trong DocxRenderer.cs) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 10:12:51 +07:00
pqhuy1987	70810e1b34	[CLAUDE] Domain+Infra: 7 ContractType-specific Details + ContractChangelog (migration 9) ... User decision: Option B — bảng riêng cho mỗi loại HĐ (chuẩn nhất, schema chuyên biệt). Plus: ContractChangelog audit log thống nhất Header / Detail / Workflow / Comment / Attachment. ## 8 entities mới ### Details (7) — Domain/Contracts/Details/ | Bảng | Loại HĐ | Field đặc trưng | |---|---|---| | ThauPhuDetails | 1 (Thầu phụ) | HangMuc, KhoiLuong, DonGia, ThoiGianHoanThanh | | GiaoKhoanDetails | 2 (Giao khoán) | MaCongViec, KhoiLuong, YeuCauKyThuat | | NhaCungCapDetails | 3 (NCC) | MaSP, ThongSoKyThuat, SoLuong, ThoiGianGiao, XuatXu | | DichVuDetails | 4 (Dịch vụ) | MaDichVu, ThoiGian, TuNgay/DenNgay | | MuaBanDetails | 5 (Mua bán) | MaSP, SoLuong, DonGia, ThueVAT (%), XuatXu | | NguyenTacNccDetails | 6 (Nguyên tắc NCC) | NhomSP, DonGiaToiThieu/ToiDa, DieuKienGiaoHang | | NguyenTacDvDetails | 7 (Nguyên tắc DV) | LoaiDichVu, DonGiaToiThieu/ToiDa, PhamViDichVu, SLA | Common base `ContractDetailBase`: ContractId FK + Order + ThanhTien decimal(18,2) + GhiChu nvarchar(1000) + audit (BaseEntity). ### ContractChangelog (1) — Domain/Contracts/ Unified audit log. Khác ContractApprovals (workflow-only, dùng cho guard logic) — Changelog là VIEW LAYER cho user đọc lịch sử thao tác: - EntityType enum: Contract | Detail | Workflow | Comment | Attachment - Action enum: Insert | Update | Delete | Transition - PhaseAtChange snapshot - UserId + UserName denormalize (log readable) - Summary human-readable + FieldChangesJson [{Field, Old, New}] - ContextNote (comment kèm theo) ## EF Configurations ContractDetailsConfiguration.cs (1 file gộp 7 IEntityTypeConfiguration): - ToTable + HasMaxLength + HasPrecision per type - HasOne(Contract).WithMany(<TypeDetails>) cascade delete - IX (ContractId, Order) cho load timeline ContractChangelogConfiguration.cs: - Cascade delete khi Contract xóa - IX (ContractId, CreatedAt) timeline + IX (ContractId, EntityType) filter ## DbContext + IApplicationDbContext + 8 DbSet mới (7 Details + ContractChangelogs). ## Migration 9: AddContractDetailsAndChangelog 3-file rule (gotcha #17): .cs + .Designer.cs + ApplicationDbContextModel Snapshot.cs đầy đủ. Applied LocalDB SolutionErp_Dev OK — 24 + 8 = 32 bảng total. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-23 10:08:42 +07:00
pqhuy1987	f216169039	[CLAUDE] FE-Admin+Domain+Infra+App: Workflows tab → sidebar menu items ... User request: 7 tab trong /system/workflows thành menu items riêng. Domain: - MenuKeys.WorkflowTypeLeaf(code) helper — `Wf_<TypeCode>` pattern Infrastructure (DbInitializer): - Seed 7 leaves dưới Workflows group (order 95..101), label matches ContractType (HĐ Thầu phụ / Giao khoán / NCC / Dịch vụ / Mua bán / Nguyên tắc NCC / Nguyên tắc Dịch vụ). Idempotent. Application (GetMyMenuTreeQuery): - Generalized inherit-perm logic: descendants of Contracts AND Workflows inherit parent CanRead flag. Single Workflows.Read grant → all 7 Wf_* leaves visible; no per-leaf permission rows needed. FE Layout (admin): - resolvePath: Wf_<Code> → /system/workflows/<code>. Ct_* still hidden on admin side. FE App.tsx: - New route /system/workflows/:typeCode? FE WorkflowsPage: - Removed horizontal tab bar; type selection now comes từ URL param. - Landing view (no param): 3-col grid card per type với active version badge — so admin có visual overview khi click top-level Workflows group without selecting a type. - TYPE_CODE_TO_INT map drives URL→int conversion. Result: click `Quy trình HĐ > HĐ Mua bán` trong sidebar → opens /system/workflows/MuaBan directly với designer scoped. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-22 09:49:42 +07:00
pqhuy1987	e7e5f2d066	[CLAUDE] Domain+Infra+App+Api+FE-Admin: versioned workflow per ContractType ... User yêu cầu: mỗi loại HĐ có quy trình riêng với admin add roles + users vào từng bước. Khi tạo version mới → HĐ tương lai chạy theo, HĐ cũ giữ version cũ. Domain: - WorkflowDefinition (Code + Version + ContractType + IsActive + Steps) - WorkflowStep (Order + Phase + Name + SlaDays + Approvers) - WorkflowStepApprover (Kind: Role/User + AssignmentValue) - Contract.WorkflowDefinitionId — pinned at creation - WorkflowPolicyRegistry.FromDefinition() — build runtime policy từ DB Infrastructure: - EF config + migration AddVersionedWorkflows (3 table mới) - DbInitializer.SeedWorkflowDefinitionsAsync: v01 per 7 ContractType, steps sinh từ hardcoded WorkflowPolicies (Role approvers). - ContractWorkflowService.TransitionAsync: load pinned WorkflowDefinition → FromDefinition(), fallback cho HĐ cũ không có pin. Application: - CreateContractCommand pin WorkflowDefinitionId = active version cho type - ContractFeatures.Get(id): load pinned def cho workflow summary - WorkflowAdminFeatures: GetWorkflowAdminOverviewQuery (7 types + active + history + ContractsUsingCount), CreateWorkflowDefinitionCommand (validate payload, auto-increment version, deactivate old). Api: - GET /api/workflows trả overview - POST /api/workflows tạo version mới (deactivate old) FE /system/workflows: - Tabs per 7 ContractType, mỗi tab hiện active version + lịch sử - DefinitionCard: steps với badge role/user + SLA + archived indicator hiện "N HĐ còn chạy" cho version cũ - WorkflowDesigner modal: form code/name/desc + danh sách steps (phase/name/SLA) + approvers (+ Role hoặc + User). Drop step ok. Clone từ version hiện tại để tạo v02 có điểm start sensible. - Amber banner: HĐ cũ không bị ảnh hưởng khi tạo version mới Invariants được giữ: - Unique (Code, Version) index - Chỉ 1 version IsActive per ContractType tại 1 thời điểm - Set default sẽ auto xóa override → respect legacy override table - Role-kind approvers drive transition guards; User-kind fallback DeptManager role cho v1 (user-level targeting = iteration 2) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 22:57:41 +07:00
pqhuy1987	5e0f3801a1	[CLAUDE] Move nested-type menu → fe-user; Admin workflow config page ... User clarified: menu loại HĐ 3-level (Danh sách/Thao tác/Duyệt) thuộc fe-user. Admin có page riêng để config quy trình per loại HĐ. fe-admin Layout: - filterForAdmin() drops Ct_* entries (hide nested type menu). - Admin sidebar giờ về lại đơn giản: Dashboard / Master / Hợp đồng (leaf) / Forms / Reports / System. fe-user Layout: - Dynamic menu tree từ /menus/me (thay fixed USER_MENU hardcoded). - Recursive MenuNodeRenderer (top-level expanded, nested collapsed). - resolvePath user-specific: Ct_*_List → /my-contracts?type=X, Ct_*_Create → /contracts/new?type=X, Ct_*_Pending → /inbox?type=X. - filterForUser drops admin-only entries (Master/System/Forms/Reports). - Static USER_FIXED_TOP prepends "Hộp thư" leaf → /inbox. - MyContractsPage + InboxPage đọc ?type=X param, filter client-side. Workflow config (Admin side): - Domain: WorkflowTypeAssignment entity (ContractType → PolicyName override). Registry.ForContractWithOverrides() prefer DB override else default. - Infrastructure: EF config + migration AddWorkflowTypeAssignments, unique index trên ContractType. ContractWorkflowService load overrides dict mỗi transition. ContractFeatures load overrides khi build WorkflowSummaryDto. - Application: GetWorkflowAdminOverviewQuery returns 7 types × current policy + available policies. SetWorkflowAssignmentCommand validate policy name tồn tại; nếu = default thì delete override (no stale row). - Api: GET /api/workflows + PUT /api/workflows/{contractType} với policy "Workflows.Read" + "Workflows.Update". - Menu: new key `Workflows` dưới System, label "Quy trình HĐ". - FE /system/workflows: 7 card per type, dropdown Standard/SkipCcm + 'Đã override' badge khi khác default, phase sequence timeline, explanation banner ở top. Iteration 2 note: admin-authored custom policies. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 22:41:05 +07:00
pqhuy1987	48e91fe7ca	[CLAUDE] Domain+Infra+App+FE-Admin: per-ContractType nested sidebar menu ... User request: mỗi loại HĐ có menu riêng với 3 action Danh sách / Thao tác / Duyệt. Sidebar giờ 3-level under "Hợp đồng": Hợp đồng (group, expandable) ├── HĐ Thầu phụ (sub-group) │ ├── Danh sách → /contracts?type=1 │ ├── Thao tác → /contracts/new?type=1 │ └── Duyệt → /contracts?type=1&pendingMe=1 ├── HĐ Giao khoán (sub-group) ├── HĐ NCC / Dịch vụ / Mua bán / Nguyên tắc NCC / Nguyên tắc DV └── ... (7 types × 4 = 28 new menu items) BE: - MenuKeys.cs: ContractTypeCodes array + helpers ContractTypeGroup/ List/Create/Pending → key format Ct_<TypeCode>[_<Action>] - DbInitializer.SeedMenuTreeAsync: loop seeds 28 entries under Contracts - GetMyMenuTreeQuery.BuildChildren: descendants of `Contracts` inherit parent permission (avoid adding 28 rows to Permissions table per role) FE: - Layout.tsx recursive: MenuNodeRenderer dispatches group vs leaf by depth; nested groups collapsed by default (top-level expanded). Deeper levels get smaller padding/text + left border guide. - Pattern-based resolvePath: Ct_<Type>_<Action> → URL with query. - Contract type code → int map (matches Domain ContractType enum). - ContractsListPage reads ?type + ?pendingMe, filters client-side. Header title + description reflect active filter. "← Tất cả loại" quick-reset button. - ContractCreatePage new cho admin (copy từ fe-user), pre-select type từ ?type URL param. - App.tsx route /contracts/new → ContractCreatePage. Pure navigation UX; no new permissions needed. Admin + any role with Contracts.Read see full menu; leaves click-through to filtered views. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 22:25:00 +07:00
pqhuy1987	6197c841bb	[CLAUDE] App+Infra+FE-Admin: seed master data + MyDashboard widgets ... Task 1 — Seed master data unblock UAT/demo: - DbInitializer.SeedDepartmentsAsync: 9 departments từ QT-TP-NCC.docx (PM/QS/CCM/PRO/FIN/ACT/EQU/HRA/BOD) — reference data không phải demo. - DbInitializer.SeedDemoMasterDataAsync: 5 demo suppliers (NCC VLXD, NTP Xây dựng, TĐ Hoàng Nam, DV Clean, CĐT Vingroup — covers cả 5 SupplierType) + 3 demo projects (FLOCK01, SkyGarden, Industrial). Chỉ seed nếu tables empty — respect admin's real data khi họ add. Task 2 — Roles CRUD đã có sẵn trong UsersPage (Shield icon button mở dialog gán 12 roles từ AppRoles.cs). Skip. Task 3 — MyDashboard role-specific widgets: - GetMyDashboardQuery (Reports): returns DraftsInProgress (tôi là Drafter + phase soạn thảo), PendingMyApproval (phase eligible role tôi + không phải tôi drafter), DueSoon 24h, Overdue, DraftsTotalValue. - Endpoint GET /api/reports/my-dashboard. - FE MyDashboardRow ở đầu DashboardPage: 4 card hover → navigate. Admin ẩn row nếu tất cả = 0 (ERP noise reduction). 'Đang soạn thảo' + 'Chờ tôi duyệt' clickable → /contracts?filter=... (filter param để wire lần sau; row hiện chưa implement). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 22:06:28 +07:00
pqhuy1987	cae4d84830	[CLAUDE] Domain+Infra+App+FE: dynamic workflow policy per ContractType ... Đọc QT-TP-NCC.docx: quy trình 9 bước chỉ áp dụng cho Thầu phụ/NCC/Tổ đội. Dịch vụ/Mua bán/Nguyên tắc bypass CCM. Thay hardcoded dict bằng policy registry. Domain — WorkflowPolicy.cs: - Record WorkflowPolicy { Name, Description, Transitions, PhaseSla, ActivePhases } — pure data, testable. - WorkflowPolicies.Standard: 9-phase full (Thầu phụ/Giao khoán/NCC) - WorkflowPolicies.SkipCcm: 7-phase (Dịch vụ/Mua bán/Nguyên tắc) - WorkflowPolicyRegistry.For(type) map ContractType → policy - WorkflowPolicyRegistry.ForContract(c) override nếu BypassProcurement AndCCM=true (instance-level escape hatch) Infrastructure — ContractWorkflowService: - Xóa hardcoded Transitions/PhaseSla dicts → load từ policy.ForContract - TransitionAsync: validate qua policy.Transitions thay vì dict local - Error message include policy.Name để debug dễ hơn - GetPhaseSla trả SLA từ Standard policy (fallback — SLA hiện tại giống nhau giữa 2 policy) Application — ContractDetailDto: - Field mới `Workflow: WorkflowSummaryDto { PolicyName, Description, ActivePhases, NextPhases }` — FE dùng để render nút chuyển phase dynamic + timeline card. - BuildWorkflowSummary helper trong ContractFeatures. FE (both apps): - Type WorkflowSummary + ContractDetail.workflow - ContractDetailPage xóa hardcoded NEXT_PHASES — dùng c.workflow.nextPhases từ BE (single source of truth) - WorkflowSummaryCard: timeline của ActivePhases với check/current/ future states + policy name/description ở header - Card hiển thị trong sidebar, phía trên "Lịch sử duyệt" Docs: - gotchas.md #21 marked RESOLVED (NEXT_PHASES sync không còn cần) Foundation: sau này admin có thể edit policy qua UI khi chuyển sang DB- backed policy — nhưng API contract (WorkflowSummaryDto) đã stable. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 21:46:31 +07:00
pqhuy1987	e45909712b	[CLAUDE] App+Infra+FE-Admin: DynamicForm + .doc/.xls auto-convert on upload ... Tier 3 iter2 — form builder UI dùng FieldSpec thay raw JSON textarea. FE: - DynamicForm component — parse FieldSpec JSON (record of FieldDef với label/type/required/placeholder/hint/options) và render inputs dynamic theo type: text/textarea/number/date/currency/select. - FormsPage render dialog thêm toggle Form ↔ JSON (segmented control). Mặc định Form mode khi template có FieldSpec, JSON mode khi không. Khi mở dialog cho row khác, reset formValues + chọn đúng default mode. - parseFieldSpec helper trả { spec, error } — UI báo lỗi nếu JSON không parse được, fallback JSON textarea. BE — generalize converter thành IDocumentConverter: - IPdfConverter → IDocumentConverter (ConvertAsync(bytes, src, tgt, ct)) — đủ gánh cả pdf, docx, xlsx targets. - LibreOfficeDocumentConverter — 1 shell-out pattern cho mọi conversion (docx→pdf, doc→docx, xls→xlsx, xlsx→pdf), target arg truyền vào --convert-to. - ExportTemplatePdfCommand update dùng "pdf" target. Auto-convert .doc/.xls trên upload: - Validator accept thêm .doc/.xls (thêm note "sẽ tự convert"). - UploadContractTemplateCommandHandler: nếu ext là doc/xls → read stream → converter.ConvertAsync → lưu file .docx/.xlsx thay vì format gốc. File rendering pipeline (DocxRenderer/XlsxRenderer) chỉ support docx/ xlsx — convert đảm bảo consistent. - Display FileName preserve original name nhưng đổi extension. Unblock 3 file .doc legacy template — admin giờ upload .doc bình thường, system tự convert. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 21:35:05 +07:00
pqhuy1987	6bbd894d96	[CLAUDE] App+Infra+Api+FE-Admin: PDF export (LibreOffice headless) ... Pipeline: template.docx → FormRenderer fill placeholders → LibreOffice soffice --headless --convert-to pdf → PDF byte[] → File() stream to browser. Clean-arch split: - Application: IPdfConverter abstraction (swap to QuestPDF/Aspose later without touching caller). - Infrastructure: LibreOfficePdfConverter — shells out to soffice.exe path from config (Pdf:SofficePath, default `C:\Program Files\LibreOffice\program\soffice.exe` on Windows). Per-request temp workDir để tránh filename collision + -env: UserInstallation isolate mỗi conversion (chống "soffice already running" khi concurrent). Timeout 60s (configurable). Best-effort cleanup. Kill entire process tree nếu timeout. - Application: ExportTemplatePdfCommand — reuses existing FormRenderer + pipes bytes through IPdfConverter. Same data dict signature as Render để UI code share. - Api: POST /api/forms/templates/{id}/export-pdf (same JSON body as /render, returns PDF stream). FE: - useExport hook chung cho 2 endpoints (DRY render + export-pdf mutations) - Render dialog thêm nút "Tải PDF" (outline variant) cạnh "Tải file gốc". Disabled khi mutation khác đang chạy. - Hướng dẫn dialog nâng cấp: "file gốc để edit Word/Excel, PDF để in/gửi không chỉnh sửa được". Ops: scripts/install-libreoffice.ps1 — silent MSI install 25.8.6 cho VPS (đã chạy trên prod). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 21:28:31 +07:00
pqhuy1987	ea9ab5e352	[CLAUDE] App+Infra+Api+FE: SignalR realtime notifications E2E ... Clean-arch split: - Application: IRealtimeNotifier (PushToUserAsync, abstraction) - Api: NotificationHub (/hubs/notifications, [Authorize]) + SignalRNotifier impl với IHubContext<NotificationHub>, uses Clients.User(userId) (default provider resolves NameIdentifier="sub") - Infrastructure: NotificationPushInterceptor — SaveChangesInterceptor capture Notification entities state=Added trong SavingChanges, push qua IRealtimeNotifier trong SavedChanges sau khi commit thành công. Zero caller changes — handlers chỉ cần db.Add(Notification). Attached vào ApplicationDbContext cùng với AuditingInterceptor. Auth: - JWT config thêm OnMessageReceived event: read ?access_token= từ query string khi path = /hubs/* (WebSockets không set headers). - SignalRNotifier singleton (stateless, chỉ delegate IHubContext). FE (both apps): - @microsoft/signalr 8.0.7 vào package.json. - lib/realtime.ts: singleton connection với lazy start + automatic reconnect [0,2s,5s,10s,15s] + accessTokenFactory lấy từ localStorage. - NotificationBell: useEffect subscribe 'notification-created' khi isAuthenticated. On push: invalidate query + toast.message. Fallback polling giảm từ 30s → 60s (realtime cover gap). - AuthContext.logout: dynamic import stopConnection() — avoid leaking auth'd socket across users. Result: ERP-grade feel. Contract transition → Drafter nhận toast ngay trong vòng 100-300ms (same-origin WebSocket), không cần F5 hay polling. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 20:56:37 +07:00
pqhuy1987	c8d0070770	[CLAUDE] App+Infra+Api+FE: Attachment upload E2E ... Foundation file-storage: - IFileStorage interface (Application) — SaveAsync/OpenReadAsync/ DeleteAsync/Exists. Future swap cho S3/Azure Blob không đổi caller. - LocalFileStorage (Infrastructure) — resolve Uploads:RootPath từ config, path-traversal guard (resolved full path phải stay in root), tự tạo directory khi save. - DI: singleton (stateless). - Config: dev "uploads", prod "C:\inetpub\solution-erp\uploads". CQRS: - UploadContractAttachmentCommand: validate size <=20MB + MIME whitelist (pdf, doc/docx, xls/xlsx, png/jpg/jpeg/webp). Sanitize filename (strip path components + invalid FS chars + leading dots). Storage path: contracts/{contractId}/{attId}_{safeFileName}. - DownloadContractAttachmentQuery: trả Stream + FileName + ContentType. - DeleteContractAttachmentCommand: best-effort file delete sau DB remove (orphan cleanup job có thể sweep sau). Api: - POST /api/contracts/{id}/attachments — multipart/form-data, field 'file' + form fields 'purpose' + 'note'. RequestSizeLimit 25MB (validator enforces 20MB). - GET /api/contracts/{id}/attachments/{attId}/download — File() stream. - DELETE /api/contracts/{id}/attachments/{attId}. FE ContractAttachmentsSection (both apps, identical): - Drag-drop zone với dragging highlight (brand-500 border + brand-50 bg) - Purpose selector (DraftExport / ScannedSigned / SealedCopy / Other) - List có icon per MIME (FileText/Image/File), filename, metadata (purpose · size · createdAt), download button (fetch blob + trigger browser save với auth header), delete button (confirm dialog) - Empty state hint về use-case ("bản scan HĐ đã ký ở phase In ký…") Integrated vào cả 2 ContractDetailPage — ngay dưới phần comments, trước sidebar lịch sử duyệt. Unblock E2E workflow: users giờ có thể upload bản scan ký (DangInKy), scan đóng dấu (DangDongDau) — phase transitions có bằng chứng thật. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 20:37:35 +07:00
pqhuy1987	49c0ddc8f4	[CLAUDE] App+Domain+Infra+Api+FE: Notifications module end-to-end ... Domain: - Notification entity + NotificationType enum (stable ints) - Nullable RefId cho correlation (contract, user, ...) Infrastructure: - NotificationConfiguration: bảng Notifications, index theo (UserId, ReadAt) - NotificationService: ghi vào DbContext, không SaveChanges (để caller quyết định unit-of-work — đảm bảo atomic với domain mutation) - EF migration AddNotifications Application: - INotificationService (Notify + NotifyMany) - CQRS: ListMyNotifications / GetMyUnreadCount / MarkRead / MarkAllRead Api: - NotificationsController: GET /api/notifications + unread-count + mark-read Integration: - ContractWorkflowService emit notification tới Drafter khi HĐ chuyển phase (skip nếu actor chính là Drafter). Title + type theo phase đích: DaPhatHanh → ContractPublished, TuChoi → ContractRejected, khác → ContractPhaseTransition. FE: - Both NotificationBell (admin + user) dùng /api/notifications thật (thay cho derived-from-inbox MVP trước đó). 30s refetch, click mark-read, 'Đọc hết' bulk action. Foundation sẵn cho SignalR push + email outbox sau này — chỉ cần mở rộng NotificationService mà không đổi caller. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 15:24:09 +07:00
pqhuy1987	1b5ef2ed51	[CLAUDE] Phase5.1/3.2: IDOR filter + SLA auto-approve job + admin password warning ... IDOR filter ContractsController: - ListContractsQueryHandler + ICurrentUser: non-admin chi thay HD minh la Drafter hoac role eligible phase hien tai - GetContractQueryHandler + ICurrentUser: throw ForbiddenException neu truy cap HD khong lien quan - GetEligiblePhases() internal static trong ListContractsQueryHandler — mirror GetMyInboxQueryHandler.PhaseActorRoles (Drafter/DeptManager → DangSoanThao/DangDamPhan/DangInKy, ProjectManager+PRO+CCM+FIN+ACT+EQU → DangGopY, CostControl → DangKiemTraCCM, Director+AuthorizedSigner → DangTrinhKy, HrAdmin → DangDongDau) SLA Expiry BackgroundService (Phase 3 iteration 2 partial): - Infrastructure/HostedServices/SlaExpiryJob MOI: BackgroundService moi 15 phut (delay 30s startup) - Query Contracts WHERE SlaDeadline < UtcNow AND Phase NOT IN (DaPhatHanh, TuChoi) - Map phase → next (happy path). Goi IContractWorkflowService.TransitionAsync voi actorUserId=null + Decision=AutoApprove + comment 'AUTO: het SLA phase X (Nh qua han)' - Try-catch tung contract, 1 fail khong block batch - Log structured: 'SlaExpiryJob: auto-approved contract {Id} {From} → {To}' - Package Microsoft.Extensions.Hosting added to Infrastructure - DI register AddHostedService<SlaExpiryJob> Admin password warning (Phase 5.1): - DbInitializer.WarnDefaultAdminPasswordAsync: check CheckPasswordAsync voi AdminPassword default → log WRN '⚠️ Admin user vẫn dùng password mặc định. ĐỔI NGAY trong production!' - Chain vao InitializeAsync sau cac seed E2E verified: - Admin GET /contracts → total 1 (see all) - Drafter GET /contracts → total 0 (IDOR filter, chua tao HD nao) - API startup log: '⚠️ Admin user admin@solutionerp.local vẫn dùng password mặc định' - Build + TS check → pass Docs: - STATUS.md: Phase 5.1 hau nhu xong (IDOR + admin warning + SLA job tick), cumulative BE 3900 LOC - migration-todos.md: tick Phase 5.1 IDOR + admin warning, Phase 3 iter 2 SlaExpiryJob + E2E non-admin + admin warning - session log 2026-04-21-1730-idor-sla-job.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 13:15:14 +07:00
pqhuy1987	11e61c9c39	[CLAUDE] Phase5.1: Security headers + account lockout + Users management ... Security hardening: - Api/Middleware/SecurityHeadersMiddleware MOI: remove server fingerprint (Server, X-Powered-By, ...), add X-Content-Type-Options:nosniff, X-Frame-Options:DENY, Referrer-Policy:strict-origin-when-cross-origin, Permissions-Policy (disable geolocation/mic/cam/payment), X-Permitted-Cross-Domain-Policies:none, CSP (default-src 'self' + img data: + style inline for Tailwind + frame-ancestors 'none'). Skip CSP tren /swagger (dung inline script). - Program.cs wire UseMiddleware SecurityHeadersMiddleware first in pipeline - Infrastructure/DependencyInjection Identity options: - Password.RequiredLength config-driven (Identity:Password:RequiredLength, default 8 dev, override 12+ prod) - Lockout: DefaultLockoutTimeSpan (15min), MaxFailedAccessAttempts (5), AllowedForNewUsers=true — all config-driven - LoginCommandHandler: IsLockedOutAsync check truoc → throw voi deadline message, AccessFailedAsync khi sai password, ResetAccessFailedCountAsync khi login thanh cong Users management: - Application/Users/UserFeatures.cs: 8 CQRS (ListUsersQuery paging+search, GetUserQuery, CreateUserCommand + Validator, UpdateUserCommand voi self-disable protection, AssignRolesCommand voi self-demote protection (khong tu go Admin), ResetPasswordCommand (invalidate refresh token + unlock), UnlockUserCommand) - UserDto: Id, Email, FullName, IsActive, IsLocked (computed tu LockoutEnd), CreatedAt, Roles - Api/Controllers/UsersController: 7 endpoint (Users.Read/Create/Update policies): - GET / (list paged), GET /{id}, POST /, PUT /{id}, PUT /{id}/roles, POST /{id}/reset-password, POST /{id}/unlock - using alias ValidationException = Application.Common.Exceptions.ValidationException (fix ambiguity voi FluentValidation) Frontend fe-admin: - types/users.ts MOI: User type + AVAILABLE_ROLES 12 role (match BE AppRoles.cs) + RoleLabel Vietnamese - pages/system/UsersPage.tsx MOI: - DataTable columns: Email (mono), FullName, Roles (badge chips voi Vietnamese label), IsActive (CheckCircle/XCircle), IsLocked (KeyRound red), CreatedAt - Actions per row (PermissionGuard Users.Update wrap): Gan role (Shield icon → Dialog grid 12 checkbox), Reset password (KeyRound → Dialog voi warning user se bi logout), Unlock (Unlock icon, chi hien khi isLocked), Toggle active (XCircle/CheckCircle) - Create user dialog: email + fullName + password (min 8) + grid 12 role checkbox - Route /system/users vao App.tsx E2E verified: - Security headers present tren moi response (check qua curl -I) - POST /api/users voi roles: [Drafter] → 201 + id - GET /api/users → paged voi 2 user (admin + new test.drafter) - TS check fe-admin → pass - dotnet build → 0 errors Docs: - docs/STATUS.md: Phase 5.1 xong, cumulative BE 3700 LOC, 42 endpoints, 17 FE pages - docs/HANDOFF.md: phase table update row Phase 5.1, last updated timestamp - docs/changelog/migration-todos.md: tick 6 items Phase 5.1 + 4 items remaining (IDOR, deps scan, admin warning, Roles CRUD) - docs/changelog/sessions/2026-04-21-1630-phase5-1-security-users.md: session log Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> EOF	2026-04-21 13:06:46 +07:00
pqhuy1987	fe7ad8e4a3	[CLAUDE] Phase4: Report MVP + Docs Consolidation (rules, architecture, schema-diagram) ... Backend Report: - Application/Reports/Dtos/DashboardStatsDto: 5 KPI + PhaseCount + SupplierCount + ProjectCount + MonthlyValue - Application/Reports/Queries/GetDashboardStats handler: total/active/overdue/published this month/totalValueActive + byPhase + top 5 NCC/du an + 12 thang monthly (fill zero khi thang empty) - Application/Reports/Services/IContractExcelExporter interface - Infrastructure/Reports/ContractExcelExporter: ClosedXML workbook 10 cot, header style bold+blue, number format #,##0, formula SUM, auto-fit, freeze header - Application/Reports/Commands/ExportContractsToExcelCommand: filter phase/supplier/project/date range - Api/Controllers/ReportsController: GET /reports/dashboard, GET /reports/contracts/export - DI register IContractExcelExporter (Scoped) Frontend fe-admin: - types/reports.ts: DashboardStats type - components/BarChart.tsx: generic horizontal bar chart — chi Tailwind, khong thu vien ngoai - pages/DashboardPage.tsx REWRITE: 5 KPI card (FileText/TrendingUp/AlertTriangle/CheckCircle2/Coins) + by-phase bar + monthly 12-month chart + top 5 NCC + top 5 du an + skeleton loader - pages/ReportsPage.tsx MOI: filter phase/fromDate/toDate → export Excel button - Route /reports vao App.tsx E2E verified: - GET /api/reports/dashboard → 200 voi day du KPI + monthly fill 12 thang - GET /api/reports/contracts/export → 200 xlsx 7229 bytes (Microsoft Excel 2007+) Docs consolidation (theo yeu cau user): - docs/rules.md MOI: 9 section coding conventions (ngon ngu UI/code/DB/docs, BE Clean Arch, CQRS+MediatR, Validation FluentValidation, Error handling, Async, Entity rules, DI, Package pinning, FE React/TS erasableSyntaxOnly, path alias, TanStack Query, Permission guard, Toast+error, DB convention, Git commit format, Docs structure, Testing, Security) - docs/architecture.md MOI: layered overview ASCII art, request lifecycle (1 POST/api/contracts qua 10 step), workflow state machine 9 phase, permission model, data flow sequence diagram 4 actor (Drafter/Manager/CCM/BOD/HRA), deployment architecture Phase 5, skill library, non-functional table - docs/database/schema-diagram.md MOI: full ERD 19 table mermaid + data flow diagram + vong doi 1 HD (create → 7 transition → gen ma → publish) + index strategy table + relationship cardinality + soft delete behavior + SQL queries (inbox/dashboard/gen ma) + migration history - docs/gotchas.md UPDATE: 17 → 26 pitfalls, them section "Claude Code harness quirks" (Edit File not read, DI build pass nhung runtime fail) + "Contract workflow" (ma HD gen 2 lan, BE-FE NEXT_PHASES sync, race condition) + "Permission matrix" (cache real-time, MenuKey typo) - docs/STATUS.md: Phase 4 MVP done, docs entry points section liet ke het, next Phase 5 Production - docs/HANDOFF.md: phase table them Phase 4 row, file tree update voi Reports, test points day du, git state commit 7 - docs/changelog/migration-todos.md: tick Phase 4 MVP items + them iteration 2 list - docs/changelog/sessions/2026-04-21-1430-phase4-report.md: session log voi thong so cumulative (BE 3100 LOC, 30 docs) - CLAUDE.md root: update Tai lieu quan trong section them rules.md, architecture.md, schema-diagram.md, .claude/skills (13 links now) Bug fix: - TS unused import ContractPhaseLabel trong DashboardPage - DI thieu register IContractExcelExporter — build pass but runtime would fail (added) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 12:42:46 +07:00
pqhuy1987	7e957a7654	[CLAUDE] Phase3: Workflow MVP — 9-phase state machine + code gen + FE Inbox/Detail ... Backend Contracts domain (5 entities): - Contract aggregate: Phase (9 enum), SlaDeadline, MaHopDong, BypassProcurementAndCCM, DraftData, SlaWarningSent - ContractApproval: FromPhase → ToPhase, ApproverUserId (null = system auto-approve), Decision, Comment - ContractComment: thread theo Phase current - ContractAttachment: FileName + StoragePath + Purpose (DraftExport/ScannedSigned/SealedCopy) - ContractCodeSequence: Prefix PK + LastSeq — atomic gen EF configs: - Unique MaHopDong filtered [MaHopDong] IS NOT NULL - Indexes: Phase+IsDeleted, SupplierId, ProjectId, SlaDeadline, ContractId+ApprovedAt, ContractId+CreatedAt - Cascade delete Approvals/Comments/Attachments khi Contract xoa - Query filter IsDeleted - Migration AddContractsWorkflow (DB 19 tables) Workflow service: - IContractWorkflowService.TransitionAsync: - Adjacency check qua Transitions Dict<(from,to), roles[]> (12 transitions) - Role guard: user phai co role ∈ allowed - Admin bypass (role Admin pass moi check) - System bypass (userId=null + Decision=AutoApprove → cho SLA job sau nay) - Bypass CCM: BypassProcurementAndCCM=true cho phep DangInKy → DangTrinhKy skip phase 6 - Gen ma HD khi chuyen DangDongDau (idempotent — khong gen lai neu da co) - Reset SlaDeadline = UtcNow + PhaseSla - Insert ContractApproval row Code generator (RG-001): - 7 format theo ContractType: HDTP / HDGK / NCC / HDDV / MB + 2 framework (year prefix) - BeginTransactionAsync(Serializable) + ContractCodeSequences UPSERT → atomic - Idempotent: neu MaHopDong da co thi skip CQRS (8 feature, ContractFeatures.cs): - CreateContractCommand + Validator + Handler (set SlaDeadline = +7d) - UpdateContractDraftCommand (chi khi Phase=DangSoanThao) - TransitionContractCommand (delegate → WorkflowService) - AddCommentCommand (phase = hien tai) - ListContractsQuery (PagedResult + filter phase/supplier/project/search) - GetMyInboxQuery (map Phase → actor roles, filter theo role user) - GetContractQuery (detail + approvals + comments + attachments + resolve user names) - DeleteContractCommand (soft, block > DangInKy) Controller: - ContractsController 8 endpoint: GET list/inbox/detail, POST create/transition/comment, PUT update, DELETE Frontend fe-admin (2 page moi): - types/contracts.ts: ContractPhase const + Label + Color maps + types - components/PhaseBadge.tsx - pages/contracts/ContractsListPage.tsx: filter phase + search + click → detail - pages/contracts/ContractDetailPage.tsx: 2-col layout (info+comments | timeline), action dialog select target phase + comment Frontend fe-user (4 page moi + 14 file shared): - cp 14 file shared tu fe-admin (menuKeys, types/*, DataTable, PhaseBadge, Dialog, Textarea, Select, apiError, usePermission, PermissionGuard) - AuthContext update: load menu tu /menus/me + cache - Layout: menu fixed 3 muc + user info + roles display - InboxPage: list HD cho role user xu ly (sort theo SLA) - ContractCreatePage: form chon loai + template + NCC + du an + gia tri + bypass CDT - ContractDetailPage: duplicate fe-admin pattern (convention) - MyContractsPage: list HD cua toi - App.tsx: 4 route moi E2E verified: - Setup Supplier + Project - POST /contracts → 201 + phase=2 - POST /contracts/{id}/transitions x7 → di het 9 phase - Final: MaHopDong = "FLOCK 01/HĐGK/SOL&PVL2026/01" dung format RG-001 - Approvals: 7 rows audit day du Docs: - .claude/skills/contract-workflow/SKILL.md: placeholder → full spec voi state machine, SLA table, role matrix, 7 code format, code pointers, API, E2E workflow, pitfalls - docs/changelog/sessions/2026-04-21-1330-phase3-workflow.md: session log - docs/STATUS.md: Phase 3 MVP done, next Phase 4 - docs/HANDOFF.md: update phase status + file tree + commit log + testing points - docs/changelog/migration-todos.md: tick Phase 3 MVP items + add iteration 2 list Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 12:26:09 +07:00
pqhuy1987	5113e4c771	[CLAUDE] Phase2: Form Engine MVP + docs (gotchas, skill, handoff) ... Backend Forms: - Domain/Forms: ContractTemplate (FormCode, Name, ContractType, FileName, StoragePath, Format, FieldSpec JSON, IsActive) + ContractClause - EF config voi unique FormCode + query filter IsDeleted - DbSets + IApplicationDbContext update - Migration AddForms (bang 14 total) - Packages: DocumentFormat.OpenXml 3.x + ClosedXML 0.105+ - Application/Forms: - IFormRenderer interface + RenderResult record - FormFeatures.cs: List/Get/Render CQRS - IWebHostEnvironmentLocator (abstract IWebHostEnvironment) - Infrastructure/Forms: - DocxRenderer: OpenXml-based placeholder {{field}} replace, handle split runs (gom text tat ca <w:t> trong paragraph, replace, gan lai text dau + clear rest) - XlsxRenderer: ClosedXML cell value replace - FormRenderer router theo format docx/xlsx - Api: - FormsController: GET /templates (filter type, onlyActive), GET /templates/{id}, POST /templates/{id}/render (return file) - WebHostEnvironmentLocator impl - DbInitializer SeedContractTemplatesAsync: seed 8 template metadata, IsActive=true chi khi file ton tai Templates vat ly: - Copy 5 .docx/.xlsx tu FORM/ sang wwwroot/templates/ - 3 .doc (FO-002.02/03/06) chua convert: IsActive=false (Word COM bi stuck luc test, can retry voi DisplayAlerts=0 hoac LibreOffice) - scripts/convert-doc-to-docx.ps1 (Word COM automation) Frontend fe-admin: - types/forms.ts: ContractTemplate + ContractTypeLabel - pages/forms/FormsPage.tsx: list templates + Render dialog (paste JSON data → download .docx/.xlsx) - Route /forms them vao App.tsx Bug fix: - SpaceProcessingModeValues namespace: wrap EnumValue<> full path - SaveAs2($path, 16) thay vi SaveAs([ref], [ref]) — PowerShell type issue - Word COM stuck: kill process, skip .doc cho MVP Docs (theo yeu cau user): - docs/gotchas.md MOI: 17 pitfalls nhom theo tech stack / EF Core / OpenXml / JSON / dev workflow - .claude/skills/form-engine/SKILL.md: placeholder → full spec (algorithm + code pointers + API + limitations) - .claude/skills/permission-matrix/SKILL.md: placeholder → full spec (BE policy + FE guard + seed + pitfalls) - docs/HANDOFF.md MOI: brief 5 phut cho session sau (run quickstart + where we are + next steps + file tree + gotchas ref) - docs/STATUS.md: update cumulative stats + next up Phase 3 - docs/changelog/migration-todos.md: tick Phase 2 iteration 1 items + add iteration 2 list - docs/changelog/sessions/2026-04-21-1200-phase2-form-engine.md: session log - CLAUDE.md root: them reference den gotchas + HANDOFF E2E verified: - GET /api/forms/templates (onlyActive=false) → 8 templates - POST /api/forms/templates/{FO-002.05}/render voi data dict → HTTP 200 + file .docx 482KB (Microsoft Word 2007+ OK) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 12:01:11 +07:00
pqhuy1987	54d6c9ba52	[CLAUDE] Phase1.2: CRUD Master + Permission Matrix + FE admin pages ... Backend: - Domain/Master: Supplier (+ SupplierType 5 loai), Project, Department (AuditableEntity) - Domain/Identity: MenuItem, Permission, MenuKeys const (12 menu) - EF Configurations voi unique Code + query filter IsDeleted - DbSets + IApplicationDbContext interface update - Application: PagedResult + PagedRequest generic - Application/Master CQRS CRUD 3 entity (Create/Update/Delete/Get/List voi paging search sort) - Application/Permissions: GetMyMenuTree (union OR role, filter tree), ListMenuItems, ListPermissionsByRole, UpsertPermission (guard admin khong tu giam quyen), ListRoles - Api/Authorization: MenuPermissionRequirement + Handler (Admin bypass, query DB) - Program.cs: register 48 policy {menu}.{action} tu MenuKeys x Actions - Api/Controllers: Suppliers, Projects, Departments, Menus, Roles, Permissions - DbInitializer: seed 12 menu + admin full CRUD permissions - Migration AddMasterData + AddPermissions Frontend (fe-admin): - Types: menuKeys.ts const, menu.ts (MenuNode/Role/Permission), master.ts (Supplier/Project/Department + SupplierType const-object) - AuthContext: load menu from /menus/me, cache localStorage, refreshMenu() - usePermission hook + PermissionGuard component (wrap button) - UI kit them: Dialog (modal overlay), Textarea, Select - Generic: DataTable (column config, sortable, loading, empty) + Pagination - PageHeader component - apiError helper extract message tu ProblemDetails - Layout rewrite: render menu dong tu AuthContext.menu (MenuGroup collapsible + NavLink + lucide icon map) - Pages: master/Suppliers, master/Projects, master/Departments (CRUD + search + sort + paging + Dialog form) - Page system/Permissions: ma tran Role x MenuKey x CRUD checkbox (tick tu dong PUT upsert) - App.tsx them 4 route moi Bug fix: - MenuPermissionHandler: EF expression tree khong support switch expression -> tach switch ra ngoai AnyAsync - TS erasableSyntaxOnly khong cho enum -> SupplierType const-object pattern (typeof[keyof]) E2E verified via Vite proxy: - GET /menus/me -> 6 root + 6 child nodes (12 menus) - GET /roles -> 12 roles - POST/GET/PUT/DELETE /suppliers -> full CRUD, soft delete OK - tsc -b fe-admin pass Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 11:30:14 +07:00
pqhuy1987	702411fcc8	[CLAUDE] Phase1: foundation - BE Clean Arch + Identity + JWT + 2 FE React + login E2E ... Backend (.NET 10): - Domain: BaseEntity/AuditableEntity, ContractType/Phase/ApprovalDecision enums, User/Role (Identity<Guid>), AppRoles (12 const) - Application: IApplicationDbContext/ICurrentUser/IDateTime/IJwtTokenService, custom exceptions, ValidationBehavior (MediatR pipeline), Auth CQRS (Login/Refresh/Me), DependencyInjection - Infrastructure: ApplicationDbContext (IdentityDbContext), AuditingInterceptor (auto audit + soft delete), DbInitializer (seed 12 role + admin), DesignTimeDbContextFactory, JwtTokenService, DateTimeService, DI - Api: CurrentUserService, GlobalExceptionMiddleware (ProblemDetails), AuthController, Program.cs rewrite (Serilog + JWT + CORS + Swagger), appsettings + launchSettings (port 5443) - Migration Init applied to SolutionErp_Dev LocalDB Frontend (React 19 + Vite 8 + Tailwind 4): - fe-admin (:8082 blue) + fe-user (:8080 emerald) - shared structure, khac menu + brand color - Tailwind 4 via @tailwindcss/vite plugin, theme brand colors - AuthContext (localStorage token), ProtectedRoute, Layout (sidebar + header) - UI kit: Button/Input/Label (CVA + Tailwind) - LoginPage voi toast error, DashboardPage/InboxPage placeholder - Axios interceptor: auto Bearer + 401 redirect - TanStack Query client, React Router 7, Sonner toast Package downgrades (do .NET 10 / TS 6 compat): - MediatR 14 -> 12.4.1 (v14 breaking changes) - Swashbuckle 10 -> 6.9.0 (v10 khong tuong thich OpenApi 2) - Removed Microsoft.AspNetCore.OpenApi (conflict voi Swashbuckle) E2E verified: POST /api/auth/login qua Vite proxy ca 2 FE -> JWT + user info Credentials seed: admin@solutionerp.local / Admin@123456 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 10:59:44 +07:00
pqhuy1987	25dad7f36f	[CLAUDE] Scaffold: khoi tao SOLUTION_ERP Phase 0 ... - .NET 10 Clean Architecture: Domain/Application/Infrastructure/Api (4 project) - 2 React + Vite + TS app: fe-admin (:8082), fe-user (:8080) voi proxy /api - Node engines >=20, .nvmrc = 20 cho CI (bai hoc NamGroup) - SQL Server 2022 qua docker-compose (dev) - Parse 8 FORM -> docs/forms-spec.md (catalog + ma HD format RG-001) - Parse QUY_TRINH -> docs/workflow-contract.md (9 phase state machine + role matrix) - docs: CLAUDE.md, STATUS.md, PROJECT-MAP.md, migration-todos.md (roadmap 5 phase) - .claude/skills: 3 placeholder (contract-workflow, form-engine, permission-matrix) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-21 10:37:34 +07:00