This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 055cfba4 authored by Michael Breu's avatar Michael Breu
Browse files

Eliminate some elastic search dependency

parent 15faf47e
Branches
2 merge requests!231New Deployment into production and update gitlab,!225Resolve "Collections mehr hervorheben"
......@@ -5,11 +5,11 @@ import at.ac.uibk.gitsearch.domain.Authority;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.repository.jpa.AuthorityRepository;
import at.ac.uibk.gitsearch.repository.jpa.UserRepository;
import at.ac.uibk.gitsearch.repository.search.UserSearchRepository;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.security.SecurityUtils;
import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
import at.ac.uibk.gitsearch.service.dto.UserDTO;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.HashSet;
......@@ -19,6 +19,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cache.CacheManager;
......@@ -29,6 +30,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tech.jhipster.security.RandomUtil;
/**
......@@ -45,8 +47,6 @@ public class UserService {
private final PasswordEncoder passwordEncoder;
private final UserSearchRepository userSearchRepository;
private final AuthorityRepository authorityRepository;
private final CacheManager cacheManager;
......@@ -54,13 +54,11 @@ public class UserService {
public UserService(
UserRepository userRepository,
PasswordEncoder passwordEncoder,
UserSearchRepository userSearchRepository,
AuthorityRepository authorityRepository,
CacheManager cacheManager
) {
this.userRepository = userRepository;
this.passwordEncoder = passwordEncoder;
this.userSearchRepository = userSearchRepository;
this.authorityRepository = authorityRepository;
this.cacheManager = cacheManager;
}
......@@ -73,7 +71,6 @@ public class UserService {
// activate given user for the registration key.
user.setActivated(true);
user.setActivationKey(null);
userSearchRepository.save(user);
this.clearUserCaches(user);
log.debug("Activated user: {}", user);
return user;
......@@ -144,7 +141,6 @@ public class UserService {
authorityRepository.findById(AuthoritiesConstants.USER).ifPresent(authorities::add);
newUser.setAuthorities(authorities);
userRepository.save(newUser);
userSearchRepository.save(newUser);
this.clearUserCaches(newUser);
log.debug("Created Information for User: {}", newUser);
return newUser;
......@@ -190,7 +186,6 @@ public class UserService {
}
userRepository.save(user);
userSearchRepository.save(user);
this.clearUserCaches(user);
log.debug("Created Information for User: {}", user);
return user;
......@@ -255,7 +250,6 @@ public class UserService {
.findOneByLogin(login)
.ifPresent(user -> {
userRepository.delete(user);
userSearchRepository.delete(user);
this.clearUserCaches(user);
log.debug("Deleted User: {}", user);
});
......@@ -283,7 +277,6 @@ public class UserService {
}
user.setLangKey(langKey);
user.setImageUrl(imageUrl);
userSearchRepository.save(user);
this.clearUserCaches(user);
log.debug("Changed Information for User: {}", user);
});
......@@ -352,7 +345,6 @@ public class UserService {
.forEach(user -> {
log.debug("Deleting not activated user {}", user.getLogin());
userRepository.delete(user);
userSearchRepository.delete(user);
this.clearUserCaches(user);
});
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment