fix: add new workflow to remove old rocketchat sessions

pom.xml

@@ -424,11 +424,10 @@
 			<version>1.2021.16</version>
 		</dependency>
 
-		<!-- MongoDB dependencies -->
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>
-			<version>3.12.11</version>
+			<version>3.12.14</version>
 		</dependency>
 
 		<dependency>

src/main/java/de/caritas/cob/userservice/api/adapters/rocketchat/RocketChatMongoDbService.java

@@ -0,0 +1,79 @@
+package de.caritas.cob.userservice.api.adapters.rocketchat;
+
+import com.google.common.collect.Lists;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import de.caritas.cob.userservice.api.adapters.rocketchat.model.RocketchatSession;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.NonNull;
+import org.bson.Document;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RocketChatMongoDbService implements InitializingBean {
+
+  @Value("${spring.data.mongodb.rocketchat.uri}")
+  String mongoUrl;
+
+  @Value("${spring.data.mongodb.rocketchat.database}")
+  String databaseName;
+
+  @NonNull MongoClient mongoClient;
+
+  public List<RocketchatSession> findInactiveSessions() {
+    MongoDatabase database = mongoClient.getDatabase(databaseName);
+    MongoCollection<Document> collection = database.getCollection("rocketchat_sessions");
+    Document sessionInactivityCriteria = sessionInactivityCriteria();
+    List<RocketchatSession> rocketchatSessions = Lists.newArrayList();
+    collection
+        .find(sessionInactivityCriteria)
+        .forEach(document -> rocketchatSessions.add(new RocketchatSession(document)));
+    return rocketchatSessions;
+  }
+
+  private Document sessionInactivityCriteria() {
+    Document closedAt = new Document("closedAt", null);
+    closedAt.put("lastActivityAt", new Document("$lt", "2021-01-01T00:00:00.000Z"));
+    return closedAt;
+  }
+
+  @Override
+  public void afterPropertiesSet() throws Exception {
+    initializeMongoClient();
+  }
+
+  private void initializeMongoClient() {
+    if (mongoClient == null) {
+      mongoClient = MongoClients.create(mongoUrl);
+    }
+  }
+
+  public void patchClosedAt(RocketchatSession rocketchatSession) {
+    MongoDatabase database = mongoClient.getDatabase(databaseName);
+    MongoCollection<Document> collection = database.getCollection("rocketchat_sessions");
+    Document originalSession =
+        collection.find(new Document("sessionId", rocketchatSession.getSessionId())).first();
+
+    Document patchedDocument = patchDocumentWithClosedAt(rocketchatSession, originalSession);
+    collection.replaceOne(originalSession, patchedDocument);
+  }
+
+  private Document patchDocumentWithClosedAt(
+      RocketchatSession rocketchatSession, Document document) {
+    var patchedDocument = cloneDocument(document);
+    patchedDocument.put("closedAt", rocketchatSession.getClosedAt());
+    return patchedDocument;
+  }
+
+  private Document cloneDocument(Document document) {
+    return new Document(
+        document.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+  }
+}

src/main/java/de/caritas/cob/userservice/api/adapters/rocketchat/model/RocketchatSession.java

@@ -0,0 +1,23 @@
+package de.caritas.cob.userservice.api.adapters.rocketchat.model;
+
+import java.time.Instant;
+import java.util.Date;
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document(collection = "rocketchat_sessions")
+@Data
+public class RocketchatSession {
+  private Instant closedAt;
+
+  private String sessionId;
+
+  private String userId;
+
+  public RocketchatSession(org.bson.Document document) {
+    this.sessionId = document.getString("sessionId");
+    this.userId = document.getString("userId");
+    Date closedAtNullable = document.getDate("closedAt");
+    this.closedAt = closedAtNullable != null ? closedAtNullable.toInstant() : null;
+  }
+}

src/main/java/de/caritas/cob/userservice/api/config/auth/SecurityConfig.java

@@ -121,7 +121,12 @@ protected void configure(HttpSecurity http) throws Exception {
         .antMatchers("/users/password/change")
         .hasAnyAuthority(USER_DEFAULT, CONSULTANT_DEFAULT, SINGLE_TENANT_ADMIN, TENANT_ADMIN)
         .antMatchers("/users/twoFactorAuth", "/users/2fa/**", "/users/mobile/app/token")
-        .hasAnyAuthority(SINGLE_TENANT_ADMIN, TENANT_ADMIN, USER_DEFAULT, CONSULTANT_DEFAULT)
+        .hasAnyAuthority(
+            SINGLE_TENANT_ADMIN,
+            TENANT_ADMIN,
+            USER_DEFAULT,
+            CONSULTANT_DEFAULT,
+            RESTRICTED_AGENCY_ADMIN)
         .antMatchers("/users/statistics/registration")
         .hasAnyAuthority(SINGLE_TENANT_ADMIN, TENANT_ADMIN)
         .antMatchers(

src/main/java/de/caritas/cob/userservice/api/workflow/delete/service/CloseInactiveRocketchatSessionsService.java

@@ -5,8 +5,8 @@
 import static de.caritas.cob.userservice.api.workflow.delete.model.DeletionTargetType.ALL;
 import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 
-import de.caritas.cob.userservice.api.model.RocketchatSession;
-import de.caritas.cob.userservice.api.port.out.RocketchatSessionRepository;
+import de.caritas.cob.userservice.api.adapters.rocketchat.RocketChatMongoDbService;
+import de.caritas.cob.userservice.api.adapters.rocketchat.model.RocketchatSession;
 import de.caritas.cob.userservice.api.workflow.delete.model.DeletionWorkflowError;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -22,15 +22,15 @@
 @Slf4j
 public class CloseInactiveRocketchatSessionsService {
 
-  private final @NonNull RocketchatSessionRepository rocketchatSessionRepository;
+  private final @NonNull RocketChatMongoDbService rocketChatMongoDbService;
 
   private final @NonNull WorkflowErrorMailService workflowErrorMailService;
 
   public void closeInactiveRocketchatSessions() {
 
     List<DeletionWorkflowError> workflowErrors = new ArrayList<>();
     try {
-      List<RocketchatSession> inactiveSessions = rocketchatSessionRepository.findInactiveSessions();
+      List<RocketchatSession> inactiveSessions = rocketChatMongoDbService.findInactiveSessions();
       if (isNotEmpty(inactiveSessions)) {
         log.info("Found {} inactive rocketchat sessions.", inactiveSessions.size());
       } else {
@@ -55,7 +55,7 @@ private void closeSession(RocketchatSession rocketchatSession) {
         "Closing rocketchat session with id: {} for rcUserId: {}",
         rocketchatSession.getSessionId());
     rocketchatSession.setClosedAt(Instant.now());
-    rocketchatSessionRepository.save(rocketchatSession);
+    rocketChatMongoDbService.patchClosedAt(rocketchatSession);
   }
 
   private void sendWorkflowErrorsMail(List<DeletionWorkflowError> workflowErrors) {

src/main/resources/application.properties

@@ -206,3 +206,6 @@ management.health.probes.enabled=true
 spring.data.mongodb.uri=mongodb://<USERNAME>:<PASSWORD>@mongodb:27017/rocketchat?directConnection=true
 rocketchat.session.inactive.closeWorkflow.enabled=false
 rocketchat.session.inactive.closeWorkflow.cron=0 0 2 * * ?
+
+spring.data.mongodb.rocketchat.database=rocketchat
+spring.data.mongodb.rocketchat.uri=mongodb://<USERNAME>:<PASSWORD>@mongodb:27017/rocketchat?directConnection=true

src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserControllerE2EIT.java

@@ -125,7 +125,6 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;

src/test/java/de/caritas/cob/userservice/api/workflow/delete/scheduler/CloseInactiveRocketchatSessionsSchedulerTest.java

@@ -25,7 +25,7 @@ void performDeletionWorkflow_Should_CallDeleteInactiveRocketchatSessionsService(
             closeInactiveRocketchatSessionsService, tenantContextProvider);
     ReflectionTestUtils.setField(
         deleteInactiveRocketchatSessionsScheduler,
-        "rocketchatSessionInactiveDeleteWorkflowEnabled",
+        "rocketchatSessionInactiveCloseWorkflowEnabled",
         true);
     // when
     deleteInactiveRocketchatSessionsScheduler.performDeletionWorkflow();
@@ -42,7 +42,7 @@ void performDeletionWorkflow_Should_CallDeleteInactiveRocketchatSessionsService(
             closeInactiveRocketchatSessionsService, tenantContextProvider);
     ReflectionTestUtils.setField(
         closeInactiveRocketchatSessionsScheduler,
-        "rocketchatSessionInactiveDeleteWorkflowEnabled",
+        "rocketchatSessionInactiveCloseWorkflowEnabled",
         false);
     // when
     closeInactiveRocketchatSessionsScheduler.performDeletionWorkflow();

src/test/java/de/caritas/cob/userservice/api/workflow/delete/service/CloseInactiveRocketchatSessionsServiceTest.java

@@ -6,8 +6,8 @@
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.Lists;
-import de.caritas.cob.userservice.api.model.RocketchatSession;
-import de.caritas.cob.userservice.api.port.out.RocketchatSessionRepository;
+import de.caritas.cob.userservice.api.adapters.rocketchat.RocketChatMongoDbService;
+import de.caritas.cob.userservice.api.adapters.rocketchat.model.RocketchatSession;
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -21,7 +21,7 @@ class CloseInactiveRocketchatSessionsServiceTest {
 
   @InjectMocks CloseInactiveRocketchatSessionsService closeInactiveRocketchatSessionsService;
 
-  @Mock RocketchatSessionRepository rocketchatSessionRepository;
+  @Mock RocketChatMongoDbService rocketChatMongoDbService;
 
   @Mock WorkflowErrorMailService workflowErrorMailService;
 
@@ -30,8 +30,7 @@ class CloseInactiveRocketchatSessionsServiceTest {
   @Test
   void deleteInactiveRocketchatSessions_Should_CallDeleteInactiveRocketchatSessions() {
     // given
-    when(rocketchatSessionRepository.findInactiveSessions())
-        .thenReturn(Lists.newArrayList(session));
+    when(rocketChatMongoDbService.findInactiveSessions()).thenReturn(Lists.newArrayList(session));
     // when
     closeInactiveRocketchatSessionsService.closeInactiveRocketchatSessions();
     // then
@@ -43,7 +42,7 @@ void deleteInactiveRocketchatSessions_Should_CallDeleteInactiveRocketchatSession
   void
       deleteInactiveRocketchatSessions_Should_SendWorkflowErrorsIfExceptionCaughtUponSessionDeletion() {
     // given
-    doThrow(IllegalStateException.class).when(rocketchatSessionRepository).findInactiveSessions();
+    doThrow(IllegalStateException.class).when(rocketChatMongoDbService).findInactiveSessions();
     // when
     closeInactiveRocketchatSessionsService.closeInactiveRocketchatSessions();
     // then