Mosip 32461 (mosip#1880)

* MOSIP-32461 intial changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 few test cases fixed Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code fix Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code fix Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code fix Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code fix Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code fix Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 docker changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 docker changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 docker changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 docker changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 activemq exclude from spring boot Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 activemq exclude from spring boot Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 docker changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 docker changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 Code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 Code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> * MOSIP-32461 code changes Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> --------- Signed-off-by: Sowmya Ujjappa Banakar <[email protected]> Co-authored-by: Sowmya Ujjappa Banakar <[email protected]> Signed-off-by: Sowmya Ujjappa Banakar <[email protected]>
sowmya695 · Jun 20, 2024 · d0414ad · d0414ad
1 parent 58071a0
commit d0414ad
Show file tree

Hide file tree

Showing 7 changed files with 989 additions and 989 deletions.
diff --git a/...io/mosip/registration/processor/status/api/controller/PacketExternalStatusController.java b/...io/mosip/registration/processor/status/api/controller/PacketExternalStatusController.java
@@ -122,27 +122,19 @@ public ResponseEntity<Object> packetExternalStatus(
 			}
 			List<PacketExternalStatusDTO> packetExternalStatusDTOList = packetExternalStatusService
 					.getByPacketIds(packetIdList);
-
+			PacketExternalStatusResponseDTO packetExternalStatusResponseDTO = buildPacketStatusResponse(
+					packetExternalStatusDTOList, packetExternalStatusRequestDTO.getRequest());
+			String res = objectMapper.writeValueAsString(packetExternalStatusResponseDTO);
 			if (isEnabled) {
-				PacketExternalStatusResponseDTO packetExternalStatusResponseDTO = buildPacketStatusResponse(
-						packetExternalStatusDTOList, packetExternalStatusRequestDTO.getRequest());
-
 				HttpHeaders headers = new HttpHeaders();
-				String res=null;
-				try {
-
-					res=objectMapper.writeValueAsString(packetExternalStatusResponseDTO);
-				} catch (Exception e1) {
-					logger.error("Error while processing dto ",e1);
-
-				}
 				headers.add(RESPONSE_SIGNATURE,
 						digitalSignatureUtility.getDigitalSignature(res));
 				return ResponseEntity.status(HttpStatus.OK).headers(headers)
 						.body(res);
 			}
+
 			return ResponseEntity.status(HttpStatus.OK)
-					.body(buildPacketStatusResponse(packetExternalStatusDTOList, packetExternalStatusRequestDTO.getRequest()));
+					.body(res);
 		} catch (RegStatusAppException e) {
 			throw new RegStatusAppException(PlatformErrorMessages.RPR_RGS_DATA_VALIDATION_FAILED, e);
 		} catch (Exception e) {

diff --git a/...ip/registration/processor/status/api/controller/RegistrationExternalStatusController.java b/...ip/registration/processor/status/api/controller/RegistrationExternalStatusController.java
diff --git a/...a/io/mosip/registration/processor/status/api/controller/RegistrationStatusController.java b/...a/io/mosip/registration/processor/status/api/controller/RegistrationStatusController.java
diff --git a/...ava/io/mosip/registration/processor/status/api/controller/RegistrationSyncController.java b/...ava/io/mosip/registration/processor/status/api/controller/RegistrationSyncController.java
@@ -108,15 +108,17 @@ public ResponseEntity<Object> syncRegistrationController(
 					env.getProperty(REG_SYNC_SERVICE_ID), syncResponseList)) {
 				syncResponseList = syncRegistrationService.sync(registrationSyncRequestDTO.getRequest(), referenceId, timeStamp);
 			}
+			RegSyncResponseDTO responseDto = buildRegistrationSyncResponse(syncResponseList);
+			String res = objectMapper.writeValueAsString(responseDto);
 			if (isEnabled) {
-				RegSyncResponseDTO responseDto = buildRegistrationSyncResponse(syncResponseList);
+
 				HttpHeaders headers = new HttpHeaders();
 				headers.add(RESPONSE_SIGNATURE,
-						digitalSignatureUtility.getDigitalSignature(objectMapper.writeValueAsString(responseDto)));
-				return ResponseEntity.ok().headers(headers).body(responseDto);
+						digitalSignatureUtility.getDigitalSignature(res));
+				return ResponseEntity.ok().headers(headers).body(res);
 			}
 
-			return ResponseEntity.ok().body(buildRegistrationSyncResponse(syncResponseList));
+			return ResponseEntity.ok().body(res);
 
 		} catch (JsonProcessingException e) {
 			throw new RegStatusAppException(PlatformErrorMessages.RPR_RGS_DATA_VALIDATION_FAILED, e);
@@ -155,15 +157,16 @@ public ResponseEntity<Object> syncRegistrationController2(
 					env.getProperty(REG_SYNC_SERVICE_ID), syncResponseList)) {
 				syncResponseList = syncRegistrationService.syncV2(registrationSyncRequestDTO.getRequest(), referenceId, timeStamp);
 			}
+			RegSyncResponseDTO responseDto = buildRegistrationSyncResponse(syncResponseList);
+			String res = objectMapper.writeValueAsString(responseDto);
 			if (isEnabled) {
-				RegSyncResponseDTO responseDto = buildRegistrationSyncResponse(syncResponseList);
 				HttpHeaders headers = new HttpHeaders();
 				headers.add(RESPONSE_SIGNATURE,
-						digitalSignatureUtility.getDigitalSignature(objectMapper.writeValueAsString(responseDto)));
-				return ResponseEntity.ok().headers(headers).body(responseDto);
+						digitalSignatureUtility.getDigitalSignature(res));
+				return ResponseEntity.ok().headers(headers).body(res);
 			}
 
-			return ResponseEntity.ok().body(buildRegistrationSyncResponse(syncResponseList));
+			return ResponseEntity.ok().body(res);
 
 		} catch (JsonProcessingException e) {
 			throw new RegStatusAppException(PlatformErrorMessages.RPR_RGS_DATA_VALIDATION_FAILED, e);