From 801380d833ae9f90577b6dd2b1ce99e79ce96173 Mon Sep 17 00:00:00 2001 From: Swetha K Date: Fri, 20 Dec 2024 13:50:35 +0530 Subject: [PATCH 1/4] MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K --- .../service/DeviceDetailService.java | 3 ++- .../service/FtpChipDetailService.java | 3 ++- .../SecureBiometricInterfaceService.java | 3 ++- .../service/impl/DeviceDetailServiceImpl.java | 9 ++++++- .../impl/FTPChipDetailServiceImpl.java | 9 ++++++- .../SecureBiometricInterfaceServiceImpl.java | 14 +++++++++- .../controller/DeviceDetailController.java | 14 ++++++++-- .../controller/FTPChipDetailController.java | 14 ++++++++-- .../SecureBiometricInterfaceController.java | 13 ++++++++-- .../dto/DeactivateDeviceRequestDto.java | 11 ++++++++ .../request/dto/DeactivateFtmRequestDto.java | 11 ++++++++ .../request/dto/DeactivateSbiRequestDto.java | 11 ++++++++ .../mosip/pms/partner/constant/ErrorCode.java | 1 + .../partner/constant/PartnerConstants.java | 2 ++ .../DeviceDetailControllerTest.java | 2 +- .../FTPChipDetailControllerTest.java | 2 +- ...ecureBiometricInterfaceControllerTest.java | 2 +- .../service/impl/DeviceDetailServiceTest.java | 26 +++++++++++++++---- .../impl/FTPChipDetailServiceTest.java | 21 ++++++++++++--- .../device/service/impl/SBIServiceTest.java | 16 +++++++++--- 20 files changed, 160 insertions(+), 27 deletions(-) create mode 100644 partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateDeviceRequestDto.java create mode 100644 partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateFtmRequestDto.java create mode 100644 partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateSbiRequestDto.java diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/DeviceDetailService.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/DeviceDetailService.java index f5e56aac3a..24b69c3ee6 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/DeviceDetailService.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/DeviceDetailService.java @@ -15,6 +15,7 @@ import io.mosip.pms.device.request.dto.DeviceDetailUpdateDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; import io.mosip.pms.device.request.dto.UpdateDeviceDetailStatusDto; +import io.mosip.pms.device.request.dto.DeactivateDeviceRequestDto; import io.mosip.pms.device.response.dto.DeviceDetailSearchResponseDto; import io.mosip.pms.device.response.dto.FilterResponseCodeDto; import io.mosip.pms.device.response.dto.IdDto; @@ -92,7 +93,7 @@ public interface DeviceDetailService { */ public FilterResponseCodeDto deviceTypeFilterValues(DeviceFilterValueDto deviceFilterValueDto); - public ResponseWrapperV2 deactivateDevice(String deviceDetailId); + public ResponseWrapperV2 deactivateDevice(String deviceDetailId, DeactivateDeviceRequestDto requestDto); ResponseWrapperV2> getAllDeviceDetails(String sortFieldName, String sortType, int pageNo, int pageSize, DeviceDetailFilterDto filterDto); diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/FtpChipDetailService.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/FtpChipDetailService.java index 16cd3400fc..2306bcc048 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/FtpChipDetailService.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/FtpChipDetailService.java @@ -18,6 +18,7 @@ import io.mosip.pms.common.dto.PageResponseDto; import io.mosip.pms.device.authdevice.entity.FTPChipDetail; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateFtmRequestDto; import io.mosip.pms.device.request.dto.FtpChipCertDownloadRequestDto; import io.mosip.pms.device.request.dto.FtpChipCertificateRequestDto; import io.mosip.pms.device.request.dto.FtpChipDetailDto; @@ -88,7 +89,7 @@ public interface FtpChipDetailService { */ public PageResponseDto searchFTPChipDetails(Class entity, DeviceSearchDto dto); - public ResponseWrapperV2 deactivateFtm(String ftmId); + public ResponseWrapperV2 deactivateFtm(String ftmId, DeactivateFtmRequestDto requestDto); public ResponseWrapperV2 getFtmCertificateData(String ftmId); diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/SecureBiometricInterfaceService.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/SecureBiometricInterfaceService.java index 6d21078469..c855a6ea32 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/SecureBiometricInterfaceService.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/SecureBiometricInterfaceService.java @@ -14,6 +14,7 @@ import io.mosip.pms.common.dto.PageResponseDto; import io.mosip.pms.device.request.dto.DeviceDetailSBIMappingDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateSbiRequestDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceCreateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceStatusUpdateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceUpdateDto; @@ -50,7 +51,7 @@ public interface SecureBiometricInterfaceService { public ResponseWrapperV2> getAllDevicesForSbi(String sbiId); - public ResponseWrapperV2 deactivateSbi(String id); + public ResponseWrapperV2 deactivateSbi(String id, DeactivateSbiRequestDto deactivateSbiRequestDto); public ResponseWrapperV2> getAllSbiDetails(String sortFieldName, String sortType, int pageNo, int pageSize, SbiFilterDto filterDto); } diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java index 72769a93af..6b73e69bf0 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java @@ -67,6 +67,7 @@ import io.mosip.pms.device.request.dto.DeviceDetailDto; import io.mosip.pms.device.request.dto.DeviceDetailUpdateDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateDeviceRequestDto; import io.mosip.pms.device.request.dto.UpdateDeviceDetailStatusDto; import io.mosip.pms.device.response.dto.ColumnCodeValue; import io.mosip.pms.device.response.dto.DeviceDetailSearchResponseDto; @@ -425,9 +426,15 @@ public static void validatePartnerId(Partner partner, String userId) { } @Override - public ResponseWrapperV2 deactivateDevice(String deviceDetailId) { + public ResponseWrapperV2 deactivateDevice(String deviceDetailId, DeactivateDeviceRequestDto requestDto) { ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); try { + String status = requestDto.getStatus(); + if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVATE)) { + LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-active)"); + throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), + ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); + } String userId = getUserId(); List partnerList = partnerRepository.findByUserId(userId); if (partnerList.isEmpty()) { diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java index 4c3bf45ecf..a2f22cc11e 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java @@ -68,6 +68,7 @@ import io.mosip.pms.device.constant.DeviceConstant; import io.mosip.pms.device.constant.FoundationalTrustProviderErrorMessages; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateFtmRequestDto; import io.mosip.pms.device.request.dto.FtpCertificateRequestDto; import io.mosip.pms.device.request.dto.FtpChipCertDownloadRequestDto; import io.mosip.pms.device.request.dto.FtpChipCertificateRequestDto; @@ -547,9 +548,15 @@ private void notify(String certData, String partnerDomain) { } @Override - public ResponseWrapperV2 deactivateFtm(String ftmId) { + public ResponseWrapperV2 deactivateFtm(String ftmId, DeactivateFtmRequestDto requestDto) { ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); try { + String status = requestDto.getStatus(); + if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVE)) { + LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-active)"); + throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), + ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); + } String userId = getUserId(); List partnerList = partnerRepository.findByUserId(userId); if (partnerList.isEmpty()) { diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java index ede76bb170..5ee7dae217 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java @@ -22,6 +22,7 @@ import io.mosip.pms.device.dto.SbiFilterDto; import io.mosip.pms.device.util.DeviceUtil; import io.mosip.pms.partner.constant.ErrorCode; +import io.mosip.pms.partner.constant.PartnerConstants; import io.mosip.pms.partner.dto.DeviceDto; import io.mosip.pms.device.dto.SbiDetailsDto; import io.mosip.pms.partner.exception.PartnerServiceException; @@ -76,6 +77,7 @@ import io.mosip.pms.device.request.dto.SecureBiometricInterfaceStatusUpdateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceUpdateDto; import io.mosip.pms.device.request.dto.DeviceDetailDto; +import io.mosip.pms.device.request.dto.DeactivateSbiRequestDto; import io.mosip.pms.device.response.dto.ColumnCodeValue; import io.mosip.pms.device.response.dto.FilterResponseCodeDto; import io.mosip.pms.device.response.dto.IdDto; @@ -1008,9 +1010,15 @@ private void validateDevicePartnerType(Partner partner, String userId) { } @Override - public ResponseWrapperV2 deactivateSbi(String sbiId) { + public ResponseWrapperV2 deactivateSbi(String sbiId, DeactivateSbiRequestDto requestDto) { ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); try { + String status = requestDto.getStatus(); + if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVE)) { + LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-active)"); + throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), + ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); + } String userId = getUserId(); List partnerList = partnerRepository.findByUserId(userId); if (partnerList.isEmpty()) { @@ -1052,6 +1060,8 @@ public ResponseWrapperV2 deactivateSbi(String sbiId) { if (!approvedDevices.isEmpty()) { for (DeviceDetail deviceDetail : approvedDevices) { deviceDetail.setIsActive(false); + deviceDetail.setUpdDtimes(LocalDateTime.now()); + deviceDetail.setUpdBy(getUserId()); deviceDetailRepository.save(deviceDetail); } } @@ -1060,6 +1070,8 @@ public ResponseWrapperV2 deactivateSbi(String sbiId) { if (!pendingApprovalDevices.isEmpty()) { for (DeviceDetail deviceDetail : pendingApprovalDevices) { deviceDetail.setApprovalStatus(REJECTED); + deviceDetail.setUpdDtimes(LocalDateTime.now()); + deviceDetail.setUpdBy(getUserId()); deviceDetailRepository.save(deviceDetail); } } diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/DeviceDetailController.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/DeviceDetailController.java index 83d59cbe5a..3cdfe07ae0 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/DeviceDetailController.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/DeviceDetailController.java @@ -42,6 +42,7 @@ import io.mosip.pms.device.request.dto.DeviceDetailDto; import io.mosip.pms.device.request.dto.DeviceDetailUpdateDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateDeviceRequestDto; import io.mosip.pms.device.request.dto.UpdateDeviceDetailStatusDto; import io.mosip.pms.device.response.dto.DeviceDetailSearchResponseDto; import io.mosip.pms.device.response.dto.FilterResponseCodeDto; @@ -59,8 +60,12 @@ @RequestMapping(value = "/devicedetail") @Api(tags = { "DeviceDetail" }) public class DeviceDetailController { + @Value("${mosip.pms.api.id.approval.mapping.device.to.sbi.post}") private String postApprovalMappingDeviceToSbiId; + + @Value("${mosip.pms.api.id.deactivate.device.patch}") + private String patchDeactivateDevice; @Autowired AuditUtil auditUtil; @@ -237,8 +242,13 @@ public ResponseWrapper filterDeviceSubType( @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))) }) - public ResponseWrapperV2 deactivateDevice(@PathVariable("deviceId") @NotBlank String deviceId) { - return deviceDetaillService.deactivateDevice(deviceId); + public ResponseWrapperV2 deactivateDevice(@PathVariable("deviceId") @NotBlank String deviceId, @RequestBody @Valid RequestWrapperV2 + requestWrapper) { + Optional> validationResponse = requestValidator.validate(patchDeactivateDevice, requestWrapper); + if (validationResponse.isPresent()) { + return validationResponse.get(); + } + return deviceDetaillService.deactivateDevice(deviceId, requestWrapper.getRequest()); } @PreAuthorize("hasAnyRole(@authorizedRoles.getPostdevicewithsbimapping())") diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/FTPChipDetailController.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/FTPChipDetailController.java index 49e76bea42..9f2079aac7 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/FTPChipDetailController.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/FTPChipDetailController.java @@ -3,12 +3,14 @@ import java.io.IOException; import java.security.cert.CertificateException; import java.util.List; +import java.util.Optional; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import io.mosip.pms.common.dto.PageResponseV2Dto; +import io.mosip.pms.common.request.dto.RequestWrapperV2; import io.mosip.pms.common.response.dto.ResponseWrapperV2; import io.mosip.pms.device.dto.FtmChipDetailsDto; import io.mosip.pms.device.dto.FtmChipFilterDto; @@ -71,6 +73,9 @@ public class FTPChipDetailController { @Autowired RequestValidator requestValidator; + @Value("${mosip.pms.api.id.deactivate.ftm.patch}") + private String patchDeactivateFtm; + /** * Post API to insert a new row of ftpChipDetail data * @@ -254,8 +259,13 @@ public ResponseWrapper> searchFtpChipDetai @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))) }) - public ResponseWrapperV2 deactivateFtm(@PathVariable("ftmId") @NotBlank String ftmId) { - return ftpChipDetaillService.deactivateFtm(ftmId); + public ResponseWrapperV2 deactivateFtm(@PathVariable("ftmId") @NotBlank String ftmId, @RequestBody @Valid RequestWrapperV2 + requestWrapper) { + Optional> validationResponse = requestValidator.validate(patchDeactivateFtm, requestWrapper); + if (validationResponse.isPresent()) { + return validationResponse.get(); + } + return ftpChipDetaillService.deactivateFtm(ftmId, requestWrapper.getRequest()); } @PreAuthorize("hasAnyRole(@authorizedRoles.getGetoriginalftmcertificate())") diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/SecureBiometricInterfaceController.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/SecureBiometricInterfaceController.java index 5b7e501f02..90805279ed 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/SecureBiometricInterfaceController.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/controller/SecureBiometricInterfaceController.java @@ -40,6 +40,7 @@ import io.mosip.pms.device.constant.DeviceConstant; import io.mosip.pms.device.request.dto.DeviceDetailSBIMappingDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateSbiRequestDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceCreateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceStatusUpdateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceUpdateDto; @@ -67,6 +68,9 @@ public class SecureBiometricInterfaceController { @Value("${mosip.pms.api.id.add.device.to.sbi.id.post}") private String postAddDeviceToSbi; + @Value("${mosip.pms.api.id.deactivate.sbi.patch}") + private String patchDeactivateSbi; + @Autowired SecureBiometricInterfaceService secureBiometricInterface; @@ -263,8 +267,13 @@ public ResponseWrapperV2> getSbiDetails() { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))), @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))) }) - public ResponseWrapperV2 deactivateSbi(@PathVariable("sbiId") @NotBlank String sbiId) { - return secureBiometricInterface.deactivateSbi(sbiId); + public ResponseWrapperV2 deactivateSbi(@PathVariable("sbiId") @NotBlank String sbiId, @RequestBody @Valid RequestWrapperV2 + requestWrapper) { + Optional> validationResponse = requestValidator.validate(patchDeactivateSbi, requestWrapper); + if (validationResponse.isPresent()) { + return validationResponse.get(); + } + return secureBiometricInterface.deactivateSbi(sbiId, requestWrapper.getRequest()); } @PreAuthorize("hasAnyRole(@authorizedRoles.getGetallsbidetails())") diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateDeviceRequestDto.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateDeviceRequestDto.java new file mode 100644 index 0000000000..8f95c195d2 --- /dev/null +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateDeviceRequestDto.java @@ -0,0 +1,11 @@ +package io.mosip.pms.device.request.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class DeactivateDeviceRequestDto { + + @Schema(description = "Status for deactivate device", example = "De-Activate") + private String status; +} diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateFtmRequestDto.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateFtmRequestDto.java new file mode 100644 index 0000000000..273aeb1e4e --- /dev/null +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateFtmRequestDto.java @@ -0,0 +1,11 @@ +package io.mosip.pms.device.request.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class DeactivateFtmRequestDto { + + @Schema(description = "Status for deactivate FTM", example = "De-Activate") + private String status; +} diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateSbiRequestDto.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateSbiRequestDto.java new file mode 100644 index 0000000000..8dd08b7779 --- /dev/null +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/request/dto/DeactivateSbiRequestDto.java @@ -0,0 +1,11 @@ +package io.mosip.pms.device.request.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class DeactivateSbiRequestDto { + + @Schema(description = "Status for deactivate SBI", example = "De-Activate") + private String status; +} diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/ErrorCode.java b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/ErrorCode.java index 5c56f0aadb..9076117708 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/ErrorCode.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/ErrorCode.java @@ -135,6 +135,7 @@ public enum ErrorCode { DEVICE_NOT_APPROVED("PMS_DEVICE_ERROR_023", "The selected Device is not in an approved status."), NO_SBI_FOUND_FOR_APPROVE("PMS_DEVICE_ERROR_024", "This device cannot be approved as it does not have any SBI associated to it."), NO_SBI_FOUND_FOR_REJECT("PMS_DEVICE_ERROR_025", "This device cannot be rejected as it does not have any SBI associated to it."), + DEACTIVATE_STATUS_CODE("PMS_DEVICE_ERROR_026", "Request status should be De-Activate"), GET_ALL_DEVICE_DETAILS_FETCH_ERROR("PMS_FTM_ERROR_024", "Error occurred while retrieving all device details"), FTM_CHIP_DETAILS_LIST_FETCH_ERROR("PMS_FTM_ERROR_001", "Error while fetching the FTM chip details"), DEACTIVATE_FTM_ERROR("PMS_FTM_ERROR_003", "Error while deactivating the FTM"), diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/PartnerConstants.java b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/PartnerConstants.java index 09ff136796..c78991590c 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/PartnerConstants.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/constant/PartnerConstants.java @@ -41,4 +41,6 @@ public final class PartnerConstants { public static final String DESC = "desc"; public static final String PARTNER_ADMIN = "PARTNER_ADMIN"; + + public static final String DEACTIVATE = "De-Activate"; } diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java index 266a293fae..c93bd4f172 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java @@ -453,7 +453,7 @@ public void deactivateDeviceTest() throws Exception { DeviceDetailResponseDto deviceDetailResponseDto = new DeviceDetailResponseDto(); responseWrapper.setResponse(deviceDetailResponseDto); - Mockito.when(deviceDetaillService.deactivateDevice(Mockito.anyString())).thenReturn(responseWrapper); + Mockito.when(deviceDetaillService.deactivateDevice(Mockito.anyString(), Mockito.any())).thenReturn(responseWrapper); mockMvc.perform(MockMvcRequestBuilders.patch("/devicedetail/12345") .contentType(MediaType.APPLICATION_JSON_VALUE)) diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java index ce9bc0e6a7..c9abdc6eef 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java @@ -388,7 +388,7 @@ public void deactivateFtmTest() throws Exception { ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); FtmDetailResponseDto ftmDetailResponseDto = new FtmDetailResponseDto(); responseWrapper.setResponse(ftmDetailResponseDto); - Mockito.when(ftpChipDetaillService.deactivateFtm(Mockito.any())).thenReturn(responseWrapper); + Mockito.when(ftpChipDetaillService.deactivateFtm(Mockito.any(), Mockito.any())).thenReturn(responseWrapper); mockMvc.perform(MockMvcRequestBuilders.patch("/ftpchipdetail/1232") .contentType(MediaType.APPLICATION_JSON_VALUE)) .andExpect(status().isOk()); diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java index 7925dd8504..db79e29208 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java @@ -376,7 +376,7 @@ public void deactivateSbiTest() throws Exception { SbiDetailsResponseDto sbiDetailsResponseDto = new SbiDetailsResponseDto(); responseWrapper.setResponse(sbiDetailsResponseDto); - Mockito.when(secureBiometricInterfaceService.deactivateSbi(Mockito.anyString())).thenReturn(responseWrapper); + Mockito.when(secureBiometricInterfaceService.deactivateSbi(Mockito.anyString(), Mockito.any())).thenReturn(responseWrapper); mockMvc.perform(MockMvcRequestBuilders.patch("/securebiometricinterface/1234") .contentType(MediaType.APPLICATION_JSON_VALUE)) diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/DeviceDetailServiceTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/DeviceDetailServiceTest.java index b1843e1fa8..77a3c1939f 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/DeviceDetailServiceTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/DeviceDetailServiceTest.java @@ -31,6 +31,7 @@ import io.mosip.pms.device.request.dto.DeviceDetailDto; import io.mosip.pms.device.request.dto.DeviceDetailUpdateDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateDeviceRequestDto; import io.mosip.pms.device.request.dto.UpdateDeviceDetailStatusDto; import io.mosip.pms.device.util.AuditUtil; import io.mosip.pms.partner.request.dto.SbiAndDeviceMappingRequestDto; @@ -401,6 +402,9 @@ public void deactivateDeviceTest() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateDeviceRequestDto requestDto = new DeactivateDeviceRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -416,7 +420,7 @@ public void deactivateDeviceTest() throws Exception { deviceDetail.setIsActive(true); when(deviceDetailRepository.findById(anyString())).thenReturn(Optional.of(deviceDetail)); when(deviceDetailRepository.save(any())).thenReturn(deviceDetail); - deviceDetaillService.deactivateDevice("23456"); + deviceDetaillService.deactivateDevice("23456", requestDto); } @Test @@ -427,6 +431,9 @@ public void deactivateDeviceTestException() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateDeviceRequestDto requestDto = new DeactivateDeviceRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -436,7 +443,7 @@ public void deactivateDeviceTestException() throws Exception { partnerList.add(partner); when(partnerRepository.findByUserId(anyString())).thenReturn(partnerList); - deviceDetaillService.deactivateDevice(null); + deviceDetaillService.deactivateDevice(null, requestDto); } @Test @@ -447,9 +454,12 @@ public void deactivateDeviceTestException1() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateDeviceRequestDto requestDto = new DeactivateDeviceRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); when(partnerRepository.findByUserId(anyString())).thenReturn(partnerList); - deviceDetaillService.deactivateDevice("23456"); + deviceDetaillService.deactivateDevice("23456", requestDto); } @Test @@ -460,6 +470,9 @@ public void deactivateDeviceTestException2() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateDeviceRequestDto requestDto = new DeactivateDeviceRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -472,7 +485,7 @@ public void deactivateDeviceTestException2() throws Exception { DeviceDetail deviceDetail = new DeviceDetail(); when(deviceDetailRepository.findById(anyString())).thenReturn(Optional.of(deviceDetail)); - deviceDetaillService.deactivateDevice("23456"); + deviceDetaillService.deactivateDevice("23456", requestDto); } @Test @@ -483,6 +496,9 @@ public void deactivateDeviceTestException3() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateDeviceRequestDto requestDto = new DeactivateDeviceRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -495,7 +511,7 @@ public void deactivateDeviceTestException3() throws Exception { SecureBiometricInterface sbi = new SecureBiometricInterface(); when(secureBiometricInterfaceRepository.findById(anyString())).thenReturn(Optional.of(sbi)); - deviceDetaillService.deactivateDevice("23456"); + deviceDetaillService.deactivateDevice("23456", requestDto); } @Test diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/FTPChipDetailServiceTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/FTPChipDetailServiceTest.java index ca58487ac0..fad15f2864 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/FTPChipDetailServiceTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/FTPChipDetailServiceTest.java @@ -72,6 +72,7 @@ import io.mosip.pms.device.authdevice.service.impl.FTPChipDetailServiceImpl; import io.mosip.pms.device.constant.FoundationalTrustProviderErrorMessages; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateFtmRequestDto; import io.mosip.pms.device.request.dto.FtpChipCertDownloadRequestDto; import io.mosip.pms.device.request.dto.FtpChipCertificateRequestDto; import io.mosip.pms.device.request.dto.FtpChipDetailDto; @@ -1024,6 +1025,9 @@ public void deactivateFtmTest() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateFtmRequestDto requestDto = new DeactivateFtmRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -1039,7 +1043,7 @@ public void deactivateFtmTest() throws Exception { ftpChipDetail.setActive(true); when(ftpChipDetailRepository.findById(anyString())).thenReturn(Optional.of(ftpChipDetail)); when(ftpChipDetailRepository.save(any())).thenReturn(ftpChipDetail); - ftpChipDetailService.deactivateFtm("23456"); + ftpChipDetailService.deactivateFtm("23456", requestDto); } @Test @@ -1050,6 +1054,9 @@ public void deactivateFtmTestException() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateFtmRequestDto requestDto = new DeactivateFtmRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -1059,7 +1066,7 @@ public void deactivateFtmTestException() throws Exception { partnerList.add(partner); when(partnerRepository.findByUserId(anyString())).thenReturn(partnerList); - ftpChipDetailService.deactivateFtm(null); + ftpChipDetailService.deactivateFtm(null, requestDto); } @Test @@ -1070,9 +1077,12 @@ public void deactivateFtmTestException1() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateFtmRequestDto requestDto = new DeactivateFtmRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); when(partnerRepository.findByUserId(anyString())).thenReturn(partnerList); - ftpChipDetailService.deactivateFtm("23456"); + ftpChipDetailService.deactivateFtm("23456", requestDto); } @Test @@ -1083,6 +1093,9 @@ public void deactivateFtmTestException2() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateFtmRequestDto requestDto = new DeactivateFtmRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -1095,7 +1108,7 @@ public void deactivateFtmTestException2() throws Exception { FTPChipDetail ftpChipDetail = new FTPChipDetail(); when(ftpChipDetailRepository.findById(anyString())).thenReturn(Optional.of(ftpChipDetail)); - ftpChipDetailService.deactivateFtm("23456"); + ftpChipDetailService.deactivateFtm("23456", requestDto); } @Test diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/SBIServiceTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/SBIServiceTest.java index 454e8ee005..3bd6754392 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/SBIServiceTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/service/impl/SBIServiceTest.java @@ -68,6 +68,7 @@ import io.mosip.pms.device.constant.SecureBiometricInterfaceConstant; import io.mosip.pms.device.request.dto.DeviceDetailSBIMappingDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateSbiRequestDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceCreateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceStatusUpdateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceUpdateDto; @@ -559,6 +560,9 @@ public void deactivateSbiTest() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateSbiRequestDto requestDto = new DeactivateSbiRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -584,7 +588,7 @@ public void deactivateSbiTest() throws Exception { when(deviceDetailRepository.findApprovedDevicesBySbiId(anyString())).thenReturn(deviceDetailList); when(deviceDetailRepository.save(any())).thenReturn(deviceDetail); when(sbiRepository.save(any())).thenReturn(sbi); - secureBiometricInterfaceService.deactivateSbi("12345"); + secureBiometricInterfaceService.deactivateSbi("12345", requestDto); } @Test @@ -595,6 +599,9 @@ public void deactivateSbiTestException() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateSbiRequestDto requestDto = new DeactivateSbiRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); Partner partner = new Partner(); partner.setId("123"); @@ -603,7 +610,7 @@ public void deactivateSbiTestException() throws Exception { partner.setIsActive(true); partnerList.add(partner); when(partnerRepository.findByUserId(anyString())).thenReturn(partnerList); - secureBiometricInterfaceService.deactivateSbi(null); + secureBiometricInterfaceService.deactivateSbi(null, requestDto); } @Test @@ -614,9 +621,12 @@ public void deactivateSbiTestException1() throws Exception { when(authentication.getPrincipal()).thenReturn(authUserDetails); when(securityContext.getAuthentication()).thenReturn(authentication); + DeactivateSbiRequestDto requestDto = new DeactivateSbiRequestDto(); + requestDto.setStatus("De-Activate"); + List partnerList = new ArrayList<>(); when(partnerRepository.findByUserId(anyString())).thenReturn(partnerList); - secureBiometricInterfaceService.deactivateSbi("23456"); + secureBiometricInterfaceService.deactivateSbi("23456", requestDto); } @Test From d6437e03f1eecaff96b1ba74a8a7d2d7fed559ba Mon Sep 17 00:00:00 2001 From: Swetha K Date: Fri, 20 Dec 2024 13:54:24 +0530 Subject: [PATCH 2/4] MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K --- .../device/authdevice/service/impl/DeviceDetailServiceImpl.java | 2 +- .../authdevice/service/impl/FTPChipDetailServiceImpl.java | 2 +- .../service/impl/SecureBiometricInterfaceServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java index 6b73e69bf0..6488f446b4 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/DeviceDetailServiceImpl.java @@ -431,7 +431,7 @@ public ResponseWrapperV2 deactivateDevice(String device try { String status = requestDto.getStatus(); if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVATE)) { - LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-active)"); + LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-Activate)"); throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); } diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java index a2f22cc11e..66f32e2271 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java @@ -553,7 +553,7 @@ public ResponseWrapperV2 deactivateFtm(String ftmId, Deact try { String status = requestDto.getStatus(); if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVE)) { - LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-active)"); + LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-Activate)"); throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); } diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java index 5ee7dae217..8f34f9a0b7 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java @@ -1015,7 +1015,7 @@ public ResponseWrapperV2 deactivateSbi(String sbiId, Deac try { String status = requestDto.getStatus(); if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVE)) { - LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-active)"); + LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-Activate)"); throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); } From 755de394e6cac208b87f74b73a09f1c9ea18ba75 Mon Sep 17 00:00:00 2001 From: Swetha K Date: Fri, 20 Dec 2024 14:20:41 +0530 Subject: [PATCH 3/4] MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K --- .../service/impl/FTPChipDetailServiceImpl.java | 2 +- .../impl/SecureBiometricInterfaceServiceImpl.java | 2 +- .../device/controller/DeviceDetailControllerTest.java | 11 +++++++---- .../controller/FTPChipDetailControllerTest.java | 10 ++++++---- .../SecureBiometricInterfaceControllerTest.java | 11 ++++++++--- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java index 66f32e2271..0ee5af1436 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java @@ -552,7 +552,7 @@ public ResponseWrapperV2 deactivateFtm(String ftmId, Deact ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); try { String status = requestDto.getStatus(); - if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVE)) { + if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVATE)) { LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-Activate)"); throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java index 8f34f9a0b7..cd19a1cb0c 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java @@ -1014,7 +1014,7 @@ public ResponseWrapperV2 deactivateSbi(String sbiId, Deac ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); try { String status = requestDto.getStatus(); - if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVE)) { + if (Objects.isNull(status) || status.equals(BLANK_STRING) || !status.equals(PartnerConstants.DEACTIVATE)) { LOGGER.info(status + " : is Invalid Input Parameter, it should be (De-Activate)"); throw new PartnerServiceException(ErrorCode.DEACTIVATE_STATUS_CODE.getErrorCode(), ErrorCode.DEACTIVATE_STATUS_CODE.getErrorMessage()); diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java index c93bd4f172..321678459b 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/DeviceDetailControllerTest.java @@ -14,6 +14,7 @@ import io.mosip.pms.device.request.dto.DeviceDetailDto; import io.mosip.pms.device.request.dto.DeviceDetailUpdateDto; import io.mosip.pms.device.request.dto.DeviceSearchDto; +import io.mosip.pms.device.request.dto.DeactivateDeviceRequestDto; import io.mosip.pms.device.request.dto.UpdateDeviceDetailStatusDto; import io.mosip.pms.device.response.dto.*; import io.mosip.pms.device.util.AuditUtil; @@ -449,16 +450,18 @@ public void filterDeviceSubTypeTest() throws JsonProcessingException, Exception @Test @WithMockUser(roles = {"DEVICE_PROVIDER"}) public void deactivateDeviceTest() throws Exception { + RequestWrapperV2 requestWrapper = new RequestWrapperV2<>(); + DeactivateDeviceRequestDto requestDto = new DeactivateDeviceRequestDto(); + requestDto.setStatus("De-Activate"); + requestWrapper.setRequest(requestDto); ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); DeviceDetailResponseDto deviceDetailResponseDto = new DeviceDetailResponseDto(); responseWrapper.setResponse(deviceDetailResponseDto); Mockito.when(deviceDetaillService.deactivateDevice(Mockito.anyString(), Mockito.any())).thenReturn(responseWrapper); - mockMvc.perform(MockMvcRequestBuilders.patch("/devicedetail/12345") - .contentType(MediaType.APPLICATION_JSON_VALUE)) - .andExpect(status().isOk()); - + mockMvc.perform(MockMvcRequestBuilders.patch("/devicedetail/12345").contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(requestWrapper))).andExpect(status().isOk()); } diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java index c9abdc6eef..c6a13d4a15 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java @@ -386,12 +386,14 @@ public void getPartnerCertificateTest_02() throws JsonProcessingException, Excep @WithMockUser(roles = {"FTM_PROVIDER"}) public void deactivateFtmTest() throws Exception { ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); + RequestWrapperV2 requestWrapper = new RequestWrapperV2<>(); + DeactivateFtmRequestDto requestDto = new DeactivateFtmRequestDto(); + requestDto.setStatus("De-Activate"); + requestWrapper.setRequest(requestDto); FtmDetailResponseDto ftmDetailResponseDto = new FtmDetailResponseDto(); responseWrapper.setResponse(ftmDetailResponseDto); - Mockito.when(ftpChipDetaillService.deactivateFtm(Mockito.any(), Mockito.any())).thenReturn(responseWrapper); - mockMvc.perform(MockMvcRequestBuilders.patch("/ftpchipdetail/1232") - .contentType(MediaType.APPLICATION_JSON_VALUE)) - .andExpect(status().isOk()); + mockMvc.perform(MockMvcRequestBuilders.patch("/ftpchipdetail/1232").contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(requestWrapper))).andExpect(status().isOk()); } @Test diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java index db79e29208..74ed068799 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import io.mosip.pms.common.request.dto.RequestWrapperV2; import io.mosip.pms.common.response.dto.ResponseWrapperV2; import io.mosip.pms.device.dto.SbiFilterDto; import io.mosip.pms.device.response.dto.SbiSummaryDto; @@ -54,6 +55,7 @@ import io.mosip.pms.device.request.dto.SecureBiometricInterfaceCreateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceStatusUpdateDto; import io.mosip.pms.device.request.dto.SecureBiometricInterfaceUpdateDto; +import io.mosip.pms.device.request.dto.DeactivateSbiRequestDto; import io.mosip.pms.device.response.dto.IdDto; import io.mosip.pms.device.response.dto.SbiSearchResponseDto; import io.mosip.pms.device.util.AuditUtil; @@ -372,15 +374,18 @@ public void getAllDevicesForSbiTest() throws Exception { @Test @WithMockUser(roles = {"DEVICE_PROVIDER"}) public void deactivateSbiTest() throws Exception { + RequestWrapperV2 requestWrapper = new RequestWrapperV2<>(); + DeactivateSbiRequestDto requestDto = new DeactivateSbiRequestDto(); + requestDto.setStatus("De-Activate"); + requestWrapper.setRequest(requestDto); ResponseWrapperV2 responseWrapper = new ResponseWrapperV2<>(); SbiDetailsResponseDto sbiDetailsResponseDto = new SbiDetailsResponseDto(); responseWrapper.setResponse(sbiDetailsResponseDto); Mockito.when(secureBiometricInterfaceService.deactivateSbi(Mockito.anyString(), Mockito.any())).thenReturn(responseWrapper); - mockMvc.perform(MockMvcRequestBuilders.patch("/securebiometricinterface/1234") - .contentType(MediaType.APPLICATION_JSON_VALUE)) - .andExpect(status().isOk()); + mockMvc.perform(MockMvcRequestBuilders.patch("/securebiometricinterface/1234").contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(requestWrapper))).andExpect(status().isOk()); } private RequestWrapper createMappingRequest() { From 34f6d32697f61609d2208db2d6e1788aa08c055d Mon Sep 17 00:00:00 2001 From: Swetha K Date: Fri, 20 Dec 2024 14:24:34 +0530 Subject: [PATCH 4/4] MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K --- .../pms/test/device/controller/FTPChipDetailControllerTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java index c6a13d4a15..a6934db501 100644 --- a/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java +++ b/partner/partner-management-service/src/test/java/io/mosip/pms/test/device/controller/FTPChipDetailControllerTest.java @@ -392,6 +392,7 @@ public void deactivateFtmTest() throws Exception { requestWrapper.setRequest(requestDto); FtmDetailResponseDto ftmDetailResponseDto = new FtmDetailResponseDto(); responseWrapper.setResponse(ftmDetailResponseDto); + Mockito.when(ftpChipDetaillService.deactivateFtm(Mockito.any(), Mockito.any())).thenReturn(responseWrapper); mockMvc.perform(MockMvcRequestBuilders.patch("/ftpchipdetail/1232").contentType(MediaType.APPLICATION_JSON_VALUE) .content(objectMapper.writeValueAsString(requestWrapper))).andExpect(status().isOk()); }