Merge pull request #15 from Manishch22/tf-develop

Removed packet process API
tf-govstack · Sep 29, 2023 · b42c70d · b42c70d
2 parents 5e260fd + af0a76a
commit b42c70d
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 114 deletions.
diff --git a/.../kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/ApiName.java b/.../kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/ApiName.java
@@ -7,6 +7,6 @@
  */
 public enum ApiName {
 
-	PACKET_RESUME_API, PACKET_PROCESS_API, PACKET_PAUSE_API;
+	PACKET_RESUME_API, PACKET_PAUSE_API;
 
 }
diff --git a/...ta-service/src/main/java/io/mosip/kernel/masterdata/constant/PacketWorkflowErrorCode.java b/...ta-service/src/main/java/io/mosip/kernel/masterdata/constant/PacketWorkflowErrorCode.java
@@ -3,8 +3,7 @@
 public enum PacketWorkflowErrorCode {
 
 	ERROR_OCCURED_WHILE_SEARCHING("KER-MSD-263", "error occured while searching the record : invalid rquest"),
-	ERROR_OCCURED_WHILE_RESUMING_PACKET("KER-MSD-364", "failed to resume packet"),
-	ERROR_OCCURED_WHILE_PROCESSING_PACKET("KER-MSD-365", "failed to process packet");
+	ERROR_OCCURED_WHILE_RESUMING_PACKET("KER-MSD-364", "failed to resume packet");
 
 	private String errorCode;
 	private String errorMessage;

diff --git a/...service/src/main/java/io/mosip/kernel/masterdata/controller/PacketWorkflowController.java b/...service/src/main/java/io/mosip/kernel/masterdata/controller/PacketWorkflowController.java
@@ -11,8 +11,6 @@
 
 import io.mosip.kernel.core.http.RequestWrapper;
 import io.mosip.kernel.masterdata.dto.PacketWorkflowActionResponseDTO;
-import io.mosip.kernel.masterdata.dto.PacketWorkflowInstanceRequestDto;
-import io.mosip.kernel.masterdata.dto.PacketWorkflowInstanceResponseDTO;
 import io.mosip.kernel.masterdata.dto.PacketWorkflowResumeRequestDto;
 import io.mosip.kernel.masterdata.dto.RegProcResponseWrapper;
 import io.mosip.kernel.masterdata.dto.SearchDtoWithoutLangCode;
@@ -41,15 +39,6 @@ public RegProcResponseWrapper<PacketWorkflowActionResponseDTO> resumePacket(
 				.resumePacket(requestDto.getRequest());
 		return responseWrapper;
 	}
-
-	@PreAuthorize("hasAnyRole(@authorizedRoles.getPostpacketprocess())")
-	@PostMapping("/process")
-	public RegProcResponseWrapper<PacketWorkflowInstanceResponseDTO> processPacket(
-			@Valid @RequestBody RequestWrapper<PacketWorkflowInstanceRequestDto> requestDto) {
-		RegProcResponseWrapper<PacketWorkflowInstanceResponseDTO> responseWrapper = packetWorkflowActionService
-				.processPacket(requestDto.getRequest());
-		return responseWrapper;
-	}
 
 	//@PreAuthorize("hasAnyRole('GLOBAL_ADMIN','REGISTRATION_ADMIN')")
 	@PreAuthorize("hasAnyRole(@authorizedRoles.getPostpacketsearch())")

diff --git a/...l-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/AuthorizedRolesDto.java b/...l-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/AuthorizedRolesDto.java
@@ -358,8 +358,6 @@ public class AuthorizedRolesDto {
 
 	private List<String> postpacketresume;
 
-	private List<String> postpacketprocess;
-
 	private List<String> postpacketsearch;
 
 	private List<String> getpossiblevaluesfieldname;

diff --git a/...ervice/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceRequestDto.java b/...ervice/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceRequestDto.java
diff --git a/...rvice/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceResponseDTO.java b/...rvice/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceResponseDTO.java
diff --git a/...a-service/src/main/java/io/mosip/kernel/masterdata/dto/RegistrationAdditionalInfoDTO.java b/...a-service/src/main/java/io/mosip/kernel/masterdata/dto/RegistrationAdditionalInfoDTO.java
diff --git a/...service/src/main/java/io/mosip/kernel/masterdata/service/PacketWorkflowActionService.java b/...service/src/main/java/io/mosip/kernel/masterdata/service/PacketWorkflowActionService.java
@@ -1,8 +1,6 @@
 package io.mosip.kernel.masterdata.service;
 
 import io.mosip.kernel.masterdata.dto.PacketWorkflowActionResponseDTO;
-import io.mosip.kernel.masterdata.dto.PacketWorkflowInstanceRequestDto;
-import io.mosip.kernel.masterdata.dto.PacketWorkflowInstanceResponseDTO;
 import io.mosip.kernel.masterdata.dto.PacketWorkflowResumeRequestDto;
 import io.mosip.kernel.masterdata.dto.RegProcResponseWrapper;
 import io.mosip.kernel.masterdata.dto.SearchDtoWithoutLangCode;
@@ -11,8 +9,6 @@
 public interface PacketWorkflowActionService {
 
 	RegProcResponseWrapper<PacketWorkflowActionResponseDTO> resumePacket(PacketWorkflowResumeRequestDto request);
-
-	RegProcResponseWrapper<PacketWorkflowInstanceResponseDTO> processPacket(PacketWorkflowInstanceRequestDto request);
 
 	RegProcResponseWrapper<SearchResponseDto> searchPacket(SearchDtoWithoutLangCode request);
 

diff --git a/...rc/main/java/io/mosip/kernel/masterdata/service/impl/PacketWorkflowActionServiceImpl.java b/...rc/main/java/io/mosip/kernel/masterdata/service/impl/PacketWorkflowActionServiceImpl.java
@@ -15,8 +15,6 @@
 import io.mosip.kernel.masterdata.constant.PacketWorkflowErrorCode;
 import io.mosip.kernel.masterdata.dto.PacketWorkflowActionRequestDTO;
 import io.mosip.kernel.masterdata.dto.PacketWorkflowActionResponseDTO;
-import io.mosip.kernel.masterdata.dto.PacketWorkflowInstanceRequestDto;
-import io.mosip.kernel.masterdata.dto.PacketWorkflowInstanceResponseDTO;
 import io.mosip.kernel.masterdata.dto.PacketWorkflowResumeRequestDto;
 import io.mosip.kernel.masterdata.dto.RegProcRequestWrapper;
 import io.mosip.kernel.masterdata.dto.RegProcResponseWrapper;
@@ -46,12 +44,6 @@ public class PacketWorkflowActionServiceImpl implements PacketWorkflowActionServ
 	@Value("${mosip.regproc.workflow.search.version:v1}")
 	private String searchReqVersion;
 
-	@Value("${mosip.regproc.workflow.instance.api-id:mosip.registration.processor.workflow.create}")
-	private String processRequestId;
-
-	@Value("${mosip.regproc.workflow.instance.version:1.0}")
-	private String processReqVersion;
-
 	@Autowired
 	RestClient restClient;
 
@@ -81,29 +73,6 @@ public RegProcResponseWrapper<PacketWorkflowActionResponseDTO> resumePacket(
 		return procResponseWrapper;
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public RegProcResponseWrapper<PacketWorkflowInstanceResponseDTO> processPacket(
-			PacketWorkflowInstanceRequestDto request) {
-		RegProcRequestWrapper<PacketWorkflowInstanceRequestDto> procRequestWrapper = new RegProcRequestWrapper<>();
-		RegProcResponseWrapper<PacketWorkflowInstanceResponseDTO> procResponseWrapper = null;
-		procRequestWrapper.setId(processRequestId);
-		procRequestWrapper.setVersion(processReqVersion);
-		procRequestWrapper.setRequest(request);
-		procRequestWrapper.setRequesttime(LocalDateTime.now().toString());
-		try {
-			String response = restClient.postApi(ApiName.PACKET_PROCESS_API, null, "", "", MediaType.APPLICATION_JSON,
-					procRequestWrapper, String.class);
-			procResponseWrapper = objectMapper.readValue(response, RegProcResponseWrapper.class);
-		} catch (Exception e) {
-			throw new MasterDataServiceException(
-					PacketWorkflowErrorCode.ERROR_OCCURED_WHILE_PROCESSING_PACKET.getErrorCode(),
-					PacketWorkflowErrorCode.ERROR_OCCURED_WHILE_PROCESSING_PACKET.getErrorMessage()
-							+ ExceptionUtils.parseException(e));
-		}
-		return procResponseWrapper;
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public RegProcResponseWrapper<SearchResponseDto> searchPacket(SearchDtoWithoutLangCode request) {