Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public HotlistRequestResponseDTO block(HotlistRequestResponseDTO blockRequest) t
eventHandler.publishEvent(idHash, blockRequest.getIdType(), status, hotlist.getExpiryTimestamp(), description);
}

if(sendNotification.equalsIgnoreCase("YES")) {
if(sendNotification != null && sendNotification.equalsIgnoreCase("YES")) {
NotificationRequestDto notificationRequestDto = new NotificationRequestDto();
NotificationTemplateCode templateTypeCode = NotificationTemplateCode.HS_UIN_BLOCK;

Expand Down Expand Up @@ -204,7 +204,7 @@ public HotlistRequestResponseDTO unblock(HotlistRequestResponseDTO unblockReques
updateStatus(unblockRequest, idHash, hotlistedOptionalData, dbStatus, requestedStatus);
}

if(sendNotification.equalsIgnoreCase("YES")) {
if(sendNotification != null && sendNotification.equalsIgnoreCase("YES")) {

NotificationRequestDto notificationRequestDto = new NotificationRequestDto();
NotificationTemplateCode templateTypeCode = NotificationTemplateCode.HS_UIN_UNBLOCK;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,112 @@ public void testUnblockIdNotHotlisted() throws HotlistAppException, ApisResource
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.UNBLOCKED));
}

@Test
public void testBlockWithoutNotification() throws HotlistAppException, ApisResourceAccessException {

when(hotlistRepo.findByIdHashAndIdTypeAndIsDeleted(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Optional.empty());

HotlistRequestResponseDTO blockRequest = new HotlistRequestResponseDTO();
blockRequest.setId("id");
blockRequest.setIdType("VID");
HotlistRequestResponseDTO response = service.block(blockRequest);
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.BLOCKED));
}

@Test
public void testBlockUIN() throws HotlistAppException, ApisResourceAccessException {

ReflectionTestUtils.setField(service, "sendNotification", "YES");

when(hotlistRepo.findByIdHashAndIdTypeAndIsDeleted(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Optional.empty());

NotificationResponseDTO notificationResponse = new NotificationResponseDTO();
when(notificationService.sendNotification(Mockito.any()))
.thenReturn(notificationResponse);
HotlistRequestResponseDTO blockRequest = new HotlistRequestResponseDTO();
blockRequest.setId("id");
blockRequest.setIdType("UIN");
HotlistRequestResponseDTO response = service.block(blockRequest);
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.BLOCKED));
}

@Test
public void testBlockVID() throws HotlistAppException, ApisResourceAccessException {

ReflectionTestUtils.setField(service, "sendNotification", "YES");

when(hotlistRepo.findByIdHashAndIdTypeAndIsDeleted(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Optional.empty());

NotificationResponseDTO notificationResponse = new NotificationResponseDTO();
when(notificationService.sendNotification(Mockito.any()))
.thenReturn(notificationResponse);
HotlistRequestResponseDTO blockRequest = new HotlistRequestResponseDTO();
blockRequest.setId("id");
blockRequest.setIdType("VID");
HotlistRequestResponseDTO response = service.block(blockRequest);
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.BLOCKED));
}

@Test
public void testUnblockVID() throws HotlistAppException, ApisResourceAccessException {

ReflectionTestUtils.setField(service, "sendNotification", "YES");

when(hotlistRepo.findByIdHashAndIdTypeAndIsDeleted(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Optional.empty());

NotificationResponseDTO notificationResponse = new NotificationResponseDTO();
when(notificationService.sendNotification(Mockito.any()))
.thenReturn(notificationResponse);
HotlistRequestResponseDTO unblockRequest = new HotlistRequestResponseDTO();
unblockRequest.setId("id");
unblockRequest.setIdType("VID");
HotlistRequestResponseDTO response = service.unblock(unblockRequest);
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.UNBLOCKED));
}

@Test
public void testUnblocUIN() throws HotlistAppException, ApisResourceAccessException {

ReflectionTestUtils.setField(service, "sendNotification", "YES");

when(hotlistRepo.findByIdHashAndIdTypeAndIsDeleted(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Optional.empty());

NotificationResponseDTO notificationResponse = new NotificationResponseDTO();
when(notificationService.sendNotification(Mockito.any()))
.thenReturn(notificationResponse);
HotlistRequestResponseDTO unblockRequest = new HotlistRequestResponseDTO();
unblockRequest.setId("id");
unblockRequest.setIdType("UIN");
HotlistRequestResponseDTO response = service.unblock(unblockRequest);
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.UNBLOCKED));
}

@Test
public void testUnblockWithouNotification() throws HotlistAppException, ApisResourceAccessException {

when(hotlistRepo.findByIdHashAndIdTypeAndIsDeleted(Mockito.any(), Mockito.any(), Mockito.any()))
.thenReturn(Optional.empty());


HotlistRequestResponseDTO unblockRequest = new HotlistRequestResponseDTO();
unblockRequest.setId("id");
unblockRequest.setIdType("idType");
HotlistRequestResponseDTO response = service.unblock(unblockRequest);
assertTrue(response.getId().contentEquals("id"));
assertTrue(response.getStatus().contentEquals(HotlistStatus.UNBLOCKED));
}

@SuppressWarnings("serial")
@Test
public void testUnblockTransactionFailed() throws HotlistAppException, ApisResourceAccessException {
Expand Down
Loading