Merge pull request #28 from ruksana2808/cbrelease-4.8.27.2

KB-11217 | BE | QA issue with read API while reading data

Author: rajeevsathish

src/main/java/com/igot/cb/service/ContentStateServiceImpl.java

@@ -153,9 +153,12 @@ public ApiResponse readContentState(Map<String, Object> requestBody, String auth
                 return mapped;
             }).toList();
 
-            response.getResult().put(Constants.CONTENT_LIST,
-                    objectMapper.convertValue(mappedUserContentDetails, new TypeReference<Object>() {
-                    }));
+            Object convertInstantsToString = convertInstantsToString(mappedUserContentDetails);
+
+            response.getResult().put(
+                    Constants.CONTENT_LIST,
+                    objectMapper.convertValue(convertInstantsToString, new TypeReference<Object>() {})
+            );
             response.setResponseCode(HttpStatus.OK);
             return response;
 
@@ -167,6 +170,28 @@ public ApiResponse readContentState(Map<String, Object> requestBody, String auth
         }
     }
 
+
+    @SuppressWarnings("unchecked")
+    private static Object convertInstantsToString(Object value) {
+        if (value instanceof Instant) {
+            return value.toString();
+        } else if (value instanceof Map) {
+            Map<String, Object> convertedMap = new HashMap<>();
+            ((Map<?, ?>) value).forEach((k, v) ->
+                    convertedMap.put(String.valueOf(k), convertInstantsToString(v))
+            );
+            return convertedMap;
+        } else if (value instanceof List) {
+            return ((List<?>) value).stream()
+                    .map(ContentStateServiceImpl::convertInstantsToString)
+                    .toList();
+        } else {
+            return value;
+        }
+    }
+
+
+
     public ApiResponse updateContentState(Map<String, Object> requestBody, String authToken) {
         log.info("CourseService::readContentState:inside");
         ApiResponse response = ProjectUtil.createDefaultResponse(Constants.API_CONTENT_V2_STATE_READ);

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

@@ -12,7 +12,9 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.util.ReflectionTestUtils;
 
+import java.time.Instant;
 import java.util.*;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -255,4 +257,68 @@ void testMapPayloadToCassandraColumns() {
         Map<String, Object> result = ContentStateServiceImpl.mapPayloadToCassandraColumns(payload, mapping);
         assertEquals("bar", result.get("baz"));
     }
+
+    @Test
+    void testConvertInstantsToString_singleInstant() {
+        Instant now = Instant.now();
+        Object result = invokeConvert(now);
+
+        assertTrue(result instanceof String);
+        assertEquals(now.toString(), result);
+    }
+
+    @Test
+    void testConvertInstantsToString_mapWithInstant() {
+        Instant now = Instant.now();
+        Map<String, Object> input = Map.of("time", now);
+
+        Object result = invokeConvert(input);
+
+        assertTrue(result instanceof Map);
+        assertEquals(now.toString(), ((Map<?, ?>) result).get("time"));
+    }
+
+    @Test
+    void testConvertInstantsToString_listWithInstant() {
+        Instant now = Instant.now();
+        List<Object> input = List.of(now, "test");
+
+        Object result = invokeConvert(input);
+
+        assertTrue(result instanceof List);
+        assertEquals(now.toString(), ((List<?>) result).get(0));
+        assertEquals("test", ((List<?>) result).get(1));
+    }
+
+    @Test
+    void testConvertInstantsToString_nestedMapAndList() {
+        Instant now = Instant.now();
+        Map<String, Object> input = Map.of(
+                "list", List.of(Map.of("time", now))
+        );
+
+        Object result = invokeConvert(input);
+
+        assertEquals(
+                now.toString(),
+                ((Map<?, ?>) ((List<?>) ((Map<?, ?>) result).get("list")).get(0)).get("time")
+        );
+    }
+
+    @Test
+    void testConvertInstantsToString_nonInstantValue() {
+        String value = "not a time";
+        Object result = invokeConvert(value);
+
+        assertSame(value, result);
+    }
+
+    private Object invokeConvert(Object value) {
+        // Call the private static method using ReflectionTestUtils
+        return ReflectionTestUtils.invokeMethod(
+                ContentStateServiceImpl.class,
+                "convertInstantsToString",
+                value
+        );
+    }
 }