@goplusvn/core 0.1.52 → 0.1.53

package/features/README.md

@@ -31,6 +31,11 @@ GENERATED — đừng sửa tay) và tạo thư mục migration
 - `background-tasks` — bảng `background_tasks` cho trung tâm tác vụ nền
   (export/import chạy nền). Runtime: `@goerp/core/tasks`
   (`configureTaskRunner`) + UI `@goerp/core/tasks/ui`.
+- `notifications` — bảng `notifications` + `push_subscriptions` cho thông báo
+  in-app NHÂN VIÊN. Runtime: `@goerp/core/notification`
+  (`configureNotificationService`, seam `afterNotify` để app cắm web push/email)
+  + UI `@goerp/core/notification/ui` (chuông + hộp thư). YÊU CẦU model `User`
+  của app khai back-relation — xem `features/notifications/README.md`.
 - `error-logs` — bảng `error_logs` cho hệ ghi lỗi server
   (`createErrorLogger`/`buildServerError` ở `errors/server-error`) + trang
   admin `system/pages/error-logs-page` (app cung cấp API, mẫu vinhhoa

package/features/notifications/README.md

@@ -0,0 +1,14 @@
+# Feature: notifications
+
+Bảng `notifications` + `push_subscriptions` cho engine
+`@goerp/core/notification` (`configureNotificationService`).
+
+**Yêu cầu phía app (Prisma bắt buộc 2 chiều relation):** model `User` phải khai
+
+```prisma
+notifications     Notification[]
+pushSubscriptions PushSubscription[]
+```
+
+App template (F2) có sẵn; app cũ thêm 2 dòng trên vào model User trước khi
+`goerp-features sync`.

package/features/notifications/migrations/0001_init.sql

@@ -0,0 +1,59 @@
+-- goerp feature: notifications — bước 0001 (idempotent). 2 bảng: thông báo
+-- in-app (fan-out mỗi người 1 row) + web push subscription theo thiết bị.
+-- YÊU CẦU: bảng "users" tồn tại (schema auth/RBAC chung của goerp) và model
+-- User của app khai back-relation `notifications Notification[]` +
+-- `pushSubscriptions PushSubscription[]` (xem features/notifications/README).
+CREATE TABLE IF NOT EXISTS "notifications" (
+    "id" TEXT NOT NULL,
+    "user_id" TEXT NOT NULL,
+    "type" TEXT NOT NULL DEFAULT 'info',
+    "category" TEXT,
+    "title" TEXT NOT NULL,
+    "content" TEXT NOT NULL,
+    "url" TEXT,
+    "icon_name" TEXT,
+    "resource_type" TEXT,
+    "resource_id" TEXT,
+    "is_read" BOOLEAN NOT NULL DEFAULT false,
+    "read_at" TIMESTAMP(3),
+    "created_by" TEXT,
+    "meta" JSONB,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "notifications_pkey" PRIMARY KEY ("id")
+);
+
+CREATE INDEX IF NOT EXISTS "notifications_user_id_is_read_idx" ON "notifications"("user_id", "is_read");
+CREATE INDEX IF NOT EXISTS "notifications_user_id_created_at_idx" ON "notifications"("user_id", "created_at");
+CREATE INDEX IF NOT EXISTS "notifications_resource_type_resource_id_idx" ON "notifications"("resource_type", "resource_id");
+
+CREATE TABLE IF NOT EXISTS "push_subscriptions" (
+    "id" TEXT NOT NULL,
+    "user_id" TEXT NOT NULL,
+    "endpoint" TEXT NOT NULL,
+    "p256dh" TEXT NOT NULL,
+    "auth" TEXT NOT NULL,
+    "user_agent" TEXT,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "push_subscriptions_pkey" PRIMARY KEY ("id")
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS "push_subscriptions_endpoint_key" ON "push_subscriptions"("endpoint");
+CREATE INDEX IF NOT EXISTS "push_subscriptions_user_id_idx" ON "push_subscriptions"("user_id");
+
+-- FK: PG không có ADD CONSTRAINT IF NOT EXISTS → DO-block kiểm tra pg_constraint.
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'notifications_user_id_fkey') THEN
+    ALTER TABLE "notifications" ADD CONSTRAINT "notifications_user_id_fkey"
+      FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+  END IF;
+END $$;
+
+DO $$ BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'push_subscriptions_user_id_fkey') THEN
+    ALTER TABLE "push_subscriptions" ADD CONSTRAINT "push_subscriptions_user_id_fkey"
+      FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+  END IF;
+END $$;

package/features/notifications/schema.prisma

@@ -0,0 +1,46 @@
+/// Thông báo in-app cho NHÂN VIÊN (khác ZaloNotification / TriAnhZnsMessage — đó
+/// là ZNS gửi KHÁCH). Mỗi row là 1 tin gửi tới 1 user (fan-out ở tầng service,
+/// không broadcast 1-row-nhiều-người). Best-effort: emit không được chặn nghiệp vụ.
+model Notification {
+  id           String    @id @default(cuid()) @map("id")
+  userId       String    @map("user_id") // người NHẬN
+  type         String    @default("info") @map("type") // info | success | warning | error | approval
+  category     String?   @map("category") // sales-order | payment | payment-request | misa | purchase-order | system
+  title        String    @map("title")
+  content      String    @map("content") @db.Text
+  url          String?   @map("url") // deep-link tới đối tượng
+  iconName     String?   @map("icon_name") // lucide icon cho dropdown
+  resourceType String?   @map("resource_type") // "SalesOrder" | "PaymentRequest" | "PurchaseOrder"…
+  resourceId   String?   @map("resource_id")
+  isRead       Boolean   @default(false) @map("is_read")
+  readAt       DateTime? @map("read_at")
+  createdBy    String?   @map("created_by") // actor gây ra sự kiện (null = hệ thống)
+  meta         Json?     @map("meta")
+  createdAt    DateTime  @default(now()) @map("created_at")
+
+  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId, isRead])
+  @@index([userId, createdAt])
+  @@index([resourceType, resourceId])
+  @@map("notifications")
+}
+
+/// Web Push subscription của 1 thiết bị (PWA iOS/Android/desktop). 1 user nhiều
+/// row = nhiều thiết bị. `endpoint` (URL APNs/FCM) là khoá dedup tự nhiên; push
+/// service trả 404/410 → XÓA row (chuẩn giao thức), không dùng cờ active.
+model PushSubscription {
+  id        String   @id @default(cuid()) @map("id")
+  userId    String   @map("user_id")
+  endpoint  String   @unique @map("endpoint")
+  p256dh    String   @map("p256dh") // khoá mã hoá payload (từ PushSubscription.toJSON)
+  auth      String   @map("auth")
+  userAgent String?  @map("user_agent") // nhận diện thiết bị khi user quản lý danh sách
+  createdAt DateTime @default(now()) @map("created_at")
+  updatedAt DateTime @updatedAt @map("updated_at")
+
+  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId])
+  @@map("push_subscriptions")
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goplusvn/core",
   "description": "GoPlusVN Platform Kit - ERP kernel: layout, RBAC, CRUD, multi-tenant, system pages",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
@@ -43,6 +43,8 @@
     "./assets/*": "./src/assets/*",
     "./styles/*": "./src/styles/*",
     "./auth/api-handler": "./src/auth/api-handler.ts",
+    "./notification": "./src/notification/index.ts",
+    "./notification/ui": "./src/notification/ui/index.ts",
     "./tasks": "./src/tasks/index.ts",
     "./tasks/ui": "./src/tasks/ui/task-list-client.tsx",
     "./auth/proxy-gate": "./src/auth/proxy-gate.ts",

package/src/notification/__tests__/notification-service.test.ts

@@ -0,0 +1,192 @@
+import { beforeEach, describe, expect, it, vi } from "vitest"
+
+import {
+  configureNotificationService,
+  markRead,
+  notify,
+} from "../notification-service"
+import type { NotificationDb, NotifyInput } from "../notification-service"
+
+interface FakeData {
+  rolePermissions: Array<{ resourceCode: string; actionCode: string; roleCode: string }>
+  userRoles: Array<{ roleCode: string; userId: string }>
+  userBranches: Array<{ branchId: string; userId: string; isDefault: boolean }>
+  users: Array<{ id: string; isActive: boolean }>
+}
+
+function makeDb(data: FakeData) {
+  const created: Array<Record<string, unknown>> = []
+  const db = {
+    notification: {
+      createMany: vi.fn(async ({ data: rows }: { data: Array<Record<string, unknown>> }) => {
+        created.push(...rows)
+        return { count: rows.length }
+      }),
+      findMany: vi.fn(async () => []),
+      count: vi.fn(async () => 0),
+      updateMany: vi.fn(async () => ({ count: 1 })),
+    },
+    rolePermission: {
+      findMany: vi.fn(async ({ where }: { where: { resourceCode: string; actionCode: string } }) =>
+        data.rolePermissions
+          .filter(
+            (r) =>
+              r.resourceCode === where.resourceCode &&
+              r.actionCode === where.actionCode,
+          )
+          .map((r) => ({ roleCode: r.roleCode })),
+      ),
+    },
+    userRole: {
+      findMany: vi.fn(async ({ where }: { where: { roleCode: { in: string[] } } }) =>
+        data.userRoles
+          .filter((r) => where.roleCode.in.includes(r.roleCode))
+          .map((r) => ({ userId: r.userId })),
+      ),
+    },
+    userBranch: {
+      findMany: vi.fn(
+        async ({
+          where,
+        }: {
+          where: { branchId: string; userId: { in: string[] }; isDefault?: boolean }
+        }) =>
+          data.userBranches
+            .filter(
+              (b) =>
+                b.branchId === where.branchId &&
+                where.userId.in.includes(b.userId) &&
+                (where.isDefault === undefined || b.isDefault === where.isDefault),
+            )
+            .map((b) => ({ userId: b.userId })),
+      ),
+    },
+    user: {
+      findMany: vi.fn(async ({ where }: { where: { id: { in: string[] } } }) =>
+        data.users
+          .filter((u) => where.id.in.includes(u.id) && u.isActive)
+          .map((u) => ({ id: u.id })),
+      ),
+    },
+  }
+  return { db: db as unknown as NotificationDb, created }
+}
+
+const BASE: FakeData = {
+  rolePermissions: [
+    { resourceCode: "payment-request", actionCode: "approve", roleCode: "MANAGER" },
+  ],
+  userRoles: [
+    { roleCode: "MANAGER", userId: "m1" },
+    { roleCode: "MANAGER", userId: "m2" },
+    { roleCode: "ACCOUNTANT", userId: "a1" },
+  ],
+  userBranches: [
+    { branchId: "b1", userId: "m1", isDefault: true },
+    { branchId: "b1", userId: "m2", isDefault: false },
+  ],
+  users: [
+    { id: "m1", isActive: true },
+    { id: "m2", isActive: true },
+    { id: "a1", isActive: true },
+    { id: "locked", isActive: false },
+    { id: "u1", isActive: true },
+  ],
+}
+
+const INPUT: Omit<NotifyInput, "userIds"> = { title: "T", content: "C" }
+
+describe("notify — resolveRecipients", () => {
+  let created: Array<Record<string, unknown>>
+
+  function setup(
+    data: FakeData = BASE,
+    afterNotify?: (recipients: string[], input: NotifyInput) => Promise<unknown>,
+  ) {
+    const made = makeDb(data)
+    created = made.created
+    configureNotificationService({ db: made.db, afterNotify })
+  }
+
+  beforeEach(() => setup())
+
+  it("userIds tường minh: lọc falsy + user bị khoá, exclude actor", async () => {
+    const n = await notify({
+      ...INPUT,
+      userIds: ["u1", null, undefined, "locked", "m1"],
+      excludeUserId: "m1",
+    })
+    expect(n).toBe(1)
+    expect(created.map((c) => c.userId)).toEqual(["u1"])
+  })
+
+  it("roleCodes + branchId (member): chỉ user được gán chi nhánh", async () => {
+    const n = await notify({ ...INPUT, roleCodes: ["MANAGER"], branchId: "b1" })
+    expect(n).toBe(2) // m1 + m2 đều thuộc b1
+  })
+
+  it("branchScope default: chỉ user có isDefault tại chi nhánh", async () => {
+    const n = await notify({
+      ...INPUT,
+      roleCodes: ["MANAGER"],
+      branchId: "b1",
+      branchScope: "default",
+    })
+    expect(n).toBe(1)
+    expect(created[0].userId).toBe("m1")
+  })
+
+  it("permission → suy ra roleCodes từ rolePermission", async () => {
+    const n = await notify({
+      ...INPUT,
+      permission: { resourceCode: "payment-request", actionCode: "approve" },
+    })
+    expect(n).toBe(2) // MANAGER: m1, m2
+  })
+
+  it("roleCodesAllBranches bỏ qua lọc chi nhánh + gộp distinct", async () => {
+    const n = await notify({
+      ...INPUT,
+      roleCodes: ["MANAGER"],
+      branchId: "b1",
+      branchScope: "default", // member lọc còn m1
+      roleCodesAllBranches: ["ACCOUNTANT"], // a1 vào bất kể CN
+    })
+    expect(n).toBe(2)
+    expect(created.map((c) => c.userId).sort()).toEqual(["a1", "m1"])
+  })
+
+  it("afterNotify được gọi với recipients sau khi ghi DB", async () => {
+    const after = vi.fn(async () => {})
+    setup(BASE, after)
+    await notify({ ...INPUT, userIds: ["u1"] })
+    await new Promise((r) => setTimeout(r, 5))
+    expect(after).toHaveBeenCalledWith(["u1"], expect.objectContaining({ title: "T" }))
+  })
+
+  it("không người nhận → 0 row, afterNotify KHÔNG gọi", async () => {
+    const after = vi.fn(async () => {})
+    setup(BASE, after)
+    const n = await notify({ ...INPUT, userIds: ["locked"] })
+    expect(n).toBe(0)
+    expect(after).not.toHaveBeenCalled()
+  })
+
+  it("db nổ → notify nuốt lỗi trả 0 (KHÔNG throw — không chặn nghiệp vụ)", async () => {
+    const made = makeDb(BASE)
+    ;(made.db.notification.createMany as ReturnType<typeof vi.fn>).mockRejectedValue(
+      new Error("db down"),
+    )
+    configureNotificationService({ db: made.db })
+    await expect(notify({ ...INPUT, userIds: ["u1"] })).resolves.toBe(0)
+  })
+})
+
+describe("markRead", () => {
+  it("ids rỗng → 0, không đụng db", async () => {
+    const made = makeDb(BASE)
+    configureNotificationService({ db: made.db })
+    expect(await markRead("u1", [])).toBe(0)
+    expect(made.db.notification.updateMany).not.toHaveBeenCalled()
+  })
+})

package/src/notification/__tests__/notification-ui.test.tsx

@@ -0,0 +1,62 @@
+/**
+ * Smoke render chuông + hộp thư: mount thật (jsdom) với fetch giả — bắt lỗi
+ * import/hook sai trước khi app tiêu thụ, vì UI này chạy trong MainLayout của
+ * MỌI trang (vỡ là vỡ toàn app).
+ */
+import { fireEvent, render, screen, waitFor } from "@testing-library/react"
+import { beforeEach, describe, expect, it, vi } from "vitest"
+
+vi.mock("next/navigation", () => ({
+  useParams: () => ({ lang: "vi" }),
+  useRouter: () => ({ push: vi.fn() }),
+}))
+
+import { NotificationBell } from "../ui/notification-bell"
+import { NotificationsInbox } from "../ui/notifications-inbox"
+
+const ITEM = {
+  id: "n1",
+  type: "info",
+  category: "system",
+  title: "Đơn hàng mới",
+  content: "Đơn DH001 vừa được tạo",
+  url: "/sales-orders/1",
+  iconName: null,
+  isRead: false,
+  createdAt: new Date().toISOString(),
+}
+
+function mockFetch() {
+  global.fetch = vi.fn(async (input: RequestInfo | URL) => {
+    const url = String(input)
+    const body = url.includes("unread-count")
+      ? { count: 3 }
+      : { items: [ITEM], nextCursor: null, total: 1, unreadCount: 3 }
+    return new Response(JSON.stringify(body), {
+      status: 200,
+      headers: { "Content-Type": "application/json" },
+    })
+  }) as unknown as typeof fetch
+}
+
+describe("UI thông báo", () => {
+  beforeEach(() => mockFetch())
+
+  it("chuông render badge số chưa đọc", async () => {
+    render(<NotificationBell />)
+    expect(screen.getByLabelText("Thông báo")).toBeDefined()
+    await waitFor(() => expect(screen.getByRole("status").textContent).toBe("3"))
+  })
+
+  it("mở chuông: có tin + settingsSlot của app (vd toggle web push)", async () => {
+    render(<NotificationBell settingsSlot={<span>Bật thông báo đẩy</span>} />)
+    fireEvent.click(screen.getByLabelText("Thông báo"))
+    await waitFor(() => expect(screen.getByText("Đơn hàng mới")).toBeDefined())
+    expect(screen.getByText("Bật thông báo đẩy")).toBeDefined()
+  })
+
+  it("hộp thư render danh sách từ API", async () => {
+    render(<NotificationsInbox />)
+    await waitFor(() => expect(screen.getByText("Đơn hàng mới")).toBeDefined())
+  })
+})

package/src/notification/index.ts

@@ -1,14 +1,16 @@
+// Thông báo in-app — engine thật (thay bản mock InMemoryStorage cũ, không app
+// nào dùng). Bảng ship qua `goerp-features sync` (feature notifications).
+// App wiring mẫu: vinhhoa src/server/services/notification-service.ts
+// (configureNotificationService + afterNotify=web-push).
 export {
-  notificationService,
-  NotificationServiceImpl,
-} from "./notification-service";
-export { InMemoryStorage } from "./storage";
-export type {
-  Notification,
-  NotificationType,
-  NotificationChannel,
-  NotificationStatus,
-  CreateNotificationInput,
-  NotificationStorage,
-  NotificationServiceOptions,
-} from "./types";
+  configureNotificationService,
+  getUnreadCount,
+  listNotifications,
+  markAllRead,
+  markRead,
+  notify,
+  type ListParams,
+  type NotificationDb,
+  type NotificationType,
+  type NotifyInput,
+} from "./notification-service"