251129:1700 update to 1.4.5

backend/src/modules/correspondence/correspondence-workflow.service.ts

@@ -0,0 +1,153 @@
+// File: src/modules/correspondence/correspondence-workflow.service.ts
+
+import { Injectable, Logger, NotFoundException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { DataSource, Repository } from 'typeorm';
+
+import { WorkflowTransitionDto } from '../workflow-engine/dto/workflow-transition.dto';
+import { WorkflowEngineService } from '../workflow-engine/workflow-engine.service';
+import { CorrespondenceRevision } from './entities/correspondence-revision.entity';
+import { CorrespondenceStatus } from './entities/correspondence-status.entity';
+import { Correspondence } from './entities/correspondence.entity';
+
+@Injectable()
+export class CorrespondenceWorkflowService {
+  private readonly logger = new Logger(CorrespondenceWorkflowService.name);
+  private readonly WORKFLOW_CODE = 'CORRESPONDENCE_FLOW_V1';
+
+  constructor(
+    private readonly workflowEngine: WorkflowEngineService,
+    @InjectRepository(Correspondence)
+    private readonly correspondenceRepo: Repository<Correspondence>,
+    @InjectRepository(CorrespondenceRevision)
+    private readonly revisionRepo: Repository<CorrespondenceRevision>,
+    @InjectRepository(CorrespondenceStatus)
+    private readonly statusRepo: Repository<CorrespondenceStatus>,
+    private readonly dataSource: DataSource,
+  ) {}
+
+  async submitWorkflow(
+    correspondenceId: number,
+    userId: number,
+    note?: string,
+  ) {
+    const queryRunner = this.dataSource.createQueryRunner();
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    try {
+      const revision = await this.revisionRepo.findOne({
+        // ✅ FIX: CamelCase (correspondenceId, isCurrent)
+        where: { correspondenceId: correspondenceId, isCurrent: true },
+        relations: ['correspondence'],
+      });
+
+      if (!revision) {
+        throw new NotFoundException(
+          `Correspondence Revision for ID ${correspondenceId} not found`,
+        );
+      }
+
+      // ✅ FIX: Check undefined before access
+      if (!revision.correspondence) {
+        throw new NotFoundException(`Correspondence relation not found`);
+      }
+
+      const context = {
+        // ✅ FIX: CamelCase (projectId, correspondenceTypeId)
+        projectId: revision.correspondence.projectId,
+        typeId: revision.correspondence.correspondenceTypeId,
+        ownerId: userId,
+        amount: 0,
+        priority: 'NORMAL',
+      };
+
+      const instance = await this.workflowEngine.createInstance(
+        this.WORKFLOW_CODE,
+        'correspondence_revision',
+        revision.id.toString(),
+        context,
+      );
+
+      const transitionResult = await this.workflowEngine.processTransition(
+        instance.id,
+        'SUBMIT',
+        userId,
+        note || 'Initial Submission',
+        {},
+      );
+
+      await this.syncStatus(revision, transitionResult.nextState, queryRunner);
+
+      await queryRunner.commitTransaction();
+
+      return {
+        instanceId: instance.id,
+        currentState: transitionResult.nextState,
+      };
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      this.logger.error(`Failed to submit workflow: ${error}`);
+      throw error;
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  async processAction(
+    instanceId: string,
+    userId: number,
+    dto: WorkflowTransitionDto,
+  ) {
+    const result = await this.workflowEngine.processTransition(
+      instanceId,
+      dto.action,
+      userId,
+      dto.comment,
+      dto.payload,
+    );
+
+    // ✅ FIX: Method exists now
+    const instance = await this.workflowEngine.getInstanceById(instanceId);
+
+    if (instance && instance.entityType === 'correspondence_revision') {
+      const revision = await this.revisionRepo.findOne({
+        where: { id: parseInt(instance.entityId) },
+      });
+      if (revision) {
+        await this.syncStatus(revision, result.nextState);
+      }
+    }
+
+    return result;
+  }
+
+  private async syncStatus(
+    revision: CorrespondenceRevision,
+    workflowState: string,
+    queryRunner?: any,
+  ) {
+    const statusMap: Record<string, string> = {
+      DRAFT: 'DRAFT',
+      IN_REVIEW: 'SUBOWN',
+      APPROVED: 'CLBOWN',
+      REJECTED: 'CCBOWN',
+    };
+
+    const targetCode = statusMap[workflowState] || 'DRAFT';
+
+    const status = await this.statusRepo.findOne({
+      where: { statusCode: targetCode }, // ✅ FIX: CamelCase
+    });
+
+    if (status) {
+      // ✅ FIX: CamelCase (correspondenceStatusId)
+      revision.statusId = status.id;
+
+      const manager = queryRunner
+        ? queryRunner.manager
+        : this.revisionRepo.manager;
+      await manager.save(revision);
+    }
+  }
+}

backend/src/modules/correspondence/correspondence.module.ts

@@ -1,22 +1,24 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { CorrespondenceService } from './correspondence.service.js';
 import { CorrespondenceController } from './correspondence.controller.js';
-import { Correspondence } from './entities/correspondence.entity.js';
+import { CorrespondenceService } from './correspondence.service.js';
 import { CorrespondenceRevision } from './entities/correspondence-revision.entity.js';
 import { CorrespondenceType } from './entities/correspondence-type.entity.js';
+import { Correspondence } from './entities/correspondence.entity.js';
 // Import Entities ใหม่
-import { RoutingTemplate } from './entities/routing-template.entity.js';
-import { RoutingTemplateStep } from './entities/routing-template-step.entity.js';
 import { CorrespondenceRouting } from './entities/correspondence-routing.entity.js';
+import { RoutingTemplateStep } from './entities/routing-template-step.entity.js';
+import { RoutingTemplate } from './entities/routing-template.entity.js';
 
-import { CorrespondenceStatus } from './entities/correspondence-status.entity.js';
 import { DocumentNumberingModule } from '../document-numbering/document-numbering.module.js'; // ต้องใช้ตอน Create
 import { JsonSchemaModule } from '../json-schema/json-schema.module.js'; // ต้องใช้ Validate Details
+import { SearchModule } from '../search/search.module'; // ✅ 1. เพิ่ม Import SearchModule
 import { UserModule } from '../user/user.module.js'; // <--- 1. Import UserModule
 import { WorkflowEngineModule } from '../workflow-engine/workflow-engine.module.js'; // <--- ✅ เพิ่มบรรทัดนี้ครับ
 import { CorrespondenceReference } from './entities/correspondence-reference.entity.js';
-import { SearchModule } from '../search/search.module'; // ✅ 1. เพิ่ม Import SearchModule
+import { CorrespondenceStatus } from './entities/correspondence-status.entity.js';
+// Controllers & Services
+import { CorrespondenceWorkflowService } from './correspondence-workflow.service'; // Register Service นี้
 
 @Module({
   imports: [
@@ -37,7 +39,7 @@ import { SearchModule } from '../search/search.module'; // ✅ 1. เพิ่
     SearchModule, // ✅ 2. ใส่ SearchModule ที่นี่
   ],
   controllers: [CorrespondenceController],
-  providers: [CorrespondenceService],
+  providers: [CorrespondenceService, CorrespondenceWorkflowService],
   exports: [CorrespondenceService],
 })
 export class CorrespondenceModule {}