From f9bead4543e0d18cce43d5bed26d0b76efeb1a42 Mon Sep 17 00:00:00 2001 From: Naeem Ullah Date: Tue, 20 Jan 2026 11:18:30 +0500 Subject: [PATCH] Approval DTO --- .../controller/DepositAccountController.java | 3 +- .../client/dto/AutoIncrementFieldDTO.java | 15 ++++++++ .../aconnect/client/dto/FormCounterDTO.java | 12 ++++++ .../client/dto/WorkflowApprovalDTO.java | 38 +++++++++++++++++++ .../client/service/DepositAccountService.java | 7 ++-- 5 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 aconnect/src/main/java/com/mfsys/aconnect/client/dto/AutoIncrementFieldDTO.java create mode 100644 aconnect/src/main/java/com/mfsys/aconnect/client/dto/FormCounterDTO.java create mode 100644 aconnect/src/main/java/com/mfsys/aconnect/client/dto/WorkflowApprovalDTO.java diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java b/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java index 32ef557..fcf9aed 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/controller/DepositAccountController.java @@ -1,5 +1,6 @@ package com.mfsys.aconnect.client.controller; +import com.mfsys.aconnect.client.dto.WorkflowApprovalDTO; import com.mfsys.aconnect.client.dto.WorkflowRequestDTO; import com.mfsys.aconnect.client.service.CRMService; import com.mfsys.aconnect.client.service.DepositAccountService; @@ -25,7 +26,7 @@ public class DepositAccountController { } @PatchMapping(AconnectURI.UPDATE_DEPOSIT_CREATION_URI) - public Object updateIndividualDeposit(@RequestBody WorkflowRequestDTO workflowRequestDTO, + public Object updateIndividualDeposit(@RequestBody WorkflowApprovalDTO workflowRequestDTO, @RequestHeader("Authorization") String token) { return depositAccountService.approvalIndividualDeposit(workflowRequestDTO, token); } diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/dto/AutoIncrementFieldDTO.java b/aconnect/src/main/java/com/mfsys/aconnect/client/dto/AutoIncrementFieldDTO.java new file mode 100644 index 0000000..df6d6ca --- /dev/null +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/dto/AutoIncrementFieldDTO.java @@ -0,0 +1,15 @@ +package com.mfsys.aconnect.client.dto; + +import lombok.Data; +import java.util.List; + +@Data +public class AutoIncrementFieldDTO { + + private String key; + private String type; + private List position; + private boolean incrementByCategoryTag; + private boolean incrementIfFlowTerminated; +} + diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/dto/FormCounterDTO.java b/aconnect/src/main/java/com/mfsys/aconnect/client/dto/FormCounterDTO.java new file mode 100644 index 0000000..23b2f83 --- /dev/null +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/dto/FormCounterDTO.java @@ -0,0 +1,12 @@ +package com.mfsys.aconnect.client.dto; + +import lombok.Data; + +@Data +public class FormCounterDTO { + + private String POR_ORGACODE; + private String autoIncrementField; + private int autoIncrementLength; + private String paddingCharacter; +} diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/dto/WorkflowApprovalDTO.java b/aconnect/src/main/java/com/mfsys/aconnect/client/dto/WorkflowApprovalDTO.java new file mode 100644 index 0000000..5a56abb --- /dev/null +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/dto/WorkflowApprovalDTO.java @@ -0,0 +1,38 @@ +package com.mfsys.aconnect.client.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class WorkflowApprovalDTO { + + private String workFlowId; + + @JsonProperty("SUS_USERCODE") + private String susUserCode; + + private String formId; + private String postProcessFormId; + private String operation; + + @JsonProperty("POR_ORGACODE") + private String porOrgacode; + + private Map filesMap; + + private List autoIncrementFields; + private List formCounters; + + private String filter; + + private String arrayFilters; + + @JsonProperty("$set") + private String set; + + @JsonProperty("$push") + private String push; +} diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/service/DepositAccountService.java b/aconnect/src/main/java/com/mfsys/aconnect/client/service/DepositAccountService.java index 7e33a91..79f8ede 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/service/DepositAccountService.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/service/DepositAccountService.java @@ -1,5 +1,6 @@ package com.mfsys.aconnect.client.service; +import com.mfsys.aconnect.client.dto.WorkflowApprovalDTO; import com.mfsys.aconnect.client.dto.WorkflowRequestDTO; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.*; @@ -43,16 +44,16 @@ public class DepositAccountService { } - public Object approvalIndividualDeposit(WorkflowRequestDTO workflowRequestDTO, String token) { + public Object approvalIndividualDeposit(WorkflowApprovalDTO workflowRequestDTO, String token) { String porOrgacode = workflowRequestDTO.getPorOrgacode(); String url = depositURI + "/deposit" + "/mongodb/formdata" ; HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", token); headers.set("POR_ORGACODE", porOrgacode); - headers.set("SUS_USERCODE", workflowRequestDTO.getSusUsercode()); + headers.set("SUS_USERCODE", workflowRequestDTO.getSusUserCode()); headers.setContentType(MediaType.APPLICATION_JSON); - HttpEntity entity = new HttpEntity<>(workflowRequestDTO, headers); + HttpEntity entity = new HttpEntity<>(workflowRequestDTO, headers); restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory()); ResponseEntity response = restTemplate.exchange(