@gadmin2n/schematics 0.0.135 → 0.0.137

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/temporalTenantConfig/temporalTenantConfig.service.ts

@@ -0,0 +1,110 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Prisma, TemporalTenantConfig } from '@prisma/client';
+import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
+import { PrismaService } from 'nestjs-prisma';
+import { Logger } from 'winston';
+
+import { ConfigService } from '@nestjs/config';
+
+@Injectable()
+export class TemporalTenantConfigService {
+  constructor(
+    private prisma: PrismaService,
+    private readonly config: ConfigService,
+    @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
+  ) {}
+
+  async createOne(
+    temporalTenantConfigCreateArgs: Prisma.TemporalTenantConfigCreateArgs,
+  ) {
+    return await this.prisma.temporalTenantConfig.create(
+      temporalTenantConfigCreateArgs,
+    );
+  }
+
+  async createMany(data: Prisma.TemporalTenantConfigCreateManyArgs['data']) {
+    return await this.prisma.temporalTenantConfig.createMany({
+      data,
+      skipDuplicates: true,
+    });
+  }
+
+  async findMany(
+    temporalTenantConfigFindManyArgs: Prisma.TemporalTenantConfigFindManyArgs,
+  ): Promise<{ itemCount: number; entities: TemporalTenantConfig[] }> {
+    const itemCount = await this.prisma.temporalTenantConfig.count({
+      where: temporalTenantConfigFindManyArgs.where,
+    });
+    const entities = await this.prisma.temporalTenantConfig.findMany(
+      temporalTenantConfigFindManyArgs,
+    );
+    return { itemCount, entities };
+  }
+
+  async findUnique(
+    id: number,
+    select: Prisma.TemporalTenantConfigFindUniqueArgs['select'],
+  ) {
+    return await this.prisma.temporalTenantConfig.findUnique({
+      where: { id: id },
+      select,
+    });
+  }
+
+  async updateMany(
+    temporalTenantConfigUpdateManyArgs: Prisma.TemporalTenantConfigUpdateManyArgs,
+  ) {
+    return await this.prisma.temporalTenantConfig.updateMany(
+      temporalTenantConfigUpdateManyArgs,
+    );
+  }
+
+  async updateUnique(
+    id: number,
+    data: Prisma.TemporalTenantConfigUpdateManyArgs['data'],
+  ) {
+    return await this.prisma.temporalTenantConfig.update({
+      where: { id: id },
+      data,
+    });
+  }
+
+  async deleteMany(
+    temporalTenantConfigDeleteManyArgs: Prisma.TemporalTenantConfigDeleteManyArgs,
+  ) {
+    return await this.prisma.temporalTenantConfig.deleteMany(
+      temporalTenantConfigDeleteManyArgs,
+    );
+  }
+
+  async deleteUnique(id: number) {
+    await this.prisma.temporalTenantConfig.delete({
+      where: { id: id },
+    });
+    return { count: 1 };
+  }
+
+  async count(
+    temporalTenantConfigCountArgs?: Prisma.TemporalTenantConfigCountArgs,
+  ) {
+    return await this.prisma.temporalTenantConfig.count(
+      temporalTenantConfigCountArgs,
+    );
+  }
+
+  async groupBy(
+    temporalTenantConfigGroupByArgs: Prisma.TemporalTenantConfigGroupByArgs,
+  ) {
+    return await this.prisma.temporalTenantConfig.groupBy(
+      temporalTenantConfigGroupByArgs as any,
+    );
+  }
+
+  async aggregate(
+    temporalTenantConfigAggregateArgs: Prisma.TemporalTenantConfigAggregateArgs,
+  ) {
+    return await this.prisma.temporalTenantConfig.aggregate(
+      temporalTenantConfigAggregateArgs,
+    );
+  }
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflow/workflow-execution.dto.ts

@@ -1,4 +1,10 @@
-import { IsInt, IsObject, IsOptional, IsString } from 'class-validator';
+import {
+  IsBoolean,
+  IsInt,
+  IsObject,
+  IsOptional,
+  IsString,
+} from 'class-validator';
 
 export class ExecuteWorkflowDto {
   @IsOptional()
@@ -17,3 +23,15 @@ export class SignalWorkflowDto {
   @IsObject()
   payload: Record<string, any>;
 }
+
+export class ApproveInstanceDto {
+  @IsString()
+  nodeId: string;
+
+  @IsBoolean()
+  approved: boolean;
+
+  @IsOptional()
+  @IsString()
+  comment?: string;
+}

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

@@ -20,6 +20,7 @@ import { Request } from 'express';
 import AuthGuard, { AllowUnauthorizedRequest } from '../../lib/auth.guard';
 import { TemporalService } from './temporal.service';
 import {
+  ApproveInstanceDto,
   ExecuteWorkflowDto,
   SignalWorkflowDto,
 } from './workflow-execution.dto';
@@ -222,6 +223,20 @@ export class WorkflowController {
     );
   }
 
+  @Post('instance/:instanceId/approve')
+  async approveInstance(
+    @Param('instanceId', ParseIntPipe) instanceId: number,
+    @Body() dto: ApproveInstanceDto,
+    @Req() req,
+  ) {
+    return this.workflowService.approveInstance(
+      BigInt(instanceId),
+      dto,
+      req.user.userid,
+      this.temporalService,
+    );
+  }
+
   /**
    * Public webhook entry point.
    * Triggers any published workflow with a webhook_trigger node matching (path, method).

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

@@ -501,3 +501,82 @@ describe('WorkflowService — receiveWebhook', () => {
     ).rejects.toBeInstanceOf(UnauthorizedException);
   });
 });
+
+describe('WorkflowService — approveInstance', () => {
+  let service: WorkflowService;
+  let prisma: any;
+  let temporal: any;
+
+  beforeEach(async () => {
+    prisma = {
+      workflowInstance: { findUnique: jest.fn() },
+      workflowNodeExecution: { findUnique: jest.fn() },
+    };
+    temporal = { signalWorkflow: jest.fn() };
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        WorkflowService,
+        { provide: PrismaService, useValue: prisma },
+        { provide: TemporalService, useValue: temporal },
+      ],
+    }).compile();
+    service = module.get(WorkflowService);
+  });
+
+  it('rejects when caller is not in the resolved approver list', async () => {
+    prisma.workflowInstance.findUnique.mockResolvedValue({
+      id: BigInt(1),
+      temporalRunId: 'run-1',
+    });
+    prisma.workflowNodeExecution.findUnique.mockResolvedValue({
+      input: { approvers: ['alice'] },
+    });
+    await expect(
+      service.approveInstance(
+        BigInt(1),
+        { nodeId: 'n1', approved: true },
+        'bob',
+        temporal,
+      ),
+    ).rejects.toThrow('not an approver');
+    expect(temporal.signalWorkflow).not.toHaveBeenCalled();
+  });
+
+  it('forwards signal with real approverId when caller is authorized', async () => {
+    prisma.workflowInstance.findUnique.mockResolvedValue({
+      id: BigInt(1),
+      temporalRunId: 'run-1',
+    });
+    prisma.workflowNodeExecution.findUnique.mockResolvedValue({
+      input: { approvers: ['alice'] },
+    });
+    await service.approveInstance(
+      BigInt(1),
+      { nodeId: 'n1', approved: true, comment: 'ok' },
+      'alice',
+      temporal,
+    );
+    expect(temporal.signalWorkflow).toHaveBeenCalledWith('run-1', 'approval', {
+      nodeId: 'n1',
+      approved: true,
+      approvedBy: 'alice',
+      comment: 'ok',
+    });
+  });
+
+  it('throws NotFoundException when no node execution exists for nodeId', async () => {
+    prisma.workflowInstance.findUnique.mockResolvedValue({
+      id: BigInt(1),
+      temporalRunId: 'run-1',
+    });
+    prisma.workflowNodeExecution.findUnique.mockResolvedValue(null);
+    await expect(
+      service.approveInstance(
+        BigInt(1),
+        { nodeId: 'missing', approved: true },
+        'alice',
+        temporal,
+      ),
+    ).rejects.toThrow('Node execution not found');
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflow/workflow.service.ts

@@ -1,3 +1,4 @@
+import { validateDslHandles } from '@gadmin2n/nest-common/workflow-dsl';
 import {
   BadRequestException,
   Injectable,
@@ -10,10 +11,6 @@ import { PrismaService } from 'nestjs-prisma';
 import { validateDslGraph } from './dsl-validate.util';
 import { TemporalService } from './temporal.service';
 import { verifyWebhookSignature } from './webhook-signature.util';
-import {
-  validateDslHandles,
-  type NodeOutputsMap,
-} from './workflow-dsl-validate';
 
 @Injectable()
 export class WorkflowService {
@@ -289,21 +286,11 @@ export class WorkflowService {
       throw new BadRequestException(`Invalid DSL: ${err?.message ?? err}`);
     }
 
-    // Per-edge sourceHandle validation against node-type outputs declared in the
-    // database (t_workflow_node_type.outputs). Hard-fail with a structured error
-    // list so the frontend can highlight invalid edges.
-    const nodeTypes = await this.prisma.workflowNodeType.findMany({
-      select: { type: true, outputs: true },
-    });
-    const outputsMap: NodeOutputsMap = {};
-    for (const nt of nodeTypes) {
-      // Pass through: null = dynamic, [] = single anonymous, [..] = enumerated
-      outputsMap[nt.type] =
-        nt.outputs === undefined
-          ? []
-          : (nt.outputs as unknown as string[] | null);
-    }
-    const handleErrors = validateDslHandles(dslToPublish as any, outputsMap);
+    // Per-edge sourceHandle validation against node-type outputs declared in
+    // @gadmin2n/nest-common (NODE_TYPE_META). nest-common is the single source
+    // of truth for handle metadata; the seeded t_workflow_node_type.outputs
+    // column mirrors it (verified at seed time in workflow-node-types.ts).
+    const handleErrors = validateDslHandles(dslToPublish as any);
     if (handleErrors.length > 0) {
       throw new BadRequestException({
         message: 'DSL validation failed: invalid edge sourceHandle(s)',
@@ -786,4 +773,39 @@ export class WorkflowService {
     );
     return { success: true };
   }
+
+  async approveInstance(
+    instanceId: bigint,
+    dto: { nodeId: string; approved: boolean; comment?: string },
+    approverId: string,
+    temporalService: any,
+  ) {
+    const instance = await this.prisma.workflowInstance.findUnique({
+      where: { id: instanceId },
+    });
+    if (!instance) throw new NotFoundException('Instance not found');
+    if (!instance.temporalRunId) {
+      throw new Error('Instance has no Temporal run ID');
+    }
+
+    const nodeExecution = await this.prisma.workflowNodeExecution.findUnique({
+      where: { instanceId_nodeId: { instanceId, nodeId: dto.nodeId } },
+    });
+    if (!nodeExecution) throw new NotFoundException('Node execution not found');
+
+    const approvers: string[] = (nodeExecution.input as any)?.approvers || [];
+    if (!approvers.includes(approverId)) {
+      throw new UnauthorizedException(
+        `${approverId} is not an approver for this node`,
+      );
+    }
+
+    await temporalService.signalWorkflow(instance.temporalRunId, 'approval', {
+      nodeId: dto.nodeId,
+      approved: dto.approved,
+      approvedBy: approverId,
+      comment: dto.comment,
+    });
+    return { success: true };
+  }
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/start-prod.sh

@@ -24,7 +24,7 @@ fi
 
 echo "原始 DATABASE_URL: ${DATABASE_URL}"
 
-# 确保目标数据库已存在；prisma db push 只建 schema/表，不会建 database 本身。
+# 确保目标数据库已存在；migrate:deploy 只建 schema/表，不会建 database 本身。
 # 若部署环境已通过 DBA/init 流程保证 DB 存在，可设 SKIP_ENSURE_DATABASE=1 跳过。
 node ensure-database.js || { echo "ensure-database 失败"; exit 1; }
 
@@ -73,7 +73,7 @@ if [ "$DEPLOY_PREFIX_MATCH" -eq 1 ]; then
   echo "更新后的 DATABASE_URL: ${DATABASE_URL}"
   export DATABASE_URL="${DATABASE_URL}"
 
-  yarn push:db || { echo "同步表结构失败"; exit 1; }
+  yarn migrate:deploy || { echo "同步表结构失败"; exit 1; }
 
   # 设置迁移脚本的源和目标 schema
   # 源 schema 为 public（生产数据），目标 schema 为分支 schema
@@ -135,11 +135,11 @@ else
   NEEDS_INIT=$(node -e "const{PrismaClient}=require('@prisma/client');const p=new PrismaClient();p.\$queryRawUnsafe('SELECT COUNT(*)::int AS c FROM t_role').then(r=>{process.stdout.write(Number(r[0].c)>0?'no':'yes');return p.\$disconnect();}).catch(()=>{process.stdout.write('yes');return p.\$disconnect().catch(()=>{});});" 2>/dev/null || echo "yes")
 
   if [ "$NEEDS_INIT" != "no" ]; then
-    echo "权限表缺失或无数据（NEEDS_INIT=${NEEDS_INIT}），执行 push:db + seed ..."
-    yarn push:db || { echo "同步表结构失败"; exit 1; }
+    echo "权限表缺失或无数据（NEEDS_INIT=${NEEDS_INIT}），执行 migrate:deploy + seed ..."
+    yarn migrate:deploy || { echo "同步表结构失败"; exit 1; }
     yarn seed    || { echo "seed 失败"; exit 1; }
   else
-    echo "权限数据已就绪，跳过 push:db 与 seed"
+    echo "权限数据已就绪，跳过 migrate:deploy 与 seed"
   fi
 fi