@gadmin2n/schematics 0.0.143 → 0.0.145

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/approval-signal-outbox.service.ts

@@ -3,7 +3,11 @@ import { Interval } from '@nestjs/schedule';
 import { randomUUID } from 'crypto';
 import { PrismaService } from 'nestjs-prisma';
 import { TemporalService } from '../workflow/temporal.service';
-import { outboxError, outboxRetryAt } from './outbox-retry.util';
+import {
+  OUTBOX_MAX_RETRY_COUNT,
+  outboxError,
+  outboxRetryAt,
+} from './outbox-retry.util';
 
 const BATCH_SIZE = 25;
 const LOCK_TIMEOUT_MS = 60_000;
@@ -33,8 +37,16 @@ export class ApprovalSignalOutboxService {
         where: {
           nextAttemptAt: { lte: now },
           OR: [
-            { status: { in: ['PENDING', 'FAILED'] }, lockedAt: null },
-            { status: 'PROCESSING', lockedAt: { lt: staleAt } },
+            {
+              status: { in: ['PENDING', 'FAILED'] },
+              retryCount: { lt: OUTBOX_MAX_RETRY_COUNT },
+              lockedAt: null,
+            },
+            {
+              status: 'PROCESSING',
+              retryCount: { lt: OUTBOX_MAX_RETRY_COUNT },
+              lockedAt: { lt: staleAt },
+            },
           ],
         },
         orderBy: { id: 'asc' },
@@ -46,8 +58,16 @@ export class ApprovalSignalOutboxService {
         where: {
           id: { in: ids },
           OR: [
-            { status: { in: ['PENDING', 'FAILED'] }, lockedAt: null },
-            { status: 'PROCESSING', lockedAt: { lt: staleAt } },
+            {
+              status: { in: ['PENDING', 'FAILED'] },
+              retryCount: { lt: OUTBOX_MAX_RETRY_COUNT },
+              lockedAt: null,
+            },
+            {
+              status: 'PROCESSING',
+              retryCount: { lt: OUTBOX_MAX_RETRY_COUNT },
+              lockedAt: { lt: staleAt },
+            },
           ],
         },
         data: { status: 'PROCESSING', lockedAt: now, lockedBy: claimId },
@@ -108,7 +128,9 @@ export class ApprovalSignalOutboxService {
         },
       });
       this.logger.warn(
-        `Approval signal ${row.id} failed: ${outboxError(error)}`,
+        `Approval signal ${row.id} failed${
+          retryCount >= OUTBOX_MAX_RETRY_COUNT ? ' permanently' : ''
+        }: ${outboxError(error)}`,
       );
     }
   }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/approval-subject-source.util.spec.ts

@@ -1,7 +1,7 @@
 import { materializeApprovalSubjects } from './approval-subject-source.util';
 
 describe('materializeApprovalSubjects', () => {
-  it('combines static approvers with scalar and array dynamic inputs', () => {
+  it('combines static approvers with embedded dynamic lookup results', () => {
     expect(
       materializeApprovalSubjects(
         [
@@ -18,8 +18,17 @@ describe('materializeApprovalSubjects', () => {
           },
         ],
         {
-          request_owner: 'bob',
-          review_groups: ['finance', 'risk', 'finance'],
+          request_owner: {
+            subjects: [{ provider: 'USER', refs: ['bob'] }],
+          },
+          review_groups: {
+            subjects: [
+              {
+                provider: 'USER_GROUP',
+                refs: ['finance', 'risk', 'finance'],
+              },
+            ],
+          },
         },
       ),
     ).toEqual([
@@ -42,4 +51,42 @@ describe('materializeApprovalSubjects', () => {
       ),
     ).toThrow('Dynamic approver input "request_owner" is missing or empty');
   });
+
+  it('materializes the subjects returned by an embedded lookup script', () => {
+    expect(
+      materializeApprovalSubjects(
+        [
+          {
+            source: 'DYNAMIC',
+            provider: 'USER',
+            inputKey: 'direct_manager',
+          },
+        ],
+        {
+          direct_manager: {
+            subjects: [{ provider: 'USER', refs: ['leader-a'] }],
+          },
+        },
+      ),
+    ).toEqual([{ provider: 'USER', refs: ['leader-a'] }]);
+  });
+
+  it('rejects a lookup result that does not use the configured provider', () => {
+    expect(() =>
+      materializeApprovalSubjects(
+        [
+          {
+            source: 'DYNAMIC',
+            provider: 'USER',
+            inputKey: 'direct_manager',
+          },
+        ],
+        {
+          direct_manager: {
+            subjects: [{ provider: 'USER_GROUP', refs: ['leaders'] }],
+          },
+        },
+      ),
+    ).toThrow('Dynamic approver input "direct_manager" is missing or empty');
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/approval-subject-source.util.ts

@@ -26,7 +26,11 @@ export function materializeApprovalSubjects(
   for (const source of sources) {
     const refs =
       source.source === 'DYNAMIC'
-        ? normalizeDynamicRefs(dynamicInputs[source.inputKey], source.inputKey)
+        ? normalizeDynamicRefs(
+            dynamicInputs[source.inputKey],
+            source.inputKey,
+            source.provider,
+          )
         : normalizeRefs(source.refs);
     const current = refsByProvider.get(source.provider) ?? [];
     refsByProvider.set(source.provider, [...new Set([...current, ...refs])]);
@@ -35,13 +39,32 @@ export function materializeApprovalSubjects(
   return [...refsByProvider].map(([provider, refs]) => ({ provider, refs }));
 }
 
-function normalizeDynamicRefs(value: unknown, inputKey: string): string[] {
-  const refs = normalizeRefs(Array.isArray(value) ? value : [value]);
+function normalizeDynamicRefs(
+  value: unknown,
+  inputKey: string,
+  provider: ApprovalSubjectProvider,
+): string[] {
+  const result = asObject(value);
+  const subjects = Array.isArray(result.subjects) ? result.subjects : [];
+  const refs = normalizeRefs(
+    subjects.flatMap((item) => {
+      const subject = asObject(item);
+      return subject.provider === provider && Array.isArray(subject.refs)
+        ? subject.refs
+        : [];
+    }),
+  );
   if (refs.length === 0)
     throw new Error(`Dynamic approver input "${inputKey}" is missing or empty`);
   return refs;
 }
 
+function asObject(value: unknown): Record<string, unknown> {
+  return value && typeof value === 'object' && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
 function normalizeRefs(values: unknown[]): string[] {
   return [
     ...new Set(

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/human-approval.dto.ts

@@ -1,6 +1,9 @@
 import { Type } from 'class-transformer';
 import {
+  Allow,
   IsArray,
+  IsBoolean,
+  IsDefined,
   IsIn,
   IsInt,
   IsNotEmpty,
@@ -30,6 +33,15 @@ export class ApprovalSubjectConfigDto {
   @IsString()
   @IsNotEmpty()
   inputKey?: string;
+
+  @ValidateIf((input) => input.source === 'DYNAMIC')
+  @IsString()
+  @IsNotEmpty()
+  label?: string;
+
+  @ValidateIf((input) => input.source === 'DYNAMIC')
+  @IsObject()
+  lookup?: Record<string, unknown>;
 }
 
 export class ApprovalTimeoutConfigDto {
@@ -43,13 +55,11 @@ export class ApprovalTimeoutConfigDto {
 
 export class ApprovalConfigSnapshotDto {
   @IsOptional()
-  @IsString()
-  @IsNotEmpty()
-  approvalWorkflowId?: string;
+  @IsObject()
+  external?: Record<string, unknown>;
 
-  @IsOptional()
   @IsObject()
-  approvalWorkflowInputBindings?: Record<string, unknown>;
+  task: Record<string, unknown>;
 
   @IsArray()
   @ValidateNested({ each: true })
@@ -62,35 +72,51 @@ export class ApprovalConfigSnapshotDto {
   @IsObject()
   rejectionRule: ApprovalRule;
 
+  @IsOptional()
+  @IsBoolean()
+  blockCancellationOnResolved?: boolean;
+
   @ValidateNested()
   @Type(() => ApprovalTimeoutConfigDto)
   timeout: ApprovalTimeoutConfigDto;
 }
 
-export class StartApprovalRequestDto {
-  workflowInstanceId: string | number | bigint;
+export class ApprovalTaskDetailDto {
+  @IsString()
+  @IsNotEmpty()
+  key: string;
 
   @IsString()
   @IsNotEmpty()
-  nodeId: string;
+  label: string;
 
-  workflowVersionId: string | number | bigint;
+  @IsDefined()
+  value: unknown;
+}
 
-  @IsOptional()
+export class ApprovalTaskDto {
   @IsString()
-  tenantNamespace?: string;
+  @IsNotEmpty()
+  title: string;
 
   @IsOptional()
   @IsString()
-  temporalRunId?: string;
+  description?: string;
 
-  @IsOptional()
-  @IsString()
-  approvalWorkflowRunId?: string;
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ApprovalTaskDetailDto)
+  details: ApprovalTaskDetailDto[];
+}
+
+export class StartApprovalRequestDto {
+  workflowInstanceId: string | number | bigint;
 
-  @IsOptional()
   @IsString()
-  callbackToken?: string;
+  @IsNotEmpty()
+  nodeId: string;
+
+  workflowVersionId: string | number | bigint;
 
   @IsString()
   @IsNotEmpty()
@@ -104,24 +130,18 @@ export class StartApprovalRequestDto {
   @IsObject()
   dynamicInputs?: Record<string, unknown>;
 
-  @IsOptional()
-  @IsObject()
-  approvalWorkflowInputs?: Record<string, unknown>;
-
-  @IsOptional()
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => ResolvedApprovalSubjectDto)
-  resolvedSubjects?: ResolvedApprovalSubjectDto[];
-}
+  @ValidateNested()
+  @Type(() => ApprovalTaskDto)
+  task: ApprovalTaskDto;
 
-export class ResolvedApprovalSubjectDto {
-  @IsIn(['USER', 'USER_GROUP'])
-  provider!: 'USER' | 'USER_GROUP';
+  @Allow()
+  @IsDefined()
+  input: unknown;
 
-  @IsArray()
-  @IsString({ each: true })
-  refs!: string[];
+  tenantNamespace?: string;
+  temporalRunId?: string;
+  callbackToken?: string;
+  callbackUrl?: string;
 }
 
 export class SubmitApprovalDecisionDto {
@@ -136,17 +156,3 @@ export class SubmitApprovalDecisionDto {
   @IsObject()
   payload?: Record<string, unknown>;
 }
-
-export class SubmitExternalApprovalDecisionDto extends SubmitApprovalDecisionDto {
-  @IsString()
-  @IsNotEmpty()
-  approvalWorkflowId!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  eventId!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  approverId!: string;
-}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/humanApproval/human-approval.errors.ts

@@ -5,7 +5,6 @@ export type HumanApprovalErrorCode =
   | 'APPROVAL_REQUEST_NOT_FOUND'
   | 'APPROVAL_REQUEST_CLOSED'
   | 'APPROVAL_NOT_CANDIDATE'
-  | 'APPROVAL_WORKFLOW_MISMATCH'
   | 'APPROVAL_DECISION_CONFLICT';
 
 export class HumanApprovalDomainError extends HttpException {