Merge branch 'cbrelease-4.8.30' into cbrelease-4.8.31

# Conflicts:
#	Dockerfile
#	src/test/java/com/igot/cb/profile/ProfileServiceImplTest.java

Author: Sahil-tarento

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-jammy
+FROM sivaprakash123/openjdk:17-slim-debian11
 # Install necessary dependencies
 RUN apt-get update \
     && apt-get install -y \

src/test/java/com/igot/cb/profile/ProfileServiceImplTest.java

@@ -1547,7 +1547,7 @@ void returnsCachedCertificateCount_whenCacheHit() {
         ReflectionTestUtils.setField(localService, "serverConfig", serverConfig);
         when(serverConfig.getCertificateCountRedisKey()).thenReturn("cert:count");
         when(serverConfig.getDataIndex()).thenReturn(12);
-        when(serverConfig.getCacheTtl()).thenReturn(100);
+        when(serverConfig.getCertificateCountRedisTtl()).thenReturn(100);
         when(localCacheService.hget("cert:count", 12, "user-1", 100)).thenReturn("7");
         int count = ReflectionTestUtils.invokeMethod(localService, "getIssuedCertificateCount", "user-1");
         assertEquals(7, count);
@@ -1566,7 +1566,7 @@ void returnsSumOfCertificatesFromBothSources_whenCacheMiss() {
         ReflectionTestUtils.setField(locaService, "serverConfig", serverConfig);
         when(serverConfig.getCertificateCountRedisKey()).thenReturn("cert:count");
         when(serverConfig.getDataIndex()).thenReturn(12);
-        when(serverConfig.getCacheTtl()).thenReturn(100);
+        when(serverConfig.getCertificateCountRedisTtl()).thenReturn(100);
         when(localCacheService.hget("cert:count", 12, "user-2", 100)).thenReturn(null);
 
         List<Map<String, Object>> courseRecords = List.of(
@@ -1594,7 +1594,7 @@ void returnsSumOfCertificatesFromBothSources_whenCacheMiss() {
 
         int count = ReflectionTestUtils.invokeMethod(locaService, "getIssuedCertificateCount", "user-2");
         assertEquals(5, count);
-        verify(localCacheService).hset("cert:count", 12, "user-2", "5",0);
+        verify(localCacheService).hset("cert:count", 12, "user-2", "5",100);
     }
 
     @Test
@@ -1608,7 +1608,7 @@ void returnsZero_whenNoCertificatesAndCacheMiss() {
         ReflectionTestUtils.setField(localService, "serverConfig", serverConfig);
         when(serverConfig.getCertificateCountRedisKey()).thenReturn("cert:count");
         when(serverConfig.getDataIndex()).thenReturn(12);
-        when(serverConfig.getCacheTtl()).thenReturn(100);
+        when(serverConfig.getCertificateCountRedisTtl()).thenReturn(100);
         when(localCacheService.hget("cert:count", 12, "user-3", 100)).thenReturn(null);
         when(localCassandraOperation.getRecordsByPropertiesByKey(
                 anyString(), eq(Constants.USER_ENROLMENTS), anyMap(), anyList(), eq("user-3")
@@ -1619,7 +1619,7 @@ void returnsZero_whenNoCertificatesAndCacheMiss() {
         int count = ReflectionTestUtils.invokeMethod(localService, "getIssuedCertificateCount", "user-3");
         assertEquals(0, count);
         //verify(localCacheService).hset("cert:count", 12, "user-3", "0");
-        verify(localCacheService, never()).hset(anyString(), anyInt(), anyString(), anyString(),0);
+        verify(localCacheService, never()).hset(anyString(), anyInt(), anyString(), anyString(), eq(100));
     }
 
     @Test
@@ -1633,7 +1633,7 @@ void returnsZero_whenExceptionIsThrown() {
         ReflectionTestUtils.setField(localService, "serverConfig", serverConfig);
         when(serverConfig.getCertificateCountRedisKey()).thenReturn("cert:count");
         when(serverConfig.getDataIndex()).thenReturn(12);
-        when(serverConfig.getCacheTtl()).thenReturn(100);
+        when(serverConfig.getCertificateCountRedisTtl()).thenReturn(100);
         when(localCacheService.hget(anyString(), anyInt(), anyString(), anyInt())).thenThrow(new RuntimeException("fail"));
         int count = ReflectionTestUtils.invokeMethod(localService, "getIssuedCertificateCount", "user-4");
         assertEquals(0, count);
@@ -1650,7 +1650,7 @@ void ignoresNonListIssuedCertificatesAndNulls() {
         ReflectionTestUtils.setField(locaService, "serverConfig", serverConfig);
         when(serverConfig.getCertificateCountRedisKey()).thenReturn("cert:count");
         when(serverConfig.getDataIndex()).thenReturn(12);
-        when(serverConfig.getCacheTtl()).thenReturn(100);
+        when(serverConfig.getCertificateCountRedisTtl()).thenReturn(100);
 
         List<Map<String, Object>> courseRecords = List.of(
                 new HashMap<String, Object>() {{ put(Constants.ISSUED_CERTIFICATES_KEY, null); }},
@@ -1674,7 +1674,7 @@ void ignoresNonListIssuedCertificatesAndNulls() {
 
         int count = ReflectionTestUtils.invokeMethod(locaService, "getIssuedCertificateCount", "user-5");
         assertEquals(0, count);
-        verify(localCacheService, never()).hset(anyString(), anyInt(), anyString(), anyString(),0);
+        verify(localCacheService, never()).hset(anyString(), anyInt(), anyString(), anyString(), eq(100));
     }
 
     @Test