Merge pull request #147 from LionnoiL/118-add-cahing-to-user-findbyid

adding caching to user methods

src/main/java/org/petmarket/users/controller/UserController.java

@@ -215,6 +215,7 @@ public void deleteUser(@ParameterId @PathVariable @Positive Long userId) {
         User user = userService.findById(userId);
         userService.checkAccess(user);
         userService.deleteById(userId);
+        userService.evictCaches(userId, user);
         log.info("User with id {} deleted.", userId);
     }
 

src/main/java/org/petmarket/users/service/UserService.java

@@ -30,7 +30,9 @@
 import org.petmarket.users.repository.UserRepository;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -68,6 +70,7 @@ public static Long getCurrentUserId() {
         return principal.getId();
     }
 
+    @Cacheable(value = "users", key = "#username")
     public User findByUsername(String username) throws ItemNotFoundException {
         User user = userRepository.findByEmail(username)
                 .orElseThrow(() -> new ItemNotFoundException("User email not found"));
@@ -155,6 +158,10 @@ public UserContactsResponseDto getContacts(User user) {
         return contacts;
     }
 
+    @Caching(evict = {
+            @CacheEvict(value = "users", key = "#user.id"),
+            @CacheEvict(value = "users", key = "#user.email")
+    })
     @Transactional
     public User updateUser(User user, UserUpdateRequestDto request) {
         String oldUserEmail = user.getEmail();
@@ -178,6 +185,13 @@ public void deleteById(Long userId) {
         userRepository.setUserStatusToDeleted(userId);
     }
 
+    @Caching(evict = {
+            @CacheEvict(value = "users", key = "#userId"),
+            @CacheEvict(value = "users", key = "#user.email")
+    })
+    public void evictCaches(Long userId, User user) {
+    }
+
     private Set<UserPhone> mergePhones(User user, UserUpdateRequestDto request) {
         Set<String> newPhones = request.getPhones();
         String mainPhone = request.getMainPhone();