added uptime monitoring
This commit is contained in:
@@ -2,18 +2,27 @@ package zw.qantra.tm.domain.services;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import zw.qantra.tm.domain.dtos.AuthResponse;
|
||||
import zw.qantra.tm.domain.dtos.LoginRequest;
|
||||
import zw.qantra.tm.domain.dtos.RegisterRequest;
|
||||
import zw.qantra.tm.domain.models.User;
|
||||
import zw.qantra.tm.domain.models.Workspace;
|
||||
import zw.qantra.tm.domain.repositories.UserRepository;
|
||||
import zw.qantra.tm.utils.JwtUtils;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserService implements UserDetailsService {
|
||||
@@ -23,6 +32,7 @@ public class UserService implements UserDetailsService {
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
private final JwtUtils jwtUtils;
|
||||
private final TransactionService transactionService;
|
||||
private final WorkspaceService workspaceService;
|
||||
|
||||
public User fetchUserByUsername(String username) {
|
||||
return userRepository.findByUsername(username)
|
||||
@@ -83,4 +93,52 @@ public class UserService implements UserDetailsService {
|
||||
return new AuthResponse(token, "Bearer", user.getUsername(),
|
||||
user.getEmail(), user.getPhone(), user.getFirstName(), user.getLastName(), user.getId());
|
||||
}
|
||||
|
||||
public Page<User> findAllUsers(Specification<User> spec, Pageable pageable) {
|
||||
return userRepository.findAll(spec, pageable);
|
||||
}
|
||||
|
||||
public Optional<User> getUser(UUID id) {
|
||||
return userRepository.findById(id);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public User createUser(User user) {
|
||||
user.setPassword(passwordEncoder.encode(user.getPassword()));
|
||||
user.setDeleted(false);
|
||||
return userRepository.save(user);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public User updateUser(UUID id, User userDetails) {
|
||||
return userRepository.findById(id)
|
||||
.map(existingUser -> {
|
||||
existingUser.setFirstName(userDetails.getFirstName());
|
||||
existingUser.setLastName(userDetails.getLastName());
|
||||
existingUser.setEmail(userDetails.getEmail());
|
||||
existingUser.setPhone(userDetails.getPhone());
|
||||
existingUser.setPhotoUrl(userDetails.getPhotoUrl());
|
||||
existingUser.setWorkflowId(userDetails.getWorkflowId());
|
||||
existingUser.setEnabled(userDetails.isEnabled());
|
||||
existingUser.setAccountNonExpired(userDetails.isAccountNonExpired());
|
||||
existingUser.setAccountNonLocked(userDetails.isAccountNonLocked());
|
||||
existingUser.setCredentialsNonExpired(userDetails.isCredentialsNonExpired());
|
||||
if (userDetails.getPassword() != null && !userDetails.getPassword().isEmpty()) {
|
||||
existingUser.setPassword(passwordEncoder.encode(userDetails.getPassword()));
|
||||
}
|
||||
return userRepository.save(existingUser);
|
||||
})
|
||||
.orElseThrow(() -> new RuntimeException("User not found with id: " + id));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public boolean deleteUser(UUID id) {
|
||||
return userRepository.findById(id)
|
||||
.map(user -> {
|
||||
user.setDeleted(true);
|
||||
userRepository.save(user);
|
||||
return true;
|
||||
})
|
||||
.orElse(false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user