KB-9789| Q8 | Access Control | My Assigned Content (#154)

* KB-9789| Q8 | Access Control | My Assigned Content

* added testCases

* KB-9789| Q8 | Access Control | My Assigned Content

* KB-9789| Q8 | Access Control | My Assigned Content

* KB-9789| Q8 | Access Control | My Assigned Content

Author: ruksana2808

src/main/java/com/igot/cb/cache/AccessSettingRuleCacheMgr.java

@@ -1,12 +1,17 @@
 package com.igot.cb.cache;
 
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.igot.cb.cassandra.CassandraOperation;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.igot.cb.model.CachedAccessSettingRule;
@@ -25,21 +30,38 @@ public class AccessSettingRuleCacheMgr {
     private final CassandraOperation cassandraOperation;
     private Map<String, CachedAccessSettingRule> cachedAccessSettingRules = new ConcurrentHashMap<>();
 
+    private Cache<String, CachedAccessSettingRule> accessSettingsCache;
+
+
     private final long LOCAL_CACHE_TTL = 3600000;
 
     private final String ACCESS_SETTINGS_CACHE_KEY = "accessSettingRules";
 
+    @Value("${access.rule.ttl.minutes}")
+    private int ttlMinutes;
+
+    @PostConstruct
+    public void initCache() {
+        accessSettingsCache = Caffeine.newBuilder()
+                .maximumSize(1000)
+                .expireAfterWrite(Duration.ofMinutes(ttlMinutes))
+                .build();
+    }
+
+
     /**
      * Constructor for AccessSettingRuleCacheMgr.
      *
      * @param redisCacheMgr      Cache manager for Redis operations.
      * @param cassandraOperation Cassandra operations for database interactions.
      */
-    public AccessSettingRuleCacheMgr(RedisCacheMgr redisCacheMgr, CassandraOperation cassandraOperation) {
+    public AccessSettingRuleCacheMgr(RedisCacheMgr redisCacheMgr,
+                                     CassandraOperation cassandraOperation) {
         this.redisCacheMgr = redisCacheMgr;
         this.cassandraOperation = cassandraOperation;
     }
 
+
     /**
      * Retrieves the cached access setting rules.
      * If the cache is empty or expired, it loads the rules from Redis or Cassandra.
@@ -207,17 +229,12 @@ BitSet createBitSetForAttribute(Collection<Integer> attributeValues) {
         return bitSet;
     }
 
-
     public CachedAccessSettingRule getOrLoadAccessSettingRule(String courseId, String contextId) {
-
         String cacheKey = courseId + "|" + contextId;
-        if (MapUtils.isEmpty(cachedAccessSettingRules)) {
-            cachedAccessSettingRules = new ConcurrentHashMap<>();
-        }
-        CachedAccessSettingRule rule = cachedAccessSettingRules.get(cacheKey);
-        if (rule != null) {
+        CachedAccessSettingRule cachedRule = accessSettingsCache.getIfPresent(cacheKey);
+        if (cachedRule != null) {
             log.debug("Cache hit for rule key: {}", cacheKey);
-            return rule;
+            return cachedRule;
         }
         log.info("Cache miss for rule key: {}, loading from Cassandra...", cacheKey);
         try {
@@ -248,7 +265,7 @@ public CachedAccessSettingRule getOrLoadAccessSettingRule(String courseId, Strin
                 if (MapUtils.isNotEmpty(contextData)) {
                     processContextData(cacheKey, contextData);
                 }
-                cachedAccessSettingRules.put(cacheKey, loadedRule);
+                accessSettingsCache.put(cacheKey, loadedRule);
                 log.info("Loaded and cached rule for key: {}", cacheKey);
             } catch (Exception e) {
                 log.error("Error processing rule {}: {}", cacheKey, e.getMessage(), e);

src/main/resources/application.properties

@@ -81,4 +81,5 @@ cb.search.limit=100
 cb.search.offset=0
 cb.search.access.settings.enabled=true
 cb.cache.course.ttl=600000
-cb.cache.ttl=600
+cb.cache.ttl=600
+access.rule.ttl.minutes=30

src/test/java/com/igot/cb/cache/AccessSettingRuleCacheMgrTest.java

@@ -35,33 +35,35 @@ class AccessSettingRuleCacheMgrTest {
 
     @BeforeEach
     void setup() throws Exception {
-        cacheMgr = new AccessSettingRuleCacheMgr(redisCacheMgr, cassandraOperation);
+        cacheMgr = new AccessSettingRuleCacheMgr(redisCacheMgr, cassandraOperation); // 10 minutes TTL
+
         validJsonRule = """
-            {
-              "contextId": "do_123",
-              "contextIdType": "Course",
-              "contextData": {
-                "accessControlId": {
-                  "version": 1,
-                  "userGroups": [
+        {
+          "contextId": "do_123",
+          "contextIdType": "Course",
+          "contextData": {
+            "accessControlId": {
+              "version": 1,
+              "userGroups": [
+                {
+                  "userGroupId": "group-123",
+                  "userGroupName": "Test Group",
+                  "userGroupCriteriaList": [
                     {
-                      "userGroupId": "group-123",
-                      "userGroupName": "Test Group",
-                      "userGroupCriteriaList": [
-                        {
-                          "criteriaKey": "designation",
-                          "criteriaValue": [1, 2]
-                        }
-                      ]
+                      "criteriaKey": "designation",
+                      "criteriaValue": [1, 2]
                     }
                   ]
                 }
-              },
-              "isArchived": false
+              ]
             }
-            """;
+          },
+          "isArchived": false
+        }
+        """;
     }
 
+
     @Test
     void testGetAccessSettingRules_fromRedis() {
         Map<String, String> redisMap = Map.of("do_123|Course", validJsonRule);