@gadmin2n/schematics 0.0.147 → 0.0.148

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

@@ -138,11 +138,102 @@ export class UserGroupService {
     });
   }
 
-  search(query: string) {
+  async deleteGroup(code: string, expectedRevision: number) {
+    try {
+      return await this.prisma.$transaction(async (tx) => {
+        const group = await this.findGroup(tx, code);
+        this.assertRevision(group.revision, expectedRevision);
+
+        const [parents, workflows, activeApprovalCount] = await Promise.all([
+          tx.userGroupChild.findMany({
+            where: { childGroupId: group.id },
+            select: {
+              parentGroup: { select: { code: true, name: true } },
+            },
+          }),
+          tx.workflow.findMany({
+            select: {
+              id: true,
+              name: true,
+              dsl: true,
+              versions: { select: { dsl: true } },
+            },
+          }),
+          tx.approvalRequestSubject.count({
+            where: {
+              provider: 'USER_GROUP',
+              ref: group.code,
+              request: { status: { in: ['PENDING', 'BLOCKED'] } },
+            },
+          }),
+        ]);
+        const parentGroups = parents.map(({ parentGroup }) => parentGroup);
+        const referencedWorkflows = workflows
+          .filter(
+            (workflow) =>
+              workflowDslReferencesGroup(workflow.dsl, group.code) ||
+              workflow.versions.some((version) =>
+                workflowDslReferencesGroup(version.dsl, group.code),
+              ),
+          )
+          .map((workflow) => ({
+            id: String(workflow.id),
+            name: workflow.name,
+          }));
+        const reasons = [
+          ...(parentGroups.length
+            ? [
+                `被人员组引用：${parentGroups
+                  .map((parent) => parent.name)
+                  .join('、')}`,
+              ]
+            : []),
+          ...(referencedWorkflows.length
+            ? [
+                `被 Workflow 引用：${referencedWorkflows
+                  .map((workflow) => workflow.name)
+                  .join('、')}`,
+              ]
+            : []),
+          ...(activeApprovalCount
+            ? [`仍有 ${activeApprovalCount} 个进行中的审批引用`]
+            : []),
+        ];
+        if (reasons.length) {
+          throw new UserGroupDomainError(
+            'USER_GROUP_IN_USE',
+            `无法删除该人员组：${reasons.join('；')}`,
+            409,
+          );
+        }
+
+        await Promise.all([
+          tx.userGroupUser.deleteMany({ where: { groupId: group.id } }),
+          tx.userGroupChild.deleteMany({ where: { parentGroupId: group.id } }),
+        ]);
+        await tx.userGroup.delete({ where: { id: group.id } });
+        return { count: 1 };
+      });
+    } catch (error) {
+      if (
+        error instanceof Prisma.PrismaClientKnownRequestError &&
+        error.code === 'P2003'
+      ) {
+        throw new UserGroupDomainError(
+          'USER_GROUP_IN_USE',
+          '该人员组刚被其他数据引用，请刷新后重试',
+          409,
+        );
+      }
+      throw error;
+    }
+  }
+
+  search(query: string, includeInactive = false) {
     const q = query.trim();
     return this.prisma.userGroup.findMany({
       where: {
-        isActive: true,
+        ...(!includeInactive && { isActive: true }),
         ...(q && {
           OR: [
             { code: { contains: q, mode: 'insensitive' } },
@@ -156,6 +247,8 @@ export class UserGroupService {
         name: true,
         description: true,
         revision: true,
+        isActive: true,
+        updatedAt: true,
       },
       take: 50,
     });
@@ -220,7 +313,7 @@ export class UserGroupService {
         where: { id: { in: ids }, isActive: true },
         select: {
           users: {
-            where: { user: { isActive: true } },
+            where: { user: { isActive: true, isApiKey: false } },
             select: {
               user: { select: { userid: true, username: true } },
             },
@@ -267,13 +360,13 @@ export class UserGroupService {
   private async requireActiveUsers(tx: Transaction, userIds: string[]) {
     if (userIds.length === 0) return [];
     const users = await tx.user.findMany({
-      where: { userid: { in: userIds }, isActive: true },
+      where: { userid: { in: userIds }, isActive: true, isApiKey: false },
       select: { userid: true },
     });
     if (users.length !== userIds.length) {
       throw new UserGroupDomainError(
         'USER_GROUP_MEMBER_INVALID',
-        'Every direct user must exist and be active',
+        'Every direct user must exist, be active, and not be an API key user',
       );
     }
     return users;
@@ -388,3 +481,23 @@ export class UserGroupService {
     );
   }
 }
+
+function workflowDslReferencesGroup(
+  value: Prisma.JsonValue | null,
+  groupCode: string,
+): boolean {
+  if (Array.isArray(value))
+    return value.some((item) => workflowDslReferencesGroup(item, groupCode));
+  if (!value || typeof value !== 'object') return false;
+
+  const record = value as Record<string, Prisma.JsonValue>;
+  const refs = Array.isArray(record.refs) ? record.refs.map(String) : [];
+  if (
+    refs.includes(`group:${groupCode}`) ||
+    (record.provider === 'USER_GROUP' && refs.includes(groupCode))
+  )
+    return true;
+  return Object.values(record).some((item) =>
+    workflowDslReferencesGroup(item, groupCode),
+  );
+}

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

@@ -69,6 +69,7 @@ describe('Workflow cancellation', () => {
       runtime.cancelExecution({
         tx: tx as any,
         instanceId: BigInt(11),
+        requestedBy: 'business-user',
         reason: 'business cancellation',
       }),
     ).resolves.toEqual({ instanceId: '11', status: 'CANCELLED' });
@@ -79,6 +80,8 @@ describe('Workflow cancellation', () => {
       data: expect.objectContaining({
         status: 'CANCELLED',
         cancellationStatus: 'PENDING',
+        cancellationRequestedAt: expect.any(Date),
+        cancellationRequestedBy: 'business-user',
         cancellationReason: 'business cancellation',
       }),
     });
@@ -112,6 +115,7 @@ describe('Workflow cancellation', () => {
     await runtime.cancelExecution({
       tx: tx as any,
       instanceId: execution!.instanceId,
+      requestedBy: 'applicant-user',
       reason: 'applicant cancellation',
     });
 
@@ -150,7 +154,11 @@ describe('Workflow cancellation', () => {
     const { runtime, temporal, tx } = setup({ status: 'COMPLETED' });
 
     await expect(
-      runtime.cancelExecution({ tx: tx as any, instanceId: BigInt(11) }),
+      runtime.cancelExecution({
+        tx: tx as any,
+        instanceId: BigInt(11),
+        requestedBy: 'admin-user',
+      }),
     ).rejects.toBeInstanceOf(ConflictException);
     expect(tx.workflowInstance.update).not.toHaveBeenCalled();
     expect(tx.approvalRequest.updateMany).not.toHaveBeenCalled();
@@ -164,7 +172,11 @@ describe('Workflow cancellation', () => {
     });
 
     await expect(
-      runtime.cancelExecution({ tx: tx as any, instanceId: BigInt(11) }),
+      runtime.cancelExecution({
+        tx: tx as any,
+        instanceId: BigInt(11),
+        requestedBy: 'admin-user',
+      }),
     ).rejects.toMatchObject({
       response: {
         code: 'WORKFLOW_CANCELLATION_BLOCKED',
@@ -180,7 +192,11 @@ describe('Workflow cancellation', () => {
     });
 
     await expect(
-      runtime.cancelExecution({ tx: tx as any, instanceId: BigInt(11) }),
+      runtime.cancelExecution({
+        tx: tx as any,
+        instanceId: BigInt(11),
+        requestedBy: 'second-user',
+      }),
     ).resolves.toEqual({ instanceId: '11', status: 'CANCELLED' });
     expect(tx.workflowInstance.update).not.toHaveBeenCalled();
     expect(temporal.cancelWorkflow).not.toHaveBeenCalled();
@@ -193,6 +209,7 @@ describe('Workflow cancellation', () => {
         runtime.cancelExecution({
           tx: transactionClient,
           instanceId: BigInt(11),
+          requestedBy: `${reason} user`,
           reason,
         }),
       );

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

@@ -279,7 +279,7 @@ describe('WorkflowCompilerService', () => {
               type: 'approval',
               label: '部门负责人审批',
               config: {
-                subjects: [{ source: 'STATIC', provider: 'USER', refs: [' '] }],
+                subjects: [{ source: 'STATIC', refs: [' '] }],
               },
             },
           ],
@@ -426,7 +426,7 @@ describe('WorkflowCompilerService', () => {
       code: 'FINANCE_APPROVAL',
       nodeTypeId: BigInt(7),
       isEnabled: true,
-      config: { subjects: [{ provider: 'USER', refs: ['alice'] }] },
+      config: { subjects: [{ source: 'STATIC', refs: ['alice'] }] },
     };
     const prisma = {
       workflowNodeType: {
@@ -483,7 +483,7 @@ describe('WorkflowCompilerService', () => {
     });
     instance.config.subjects[0].refs[0] = 'bob';
     expect(compiled.nodes[0].config).toEqual({
-      subjects: [{ provider: 'USER', refs: ['alice'] }],
+      subjects: [{ source: 'STATIC', refs: ['alice'] }],
     });
   });
 
@@ -529,9 +529,7 @@ describe('WorkflowCompilerService', () => {
             config: instance.config,
             configOverride: {
               timeoutSeconds: 3600,
-              subjects: [
-                { source: 'STATIC', provider: 'USER', refs: ['alice'] },
-              ],
+              subjects: [{ source: 'STATIC', refs: ['alice'] }],
             },
             instanceRef: {
               instanceId: '12',
@@ -546,7 +544,7 @@ describe('WorkflowCompilerService', () => {
 
     const expectedOverride = {
       timeoutSeconds: 3600,
-      subjects: [{ source: 'STATIC', provider: 'USER', refs: ['alice'] }],
+      subjects: [{ source: 'STATIC', refs: ['alice'] }],
     };
     expect(compiled.nodes[0].config).toEqual(expectedOverride);
     expect(compiled.nodes[0].source?.configHash).toBe(
@@ -571,7 +569,7 @@ describe('WorkflowCompilerService', () => {
         },
         details: [],
       },
-      subjects: [{ source: 'STATIC', provider: 'USER', refs: ['alice'] }],
+      subjects: [{ source: 'STATIC', refs: ['alice'] }],
       approvalRule: { mode: 'ANY' },
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
@@ -655,7 +653,6 @@ describe('WorkflowCompilerService', () => {
               subjects: [
                 {
                   source: 'DYNAMIC',
-                  provider: 'USER',
                   inputKey: 'direct_manager',
                   label: '查询直属领导',
                   lookup: { request: { connectionRef: 'erp' } },

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

@@ -22,6 +22,7 @@ export interface WorkflowCancellationSummary {
 export interface CancelWorkflowExecutionInput {
   tx: Prisma.TransactionClient;
   instanceId: bigint;
+  requestedBy: string;
   reason?: string;
 }
 
@@ -60,6 +61,7 @@ export class WorkflowRuntimeFacade {
     await this.workflows.cancelExecutionInTransaction(
       input.tx,
       input.instanceId,
+      input.requestedBy,
       input.reason,
     );
     return { instanceId: input.instanceId.toString(), status: 'CANCELLED' };

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

@@ -81,7 +81,9 @@ describe('WorkflowController runtime contracts', () => {
       prisma as never,
     );
 
-    await expect(controller.cancelInstance(42)).resolves.toEqual({
+    await expect(
+      controller.cancelInstance(42, { user: { userid: 'admin-user' } }),
+    ).resolves.toEqual({
       instanceId: '42',
       status: 'CANCELLED',
     });
@@ -89,6 +91,7 @@ describe('WorkflowController runtime contracts', () => {
     expect(runtime.cancelExecution).toHaveBeenCalledWith({
       tx,
       instanceId: BigInt(42),
+      requestedBy: 'admin-user',
     });
   });
 });

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

@@ -272,11 +272,15 @@ export class WorkflowController {
   }
 
   @Post('instance/:instanceId/cancel')
-  async cancelInstance(@Param('instanceId', ParseIntPipe) instanceId: number) {
+  async cancelInstance(
+    @Param('instanceId', ParseIntPipe) instanceId: number,
+    @Req() req,
+  ) {
     return this.prisma.$transaction((tx) =>
       this.workflowRuntime.cancelExecution({
         tx,
         instanceId: BigInt(instanceId),
+        requestedBy: req.user.userid,
       }),
     );
   }

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

@@ -7,6 +7,50 @@ import { signWebhookPayload } from './webhook-signature.util';
 import { WorkflowCompilerService } from './workflow-compiler.service';
 import { WorkflowService } from './workflow.service';
 
+describe('WorkflowService — workflow list run counts', () => {
+  it('includes cancelled instances in the run summary', async () => {
+    const prisma = {
+      workflow: {
+        findMany: jest.fn().mockResolvedValue([
+          {
+            id: BigInt(42),
+            dsl: null,
+            versions: [],
+            _count: { instances: 2 },
+          },
+        ]),
+        count: jest.fn().mockResolvedValue(1),
+      },
+      workflowInstance: {
+        groupBy: jest.fn().mockResolvedValue([
+          {
+            workflowId: BigInt(42),
+            status: 'CANCELLED',
+            _count: 2,
+          },
+        ]),
+        findMany: jest.fn().mockResolvedValue([]),
+      },
+    };
+    const service = new WorkflowService(
+      prisma as any,
+      {} as any,
+      {} as any,
+      {} as any,
+    );
+
+    const result = await service.findMany({});
+
+    expect(result.items[0].runs).toEqual({
+      pending: 0,
+      running: 0,
+      completed: 0,
+      failed: 0,
+      cancelled: 2,
+    });
+  });
+});
+
 describe('WorkflowService — cron lifecycle hooks', () => {
   let service: WorkflowService;
   let prisma: any;

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

@@ -592,7 +592,13 @@ export class WorkflowService {
 
     const runsMap = new Map<
       bigint,
-      { pending: number; running: number; completed: number; failed: number }
+      {
+        pending: number;
+        running: number;
+        completed: number;
+        failed: number;
+        cancelled: number;
+      }
     >();
     for (const row of instanceCounts) {
       if (!runsMap.has(row.workflowId)) {
@@ -601,6 +607,7 @@ export class WorkflowService {
           running: 0,
           completed: 0,
           failed: 0,
+          cancelled: 0,
         });
       }
       const entry = runsMap.get(row.workflowId)!;
@@ -627,6 +634,7 @@ export class WorkflowService {
         running: 0,
         completed: 0,
         failed: 0,
+        cancelled: 0,
       },
       lastRun: lastRunMap.get(item.id)?.createdAt || null,
     }));
@@ -2260,8 +2268,13 @@ export class WorkflowService {
   async cancelExecutionInTransaction(
     tx: Prisma.TransactionClient,
     instanceId: bigint,
+    requestedBy: string,
     reason?: string,
   ) {
+    const normalizedRequestedBy = requestedBy.trim().slice(0, 128);
+    if (!normalizedRequestedBy)
+      throw new BadRequestException('Cancellation requester is required');
+
     const rows = await tx.$queryRaw<
       Array<{
         id: bigint;
@@ -2301,6 +2314,7 @@ export class WorkflowService {
           status: 'CANCELLED',
           finishedAt: now,
           cancellationRequestedAt: now,
+          cancellationRequestedBy: normalizedRequestedBy,
           cancellationReason: reason?.trim().slice(0, 512) || null,
           cancellationStatus: instance.temporalRunId ? 'PENDING' : 'COMPLETED',
           cancellationLastError: null,

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflowConfig/node-config-validator.service.spec.ts

@@ -112,7 +112,7 @@ describe('NodeConfigValidatorService', () => {
         },
         details: [],
       },
-      subjects: [{ source: 'STATIC', provider: 'USER', refs: ['reviewer'] }],
+      subjects: [{ source: 'STATIC', refs: ['reviewer'] }],
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
     };
@@ -148,7 +148,7 @@ describe('NodeConfigValidatorService', () => {
         },
         details: [],
       },
-      subjects: [{ source: 'STATIC', provider: 'USER', refs: ['reviewer'] }],
+      subjects: [{ source: 'STATIC', refs: ['reviewer'] }],
       approvalRule: { mode: 'ANY' },
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
@@ -210,7 +210,6 @@ describe('NodeConfigValidatorService', () => {
       subjects: [
         {
           source: 'DYNAMIC',
-          provider: 'USER',
           inputKey: 'direct_manager',
           label: '查询直属领导',
         },

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflowConfig/subject-config-validator.service.spec.ts

@@ -1,5 +1,4 @@
 import { BadRequestException } from '@nestjs/common';
-import { SubjectProviderError } from '../subjectProvider/subject-provider.errors';
 import { SubjectProviderRegistry } from '../subjectProvider/subject-provider.registry';
 import {
   ActorContext,
@@ -28,9 +27,9 @@ const schema = {
   },
 };
 
-function provider(): jest.Mocked<SubjectProvider> {
+function provider(key = 'USER'): jest.Mocked<SubjectProvider> {
   return {
-    key: 'USER_GROUP',
+    key,
     descriptor: jest.fn(),
     search: jest.fn(),
     create: jest.fn(),
@@ -58,8 +57,8 @@ describe('SubjectConfigValidatorService', () => {
       {
         approval: {
           subjects: [
-            { provider: 'USER_GROUP', refs: ['group:ops'] },
-            { provider: 'USER_GROUP', refs: ['group:security'] },
+            { source: 'STATIC', refs: ['alice'] },
+            { source: 'STATIC', refs: ['bob'] },
           ],
         },
       },
@@ -67,15 +66,39 @@ describe('SubjectConfigValidatorService', () => {
     );
 
     expect(subjectProvider.validate).toHaveBeenCalledWith(
-      ['group:ops', 'group:security'],
+      ['alice', 'bob'],
       actor,
     );
   });
 
+  it('validates fixed user groups with the user-group provider', async () => {
+    const userGroupProvider = provider('USER_GROUP');
+    registry.register(userGroupProvider);
+
+    await service.validateSubjects(
+      schema,
+      {
+        approval: {
+          subjects: [
+            {
+              source: 'STATIC',
+              provider: 'USER_GROUP',
+              refs: ['finance'],
+            },
+          ],
+        },
+      },
+      actor,
+    );
+
+    expect(userGroupProvider.validate).toHaveBeenCalledWith(['finance'], actor);
+    expect(subjectProvider.validate).not.toHaveBeenCalled();
+  });
+
   it('rejects malformed, duplicate, and provider-invalid references', async () => {
     subjectProvider.validate.mockResolvedValue({
       valid: false,
-      issues: [{ ref: 'group:missing', code: 'NOT_FOUND', message: 'Missing' }],
+      issues: [{ ref: 'missing', code: 'NOT_FOUND', message: 'Missing' }],
     });
 
     await expect(
@@ -83,7 +106,7 @@ describe('SubjectConfigValidatorService', () => {
         schema,
         {
           approval: {
-            subjects: [{ provider: 'USER_GROUP', refs: ['group:missing'] }],
+            subjects: [{ source: 'STATIC', refs: ['missing'] }],
           },
         },
         actor,
@@ -96,19 +119,7 @@ describe('SubjectConfigValidatorService', () => {
     });
   });
 
-  it('preserves registry errors and sanitizes unexpected provider failures', async () => {
-    await expect(
-      service.validateSubjects(
-        schema,
-        {
-          approval: {
-            subjects: [{ provider: 'MISSING', refs: ['value'] }],
-          },
-        },
-        actor,
-      ),
-    ).rejects.toBeInstanceOf(SubjectProviderError);
-
+  it('sanitizes unexpected provider failures', async () => {
     subjectProvider.validate.mockRejectedValueOnce(
       new BadRequestException({ code: 'PROVIDER_LEAK', secret: 'secret DSN' }),
     );
@@ -117,7 +128,7 @@ describe('SubjectConfigValidatorService', () => {
         schema,
         {
           approval: {
-            subjects: [{ provider: 'USER_GROUP', refs: ['group:ops'] }],
+            subjects: [{ source: 'STATIC', refs: ['alice'] }],
           },
         },
         actor,

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/workflowConfig/subject-config-validator.service.ts

@@ -137,16 +137,10 @@ export class SubjectConfigValidatorService {
         return;
       }
 
-      const provider = validNonBlankString(entry.provider);
       const source = entry.source ?? 'STATIC';
+      const provider =
+        source === 'DYNAMIC' ? 'USER' : validProvider(entry.provider) ?? 'USER';
       const rawRefs = entry.refs;
-      if (!provider) {
-        issues.push({
-          path: `${entryPath}/provider`,
-          code: 'INVALID_PROVIDER',
-          message: 'provider must be a nonblank string',
-        });
-      }
       if (source === 'DYNAMIC') {
         const inputKey = validNonBlankString(entry.inputKey);
         if (!inputKey) {
@@ -164,11 +158,9 @@ export class SubjectConfigValidatorService {
         } else {
           seenDynamicInputs.add(inputKey);
         }
-        if (provider) {
-          grouped.set(provider, grouped.get(provider) ?? []);
-          if (!providerPaths.has(provider))
-            providerPaths.set(provider, entryPath);
-        }
+        grouped.set(provider, grouped.get(provider) ?? []);
+        if (!providerPaths.has(provider))
+          providerPaths.set(provider, entryPath);
         return;
       }
       if (!Array.isArray(rawRefs) || rawRefs.length === 0) {
@@ -190,17 +182,8 @@ export class SubjectConfigValidatorService {
           });
           return;
         }
-        if (!provider) return;
-
-        const duplicateKey = `${provider}\0${ref}`;
+        const duplicateKey = `${provider}\u0000${ref}`;
         if (seen.has(duplicateKey)) {
-          issues.push({
-            path: `${entryPath}/refs/${refIndex}`,
-            provider,
-            ref,
-            code: 'DUPLICATE_REF',
-            message: 'duplicate ref for provider',
-          });
           return;
         }
 
@@ -232,6 +215,10 @@ function validNonBlankString(value: unknown): string | undefined {
     : undefined;
 }
 
+function validProvider(value: unknown): 'USER' | 'USER_GROUP' | undefined {
+  return value === 'USER' || value === 'USER_GROUP' ? value : undefined;
+}
+
 function toJsonPointer(path: readonly string[]): string {
   if (path.length === 0) return '/';
   return `/${path