Merge pull request #15 from UMC-hackathon-2team/develop

[feat] 기억 랜덤 조회 기능 추가

Author: hyukkimm

src/main/java/umc/tosee/memory/controller/MemoryController.java

@@ -4,16 +4,16 @@
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import umc.tosee.global.common.ApiResponse;
 import umc.tosee.global.common.SuccessCode;
 import umc.tosee.gpt.dto.GptDTO;
 import umc.tosee.memory.dto.MemoryDTO;
+import umc.tosee.memory.dto.Res.MemoryRes;
 import umc.tosee.memory.service.MemoryService;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/memories")
@@ -86,5 +86,10 @@ public ApiResponse<GptDTO.GptResponseDTO> saveMemory(
 
         return ApiResponse.onSuccess(result, SuccessCode.CREATED);
     }
+
+    @GetMapping("/random")
+    public ApiResponse<List<MemoryRes.MemoryRandomRes>> getRandomMemories() {
+        return ApiResponse.onSuccess(memoryService.getRandomMemory(), SuccessCode.OK);
+    }
 }
 

src/main/java/umc/tosee/memory/converter/MemoryConverter.java

@@ -0,0 +1,17 @@
+package umc.tosee.memory.converter;
+
+import lombok.RequiredArgsConstructor;
+import umc.tosee.memory.domain.Memory;
+import umc.tosee.memory.dto.Res.MemoryRes.MemoryRandomRes;
+
+@RequiredArgsConstructor
+public class MemoryConverter {
+
+    public static MemoryRandomRes toRandomRes(Memory memory) {
+        return MemoryRandomRes.builder()
+                .memoryId(memory.getId())
+                .name(memory.getCategory().getName())
+                .sadCount(memory.getSadCount())
+                .build();
+    }
+}

src/main/java/umc/tosee/memory/domain/Memory.java

@@ -22,11 +22,11 @@ public class Memory {
 
     private String content;
 
-    private int sad_count = 0;
+    private int sadCount = 0;
 
     private String summation;
 
-    @OneToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "category_id", nullable = false)
     private Category category;
 

src/main/java/umc/tosee/memory/dto/Res/MemoryRes.java

@@ -0,0 +1,12 @@
+package umc.tosee.memory.dto.Res;
+import lombok.Builder;
+
+public class MemoryRes {
+
+    @Builder
+    public record MemoryRandomRes(
+            Long memoryId,
+            String name,
+            int sadCount
+    ) {}
+}

src/main/java/umc/tosee/memory/repository/MemoryRepository.java

@@ -2,8 +2,21 @@
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import umc.tosee.memory.domain.Memory;
 
-public interface MemoryRepository extends JpaRepository<Memory,Long> {
+import java.util.List;
 
+public interface MemoryRepository extends JpaRepository<Memory,Long> {
+    @Query(value = """
+        SELECT *
+        FROM (
+            SELECT *
+            FROM memories
+            ORDER BY RAND()
+            LIMIT 4
+        ) t
+        ORDER BY t.sad_count DESC
+        """, nativeQuery = true)
+    List<Memory> findRandomMemoryBySadDesc();
 }

src/main/java/umc/tosee/memory/service/MemoryService.java

@@ -9,12 +9,16 @@
 import org.springframework.stereotype.Service;
 import umc.tosee.gpt.dto.GptDTO;
 import umc.tosee.gpt.service.GptService;
+import umc.tosee.memory.converter.MemoryConverter;
 import umc.tosee.memory.domain.Memory;
 import umc.tosee.memory.dto.MemoryDTO;
+import umc.tosee.memory.dto.Res.MemoryRes;
 import umc.tosee.memory.repository.MemoryRepository;
 import umc.tosee.memorycategory.domain.Category;
 import umc.tosee.memorycategory.repository.CategoryRepository;
 
+import java.util.List;
+
 @RequiredArgsConstructor
 @Service
 public class MemoryService {
@@ -71,5 +75,13 @@ private void saveCategoryCookie(
         response.addCookie(cookie);
     }
 
+    @Transactional
+    public List<MemoryRes.MemoryRandomRes> getRandomMemory() {
+        return memoryRepository.findRandomMemoryBySadDesc()
+                .stream()
+                .map(MemoryConverter::toRandomRes)
+                .toList();
+    }
+
 
 }

src/main/java/umc/tosee/memorycategory/domain/Category.java

@@ -21,6 +21,4 @@ public class Category {
 
     private String name;
 
-    @OneToOne(mappedBy = "category")
-    private Memory memory;
 }