@rytass/bpm-core-nestjs-module 0.1.10 → 0.3.0

package/src/lib/template/dto/compose-approval-template.input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compose-approval-template.input.js","sourceRoot":"","sources":["../../../../../../../libs/bpm-core/src/lib/template/dto/compose-approval-template.input.ts"],"names":[],"mappings":";;;;AAAA,6CAAuD;AACvD,qDAA0E;AAGnE,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;CA2EhD,CAAA;AA3EY,oFAAoC;AAK/C;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,YAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;;8EACwB;AAKjC;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,YAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;;wEACkB;AAK3B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,0BAAQ,GAAE;;sEACO;AAKlB;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;6EACqB;AAKhC;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;wEACgB;AAK3B;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;0EACkB;AAK7B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,0BAAQ,GAAE;;0EACW;AAKtB;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;iFACyB;AAKpC;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;sEACc;AAKzB;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,YAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;;wEACkB;AAI3B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,0BAAQ,GAAE;;oFACqB;AAKhC;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;gFACwB;AAKnC;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;oFAC4B;AAKvC;IAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;6EACqB;AAKhC;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,2BAAS,GAAE;;qEACM;+CA1EP,oCAAoC;IADhD,IAAA,mBAAS,GAAE;GACC,oCAAoC,CA2EhD"}

package/src/lib/template/index.d.ts

@@ -1,7 +1,9 @@
 export * from './approval-template-category.entity';
 export * from './approval-template-version.entity';
 export * from './approval-template.entity';
+export * from './compose-approval-template.object';
 export * from './dto/approval-template.input';
+export * from './dto/compose-approval-template.input';
 export * from './template.enums';
 export * from './template.module';
 export * from './template.service';

package/src/lib/template/index.js

@@ -4,7 +4,9 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./approval-template-category.entity"), exports);
 tslib_1.__exportStar(require("./approval-template-version.entity"), exports);
 tslib_1.__exportStar(require("./approval-template.entity"), exports);
+tslib_1.__exportStar(require("./compose-approval-template.object"), exports);
 tslib_1.__exportStar(require("./dto/approval-template.input"), exports);
+tslib_1.__exportStar(require("./dto/compose-approval-template.input"), exports);
 tslib_1.__exportStar(require("./template.enums"), exports);
 tslib_1.__exportStar(require("./template.module"), exports);
 tslib_1.__exportStar(require("./template.service"), exports);

package/src/lib/template/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/template/index.ts"],"names":[],"mappings":";;;AAAA,8EAAoD;AACpD,6EAAmD;AACnD,qEAA2C;AAC3C,wEAA8C;AAC9C,2DAAiC;AACjC,4DAAkC;AAClC,6DAAmC;AACnC,0EAAgD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/template/index.ts"],"names":[],"mappings":";;;AAAA,8EAAoD;AACpD,6EAAmD;AACnD,qEAA2C;AAC3C,6EAAmD;AACnD,wEAA8C;AAC9C,gFAAsD;AACtD,2DAAiC;AACjC,4DAAkC;AAClC,6DAAmC;AACnC,0EAAgD"}

package/src/lib/template/template.module.js

@@ -6,9 +6,11 @@ const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const condition_module_1 = require("../condition/condition.module");
 const form_definition_version_entity_1 = require("../form/form-definition-version.entity");
+const form_module_1 = require("../form/form.module");
 const approval_template_category_entity_1 = require("./approval-template-category.entity");
 const approval_template_entity_1 = require("./approval-template.entity");
 const approval_template_version_entity_1 = require("./approval-template-version.entity");
+const compose_template_mutations_1 = require("./compose-template.mutations");
 const template_mutations_1 = require("./template.mutations");
 const template_queries_1 = require("./template.queries");
 const template_service_1 = require("./template.service");
@@ -19,6 +21,7 @@ exports.TemplateModule = TemplateModule = tslib_1.__decorate([
     (0, common_1.Module)({
         imports: [
             condition_module_1.ConditionModule,
+            form_module_1.FormModule,
             typeorm_1.TypeOrmModule.forFeature([
                 approval_template_category_entity_1.ApprovalTemplateCategoryEntity,
                 approval_template_entity_1.ApprovalTemplateEntity,
@@ -26,7 +29,12 @@ exports.TemplateModule = TemplateModule = tslib_1.__decorate([
                 form_definition_version_entity_1.FormDefinitionVersionEntity,
             ]),
         ],
-        providers: [template_mutations_1.TemplateMutations, template_queries_1.TemplateQueries, template_service_1.TemplateService],
+        providers: [
+            compose_template_mutations_1.ComposeTemplateMutations,
+            template_mutations_1.TemplateMutations,
+            template_queries_1.TemplateQueries,
+            template_service_1.TemplateService,
+        ],
         exports: [template_service_1.TemplateService],
     })
 ], TemplateModule);

package/src/lib/template/template.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.module.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/template/template.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,oEAAgE;AAChE,2FAAqF;AACrF,2FAAqF;AACrF,yEAAoE;AACpE,yFAAmF;AACnF,6DAAyD;AACzD,yDAAqD;AACrD,yDAAqD;AAe9C,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAb1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,kCAAe;YACf,uBAAa,CAAC,UAAU,CAAC;gBACvB,kEAA8B;gBAC9B,iDAAsB;gBACtB,gEAA6B;gBAC7B,4DAA2B;aAC5B,CAAC;SACH;QACD,SAAS,EAAE,CAAC,sCAAiB,EAAE,kCAAe,EAAE,kCAAe,CAAC;QAChE,OAAO,EAAE,CAAC,kCAAe,CAAC;KAC3B,CAAC;GACW,cAAc,CAAG"}
+{"version":3,"file":"template.module.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/template/template.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,oEAAgE;AAChE,2FAAqF;AACrF,qDAAiD;AACjD,2FAAqF;AACrF,yEAAoE;AACpE,yFAAmF;AACnF,6EAAwE;AACxE,6DAAyD;AACzD,yDAAqD;AACrD,yDAAqD;AAqB9C,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAnB1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,kCAAe;YACf,wBAAU;YACV,uBAAa,CAAC,UAAU,CAAC;gBACvB,kEAA8B;gBAC9B,iDAAsB;gBACtB,gEAA6B;gBAC7B,4DAA2B;aAC5B,CAAC;SACH;QACD,SAAS,EAAE;YACT,qDAAwB;YACxB,sCAAiB;YACjB,kCAAe;YACf,kCAAe;SAChB;QACD,OAAO,EAAE,CAAC,kCAAe,CAAC;KAC3B,CAAC;GACW,cAAc,CAAG"}

package/src/lib/template/template.service.d.ts

@@ -1,6 +1,9 @@
-import { Repository } from 'typeorm';
+import { EntityManager, Repository } from 'typeorm';
 import { ConditionService } from '../condition/condition.service';
 import { FormDefinitionVersionEntity } from '../form/form-definition-version.entity';
+import { FormService } from '../form/form.service';
+import { ComposeApprovalTemplateWithFormInput } from './dto/compose-approval-template.input';
+import { ComposeApprovalTemplateWithFormObject } from './compose-approval-template.object';
 import { ApprovalTemplateCategoryEntity } from './approval-template-category.entity';
 import { ApprovalTemplateEntity } from './approval-template.entity';
 import { ApprovalTemplateVersionEntity } from './approval-template-version.entity';
@@ -25,8 +28,19 @@ export declare class TemplateService {
     private readonly templateVersionRepository;
     private readonly formDefinitionVersionRepository;
     private readonly conditionService;
-    constructor(templateRepository: Repository<ApprovalTemplateEntity>, templateCategoryRepository: Repository<ApprovalTemplateCategoryEntity>, templateVersionRepository: Repository<ApprovalTemplateVersionEntity>, formDefinitionVersionRepository: Repository<FormDefinitionVersionEntity>, conditionService: ConditionService);
-    createApprovalTemplate(input: CreateApprovalTemplateInput): Promise<ApprovalTemplateEntity>;
+    private readonly formService;
+    constructor(templateRepository: Repository<ApprovalTemplateEntity>, templateCategoryRepository: Repository<ApprovalTemplateCategoryEntity>, templateVersionRepository: Repository<ApprovalTemplateVersionEntity>, formDefinitionVersionRepository: Repository<FormDefinitionVersionEntity>, conditionService: ConditionService, formService: FormService);
+    createApprovalTemplate(input: CreateApprovalTemplateInput, manager?: EntityManager): Promise<ApprovalTemplateEntity>;
+    private createApprovalTemplateWithManager;
+    /**
+     * Atomically build (and optionally publish) a form definition together with
+     * the approval template that binds it. The whole flow runs in a single DB
+     * transaction so a partial failure rolls back both sides.
+     */
+    composeApprovalTemplateWithForm(input: ComposeApprovalTemplateWithFormInput, currentMemberId: string | null): Promise<ComposeApprovalTemplateWithFormObject>;
+    private resolveComposedFormVersion;
+    private resolveComposedTemplateDraftVersion;
+    private findDraftTemplateVersion;
     updateApprovalTemplate(input: UpdateApprovalTemplateInput): Promise<ApprovalTemplateEntity>;
     listApprovalTemplates(options?: ListApprovalTemplatesOptions): Promise<readonly ApprovalTemplateEntity[]>;
     countApprovalTemplates({ categoryId, searchText, status, }?: {
@@ -47,13 +61,18 @@ export declare class TemplateService {
     deleteApprovalTemplateCategory(id: string): Promise<ApprovalTemplateCategoryEntity>;
     listApprovalTemplateVersions(templateId: string): Promise<readonly ApprovalTemplateVersionEntity[]>;
     getApprovalTemplateVersion(id: string): Promise<ApprovalTemplateVersionEntity>;
-    updateApprovalTemplateDraft(input: UpdateApprovalTemplateDraftInput): Promise<ApprovalTemplateVersionEntity>;
-    forkApprovalTemplate(templateId: string): Promise<ApprovalTemplateVersionEntity>;
-    publishApprovalTemplateVersion(versionId: string, publishedByMemberId?: string): Promise<ApprovalTemplateVersionEntity>;
+    updateApprovalTemplateDraft(input: UpdateApprovalTemplateDraftInput, manager?: EntityManager): Promise<ApprovalTemplateVersionEntity>;
+    forkApprovalTemplate(templateId: string, manager?: EntityManager): Promise<ApprovalTemplateVersionEntity>;
+    publishApprovalTemplateVersion(versionId: string, publishedByMemberId?: string, manager?: EntityManager): Promise<ApprovalTemplateVersionEntity>;
+    private publishApprovalTemplateVersionWithManager;
     rollbackApprovalTemplateVersion(versionId: string): Promise<ApprovalTemplateVersionEntity>;
     private validatePublishableVersion;
     private validateOptionalFormDefinitionVersion;
     private validateOptionalTemplateCategory;
+    private templates;
+    private templateVersions;
+    private templateCategories;
+    private formVersions;
     private getTemplateOrThrow;
     private getTemplateCategoryOrThrow;
     private setApprovalTemplateCategoryActive;

package/src/lib/template/template.service.js

@@ -6,49 +6,155 @@ const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const condition_service_1 = require("../condition/condition.service");
+const form_definition_entity_1 = require("../form/form-definition.entity");
 const form_definition_version_entity_1 = require("../form/form-definition-version.entity");
 const form_enums_1 = require("../form/form.enums");
+const form_service_1 = require("../form/form.service");
 const approval_template_category_entity_1 = require("./approval-template-category.entity");
 const approval_template_entity_1 = require("./approval-template.entity");
 const approval_template_version_entity_1 = require("./approval-template-version.entity");
 const template_enums_1 = require("./template.enums");
 const workflow_definition_validator_1 = require("./workflow-definition.validator");
 let TemplateService = class TemplateService {
-    constructor(templateRepository, templateCategoryRepository, templateVersionRepository, formDefinitionVersionRepository, conditionService) {
+    constructor(templateRepository, templateCategoryRepository, templateVersionRepository, formDefinitionVersionRepository, conditionService, formService) {
         this.templateRepository = templateRepository;
         this.templateCategoryRepository = templateCategoryRepository;
         this.templateVersionRepository = templateVersionRepository;
         this.formDefinitionVersionRepository = formDefinitionVersionRepository;
         this.conditionService = conditionService;
-    }
-    async createApprovalTemplate(input) {
-        await this.validateOptionalFormDefinitionVersion(input.formDefinitionVersionId);
-        const category = await this.validateOptionalTemplateCategory(input.categoryId);
+        this.formService = formService;
+    }
+    async createApprovalTemplate(input, manager) {
+        const run = (txManager) => this.createApprovalTemplateWithManager(txManager, input);
+        return manager
+            ? run(manager)
+            : this.templateRepository.manager.transaction(run);
+    }
+    async createApprovalTemplateWithManager(manager, input) {
+        await this.validateOptionalFormDefinitionVersion(input.formDefinitionVersionId, manager);
+        const category = await this.validateOptionalTemplateCategory(input.categoryId, manager);
+        const templateRepository = manager.getRepository(approval_template_entity_1.ApprovalTemplateEntity);
+        const versionRepository = manager.getRepository(approval_template_version_entity_1.ApprovalTemplateVersionEntity);
+        const template = await templateRepository.save(templateRepository.create({
+            category: input.category ?? category?.name ?? null,
+            categoryId: category?.id ?? null,
+            createdByMemberId: input.createdByMemberId,
+            currentVersionId: null,
+            description: input.description,
+            name: input.name,
+        }));
+        await versionRepository.save(versionRepository.create({
+            archivedAt: null,
+            formDefinitionVersionId: input.formDefinitionVersionId,
+            initiatorPolicyCel: null,
+            notificationConfig: null,
+            publishedAt: null,
+            publishedByMemberId: null,
+            slaDefaults: null,
+            status: template_enums_1.ApprovalTemplateVersionStatusEnum.DRAFT,
+            templateId: template.id,
+            version: 1,
+            workflowDefinition: workflow_definition_validator_1.EMPTY_WORKFLOW_DEFINITION,
+        }));
+        return template;
+    }
+    /**
+     * Atomically build (and optionally publish) a form definition together with
+     * the approval template that binds it. The whole flow runs in a single DB
+     * transaction so a partial failure rolls back both sides.
+     */
+    async composeApprovalTemplateWithForm(input, currentMemberId) {
         return this.templateRepository.manager.transaction(async (manager) => {
-            const templateRepository = manager.getRepository(approval_template_entity_1.ApprovalTemplateEntity);
-            const versionRepository = manager.getRepository(approval_template_version_entity_1.ApprovalTemplateVersionEntity);
-            const template = await templateRepository.save(templateRepository.create({
-                category: input.category ?? category?.name ?? null,
-                categoryId: category?.id ?? null,
-                createdByMemberId: input.createdByMemberId,
-                currentVersionId: null,
-                description: input.description,
-                name: input.name,
-            }));
-            await versionRepository.save(versionRepository.create({
-                archivedAt: null,
-                formDefinitionVersionId: input.formDefinitionVersionId,
-                initiatorPolicyCel: null,
-                notificationConfig: null,
-                publishedAt: null,
-                publishedByMemberId: null,
-                slaDefaults: null,
+            const formDefinitionVersion = await this.resolveComposedFormVersion(manager, input, currentMemberId);
+            const templateDraftVersion = await this.resolveComposedTemplateDraftVersion(manager, input, currentMemberId);
+            let templateVersion = await this.updateApprovalTemplateDraft({
+                formDefinitionVersionId: formDefinitionVersion.id,
+                initiatorPolicyCel: input.initiatorPolicyCel,
+                notificationConfigJson: input.notificationConfigJson,
+                slaDefaultsJson: input.slaDefaultsJson,
+                versionId: templateDraftVersion.id,
+                workflowDefinitionJson: input.workflowDefinitionJson,
+            }, manager);
+            if (input.publish) {
+                templateVersion = await this.publishApprovalTemplateVersion(templateDraftVersion.id, currentMemberId ?? undefined, manager);
+            }
+            const formDefinition = await manager
+                .getRepository(form_definition_entity_1.FormDefinitionEntity)
+                .findOneByOrFail({ id: formDefinitionVersion.formDefinitionId });
+            const template = await manager
+                .getRepository(approval_template_entity_1.ApprovalTemplateEntity)
+                .findOneByOrFail({ id: templateVersion.templateId });
+            return {
+                formDefinition,
+                formDefinitionVersion,
+                published: input.publish,
+                template,
+                templateVersion,
+            };
+        });
+    }
+    async resolveComposedFormVersion(manager, input, currentMemberId) {
+        if (!input.formDefinitionId) {
+            const definition = await this.formService.createFormDefinition({
+                createdByMemberId: currentMemberId,
+                description: input.formDescription,
+                name: input.formName,
+                schemaJson: input.schemaJson,
+                uiSchemaJson: input.uiSchemaJson,
+            }, manager);
+            const draft = await this.formService.findDraftVersion(definition.id, manager);
+            if (!draft) {
+                throw new common_1.NotFoundException(`Form definition ${definition.id} draft version was not created`);
+            }
+            return input.publish
+                ? this.formService.publishFormDefinitionVersion(draft.id, currentMemberId ?? undefined, manager)
+                : draft;
+        }
+        const existingDraft = await this.formService.findDraftVersion(input.formDefinitionId, manager);
+        if (existingDraft) {
+            const updated = await this.formService.updateFormDefinitionDraft({
+                schemaJson: input.schemaJson ?? '',
+                uiSchemaJson: input.uiSchemaJson ?? '',
+                versionId: existingDraft.id,
+            }, manager);
+            return input.publish
+                ? this.formService.publishFormDefinitionVersion(updated.id, currentMemberId ?? undefined, manager)
+                : updated;
+        }
+        // Published definitions no longer keep a parallel draft: edits publish a
+        // new version immediately (content-identical saves reuse the current
+        // version) so the template draft can bind a published form version.
+        return this.formService.publishFormDefinitionContent({
+            formDefinitionId: input.formDefinitionId,
+            schemaJson: input.schemaJson,
+            uiSchemaJson: input.uiSchemaJson,
+        }, currentMemberId ?? undefined, manager);
+    }
+    async resolveComposedTemplateDraftVersion(manager, input, currentMemberId) {
+        if (!input.templateId) {
+            const template = await this.createApprovalTemplate({
+                category: input.category,
+                categoryId: input.categoryId,
+                createdByMemberId: currentMemberId,
+                description: input.templateDescription,
+                formDefinitionVersionId: null,
+                name: input.templateName,
+            }, manager);
+            const draft = await this.findDraftTemplateVersion(template.id, manager);
+            if (!draft) {
+                throw new common_1.NotFoundException(`Approval template ${template.id} draft version was not created`);
+            }
+            return draft;
+        }
+        return ((await this.findDraftTemplateVersion(input.templateId, manager)) ??
+            (await this.forkApprovalTemplate(input.templateId, manager)));
+    }
+    async findDraftTemplateVersion(templateId, manager) {
+        return this.templateVersions(manager).findOne({
+            where: {
                 status: template_enums_1.ApprovalTemplateVersionStatusEnum.DRAFT,
-                templateId: template.id,
-                version: 1,
-                workflowDefinition: workflow_definition_validator_1.EMPTY_WORKFLOW_DEFINITION,
-            }));
-            return template;
+                templateId,
+            },
         });
     }
     async updateApprovalTemplate(input) {
@@ -169,25 +275,27 @@ let TemplateService = class TemplateService {
     async getApprovalTemplateVersion(id) {
         return this.getTemplateVersionOrThrow(id);
     }
-    async updateApprovalTemplateDraft(input) {
-        const existing = await this.getTemplateVersionOrThrow(input.versionId);
+    async updateApprovalTemplateDraft(input, manager) {
+        const versionRepository = this.templateVersions(manager);
+        const existing = await this.getTemplateVersionOrThrow(input.versionId, manager);
         if (existing.status !== template_enums_1.ApprovalTemplateVersionStatusEnum.DRAFT) {
             throw new common_1.ConflictException('Only draft approval template versions can be updated');
         }
-        await this.validateOptionalFormDefinitionVersion(input.formDefinitionVersionId);
+        await this.validateOptionalFormDefinitionVersion(input.formDefinitionVersionId, manager);
         const workflowDefinition = this.parseWorkflowDefinitionOrThrow(input.workflowDefinitionJson);
-        const next = this.templateVersionRepository.merge(existing, {
+        const next = versionRepository.merge(existing, {
             formDefinitionVersionId: input.formDefinitionVersionId,
             initiatorPolicyCel: input.initiatorPolicyCel,
             notificationConfig: parseOptionalJsonObject(input.notificationConfigJson),
             slaDefaults: parseOptionalJsonObject(input.slaDefaultsJson),
             workflowDefinition,
         });
-        return this.templateVersionRepository.save(next);
+        return versionRepository.save(next);
     }
-    async forkApprovalTemplate(templateId) {
-        const template = await this.getTemplateOrThrow(templateId);
-        const existingDraft = await this.templateVersionRepository.findOne({
+    async forkApprovalTemplate(templateId, manager) {
+        const versionRepository = this.templateVersions(manager);
+        const template = await this.getTemplateOrThrow(templateId, manager);
+        const existingDraft = await versionRepository.findOne({
             where: {
                 status: template_enums_1.ApprovalTemplateVersionStatusEnum.DRAFT,
                 templateId: template.id,
@@ -197,10 +305,10 @@ let TemplateService = class TemplateService {
             throw new common_1.ConflictException('A draft approval template version already exists');
         }
         const source = template.currentVersionId
-            ? await this.getTemplateVersionOrThrow(template.currentVersionId)
+            ? await this.getTemplateVersionOrThrow(template.currentVersionId, manager)
             : null;
-        const nextVersion = await this.readNextVersionNumber(template.id);
-        return this.templateVersionRepository.save(this.templateVersionRepository.create({
+        const nextVersion = await this.readNextVersionNumber(template.id, manager);
+        return versionRepository.save(versionRepository.create({
             archivedAt: null,
             formDefinitionVersionId: source?.formDefinitionVersionId ?? null,
             initiatorPolicyCel: source?.initiatorPolicyCel ?? null,
@@ -214,39 +322,43 @@ let TemplateService = class TemplateService {
             workflowDefinition: source?.workflowDefinition ?? workflow_definition_validator_1.EMPTY_WORKFLOW_DEFINITION,
         }));
     }
-    async publishApprovalTemplateVersion(versionId, publishedByMemberId) {
-        const version = await this.getTemplateVersionOrThrow(versionId);
+    async publishApprovalTemplateVersion(versionId, publishedByMemberId, manager) {
+        const version = await this.getTemplateVersionOrThrow(versionId, manager);
         if (version.status !== template_enums_1.ApprovalTemplateVersionStatusEnum.DRAFT) {
             throw new common_1.ConflictException('Only draft approval template versions can be published');
         }
-        await this.validatePublishableVersion(version);
-        return this.templateRepository.manager.transaction(async (manager) => {
-            const templateRepository = manager.getRepository(approval_template_entity_1.ApprovalTemplateEntity);
-            const versionRepository = manager.getRepository(approval_template_version_entity_1.ApprovalTemplateVersionEntity);
-            const template = await templateRepository.findOne({
-                where: { deletedAt: (0, typeorm_2.IsNull)(), id: version.templateId },
-            });
-            if (!template) {
-                throw new common_1.NotFoundException(`Approval template ${version.templateId} was not found`);
-            }
-            if (template.currentVersionId) {
-                await versionRepository.update({ id: template.currentVersionId }, {
-                    archivedAt: new Date(),
-                    status: template_enums_1.ApprovalTemplateVersionStatusEnum.ARCHIVED,
-                });
-            }
-            const published = versionRepository.merge(version, {
-                archivedAt: null,
-                publishedAt: new Date(),
-                publishedByMemberId: publishedByMemberId ?? null,
-                status: template_enums_1.ApprovalTemplateVersionStatusEnum.PUBLISHED,
+        await this.validatePublishableVersion(version, manager);
+        const run = (txManager) => this.publishApprovalTemplateVersionWithManager(txManager, version, publishedByMemberId);
+        return manager
+            ? run(manager)
+            : this.templateRepository.manager.transaction(run);
+    }
+    async publishApprovalTemplateVersionWithManager(manager, version, publishedByMemberId) {
+        const templateRepository = manager.getRepository(approval_template_entity_1.ApprovalTemplateEntity);
+        const versionRepository = manager.getRepository(approval_template_version_entity_1.ApprovalTemplateVersionEntity);
+        const template = await templateRepository.findOne({
+            where: { deletedAt: (0, typeorm_2.IsNull)(), id: version.templateId },
+        });
+        if (!template) {
+            throw new common_1.NotFoundException(`Approval template ${version.templateId} was not found`);
+        }
+        if (template.currentVersionId) {
+            await versionRepository.update({ id: template.currentVersionId }, {
+                archivedAt: new Date(),
+                status: template_enums_1.ApprovalTemplateVersionStatusEnum.ARCHIVED,
             });
-            const saved = await versionRepository.save(published);
-            await templateRepository.save(templateRepository.merge(template, {
-                currentVersionId: saved.id,
-            }));
-            return saved;
+        }
+        const published = versionRepository.merge(version, {
+            archivedAt: null,
+            publishedAt: new Date(),
+            publishedByMemberId: publishedByMemberId ?? null,
+            status: template_enums_1.ApprovalTemplateVersionStatusEnum.PUBLISHED,
         });
+        const saved = await versionRepository.save(published);
+        await templateRepository.save(templateRepository.merge(template, {
+            currentVersionId: saved.id,
+        }));
+        return saved;
     }
     async rollbackApprovalTemplateVersion(versionId) {
         const target = await this.getTemplateVersionOrThrow(versionId);
@@ -280,11 +392,11 @@ let TemplateService = class TemplateService {
             return saved;
         });
     }
-    async validatePublishableVersion(version) {
+    async validatePublishableVersion(version, manager) {
         if (!version.formDefinitionVersionId) {
             throw new common_1.BadRequestException('Approval template version must bind a form definition version before publishing');
         }
-        const formVersion = await this.formDefinitionVersionRepository.findOne({
+        const formVersion = await this.formVersions(manager).findOne({
             where: { id: version.formDefinitionVersionId },
         });
         if (!formVersion) {
@@ -309,25 +421,45 @@ let TemplateService = class TemplateService {
             throw new common_1.BadRequestException(errors.join('; '));
         }
     }
-    async validateOptionalFormDefinitionVersion(formDefinitionVersionId) {
+    async validateOptionalFormDefinitionVersion(formDefinitionVersionId, manager) {
         if (!formDefinitionVersionId) {
             return;
         }
-        const formVersion = await this.formDefinitionVersionRepository.findOne({
+        const formVersion = await this.formVersions(manager).findOne({
             where: { id: formDefinitionVersionId },
         });
         if (!formVersion) {
             throw new common_1.NotFoundException(`Form definition version ${formDefinitionVersionId} was not found`);
         }
     }
-    async validateOptionalTemplateCategory(categoryId) {
+    async validateOptionalTemplateCategory(categoryId, manager) {
         if (!categoryId) {
             return null;
         }
-        return this.getTemplateCategoryOrThrow(categoryId);
-    }
-    async getTemplateOrThrow(id) {
-        const entity = await this.templateRepository.findOne({
+        return this.getTemplateCategoryOrThrow(categoryId, manager);
+    }
+    templates(manager) {
+        return manager
+            ? manager.getRepository(approval_template_entity_1.ApprovalTemplateEntity)
+            : this.templateRepository;
+    }
+    templateVersions(manager) {
+        return manager
+            ? manager.getRepository(approval_template_version_entity_1.ApprovalTemplateVersionEntity)
+            : this.templateVersionRepository;
+    }
+    templateCategories(manager) {
+        return manager
+            ? manager.getRepository(approval_template_category_entity_1.ApprovalTemplateCategoryEntity)
+            : this.templateCategoryRepository;
+    }
+    formVersions(manager) {
+        return manager
+            ? manager.getRepository(form_definition_version_entity_1.FormDefinitionVersionEntity)
+            : this.formDefinitionVersionRepository;
+    }
+    async getTemplateOrThrow(id, manager) {
+        const entity = await this.templates(manager).findOne({
             relations: { categoryDetail: true },
             where: { deletedAt: (0, typeorm_2.IsNull)(), id },
         });
@@ -336,8 +468,8 @@ let TemplateService = class TemplateService {
         }
         return entity;
     }
-    async getTemplateCategoryOrThrow(id) {
-        const entity = await this.templateCategoryRepository.findOne({
+    async getTemplateCategoryOrThrow(id, manager) {
+        const entity = await this.templateCategories(manager).findOne({
             where: { id },
         });
         if (!entity) {
@@ -351,8 +483,8 @@ let TemplateService = class TemplateService {
             isActive,
         }));
     }
-    async getTemplateVersionOrThrow(id) {
-        const entity = await this.templateVersionRepository.findOne({
+    async getTemplateVersionOrThrow(id, manager) {
+        const entity = await this.templateVersions(manager).findOne({
             where: { id },
         });
         if (!entity) {
@@ -360,8 +492,8 @@ let TemplateService = class TemplateService {
         }
         return entity;
     }
-    async readNextVersionNumber(templateId) {
-        const row = await this.templateVersionRepository
+    async readNextVersionNumber(templateId, manager) {
+        const row = await this.templateVersions(manager)
             .createQueryBuilder('version')
             .select('MAX(version.version)', 'maxVersion')
             .where('version.template_id = :templateId', { templateId })
@@ -391,7 +523,8 @@ exports.TemplateService = TemplateService = tslib_1.__decorate([
         typeorm_2.Repository,
         typeorm_2.Repository,
         typeorm_2.Repository,
-        condition_service_1.ConditionService])
+        condition_service_1.ConditionService,
+        form_service_1.FormService])
 ], TemplateService);
 function parseOptionalJsonObject(value) {
     if (!value) {