From 611f5ba1fc5a9a3e7470d59a49fcd12ebb682ebd Mon Sep 17 00:00:00 2001 From: kbeyro <121854496+kbeyro@users.noreply.github.com> Date: Fri, 16 May 2025 15:45:11 +0200 Subject: [PATCH 1/2] get user from database if email exist --- .../kubernetes/RemoteClusterManager.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java index f4e74e07c..217cd9888 100644 --- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java +++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java @@ -20,6 +20,7 @@ import net.geant.nmaas.notifications.templates.MailType; import net.geant.nmaas.portal.api.domain.UserView; import net.geant.nmaas.portal.persistent.entity.Domain; import net.geant.nmaas.portal.service.DomainService; +import net.geant.nmaas.portal.service.UserService; import org.modelmapper.ModelMapper; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; @@ -57,6 +58,7 @@ public class RemoteClusterManager { private final KubernetesClusterDeploymentManager kClusterDeploymentManager; private final DomainService domainService; private final ApplicationEventPublisher eventPublisher; + private final UserService userService; public RemoteClusterView getClusterView(Long id) { @@ -292,7 +294,13 @@ public class RemoteClusterManager { } private void sendMail(KCluster kCluster, MailType mailType) { - UserView recipient = UserView.builder().email(kCluster.getContactEmail()).username(kCluster.getContactEmail()).selectedLanguage("EN").build(); + UserView recipient; + if(userService.existsByEmail(kCluster.getContactEmail())) { + recipient = modelMapper.map( userService.findByEmail(kCluster.getContactEmail()), UserView.class); + } else { + recipient = UserView.builder().email(kCluster.getContactEmail()).username(kCluster.getContactEmail()).selectedLanguage("EN").build(); + } + Map<String, Object> attr = new HashMap<>(); attr.put("clusterId", kCluster.getId()); attr.put("clusterCodename", kCluster.getCodename()); -- GitLab From fa676d9f93028eb26de400baae0e0e3832cf281d Mon Sep 17 00:00:00 2001 From: Lukasz Lopatowski <llopat@man.poznan.pl> Date: Mon, 26 May 2025 07:09:05 +0200 Subject: [PATCH 2/2] Fixed test after merge --- .../externalservices/kubernetes/RemoteClusterManager.java | 4 ++-- .../nmaas/externalservices/kubernetes/ClusterServiceTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java index b1442b410..7a52389aa 100644 --- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java +++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java @@ -38,8 +38,8 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.OffsetDateTime; import java.util.ArrayList; -import java.util.HashMap; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -47,8 +47,8 @@ import java.util.Optional; import java.util.stream.Collectors; @Service -@Slf4j @RequiredArgsConstructor +@Slf4j public class RemoteClusterManager implements ClusterMonitoringService { private final KClusterRepository clusterRepository; diff --git a/src/test/java/net/geant/nmaas/externalservices/kubernetes/ClusterServiceTest.java b/src/test/java/net/geant/nmaas/externalservices/kubernetes/ClusterServiceTest.java index 3900192a9..c2c80e2bb 100644 --- a/src/test/java/net/geant/nmaas/externalservices/kubernetes/ClusterServiceTest.java +++ b/src/test/java/net/geant/nmaas/externalservices/kubernetes/ClusterServiceTest.java @@ -24,7 +24,7 @@ class ClusterServiceTest { private final ModelMapper modelMapper = new ModelMapper(); private final RemoteClusterManager remoteClusterManager = new RemoteClusterManager( - kClusterRepository, kClusterIngressManager, kClusterDeploymentManager, null, null, modelMapper); + kClusterRepository, kClusterIngressManager, kClusterDeploymentManager, null, null, null, modelMapper); @Test void getClusterView_validId_returnsRemoteClusterView() { -- GitLab