From adfc2f5dac546f60c58d37482c78051dbab23a2f Mon Sep 17 00:00:00 2001
From: Thomas Georgios Giannos <thgiannos@cite.gr>
Date: Thu, 28 Mar 2024 14:46:36 +0200
Subject: [PATCH] Updating cache.yml and pom version

---
 notification-service/notification-web/pom.xml |  6 +----
 .../src/main/resources/config/cache.yml       | 26 +++++--------------
 notification-service/pom.xml                  |  7 +++++
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/notification-service/notification-web/pom.xml b/notification-service/notification-web/pom.xml
index 0ea4719cf..d6efdc081 100644
--- a/notification-service/notification-web/pom.xml
+++ b/notification-service/notification-web/pom.xml
@@ -62,11 +62,7 @@
 			<artifactId>oidc-authz</artifactId>
 			<version>2.1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>gr.cite</groupId>
-			<artifactId>cache</artifactId>
-			<version>2.1.0</version>
-		</dependency>
+
 		<dependency>
 			<groupId>gr.cite</groupId>
 			<artifactId>exceptions-web</artifactId>
diff --git a/notification-service/notification-web/src/main/resources/config/cache.yml b/notification-service/notification-web/src/main/resources/config/cache.yml
index 5b30dee77..69541500e 100644
--- a/notification-service/notification-web/src/main/resources/config/cache.yml
+++ b/notification-service/notification-web/src/main/resources/config/cache.yml
@@ -7,49 +7,37 @@ cache:
         initialCapacity: 100
         maximumSize: 500
         enableRecordStats: false
-        expireAfterWriteMinutes: 10
-        expireAfterAccessMinutes: 10
-        refreshAfterWriteMinutes: 10
+        expireAfterWriteSeconds: 600
       - names: [ tenantByCode ]
         allowNullValues: true
         initialCapacity: 100
         maximumSize: 500
         enableRecordStats: false
-        expireAfterWriteMinutes: 10
-        expireAfterAccessMinutes: 10
-        refreshAfterWriteMinutes: 10
+        expireAfterWriteSeconds: 600
       - names: [ tenantById ]
         allowNullValues: true
         initialCapacity: 100
         maximumSize: 500
         enableRecordStats: false
-        expireAfterWriteMinutes: 10
-        expireAfterAccessMinutes: 10
-        refreshAfterWriteMinutes: 10
+        expireAfterWriteSeconds: 600
       - names: [ userBySubjectId ]
         allowNullValues: true
         initialCapacity: 100
-        maximumSize: 500
+        maximumSize: 5000
         enableRecordStats: false
-        expireAfterWriteMinutes: 5
-        expireAfterAccessMinutes: 5
-        refreshAfterWriteMinutes: 5
+        expireAfterWriteSeconds: 20
       - names: [ userAccessTenant ]
         allowNullValues: true
         initialCapacity: 100
         maximumSize: 500
         enableRecordStats: false
-        expireAfterWriteMinutes: 5
-        expireAfterAccessMinutes: 5
-        refreshAfterWriteMinutes: 5
+        expireAfterWriteSeconds: 300
       - names: [ formattingUserProfile ]
         allowNullValues: true
         initialCapacity: 100
         maximumSize: 500
         enableRecordStats: false
-        expireAfterWriteMinutes: 1
-        expireAfterAccessMinutes: 1
-        refreshAfterWriteMinutes: 1
+        expireAfterWriteSeconds: 60
     mapCaches:
       - names: [ cacheB ]
         allowNullValues: true
diff --git a/notification-service/pom.xml b/notification-service/pom.xml
index 044dc8c8f..a8e1700a0 100644
--- a/notification-service/pom.xml
+++ b/notification-service/pom.xml
@@ -149,6 +149,13 @@
             <artifactId>queue-outbox</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>gr.cite</groupId>
+            <artifactId>cache</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
     </dependencies>
 
     <profiles>