From e234355e242cb916aaab1d46a131ea107b650603 Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Fri, 18 Apr 2025 15:49:54 +0300 Subject: [PATCH] Revert "SUPPORT-9115: Fix" This reverts commit 3eaae2336c6b119d322d05c5f1be37e38b869be3. --- .../service/ErvuDirectoriesService.java | 12 +++---- .../service/ErvuDirectoriesUpdateService.java | 33 +++++++++++++++++++ 2 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesUpdateService.java diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java index 6af98fe6..a9197259 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.UUID; import javax.annotation.PostConstruct; @@ -245,12 +244,11 @@ public class ErvuDirectoriesService { roleRecord.setCreated(createdAt); roleRecord.setUpdated(updatedAt); roleRecord.setFinished(finishAt); - Optional adminRole = Arrays.stream(adminRoles) - .filter(role -> role.trim().equals(data.getName())) - .findAny(); - if (adminRole.isPresent()) { - roleRecord.setAdminRole(true); - } + Arrays.stream(adminRoles).forEach(role -> { + if (role.trim().equals(data.getName())) { + roleRecord.setAdminRole(true); + } + }); if (ids.contains(data.getId())) { roleRecords.add(roleRecord); } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesUpdateService.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesUpdateService.java new file mode 100644 index 00000000..84dd9215 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesUpdateService.java @@ -0,0 +1,33 @@ +package ru.micord.ervu.account_applications.service; + +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.DependsOn; +import org.springframework.stereotype.Service; + +/** + * @author Eduard Tihomirov + */ +@Service +@DependsOn("kafkaConsumerInitializer") +public class ErvuDirectoriesUpdateService { + + @Autowired + private ErvuDirectoriesService ervuDirectoriesService; + + @Value("${load.directories:true}") + private Boolean loadDirectories; + + @PostConstruct + public void init() { + if (loadDirectories) { + new Thread(this::run).start(); + } + } + + private void run() { + ervuDirectoriesService.updateDirectories(); + } +}