Merge pull request #1404 from kameshsr/MOSIP-39000

MOSIP-38556 Fixed notification issue via phone channel (#1397)
mosip · Jan 27, 2025 · 0d0a520 · 0d0a520
2 parents 06d1205 + 8d91ab2
commit 0d0a520
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...src/main/java/io/mosip/authentication/common/service/integration/NotificationManager.java b/...src/main/java/io/mosip/authentication/common/service/integration/NotificationManager.java
@@ -56,8 +56,8 @@ public void sendSmsNotification(String notificationMobileNo, String message)
 			RestRequestDTO restRequestDTO = null;
 			restRequestDTO = restRequestFactory.buildRequest(RestServicesConstants.SMS_NOTIFICATION_SERVICE,
 					RestRequestFactory.createRequest(smsRequestDto), String.class);
-			restHelper.requestAsync(restRequestDTO);
-		} catch (IDDataValidationException e) {
+			restHelper.requestSync(restRequestDTO);
+		} catch (IDDataValidationException | RestServiceException e) {
 			logger.error(IdAuthCommonConstants.SESSION_ID, "Inside SMS Notification >>>>>", e.getErrorCode(), e.getErrorText());
 			throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.DATA_VALIDATION_FAILED, e);
 		}

diff --git a/...test/java/io/mosip/authentication/common/service/integration/NotificationManagerTest.java b/...test/java/io/mosip/authentication/common/service/integration/NotificationManagerTest.java
@@ -5,6 +5,7 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
+import io.mosip.idrepository.core.constant.IdRepoErrorConstants;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -116,4 +117,13 @@ public void TestInvalidNotificationConfig() throws IdAuthenticationBusinessExcep
 		Mockito.when(restHelper.requestAsync(Mockito.any())).thenReturn(Supplier);
 		notificationManager.sendEmailNotification("[email protected]", "test", "test");
 	}
+
+	@Test(expected = IdAuthenticationBusinessException.class)
+	public void testInValidSendNotificationPhone() throws IdAuthenticationBusinessException, RestServiceException {
+		Set<NotificationType> notificationtype = new HashSet<>();
+		notificationtype.add(NotificationType.SMS);
+        Mockito.when(restHelper.requestSync(Mockito.any()))
+				.thenThrow(new RestServiceException(IdRepoErrorConstants.UNKNOWN_ERROR));
+		notificationManager.sendSmsNotification("1234567890", "test");
+	}
 }