EPMRPP-87382 || delete expired user's photo

src/main/java/com/epam/reportportal/jobs/clean/CleanStorageJob.java

@@ -3,14 +3,12 @@
 import com.epam.reportportal.jobs.BaseJob;
 import com.epam.reportportal.model.BlobNotFoundException;
 import com.epam.reportportal.storage.DataStorageService;
-import java.nio.charset.StandardCharsets;
+import com.epam.reportportal.utils.DataStorageUtils;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -85,9 +83,9 @@ public void execute() {
       }
       try {
         storageService.deleteAll(
-            thumbnails.stream().map(this::decode).collect(Collectors.toList()));
+            thumbnails.stream().map(DataStorageUtils::decode).collect(Collectors.toList()));
         storageService.deleteAll(
-            attachments.stream().map(this::decode).collect(Collectors.toList()));
+            attachments.stream().map(DataStorageUtils::decode).collect(Collectors.toList()));
         attachments.clear();
         thumbnails.clear();
       } catch (BlobNotFoundException e) {
@@ -102,8 +100,4 @@ public void execute() {
     }
   }
 
-  private String decode(String data) {
-    return StringUtils.isEmpty(data) ? data :
-        new String(Base64.getUrlDecoder().decode(data), StandardCharsets.UTF_8);
-  }
 }

src/main/java/com/epam/reportportal/jobs/clean/DeleteExpiredUsersJob.java

@@ -23,6 +23,8 @@
 import com.epam.reportportal.model.activity.event.UnassignUserEvent;
 import com.epam.reportportal.model.activity.event.UserDeletedEvent;
 import com.epam.reportportal.service.MessageBus;
+import com.epam.reportportal.storage.DataStorageService;
+import com.epam.reportportal.utils.DataStorageUtils;
 import com.epam.reportportal.utils.ValidationUtil;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -95,6 +97,11 @@ WHERE id IN (
 
   private static final String DELETE_USERS = "DELETE FROM users WHERE id IN (:userIds)";
 
+  private static final String SELECT_USERS_ATTACHMENTS = """
+         SELECT attachment FROM users WHERE (id IN (:userIds) and attachment is not null)\s
+         UNION\s
+         SELECT attachment_thumbnail FROM users WHERE (id IN (:userIds) and attachment_thumbnail is not null)""";
+
   private static final String DELETE_PROJECTS_BY_ID_LIST =
       "DELETE FROM project WHERE id IN (:projectIds)";
 
@@ -106,6 +113,7 @@ WHERE id IN (
 
   @Value("${rp.environment.variable.clean.expiredUser.retentionPeriod}")
   private Long retentionPeriod;
+  private final DataStorageService dataStorageService;
 
   private final IndexerServiceClient indexerServiceClient;
 
@@ -114,9 +122,11 @@ WHERE id IN (
   @Autowired
   public DeleteExpiredUsersJob(JdbcTemplate jdbcTemplate,
       NamedParameterJdbcTemplate namedParameterJdbcTemplate,
-      IndexerServiceClient indexerServiceClient, MessageBus messageBus) {
+      DataStorageService dataStorageService, IndexerServiceClient indexerServiceClient,
+      MessageBus messageBus) {
     super(jdbcTemplate);
     this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
+    this.dataStorageService = dataStorageService;
     this.indexerServiceClient = indexerServiceClient;
     this.messageBus = messageBus;
   }
@@ -136,6 +146,7 @@ public void execute() {
     List<Long> personalProjectIds = getProjectIds(userProjects);
     List<Long> nonPersonalProjectsByUserIds = findNonPersonalProjectIdsByUserIds(userIds);
 
+    deleteUsersPhoto(userIds);
     deleteUsersByIds(userIds);
     publishUnassignUserEvents(nonPersonalProjectsByUserIds);
     personalProjectIds.forEach(this::deleteProjectAssociatedData);
@@ -146,6 +157,23 @@ public void execute() {
     LOGGER.info("{} - users was deleted due to retention policy", userIds.size());
   }
 
+  private void deleteUsersPhoto(List<Long> userIds) {
+    if (!CollectionUtils.isEmpty(userIds)) {
+      MapSqlParameterSource parameters = new MapSqlParameterSource();
+      parameters.addValue("userIds", userIds);
+      var userAttachments = namedParameterJdbcTemplate
+          .queryForList(SELECT_USERS_ATTACHMENTS, parameters, String.class)
+          .stream()
+          .map(DataStorageUtils::decode)
+          .toList();
+      try {
+        dataStorageService.deleteAll(userAttachments);
+      } catch (Exception e) {
+        LOGGER.error("Failed to delete users photo from data storage: {}", userAttachments, e);
+      }
+    }
+  }
+
   private void publishEmailNotificationEvents(List<String> userEmails) {
     List<EmailNotificationRequest> notifications = userEmails.stream()
         .map(recipient -> new EmailNotificationRequest(recipient, USER_DELETION_TEMPLATE))

src/main/java/com/epam/reportportal/utils/DataStorageUtils.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.epam.reportportal.utils;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Utility class for data storage functionality.
+ *
+ * @author <a href="mailto:siarhei_hrabko@epam.com">Siarhe Hrabko</a>
+ */
+public final class DataStorageUtils {
+
+  private DataStorageUtils() {
+  }
+
+  public static String decode(String data) {
+    return StringUtils.isEmpty(data) ? data :
+        new String(Base64.getUrlDecoder().decode(data), StandardCharsets.UTF_8);
+  }
+}