Merge remote-tracking branch 'upstream/develop-pmp-revamp' into devel…

…op-pmp-revamp
mosip · Jan 2, 2025 · 313ea44 · 313ea44
2 parents fc5a59c + c030379
commit 313ea44
Show file tree

Hide file tree

Showing 18 changed files with 575 additions and 34 deletions.
diff --git a/...e/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java b/...e/src/main/java/io/mosip/pms/device/authdevice/service/impl/FTPChipDetailServiceImpl.java
@@ -653,15 +653,15 @@ public ResponseWrapperV2<FtmCertificateDownloadResponseDto> getFtmCertificateDat
 			partnerHelper.populateFtmCertificateExpiryState(responseObject);
 			responseWrapper.setResponse(responseObject);
 		} catch (ApiAccessibleException ex) {
-			LOGGER.info("sessionId", "idType", "id", "In getOriginalFtmCertificate method of FTPChipDetailServiceImpl - " + ex.getMessage());
+			LOGGER.info("sessionId", "idType", "id", "In getFtmCertificateData method of FTPChipDetailServiceImpl - " + ex.getMessage());
 			responseWrapper.setErrors(MultiPartnerUtil.setErrorResponse(ex.getErrorCode(), ex.getErrorText()));
 		} catch (PartnerServiceException ex) {
-			LOGGER.info("sessionId", "idType", "id", "In getOriginalFtmCertificate method of FTPChipDetailServiceImpl - " + ex.getMessage());
+			LOGGER.info("sessionId", "idType", "id", "In getFtmCertificateData method of FTPChipDetailServiceImpl - " + ex.getMessage());
 			responseWrapper.setErrors(MultiPartnerUtil.setErrorResponse(ex.getErrorCode(), ex.getErrorText()));
 		} catch (Exception ex) {
 			LOGGER.debug("sessionId", "idType", "id", ex.getStackTrace());
 			LOGGER.error("sessionId", "idType", "id",
-					"In getOriginalFtmCertificate method of FTPChipDetailServiceImpl - " + ex.getMessage());
+					"In getFtmCertificateData method of FTPChipDetailServiceImpl - " + ex.getMessage());
 			String errorCode = ErrorCode.UNABLE_TO_DOWNLOAD_ORIGINAL_FTM_CERTIFICATE.getErrorCode();
 			String errorMessage = ErrorCode.UNABLE_TO_DOWNLOAD_ORIGINAL_FTM_CERTIFICATE.getErrorMessage();
 			responseWrapper.setErrors(MultiPartnerUtil.setErrorResponse(errorCode, errorMessage));

diff --git a/...java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java b/...java/io/mosip/pms/device/authdevice/service/impl/SecureBiometricInterfaceServiceImpl.java
@@ -493,7 +493,7 @@ public ResponseWrapperV2<List<SbiDetailsDto>> getSbiDetails() {
 			}
 			List<SbiDetailsDto> sbiDetailsDtoList = new ArrayList<>();
 			for (Partner partner : partnerList) {
-				validatePartnerId(partner, userId);
+				partnerHelper.validatePartnerId(partner, userId);
 				if (partnerHelper.checkIfPartnerIsDevicePartner(partner)) {
 					List<SecureBiometricInterface> secureBiometricInterfaceList = sbiRepository.findByProviderId(partner.getId());
 					if (!secureBiometricInterfaceList.isEmpty()) {
@@ -772,7 +772,7 @@ public ResponseWrapperV2<IdDto> addDeviceToSbi(DeviceDetailDto deviceDetailDto,
 			String partnerOrgname = BLANK_STRING;
 			for (Partner partner : partnerList) {
 				if (partner.getId().equals(partnerId)) {
-					validatePartnerId(partner, userId);
+					partnerHelper.validatePartnerId(partner, userId);
 					partnerIdExists = true;
 					partnerOrgname = partner.getName();
 					break;
@@ -941,7 +941,7 @@ public ResponseWrapperV2<List<DeviceDto>> getAllDevicesForSbi(String sbiId) {
 			boolean partnerIdExists = false;
 			for (Partner partner : partnerList) {
 				if (partner.getId().equals(sbi.getProviderId())) {
-					validatePartnerId(partner, userId);
+					partnerHelper.validatePartnerId(partner, userId);
 					validateDevicePartnerType(partner, userId);
 					partnerIdExists = true;
 					break;
@@ -993,14 +993,6 @@ public ResponseWrapperV2<List<DeviceDto>> getAllDevicesForSbi(String sbiId) {
 		return responseWrapper;
 	}
 
-	public static void validatePartnerId(Partner partner, String userId) {
-		if (Objects.isNull(partner.getId()) || partner.getId().equals(BLANK_STRING)) {
-			LOGGER.info("Partner Id is null or empty for user id : " + userId);
-			throw new PartnerServiceException(ErrorCode.PARTNER_ID_NOT_EXISTS.getErrorCode(),
-					ErrorCode.PARTNER_ID_NOT_EXISTS.getErrorMessage());
-		}
-	}
-
 	private void validateDevicePartnerType(Partner partner, String userId) {
 		if (!partner.getPartnerTypeCode().equals(DEVICE_PROVIDER)) {
 			LOGGER.info("Invalid Partner type for partner id : " + partner.getId());
@@ -1108,7 +1100,7 @@ public Partner getAssociatedPartner (List<Partner> partnerList, String sbiProvid
 		Partner partnerDetails = null;
 		for (Partner partner : partnerList) {
 			if (partner.getId().equals(sbiProviderId)) {
-				validatePartnerId(partner, userId);
+				partnerHelper.validatePartnerId(partner, userId);
 				sbiProviderExist = true;
 				partnerDetails = partner;
 				break;

diff --git a/...ce/src/main/java/io/mosip/pms/partner/manager/controller/PartnerManagementController.java b/...ce/src/main/java/io/mosip/pms/partner/manager/controller/PartnerManagementController.java
@@ -344,7 +344,7 @@ public ResponseWrapperV2<PageResponseV2Dto<PartnerPolicyRequestSummaryDto>> getA
 			@RequestParam(value = "policyId", required = false) String policyId,
 			@RequestParam(value = "policyName", required = false) String policyName,
 			@RequestParam(value = "policyGroupName", required = false) String policyGroupName,
-			@RequestParam(value = "partnerTypeCode", required = false) String partnerTypeCode
+			@RequestParam(value = "partnerType", required = false) String partnerType
 	) {
 		partnerHelper.validateRequestParameters(partnerHelper.partnerPolicyMappingAliasToColumnMap, sortFieldName, sortType, pageNo, pageSize);
 		PartnerPolicyRequestFilterDto filterDto = new PartnerPolicyRequestFilterDto();
@@ -369,8 +369,8 @@ public ResponseWrapperV2<PageResponseV2Dto<PartnerPolicyRequestSummaryDto>> getA
 		if (policyGroupName != null) {
 			filterDto.setPolicyGroupName(policyGroupName.toLowerCase());
 		}
-		if (partnerTypeCode != null) {
-			filterDto.setPartnerTypeCode(partnerTypeCode.toLowerCase());
+		if (partnerType != null) {
+			filterDto.setPartnerType(partnerType.toLowerCase());
 		}
 		return partnerManagementService.getAllPartnerPolicyRequests(sortFieldName, sortType, pageNo, pageSize, filterDto);
 	}

diff --git a/...service/src/main/java/io/mosip/pms/partner/manager/dto/PartnerPolicyRequestFilterDto.java b/...service/src/main/java/io/mosip/pms/partner/manager/dto/PartnerPolicyRequestFilterDto.java
@@ -5,7 +5,7 @@
 @Data
 public class PartnerPolicyRequestFilterDto {
     private String partnerId;
-    private String partnerTypeCode;
+    private String partnerType;
     private String requestDetails;
     private String organizationName;
     private String policyId;

diff --git a/...src/main/java/io/mosip/pms/partner/manager/service/impl/PartnerManagementServiceImpl.java b/...src/main/java/io/mosip/pms/partner/manager/service/impl/PartnerManagementServiceImpl.java
@@ -916,7 +916,7 @@ public ResponseWrapperV2<PageResponseV2Dto<PartnerPolicyRequestSummaryDto>> getA
 			}
 
 			Page<PartnerPolicyRequestSummaryEntity> page = partnerPolicyMappingRequestRepository.
-					getSummaryOfAllPartnerPolicyRequests(filterDto.getPartnerId(), filterDto.getPartnerTypeCode(),
+					getSummaryOfAllPartnerPolicyRequests(filterDto.getPartnerId(), filterDto.getPartnerType(),
 							filterDto.getOrganizationName(), filterDto.getPolicyId(), filterDto.getPolicyName(),
 							filterDto.getStatus(), filterDto.getRequestDetails(),
 							filterDto.getPolicyGroupName(), pageable);

diff --git a/...anagement-service/src/main/java/io/mosip/pms/partner/service/impl/PartnerServiceImpl.java b/...anagement-service/src/main/java/io/mosip/pms/partner/service/impl/PartnerServiceImpl.java
@@ -1882,12 +1882,12 @@ public ResponseWrapperV2<List<PartnerDtoV4>> getPartnersV4(String status, Boolea
 			}
 			responseWrapper.setResponse(partnerDtoV4List);
 		} catch (PartnerServiceException ex) {
-			LOGGER.info("sessionId", "idType", "id", "In getApprovedPartners method of PartnerServiceImpl - " + ex.getMessage());
+			LOGGER.info("sessionId", "idType", "id", "In getPartnersV4 method of PartnerServiceImpl - " + ex.getMessage());
 			responseWrapper.setErrors(MultiPartnerUtil.setErrorResponse(ex.getErrorCode(), ex.getErrorText()));
 		} catch (Exception ex) {
 			LOGGER.debug("sessionId", "idType", "id", ex.getStackTrace());
 			LOGGER.error("sessionId", "idType", "id",
-					"In getApprovedPartners method of PartnerServiceImpl - " + ex.getMessage());
+					"In getPartnersV4 method of PartnerServiceImpl - " + ex.getMessage());
 			String errorCode = ErrorCode.PARTNERS_FETCH_ERROR.getErrorCode();
 			String errorMessage = ErrorCode.PARTNERS_FETCH_ERROR.getErrorMessage();
 			responseWrapper.setErrors(MultiPartnerUtil.setErrorResponse(errorCode, errorMessage));

diff --git a/...test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java b/...test/java/io/mosip/pms/test/device/controller/SecureBiometricInterfaceControllerTest.java
@@ -1,6 +1,7 @@
 package io.mosip.pms.test.device.controller;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -56,6 +57,7 @@
 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.request.dto.DeviceDetailDto;
 import io.mosip.pms.device.response.dto.IdDto;
 import io.mosip.pms.device.response.dto.SbiSearchResponseDto;
 import io.mosip.pms.device.util.AuditUtil;
@@ -432,4 +434,29 @@ public void getSbiDetailsTest() throws Exception {
 		mockMvc.perform(MockMvcRequestBuilders.get("/securebiometricinterface").contentType(MediaType.APPLICATION_JSON_VALUE)
 				.content(objectMapper.writeValueAsString(responseWrapper))).andExpect(status().isOk());
 	}
+
+	@Test
+	@WithMockUser(roles = {"DEVICE_PROVIDER"})
+	public void addDeviceToSbiTest() throws Exception {
+		RequestWrapperV2<DeviceDetailDto> requestWrapper = new RequestWrapperV2<>();
+		requestWrapper.setId("mosip.pms.add.device.to.sbi.id.post");
+		requestWrapper.setVersion("1.0");
+		DeviceDetailDto requestDto = new DeviceDetailDto();
+		requestDto.setId(null);
+		requestDto.setDeviceTypeCode("Finger");
+		requestDto.setDeviceSubTypeCode("Slap");
+		requestDto.setMake("make");
+		requestDto.setModel("model");
+		requestDto.setDeviceProviderId("mosip123");
+		requestWrapper.setRequest(requestDto);
+		ResponseWrapperV2<IdDto> responseWrapper = new ResponseWrapperV2<>();
+		responseWrapper.setId("mosip.pms.add.device.to.sbi.id.post");
+		requestWrapper.setVersion("1.0");
+		IdDto dto = new IdDto();
+		dto.setId("12345");
+		responseWrapper.setResponse(dto);
+		Mockito.when(secureBiometricInterfaceService.addDeviceToSbi(requestDto, "sbi123")).thenReturn(responseWrapper);
+		mockMvc.perform(MockMvcRequestBuilders.post("/securebiometricinterface/sbi123/devices").contentType(MediaType.APPLICATION_JSON_VALUE)
+				.content(objectMapper.writeValueAsString(requestWrapper))).andExpect(status().isOk());
+	}
 }