KB-12367 | Email notifications not received by SPV and Content Creator| updated testCases (#213)

* KB-12295|DEV | BE | Content Retirement API implementation

* KB-12367 | Email notifications not received by SPV and Content Creator

* KB-12367 | Email notifications not received by SPV and Content Creator

* KB-12367 | Email notifications not received by SPV and Content Creator: updated testCases

* KB-12367 | Email notifications not received by SPV and Content Creator| updated testCases

Author: ruksana2808

src/test/java/com/igot/cb/service/ContentRetirementServiceTest.java

@@ -370,7 +370,7 @@ void sendContentRetirementNotificationsToSpv_CreatedDateNotToday_ShouldSkip() {
 
         verify(notificationService, never())
                 .sendNotificationForContentRetirementSpv(
-                        any(), any(), any(), any(), any());
+                        any(), any(), any(), any(), any(), any(), any());
 
         verify(contentService, never())
                 .readContent(anyString(), anyList());
@@ -381,129 +381,126 @@ void sendContentRetirementNotificationsToSpv_ValidRequest_ShouldNotify() {
         LocalDate today = LocalDate.now();
         Map<String, Object> record = Map.of(
                 Constants.CONTENT_ID, "do_123",
-                Constants.CREATED_AT_FIELD, Instant.now(),
+                Constants.CREATED_AT_FIELD, today,
                 Constants.USER_ID_RAISED_FIELD, "requester-1",
                 Constants.RETIREMENT_DATE, today.plusDays(5)
         );
         when(cassandraOperation.getRecordsByProperties(any(), any(), any(), any(), any()))
                 .thenReturn(List.of(record));
-
         when(contentService.readContent(eq("do_123"), any()))
                 .thenReturn(Map.of("name", "Sample Course"));
-
         mockSpvUsers(List.of("spv-1", "spv-2"));
         contentRetirementService.sendContentRetirementNotificationsToSpv();
-
         verify(notificationService).sendNotificationForContentRetirementSpv(
                 eq("do_123"),
                 eq("Sample Course"),
                 argThat(list ->
-                        list.contains("spv-1")
-                                && list.contains("spv-2")
-                                && list.contains("requester-1")
+                        list.contains("spv-1") &&
+                                list.contains("spv-2")
                 ),
                 eq(Constants.CONTENT_RETIREMENT_SCHEDULED_NOTIFICATION),
-                eq(today.plusDays(5))
+                eq(today.plusDays(5)),
+                argThat(emails -> emails.contains("spv-1@test.com")),
+                eq("requester-1")
         );
     }
 
     @Test
     void sendContentRetirementNotificationsToSpv_NoRequester_ShouldNotifyOnlySpv() {
+        LocalDate today = LocalDate.now();
         Map<String, Object> record = Map.of(
                 Constants.CONTENT_ID, "do_124",
-                Constants.CREATED_AT_FIELD, Instant.now(),
-                Constants.RETIREMENT_DATE, LocalDate.now().plusDays(7)
+                Constants.CREATED_AT_FIELD, today,
+                Constants.RETIREMENT_DATE, today.plusDays(7)
         );
         when(cassandraOperation.getRecordsByProperties(any(), any(), any(), any(), any()))
                 .thenReturn(List.of(record));
         when(contentService.readContent(eq("do_124"), any()))
                 .thenReturn(Map.of("name", "Course X"));
         mockSpvUsers(List.of("spv-1"));
         contentRetirementService.sendContentRetirementNotificationsToSpv();
-
         verify(notificationService).sendNotificationForContentRetirementSpv(
                 eq("do_124"),
                 eq("Course X"),
-                any(ArrayList.class),
+                argThat(list -> list.contains("spv-1")),
                 any(),
-                any()
+                any(),
+                anyList(),
+                isNull()
         );
-
     }
 
     @Test
-    void sendContentRetirementNotificationsToSpv_NoSpvUsers_ShouldNotifyRequesterOnly() {
+    void sendContentRetirementNotificationsToSpv_NoSpvUsers_ShouldNotNotifyAnyone() {
+        LocalDate today = LocalDate.now();
         Map<String, Object> record = Map.of(
                 Constants.CONTENT_ID, "do_125",
-                Constants.CREATED_AT_FIELD, Instant.now(),
+                Constants.CREATED_AT_FIELD, today,
                 Constants.USER_ID_RAISED_FIELD, "requester-2",
-                Constants.RETIREMENT_DATE, LocalDate.now().plusDays(3)
+                Constants.RETIREMENT_DATE, today.plusDays(3)
         );
         when(cassandraOperation.getRecordsByProperties(any(), any(), any(), any(), any()))
                 .thenReturn(List.of(record));
-        when(contentService.readContent(eq("do_125"), any()))
-                .thenReturn(Map.of("name", "Course Y"));
-
-        // This now mocks props + outbound call
         mockSpvUsers(Collections.emptyList());
         contentRetirementService.sendContentRetirementNotificationsToSpv();
-        ArgumentCaptor<ArrayList<String>> captor =
-                ArgumentCaptor.forClass(ArrayList.class);
-
-        verify(notificationService).sendNotificationForContentRetirementSpv(
-                eq("do_125"),
-                eq("Course Y"),
-                captor.capture(),
-                eq(Constants.CONTENT_RETIREMENT_SCHEDULED_NOTIFICATION),
-                any()
-        );
-
-        ArrayList<String> recipients = captor.getValue();
-        assertEquals(1, recipients.size());
-        assertEquals("requester-2", recipients.get(0));
+        verifyNoInteractions(notificationService);
     }
 
+
     @Test
     void sendContentRetirementNotificationsToSpv_RetirementDateInstant_ShouldConvert() {
         Map<String, Object> record = Map.of(
                 Constants.CONTENT_ID, "do_126",
                 Constants.CREATED_AT_FIELD, Instant.now(),
                 Constants.USER_ID_RAISED_FIELD, "user-x",
-                Constants.RETIREMENT_DATE, Instant.now().plus(10, ChronoUnit.DAYS)
+                Constants.RETIREMENT_DATE, LocalDate.now().plusDays(10)
         );
-
         when(cassandraOperation.getRecordsByProperties(any(), any(), any(), any(), any()))
                 .thenReturn(List.of(record));
         when(contentService.readContent(any(), any()))
                 .thenReturn(Map.of("name", "Course Z"));
-
         mockSpvUsers(List.of("spv"));
+        Map<String, Object> spvUser = Map.of(
+                "userId", "spv",
+                "email", "spv@test.com"
+        );
         contentRetirementService.sendContentRetirementNotificationsToSpv();
-
         verify(notificationService).sendNotificationForContentRetirementSpv(
-                any(), any(), any(), any(), any(LocalDate.class)
+                any(), any(), any(), any(), any(LocalDate.class), anyList(), any()
         );
     }
 
+
     private void mockSpvUsers(List<String> spvUserIds) {
         when(props.getSbUrl()).thenReturn("http://test");
         when(props.getUserSearchEndPoint()).thenReturn("/search");
-        Map<String, Object> response = Map.of(
-                Constants.RESPONSE_CODE, "OK",
-                Constants.RESULT, Map.of(
-                        Constants.RESPONSE, Map.of(
-                                Constants.CONTENT,
-                                spvUserIds.stream()
-                                        .map(id -> Map.of(Constants.USER_ID, id))
-                                        .toList()
-                        )
+        List<Map<String, Object>> contents = spvUserIds.stream()
+                .map(id -> {
+                    Map<String, Object> personalDetails = new HashMap<>();
+                    personalDetails.put(Constants.PRIMARY_EMAIL, id + "@test.com");
+
+                    Map<String, Object> profileDetails = new HashMap<>();
+                    profileDetails.put(Constants.PERSONAL_DETAILS, personalDetails);
+
+                    Map<String, Object> user = new HashMap<>();
+                    user.put(Constants.USER_ID, id);
+                    user.put(Constants.PROFILE_DETAILS, profileDetails);
+
+                    return user;
+                }).toList();
+        Map<String, Object> response = new HashMap<>();
+        response.put(Constants.RESPONSE_CODE, "OK");
+        response.put(Constants.RESULT, Map.of(
+                Constants.RESPONSE, Map.of(
+                        Constants.CONTENT, contents
                 )
-        );
+        ));
         when(outboundRequestHandlerService.fetchResultUsingPost(
                 eq("http://test/search"),
                 any(),
                 any()
         )).thenReturn(response);
     }
 
+
 }

src/test/java/com/igot/cb/service/NotificationServiceImplTest.java

@@ -392,12 +392,19 @@ void sendNotificationForContentRetirementSpv_validInput_shouldSendNotification()
         LocalDate date = LocalDate.now();
 
         // Act
+        List<String> emails = List.of(
+                "rkspvpublisher@yopmail.com",
+                "tarento.spv.publisher@yopmail.com"
+        );
+        String requestedBy = "91c9351f-803b-44d0-92a1-31f033bf3cc5";
         spyService.sendNotificationForContentRetirementSpv(
                 "do_123",
                 "Sample Course",
-                users,
+                new ArrayList<>(users),
                 Constants.CONTENT_RETIREMENT_SCHEDULED_NOTIFICATION,
-                date
+                LocalDate.now(),
+                emails,
+                requestedBy
         );
 
         // Assert
@@ -424,12 +431,18 @@ void sendNotificationForContentRetirementSpv_emptyUsers_shouldReturnEarly() {
         NotificationServiceImpl spyService = spy(notificationService);
 
         // Act
+        List<String> emails = List.of(
+                "rkspvpublisher@yopmail.com",
+                "tarento.spv.publisher@yopmail.com"
+        );
+        String requestedBy = "91c9351f-803b-44d0-92a1-31f033bf3cc5";
         spyService.sendNotificationForContentRetirementSpv(
                 "do_124",
                 "Course X",
                 new ArrayList<>(),
                 Constants.CONTENT_RETIREMENT_SCHEDULED_NOTIFICATION,
-                LocalDate.now()
+                LocalDate.now(),
+                emails, requestedBy
         );
 
         // Assert
@@ -446,14 +459,19 @@ void sendNotificationForContentRetirementSpv_exceptionThrown_shouldBeCaught() {
                 .sendInAppNotification(any(), any(), any(), any());
 
         ArrayList<String> users = new ArrayList<>(List.of("user1"));
-
+        List<String> emails = List.of(
+                "rkspvpublisher@yopmail.com",
+                "tarento.spv.publisher@yopmail.com"
+        );
+        String requestedBy = "91c9351f-803b-44d0-92a1-31f033bf3cc5";
         assertDoesNotThrow(() ->
                 spyService.sendNotificationForContentRetirementSpv(
                         "do_500",
                         "Crash Course",
                         users,
                         Constants.CONTENT_RETIREMENT_SCHEDULED_NOTIFICATION,
-                        LocalDate.now()
+                        LocalDate.now(),
+                        emails, requestedBy
                 )
         );
     }