Merge pull request #46 from inu-appcenter/wonjeong#39-feat-redis

inu-appcenter · Jan 26, 2024 · 46ede8e · 46ede8e
2 parents 677c7da + ad5c890
commit 46ede8e
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 7 deletions.
diff --git a/src/main/java/server/inuappcenter/kr/config/RedisConfig.java b/src/main/java/server/inuappcenter/kr/config/RedisConfig.java
@@ -10,7 +10,7 @@
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
-@EnableRedisRepositories
+@EnableRedisRepositories(basePackages = "server.inuappcenter.kr.data.redis")
 public class RedisConfig {
     @Value("${spring.redis.host}")
     private String host;

diff --git a/src/main/java/server/inuappcenter/kr/data/redis/domain/ImageRedis.java b/src/main/java/server/inuappcenter/kr/data/redis/domain/ImageRedis.java
@@ -0,0 +1,19 @@
+package server.inuappcenter.kr.data.redis.domain;
+
+import lombok.Getter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
+
+
+@Getter
+@RedisHash(value = "image")
+public class ImageRedis {
+    @Id
+    private Long id;
+    private final byte[] imageData;
+
+    public ImageRedis(Long id, byte[] imageData) {
+        this.id = id;
+        this.imageData = imageData;
+    }
+}
diff --git a/...y/redis/BoardResponseRedisRepository.java → ...ository/BoardResponseRedisRepository.java b/...y/redis/BoardResponseRedisRepository.java → ...ository/BoardResponseRedisRepository.java
@@ -1,4 +1,4 @@
-package server.inuappcenter.kr.data.repository.redis;
+package server.inuappcenter.kr.data.redis.repository;
 
 import org.springframework.data.repository.CrudRepository;
 import server.inuappcenter.kr.data.dto.response.BoardResponseDto;

diff --git a/src/main/java/server/inuappcenter/kr/data/redis/repository/ImageRedisRepository.java b/src/main/java/server/inuappcenter/kr/data/redis/repository/ImageRedisRepository.java
@@ -0,0 +1,7 @@
+package server.inuappcenter.kr.data.redis.repository;
+
+import org.springframework.data.repository.CrudRepository;
+import server.inuappcenter.kr.data.redis.domain.ImageRedis;
+
+public interface ImageRedisRepository extends CrudRepository<ImageRedis, Long> {
+}
diff --git a/src/main/java/server/inuappcenter/kr/service/ImageService.java b/src/main/java/server/inuappcenter/kr/service/ImageService.java
@@ -1,10 +1,11 @@
 package server.inuappcenter.kr.service;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import server.inuappcenter.kr.data.domain.board.Image;
+import server.inuappcenter.kr.data.redis.domain.ImageRedis;
+import server.inuappcenter.kr.data.redis.repository.ImageRedisRepository;
 import server.inuappcenter.kr.data.repository.ImageRepository;
 import server.inuappcenter.kr.data.utils.ImageUtils;
 import server.inuappcenter.kr.exception.customExceptions.CustomNotFoundException;
@@ -13,10 +14,23 @@
 @RequiredArgsConstructor
 public class ImageService {
     private final ImageRepository imageRepository;
+    private final ImageRedisRepository imageRedisRepository;
 
     @Transactional(readOnly = true)
     public byte[] getImage(Long id) {
-        Image foundImage = imageRepository.findById(id).orElseThrow(() -> new CustomNotFoundException("The requested ID was not found."));
-        return ImageUtils.decompressImage(foundImage.getImageData());
+        return imageRedisRepository.findById(id)
+                .map(imageRedis -> ImageUtils.decompressImage(imageRedis.getImageData()))
+                .orElseGet(() -> {
+                    Image foundImage = imageRepository.findById(id).orElseThrow(() -> new CustomNotFoundException("The requested ID was not found."));
+                    ImageRedis imageRedis = new ImageRedis(foundImage.getId(), foundImage.getImageData());
+                    imageRedisRepository.save(imageRedis);
+                    return ImageUtils.decompressImage(foundImage.getImageData());
+                });
+    }
+
+    @Transactional
+    public void deleteByImageId(Long id) {
+        imageRedisRepository.deleteById(id);
+        imageRepository.deleteById(id);
     }
 }
diff --git a/src/main/java/server/inuappcenter/kr/service/boardService/BoardService.java b/src/main/java/server/inuappcenter/kr/service/boardService/BoardService.java
@@ -10,9 +10,10 @@
 import server.inuappcenter.kr.data.domain.board.Image;
 import server.inuappcenter.kr.data.dto.request.BoardRequestDto;
 import server.inuappcenter.kr.data.dto.response.BoardResponseDto;
+import server.inuappcenter.kr.data.redis.repository.ImageRedisRepository;
 import server.inuappcenter.kr.data.repository.BoardRepository;
 import server.inuappcenter.kr.data.repository.ImageRepository;
-import server.inuappcenter.kr.data.repository.redis.BoardResponseRedisRepository;
+import server.inuappcenter.kr.data.redis.repository.BoardResponseRedisRepository;
 import server.inuappcenter.kr.exception.customExceptions.CustomNotFoundException;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,6 +28,7 @@ public class BoardService {
     private final ImageRepository imageRepository;
     private final HttpServletRequest request;
     private final BoardResponseRedisRepository<BoardResponseDto> boardResponseRedisRepository;
+    private final ImageRedisRepository imageRedisRepository;
 
     @Transactional(readOnly = true)
     public BoardResponseDto findBoard(Long id) {
@@ -48,13 +50,15 @@ public CommonResponseDto saveBoard(BoardRequestDto boardRequestDto) {
 
     @Transactional
     public CommonResponseDto deleteBoard(Long id) {
+        boardResponseRedisRepository.deleteById(id);
         boardRepository.findById(id).orElseThrow(() -> new CustomNotFoundException("ID에 해당되는 보드가 없습니다."));
         boardRepository.deleteById(id);
         return new CommonResponseDto("id: " + id + " has been successfully deleted.");
     }
 
     @Transactional
     public CommonResponseDto updateBoard(Long board_id, List<Long> image_id, BoardRequestDto boardRequestDto) {
+        // 캐시에서 보드를 삭제한다.
         boardResponseRedisRepository.deleteById(board_id);
         Board foundBoard = boardRepository.findById(board_id).orElseThrow(() -> new CustomNotFoundException("The requested ID was not found."));
         // 사용자가 multipart를 같이 보냈는지 확인
@@ -74,6 +78,10 @@ public CommonResponseDto updateBoard(Long board_id, List<Long> image_id, BoardRe
                 // 찾아진 이미지 목록에서 id를 가져와 찾아진 id 목록에 추가함
                 foundImageIds.add(image.getId());
             }
+
+            // 캐시에서 이미지를 삭제한다.
+            imageRedisRepository.deleteAllById(foundImageIds);
+
             // 찾아진 ID 목록에 존재하지 않는 ID를 얻어야 하기 때문에 없는 이미지 ID 목록을 만들어줌
             List<Long> missingImageIds = new ArrayList<>();
             for (Long id : image_id) {

diff --git a/src/test/java/server/inuappcenter/kr/RedisTest.java b/src/test/java/server/inuappcenter/kr/RedisTest.java
@@ -5,7 +5,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import server.inuappcenter.kr.data.dto.response.BoardResponseDto;
 import server.inuappcenter.kr.data.dto.response.FaqBoardResponseDto;
-import server.inuappcenter.kr.data.repository.redis.BoardResponseRedisRepository;
+import server.inuappcenter.kr.data.redis.repository.BoardResponseRedisRepository;
 import server.inuappcenter.kr.exception.customExceptions.CustomNotFoundException;
 
 import java.time.LocalDateTime;