changed messagetype from string to MessageType (#200)

egovernments · Mar 26, 2024 · 2fee0d0 · 2fee0d0
1 parent 92a135f
commit 2fee0d0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/domain-services/program-service/src/main/java/org/digit/program/models/ExchangeCode.java b/domain-services/program-service/src/main/java/org/digit/program/models/ExchangeCode.java
@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
+import org.digit.program.constants.MessageType;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Size;
@@ -18,8 +19,7 @@ public class ExchangeCode {
  private String id;
 
  @JsonProperty("type")
- @Size(min = 2, max = 64)
- private String type;
+ private MessageType type;
 
  @JsonProperty("function_code")
  @Size(min = 2, max = 64)

diff --git a/...ice/src/main/java/org/digit/program/repository/querybuilder/ExchangeCodeQueryBuilder.java b/...ice/src/main/java/org/digit/program/repository/querybuilder/ExchangeCodeQueryBuilder.java
@@ -33,7 +33,7 @@ public String buildExchangeCodeProgramInsertQuery(Program program, List<Object>
  preparedStmtList.add(program.getId());
  preparedStmtList.add(program.getLocationCode());
  preparedStmtList.add(program.getId());
- preparedStmtList.add(program.getType());
+ preparedStmtList.add(program.getType().toString());
  preparedStmtList.add(program.getFunctionCode());
  preparedStmtList.add(program.getAdministrationCode());
  preparedStmtList.add(program.getProgramCode());
@@ -72,7 +72,7 @@ public String buildExchangeCodeSanctionInsertQuery (Sanction sanction, List<Obje
  preparedStmtList.add(sanction.getId());
  preparedStmtList.add(sanction.getLocationCode());
  preparedStmtList.add(sanction.getId());
- preparedStmtList.add(sanction.getType());
+ preparedStmtList.add(sanction.getType().toString());
  preparedStmtList.add(sanction.getFunctionCode());
  preparedStmtList.add(sanction.getAdministrationCode());
  preparedStmtList.add(sanction.getProgramCode());
@@ -108,7 +108,7 @@ public String buildExchangeCodeAllocationInsertQuery (Allocation allocation, Lis
  preparedStmtList.add(allocation.getId());
  preparedStmtList.add(allocation.getLocationCode());
  preparedStmtList.add(allocation.getId());
- preparedStmtList.add(allocation.getType());
+ preparedStmtList.add(allocation.getType().toString());
  preparedStmtList.add(allocation.getFunctionCode());
  preparedStmtList.add(allocation.getAdministrationCode());
  preparedStmtList.add(allocation.getProgramCode());
@@ -144,7 +144,7 @@ public String buildExchangeCodeDisburseInsertQuery (Disbursement disbursement, L
  preparedStmtList.add(disbursement.getId());
  preparedStmtList.add(disbursement.getLocationCode());
  preparedStmtList.add(disbursement.getId());
- preparedStmtList.add(disbursement.getType());
+ preparedStmtList.add(disbursement.getType().toString());
  preparedStmtList.add(disbursement.getFunctionCode());
  preparedStmtList.add(disbursement.getAdministrationCode());
  preparedStmtList.add(disbursement.getProgramCode());

diff --git a/...ram-service/src/main/java/org/digit/program/repository/rowmapper/AllocationRowMapper.java b/...ram-service/src/main/java/org/digit/program/repository/rowmapper/AllocationRowMapper.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.digit.program.constants.AllocationType;
+import org.digit.program.constants.MessageType;
 import org.digit.program.models.allocation.Allocation;
 import org.digit.program.models.Status;
 import org.digit.program.utils.CommonUtil;
@@ -68,7 +69,7 @@ public List<Allocation> extractData(ResultSet rs) throws SQLException, DataAcces
  allocation.setAdditionalDetails(additionalDetails);
  allocation.setAuditDetails(auditDetails);
 
- allocation.setType(type);
+ allocation.setType(MessageType.fromValue(type));
  allocation.setFunctionCode(functionCode);
  allocation.setAdministrationCode(administrationCode);
  allocation.setRecipientSegmentCode(recipientSegmentCode);

diff --git a/...ogram-service/src/main/java/org/digit/program/repository/rowmapper/DisburseRowMapper.java b/...ogram-service/src/main/java/org/digit/program/repository/rowmapper/DisburseRowMapper.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.digit.program.constants.MessageType;
 import org.digit.program.models.disburse.Disbursement;
 import org.digit.program.models.disburse.Individual;
 import org.digit.program.models.Status;
@@ -88,7 +89,7 @@ public List<Disbursement> extractData(ResultSet rs) throws SQLException, DataAcc
  disbursement.setAdditionalDetails(additionalDetails);
  disbursement.setAuditDetails(auditDetails);
 
- disbursement.setType(type);
+ disbursement.setType(MessageType.fromValue(type));
  disbursement.setFunctionCode(functionCode);
  disbursement.setAdministrationCode(administrationCode);
  disbursement.setRecipientSegmentCode(recipientSegmentCode);

diff --git a/...rogram-service/src/main/java/org/digit/program/repository/rowmapper/ProgramRowMapper.java b/...rogram-service/src/main/java/org/digit/program/repository/rowmapper/ProgramRowMapper.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
+import org.digit.program.constants.MessageType;
 import org.digit.program.models.program.Program;
 import org.digit.program.models.Status;
 import org.digit.program.utils.CommonUtil;
@@ -70,7 +71,7 @@ public List<Program> extractData(ResultSet rs) throws SQLException, DataAccessEx
  program.setAdditionalDetails(additionalDetails);
  program.setAuditDetails(auditDetails);
 
- program.setType(type);
+ program.setType(MessageType.fromValue(type));
  program.setFunctionCode(functionCode);
  program.setAdministrationCode(administrationCode);
  program.setRecipientSegmentCode(recipientSegmentCode);

diff --git a/...ogram-service/src/main/java/org/digit/program/repository/rowmapper/SanctionRowMapper.java b/...ogram-service/src/main/java/org/digit/program/repository/rowmapper/SanctionRowMapper.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
+import org.digit.program.constants.MessageType;
 import org.digit.program.models.sanction.Sanction;
 import org.digit.program.models.Status;
 import org.digit.program.utils.CommonUtil;
@@ -71,7 +72,7 @@ public List<Sanction> extractData(ResultSet rs) throws SQLException, DataAccessE
  sanction.setAdditionalDetails(additionalDetails);
  sanction.setAuditDetails(auditDetails);
 
- sanction.setType(type);
+ sanction.setType(MessageType.fromValue(type));
  sanction.setFunctionCode(functionCode);
  sanction.setAdministrationCode(administrationCode);
  sanction.setRecipientSegmentCode(recipientSegmentCode);

diff --git a/...n-services/program-service/src/main/java/org/digit/program/service/EnrichmentService.java b/...n-services/program-service/src/main/java/org/digit/program/service/EnrichmentService.java
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.digit.program.configuration.ProgramConfiguration;
+import org.digit.program.constants.MessageType;
 import org.digit.program.constants.Status;
 import org.digit.program.models.RequestHeader;
 import org.digit.program.models.allocation.Allocation;
@@ -51,7 +52,7 @@ public void enrichProgramForCreate(RequestHeader header, Program program) {
  program.setId(UUID.randomUUID().toString());
  program.setStatus(org.digit.program.models.Status.builder().statusCode(Status.INITIATED).build());
  }
- program.setType(PROGRAM);
+ program.setType(MessageType.PROGRAM);
  program.setStatus(org.digit.program.models.Status.builder().statusCode(Status.ACTIVE).build());
  program.setAuditDetails(getAuditDetails(header.getSenderId(), null));
  header.setMessageId(program.getId());
@@ -80,7 +81,7 @@ public void enrichSanctionCreate(List<Sanction> sanctions, RequestHeader header)
  for (Sanction sanction : sanctions) {
  if (sanction.getId() == null || StringUtils.isEmpty(sanction.getId()))
  sanction.setId(UUID.randomUUID().toString());
- sanction.setType(SANCTION);
+ sanction.setType(MessageType.SANCTION);
  sanction.setAuditDetails(getAuditDetails(header.getSenderId(), null));
  }
  header.setMessageId(sanctions.get(0).getId());
@@ -108,7 +109,7 @@ public void enrichAllocationCreate(List<Allocation> allocations, RequestHeader h
  for (Allocation allocation : allocations) {
  if (allocation.getId() == null || StringUtils.isEmpty(allocation.getId()))
  allocation.setId(UUID.randomUUID().toString());
- allocation.setType(ALLOCATION);
+ allocation.setType(MessageType.ALLOCATION);
  allocation.setAuditDetails(getAuditDetails(header.getSenderId(), null));
  }
  header.setMessageId(allocations.get(0).getId());
@@ -139,14 +140,14 @@ public void enrichDisburseCreate(Disbursement disbursement, RequestHeader header
  AuditDetails auditDetails = getAuditDetails(header.getSenderId(), null);
  disbursement.setAuditDetails(auditDetails);
  disbursement.setStatus(org.digit.program.models.Status.builder().statusCode(Status.INITIATED).build());
- disbursement.setType(DISBURSE);
+ disbursement.setType(MessageType.DISBURSE);
  header.setMessageId(disbursement.getId());
  for (Disbursement childDisbursement : disbursement.getDisbursements()) {
  if (childDisbursement.getId() == null || StringUtils.isEmpty(childDisbursement.getId()))
  childDisbursement.setId(UUID.randomUUID().toString());
  childDisbursement.setAuditDetails(auditDetails);
  childDisbursement.setStatus(org.digit.program.models.Status.builder().statusCode(Status.INITIATED).build());
- childDisbursement.setType(DISBURSE);
+ childDisbursement.setType(MessageType.DISBURSE);
  }
  log.info("Enrichment for create completed for id: {}", disbursement.getId());
  }