@gadmin2n/schematics 0.0.68 → 0.0.70

package/dist/lib/application/files/gadmin2-game-angle-demo/server/scripts/sync-resources.ts

@@ -0,0 +1,100 @@
+/**
+ * sync-resources.ts
+ *
+ * Syncs all non-system Prisma business models as Resource records into the
+ * `t_resource` table.
+ * - Reads business models from config/prisma/ via readPrismaModels() (excludes
+ *   system.prisma and models annotated with @IgnoreReactCode).
+ * - Uses `upsert` (where: { code }) so it is idempotent and safe to re-run.
+ * - Only inserts when the resource does not yet exist; existing records are left
+ *   untouched (update: {}) to preserve any manual edits.
+ *
+ * Invoked automatically by `postgenerate:dev` in server/package.json after
+ * `generate:dev` (migrate + prisma generate) completes.
+ */
+
+import { PrismaClient } from '@prisma/client';
+import { readPrismaModels } from './prismaModels';
+
+const prisma = new PrismaClient();
+
+async function main() {
+  const businessModels = readPrismaModels();
+
+  console.log(
+    `[sync-resources] Found ${
+      businessModels.length
+    } business model(s) to sync: [${businessModels
+      .map((m) => m.name)
+      .join(', ')}]`,
+  );
+
+  let inserted = 0;
+  let skipped = 0;
+
+  for (const model of businessModels) {
+    const code = model.code;
+    const modelName = model.name;
+
+    const result = await prisma.resource.upsert({
+      where: { code },
+      // Already exists → leave it as-is (preserve any manual name / description edits)
+      update: {},
+      create: {
+        code,
+        name: code,
+        description: `${modelName} resource (auto-synced by sync-resources)`,
+        isCommonResource: false,
+      },
+    });
+
+    // Detect whether the record was just created or already existed.
+    // upsert does not expose a "created" flag, so we compare timestamps.
+    const wasCreated =
+      Math.abs(result.createdAt.getTime() - result.updatedAt.getTime()) < 1000;
+
+    if (wasCreated) {
+      inserted++;
+      console.log(
+        `[sync-resources]   ✚ Created Resource: ${code} (id=${result.id})`,
+      );
+
+      // Write audit log for newly created resources; failure must not abort the main flow.
+      try {
+        await prisma.audit.create({
+          data: {
+            creator: 'system',
+            authorId: 'system',
+            authorName: 'sync-resources',
+            action: 'create',
+            resource: code,
+            resourceId: String(result.id),
+            data: JSON.stringify({ code, name: code }),
+            previousData: null,
+          },
+        });
+      } catch (auditErr) {
+        console.warn(
+          `[sync-resources]   ⚠ Failed to write audit log for Resource "${code}":`,
+          auditErr,
+        );
+      }
+    } else {
+      skipped++;
+      console.log(
+        `[sync-resources]   · Exists  Resource: ${code} (id=${result.id}) — skipped`,
+      );
+    }
+  }
+
+  console.log(
+    `[sync-resources] ✅ Done. inserted=${inserted}, already-existed=${skipped} (total=${businessModels.length})`,
+  );
+}
+
+main()
+  .catch((e) => {
+    console.error('[sync-resources] Fatal error:', e);
+    process.exit(1);
+  })
+  .finally(() => prisma.$disconnect());

package/dist/lib/application/files/gadmin2-game-angle-demo/server/scripts/syncDataMngtPages.ts

@@ -0,0 +1,119 @@
+import { PrismaClient } from '@prisma/client';
+import {
+  bindResourceToPage,
+  getPageResourceIds,
+  grantRoleAccess,
+  upsertPage,
+} from './lib/page-helpers';
+import { readPrismaModels } from './prismaModels';
+
+// ─── Main Seed Function ───────────────────────────────────────────────────────
+
+/**
+ * For every non-system Prisma model found in config/prisma/ (excluding system.prisma):
+ *
+ *  1. Upsert a Resource record           (resource.code = camelCase model name)
+ *  2. Upsert a Page record               (parent = dataMngt, path = /admin/data-mngt/<slug>)
+ *  3. Upsert a PageResource link         (page ↔ resource, full actions)
+ *  4. Upsert a RolePages record          (SYSTEM_ADMIN → page)
+ *  5. Upsert a RoleResource record       (SYSTEM_ADMIN → resource, full actions)
+ *
+ * Safe to re-run — every write uses upsert / skipDuplicates.
+ * Depends on seedPermissions() having already created SYSTEM_ADMIN role and dataMngt page.
+ */
+export async function seedDataMngtPages(prisma: PrismaClient): Promise<void> {
+  const models = readPrismaModels();
+
+  if (models.length === 0) {
+    console.log(
+      '[seedDataMngtPages] No non-system models found — nothing to seed.',
+    );
+    return;
+  }
+
+  // ── Anchors ────────────────────────────────────────────────────────────────
+  // Auto-bootstrap: if seed/index.ts has never been run (e.g. fresh DB),
+  // run the full seed pipeline now (users + permissions + pages).
+  const existingRole = await prisma.role.findUnique({
+    where: { name: 'SYSTEM_ADMIN' },
+  });
+  if (!existingRole) {
+    console.log(
+      '[seedDataMngtPages] SYSTEM_ADMIN not found — running full seed (index.ts) first…',
+    );
+    const { main } = await import('../seed/index');
+    await main();
+    // main() already calls seedDataMngtPages, so we're done.
+    return;
+  }
+
+  const systemAdminRole = existingRole;
+
+  const dataMngtPage = await prisma.page.findUnique({
+    where: { code: 'dataMngt' },
+  });
+  if (!dataMngtPage) {
+    console.error(
+      '[seedDataMngtPages] dataMngt page still missing after seed. Aborting.',
+    );
+    return;
+  }
+
+  // ── Process models ─────────────────────────────────────────────────────────
+  for (const [index, model] of models.entries()) {
+    console.log(`[seedDataMngtPages] ── ${model.name} ──`);
+
+    const pagePath = `/admin/data-mngt/${model.slug}`;
+
+    // 1 + 2 + 3: Upsert page, resource, and PageResource link
+    const page = await upsertPage(
+      prisma,
+      {
+        code: model.code,
+        name: model.name,
+        sortOrder: 2000 + index * 10,
+        parentId: dataMngtPage.id,
+        path: pagePath,
+      },
+      { path: pagePath }, // keep path in sync with model name on update
+    );
+    console.log(
+      `[seedDataMngtPages]   Page upserted: ${page.code} → ${pagePath} (id=${page.id})`,
+    );
+
+    const resource = await bindResourceToPage(
+      prisma,
+      page.id,
+      model.code,
+      `${model.name} resource (auto-generated by seedDataMngtPages)`,
+    );
+    console.log(
+      `[seedDataMngtPages]   Resource + PageResource upserted: ${resource.code} (id=${resource.id})`,
+    );
+
+    // 4 + 5: Grant SYSTEM_ADMIN access to this page and resource
+    const resourceIds = await getPageResourceIds(prisma, page.id);
+    await grantRoleAccess(prisma, systemAdminRole.id, page.id, resourceIds);
+    console.log(
+      `[seedDataMngtPages]   RolePages + RoleResource upserted: SYSTEM_ADMIN → ${page.code}`,
+    );
+  }
+
+  console.log(
+    `[seedDataMngtPages] ✅ Done. Seeded ${models.length} model(s) under /admin/data-mngt.`,
+  );
+}
+
+// ─── Standalone Entry Point ───────────────────────────────────────────────────
+// Called directly by `postgenerate:dev` (via ts-node), NOT by seed/index.ts.
+
+if (require.main === module) {
+  const prisma = new PrismaClient();
+
+  seedDataMngtPages(prisma)
+    .catch((e) => {
+      console.error('[seedDataMngtPages] Fatal error:', e);
+      process.exit(1);
+    })
+    .finally(() => prisma.$disconnect());
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/index.ts

@@ -1,14 +1,12 @@
 import { PrismaClient } from '@prisma/client';
-import users from './users';
 import { seedPermissions } from './permissions';
-import { seedDataMngtPages } from './seedDataMngtPages';
+import users from './users';
 
 const prisma = new PrismaClient();
 
 export async function main() {
   await prisma.user.createMany({ data: users, skipDuplicates: true });
   await seedPermissions(prisma);
-  await seedDataMngtPages(prisma);
 }
 
 if (require.main === module) {

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/permissions.ts

@@ -1,6 +1,10 @@
 import { PrismaClient } from '@prisma/client';
-
-const FULL_ACTIONS = ['createAny', 'readAny', 'updateAny', 'deleteAny'];
+import {
+  bindResourceToPage,
+  FULL_ACTIONS,
+  upsertPage,
+  upsertResource,
+} from '../scripts/lib/page-helpers';
 
 /**
  * Seed permission-related tables so that the SYSTEM_ADMIN role is recognised
@@ -11,6 +15,13 @@ const FULL_ACTIONS = ['createAny', 'readAny', 'updateAny', 'deleteAny'];
  *   - config/prisma/page.prisma            → role, page, resource resources
  *
  * Safe to re-run: every write uses upsert / createMany + skipDuplicates.
+ *
+ * Data model (single source of truth):
+ *   resourceDefs[].pageCode  — which page "owns" this resource.
+ *     • undefined  → pure system resource, no page binding (currently unused)
+ *     • string     → creates a t_page_resource row linking the resource to that page
+ *   Multiple resources can share the same pageCode (e.g. rolePages + roleResource
+ *   both belong to the 'role' page because that page's UI calls both APIs).
  */
 export async function seedPermissions(prisma: PrismaClient) {
   // ------------------------------------------------------------------ Role --
@@ -25,74 +36,89 @@ export async function seedPermissions(prisma: PrismaClient) {
   console.log(`[seed] Role: SYSTEM_ADMIN (id=${systemAdminRole.id})`);
 
   // --------------------------------------------------------------- Resources -
-  // Resource.name is used as the resource identifier in @UseRoles({ resource: '...' })
-  // Resource.code is a unique slug (same value used here)
-  const resourceDefs = [
-    // from default-schema.prisma
-    { code: 'user', name: 'user', description: 'User management' },
-    { code: 'audit', name: 'audit', description: 'Audit logs' },
-    // from page.prisma
-    { code: 'role', name: 'role', description: 'Role management' },
-    { code: 'page', name: 'page', description: 'Page / menu management' },
-    { code: 'resource', name: 'resource', description: 'Resource management' },
-    // junction-table modules (page.prisma)
-    { code: 'rolePages', name: 'rolePages', description: 'Role-page assignments' },
-    { code: 'roleResource', name: 'roleResource', description: 'Role-resource grants' },
-    { code: 'pageResource', name: 'pageResource', description: 'Page-resource configuration' },
-    // business
-    { code: 'game', name: 'game', description: 'Business / Game management' },
+  // pageCode: which leaf page "owns" this resource (drives t_page_resource rows).
+  const resourceDefs: {
+    code: string;
+    description: string;
+    pageCode?: string;
+  }[] = [
+    // ── permission module ────────────────────────────────────────────────────
+    { code: 'user', description: 'User management', pageCode: 'user' },
+    { code: 'role', description: 'Role management', pageCode: 'role' },
+    {
+      code: 'rolePages',
+      description: 'Role-page assignments',
+      pageCode: 'role',
+    },
+    {
+      code: 'roleResource',
+      description: 'Role-resource grants',
+      pageCode: 'role',
+    },
+    { code: 'page', description: 'Page / menu management', pageCode: 'page' },
+    {
+      code: 'pageResource',
+      description: 'Page-resource configuration',
+      pageCode: 'page',
+    },
+    {
+      code: 'resource',
+      description: 'Resource management',
+      pageCode: 'resource',
+    },
+    { code: 'audit', description: 'Audit logs', pageCode: 'audits' },
+    // ── business module ──────────────────────────────────────────────────────
+    {
+      code: 'game',
+      description: 'Business / Game management',
+      pageCode: 'game',
+    },
+    { code: 'canvas', description: 'Canvas management', pageCode: 'canvas' },
   ];
 
-  const resources: { id: number; name: string }[] = [];
+  const resources: { id: number; code: string }[] = [];
   for (const def of resourceDefs) {
-    const r = await prisma.resource.upsert({
-      where: { code: def.code },
-      update: {},
-      create: {
-        code: def.code,
-        name: def.name,
-        description: def.description,
-        isCommonResource: false,
-      },
-    });
-    resources.push({ id: r.id, name: r.name });
-    console.log(`[seed] Resource: ${r.name} (id=${r.id})`);
+    const r = await upsertResource(prisma, def.code, def.description);
+    resources.push({ id: r.id, code: r.code });
+    console.log(`[seed] Resource: ${r.code} (id=${r.id})`);
   }
 
   // ------------------------------------------------------------------ Pages --
-  // Pages are created in order (parent first) so that parentId can be resolved.
+  // Created in order (parent first) so that parentId can be resolved.
 
   const pages: { id: number; code: string }[] = [];
 
   // Level 1: top-level group (系统管理)
-  const adminPage = await prisma.page.upsert({
-    where: { code: 'admin' },
-    update: {}, // preserve user edits (name, sortOrder, etc.)
-    create: {
-      code: 'admin',
-      name: '系统管理',
-      zhName: '系统管理',
-      enName: 'System Management',
-      isVirtual: false,
-      sortOrder: 1000,
-    },
+  const adminPage = await upsertPage(prisma, {
+    code: 'admin',
+    name: 'admin',
+    zhName: '系统管理',
+    enName: 'System Mgnt',
+    sortOrder: 1000,
   });
   pages.push({ id: adminPage.id, code: adminPage.code });
   console.log(`[seed] Page: ${adminPage.code} (id=${adminPage.id})`);
 
+  // Level 2: 数据管理 — child of admin
+  const dataMngt = await upsertPage(prisma, {
+    code: 'dataMngt',
+    name: '数据管理',
+    zhName: '数据管理',
+    enName: 'Data Management',
+    sortOrder: 1000,
+    parentId: adminPage.id,
+  });
+  pages.push({ id: dataMngt.id, code: dataMngt.code });
+  console.log(`[seed] Page: ${dataMngt.code} (id=${dataMngt.id})`);
+
   // Level 2: permission group (权限管理) — child of admin
-  const permissionPage = await prisma.page.upsert({
-    where: { code: 'permission' },
-    update: {}, // preserve user edits
-    create: {
-      code: 'permission',
-      name: '权限管理',
-      zhName: '权限管理',
-      enName: 'Permission Management',
-      isVirtual: false,
-      sortOrder: 1000,
-      parentId: adminPage.id,
-    },
+  const permissionPage = await upsertPage(prisma, {
+    code: 'permission',
+    name: 'permission',
+    zhName: '权限管理',
+    enName: 'Permission Mgnt',
+    sortOrder: 1010,
+    parentId: adminPage.id,
   });
   pages.push({ id: permissionPage.id, code: permissionPage.code });
   console.log(`[seed] Page: ${permissionPage.code} (id=${permissionPage.id})`);
@@ -101,35 +127,35 @@ export async function seedPermissions(prisma: PrismaClient) {
   const permissionChildDefs = [
     {
       code: 'permission_readme',
-      name: '菜单指引',
+      name: 'permission_readme',
       zhName: '菜单指引',
       enName: 'Menu Guide',
       sortOrder: 1005,
     },
     {
       code: 'user',
-      name: '用户管理',
+      name: 'user',
       zhName: '用户管理',
-      enName: 'User Management',
+      enName: 'User Mgnt',
       sortOrder: 1010,
     },
     {
       code: 'role',
-      name: '角色管理',
+      name: 'role',
       zhName: '角色管理',
-      enName: 'Role Management',
+      enName: 'Role Mgnt',
       sortOrder: 1020,
     },
     {
       code: 'page',
-      name: '页面管理',
+      name: 'page',
       zhName: '页面管理',
-      enName: 'Page Management',
+      enName: 'Page Mgnt',
       sortOrder: 1030,
     },
     {
       code: 'resource',
-      name: '资源管理',
+      name: 'resource',
       zhName: '资源管理',
       enName: 'Resource Management',
       sortOrder: 1040,
@@ -137,117 +163,57 @@ export async function seedPermissions(prisma: PrismaClient) {
   ];
 
   for (const def of permissionChildDefs) {
-    const p = await prisma.page.upsert({
-      where: { code: def.code },
-      update: {}, // preserve user edits (name, sortOrder, parentId)
-      create: {
-        code: def.code,
-        name: def.name,
-        zhName: def.zhName,
-        enName: def.enName,
-        isVirtual: false,
-        sortOrder: def.sortOrder,
-        parentId: permissionPage.id,
-      },
-    });
+    const p = await upsertPage(prisma, { ...def, parentId: permissionPage.id });
     pages.push({ id: p.id, code: p.code });
     console.log(`[seed] Page: ${p.code} (id=${p.id})`);
   }
 
-  // Level 2: 数据管理 — child of admin
-  const dataMngt = await prisma.page.upsert({
-    where: { code: 'dataMngt' },
-    update: {}, // preserve user edits
-    create: {
-      code: 'dataMngt',
-      name: '数据管理',
-      zhName: '数据管理',
-      enName: 'Data Management',
-      isVirtual: false,
-      sortOrder: 1010,
-      parentId: adminPage.id,
-    },
-  });
-  pages.push({ id: dataMngt.id, code: dataMngt.code });
-  console.log(`[seed] Page: ${dataMngt.code} (id=${dataMngt.id})`);
-
   // Level 2: other top-level children of admin (业务、审计日志)
   const adminChildDefs = [
+    {
+      code: 'canvas',
+      name: 'canvas',
+      zhName: 'Canvas',
+      enName: 'Canvas',
+      sortOrder: 1005,
+    },
     {
       code: 'game',
-      name: '业务',
-      zhName: '业务',
-      enName: 'Business',
-      isVirtual: false,
+      name: 'game',
+      zhName: '业务管理',
+      enName: 'Business Mgnt',
       sortOrder: 1050,
     },
     {
       code: 'audits',
-      name: '审计日志',
+      name: 'audits',
       zhName: '审计日志',
       enName: 'Audit Log',
-      isVirtual: false,
       sortOrder: 1060,
     },
   ];
 
   for (const def of adminChildDefs) {
-    const p = await prisma.page.upsert({
-      where: { code: def.code },
-      update: {}, // preserve user edits (name, sortOrder, parentId)
-      create: {
-        code: def.code,
-        name: def.name,
-        zhName: def.zhName,
-        enName: def.enName,
-        isVirtual: def.isVirtual,
-        sortOrder: def.sortOrder,
-        parentId: adminPage.id,
-      },
-    });
+    const p = await upsertPage(prisma, { ...def, parentId: adminPage.id });
     pages.push({ id: p.id, code: p.code });
     console.log(`[seed] Page: ${p.code} (id=${p.id})`);
   }
 
   // ------------------------------------------------------- PageResource links -
-  // Each leaf page that directly corresponds to a resource must have a
-  // PageResource record so that the permission-sync mechanism works correctly
-  // (Role → Page → PageResource → Resource).
-  //
-  // Mapping: page.code → resource.code (same value where they match)
-  const pageResourceMappings: { pageCode: string; resourceCode: string }[] = [
-    { pageCode: 'user',     resourceCode: 'user' },
-    { pageCode: 'role',     resourceCode: 'role' },
-    { pageCode: 'page',     resourceCode: 'page' },
-    { pageCode: 'resource', resourceCode: 'resource' },
-    { pageCode: 'audits',   resourceCode: 'audit' },
-    { pageCode: 'game',     resourceCode: 'game' },
-  ];
-
-  for (const mapping of pageResourceMappings) {
-    const targetPage = pages.find((p) => p.code === mapping.pageCode);
-    const targetResource = resources.find((r) => r.name === mapping.resourceCode);
+  for (const def of resourceDefs) {
+    if (!def.pageCode) continue;
 
-    if (!targetPage || !targetResource) {
+    const targetPage = pages.find((p) => p.code === def.pageCode);
+    if (!targetPage) {
       console.warn(
-        `[seed] PageResource: skipping ${mapping.pageCode} → ${mapping.resourceCode} (not found)`,
+        `[seed] PageResource: page "${def.pageCode}" not found — skipping ${def.code}`,
       );
       continue;
     }
 
-    await prisma.pageResource.upsert({
-      where: {
-        pageId_resourceId: { pageId: targetPage.id, resourceId: targetResource.id },
-      },
-      update: { actions: FULL_ACTIONS },
-      create: {
-        pageId: targetPage.id,
-        resourceId: targetResource.id,
-        actions: FULL_ACTIONS,
-      },
-    });
+    await bindResourceToPage(prisma, targetPage.id, def.code, def.description);
     console.log(
-      `[seed] PageResource: page(${targetPage.code}) ↔ resource(${targetResource.name})`,
+      `[seed] PageResource: page(${def.pageCode}) ↔ resource(${def.code})`,
     );
   }
 

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/main.ts

@@ -1,8 +1,11 @@
-// eslint-disable-next-line import/order
 import './lib/tracing'; // OpenTelemetry Prisma instrumentation - 必须第一个导入
 
 import { AllExceptionsFilter, UserType } from '@gadmin2n/nest-common';
-import { ClassSerializerInterceptor, UnauthorizedException, ValidationPipe } from '@nestjs/common';
+import {
+  ClassSerializerInterceptor,
+  UnauthorizedException,
+  ValidationPipe,
+} from '@nestjs/common';
 import './alias.config';
 
 import { ConfigService } from '@nestjs/config';

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/canvas/canvas.controller.spec.ts

@@ -0,0 +1,20 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { CanvasController } from './canvas.controller';
+import { CanvasService } from './canvas.service';
+
+describe('CanvasController', () => {
+  let controller: CanvasController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [CanvasController],
+      providers: [CanvasService],
+    }).compile();
+
+    controller = module.get<CanvasController>(CanvasController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});