diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/ApiName.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/ApiName.java index 6cbb7c1269d..bf218e9e545 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/ApiName.java +++ b/admin/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/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/PacketWorkflowErrorCode.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/PacketWorkflowErrorCode.java index aa7c7744552..3eebf426210 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/constant/PacketWorkflowErrorCode.java +++ b/admin/kernel-masterdata-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/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/PacketWorkflowController.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/PacketWorkflowController.java index fb6020aa7cd..fe36c796977 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/PacketWorkflowController.java +++ b/admin/kernel-masterdata-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 resumePacket( .resumePacket(requestDto.getRequest()); return responseWrapper; } - - @PreAuthorize("hasAnyRole(@authorizedRoles.getPostpacketprocess())") - @PostMapping("/process") - public RegProcResponseWrapper processPacket( - @Valid @RequestBody RequestWrapper requestDto) { - RegProcResponseWrapper responseWrapper = packetWorkflowActionService - .processPacket(requestDto.getRequest()); - return responseWrapper; - } //@PreAuthorize("hasAnyRole('GLOBAL_ADMIN','REGISTRATION_ADMIN')") @PreAuthorize("hasAnyRole(@authorizedRoles.getPostpacketsearch())") diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/AuthorizedRolesDto.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/AuthorizedRolesDto.java index f93f06f31c2..8729375a26a 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/AuthorizedRolesDto.java +++ b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/AuthorizedRolesDto.java @@ -358,8 +358,6 @@ public class AuthorizedRolesDto { private List postpacketresume; - private List postpacketprocess; - private List postpacketsearch; private List getpossiblevaluesfieldname; diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceRequestDto.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceRequestDto.java deleted file mode 100644 index dd26bcf8947..00000000000 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceRequestDto.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.mosip.kernel.masterdata.dto; - -import lombok.Data; - -@Data -public class PacketWorkflowInstanceRequestDto { - - private String registrationId; - - private String process; - - private String source; - - private String additionalInfoReqId; - - private RegistrationAdditionalInfoDTO additionalInfo; - -} diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceResponseDTO.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceResponseDTO.java deleted file mode 100644 index bea37ddcfbd..00000000000 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/PacketWorkflowInstanceResponseDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.mosip.kernel.masterdata.dto; - -import lombok.Data; - -@Data -public class PacketWorkflowInstanceResponseDTO { - - private String workflowInstanceId; - -} diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/RegistrationAdditionalInfoDTO.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/RegistrationAdditionalInfoDTO.java deleted file mode 100644 index 4a4cf5ff814..00000000000 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/dto/RegistrationAdditionalInfoDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package io.mosip.kernel.masterdata.dto; - -import java.io.Serializable; - -public class RegistrationAdditionalInfoDTO implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 5493632810187324004L; - - private String name; - private String phone; - private String email; - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getPhone() { - return phone; - } - public void setPhone(String phone) { - this.phone = phone; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - -} diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/PacketWorkflowActionService.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/PacketWorkflowActionService.java index 3356c0fa587..eca81a65739 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/PacketWorkflowActionService.java +++ b/admin/kernel-masterdata-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 resumePacket(PacketWorkflowResumeRequestDto request); - - RegProcResponseWrapper processPacket(PacketWorkflowInstanceRequestDto request); RegProcResponseWrapper searchPacket(SearchDtoWithoutLangCode request); diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/PacketWorkflowActionServiceImpl.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/PacketWorkflowActionServiceImpl.java index 045ac88ab6f..7273d4e63d0 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/PacketWorkflowActionServiceImpl.java +++ b/admin/kernel-masterdata-service/src/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 resumePacket( return procResponseWrapper; } - @SuppressWarnings("unchecked") - @Override - public RegProcResponseWrapper processPacket( - PacketWorkflowInstanceRequestDto request) { - RegProcRequestWrapper procRequestWrapper = new RegProcRequestWrapper<>(); - RegProcResponseWrapper 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 searchPacket(SearchDtoWithoutLangCode request) {