Skip to content
Snippets Groups Projects
Commit 611f5ba1 authored by kbeyro's avatar kbeyro
Browse files

get user from database if email exist

parent b1e6adbe
No related branches found
No related tags found
2 merge requests!273Release 1.8.0 update,!202get user from database if email exist
Pipeline #94164 passed
...@@ -20,6 +20,7 @@ import net.geant.nmaas.notifications.templates.MailType; ...@@ -20,6 +20,7 @@ import net.geant.nmaas.notifications.templates.MailType;
import net.geant.nmaas.portal.api.domain.UserView; import net.geant.nmaas.portal.api.domain.UserView;
import net.geant.nmaas.portal.persistent.entity.Domain; import net.geant.nmaas.portal.persistent.entity.Domain;
import net.geant.nmaas.portal.service.DomainService; import net.geant.nmaas.portal.service.DomainService;
import net.geant.nmaas.portal.service.UserService;
import org.modelmapper.ModelMapper; import org.modelmapper.ModelMapper;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -57,6 +58,7 @@ public class RemoteClusterManager { ...@@ -57,6 +58,7 @@ public class RemoteClusterManager {
private final KubernetesClusterDeploymentManager kClusterDeploymentManager; private final KubernetesClusterDeploymentManager kClusterDeploymentManager;
private final DomainService domainService; private final DomainService domainService;
private final ApplicationEventPublisher eventPublisher; private final ApplicationEventPublisher eventPublisher;
private final UserService userService;
public RemoteClusterView getClusterView(Long id) { public RemoteClusterView getClusterView(Long id) {
...@@ -292,7 +294,13 @@ public class RemoteClusterManager { ...@@ -292,7 +294,13 @@ public class RemoteClusterManager {
} }
private void sendMail(KCluster kCluster, MailType mailType) { 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<>(); Map<String, Object> attr = new HashMap<>();
attr.put("clusterId", kCluster.getId()); attr.put("clusterId", kCluster.getId());
attr.put("clusterCodename", kCluster.getCodename()); attr.put("clusterCodename", kCluster.getCodename());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment