Merge pull request #61 from kookmin-sw/BE_Feature/#25-content-and-quiz

#25 refactor: 컨텐츠 종류별 조회를 모임별 조회 추가 적용
kookmin-sw · May 10, 2024 · e2f17dc · e2f17dc
2 parents 52e3a40 + dbc9c43
commit e2f17dc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/backend/src/main/java/com/project/capstone/content/controller/ContentController.java b/backend/src/main/java/com/project/capstone/content/controller/ContentController.java
@@ -36,8 +36,8 @@ public ResponseEntity<ContentResponse> getContent(@PathVariable Long id) {
 
     // 컨텐츠 종류별 조회
     @GetMapping("/get")
-    public ResponseEntity<List<ContentResponse>> getContents(@RequestParam String type) {
-        List<ContentResponse> contentResponseList = contentService.getContents(type);
+    public ResponseEntity<List<ContentResponse>> getContents(@RequestParam String type, @RequestParam Long clubId) {
+        List<ContentResponse> contentResponseList = contentService.getContents(type, clubId);
         return ResponseEntity.ok().body(contentResponseList);
     }
 }
diff --git a/backend/src/main/java/com/project/capstone/content/domain/ContentRepository.java b/backend/src/main/java/com/project/capstone/content/domain/ContentRepository.java
@@ -1,11 +1,12 @@
 package com.project.capstone.content.domain;
 
+import com.project.capstone.club.domain.Club;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 import java.util.Optional;
 
 public interface ContentRepository extends JpaRepository<Content, Long> {
     Optional<Content> findContentById(Long id);
-    List<Content> findContentsByType(ContentType type);
+    List<Content> findContentsByTypeAndClub(ContentType type, Club club);
 }
diff --git a/backend/src/main/java/com/project/capstone/content/service/ContentService.java b/backend/src/main/java/com/project/capstone/content/service/ContentService.java
@@ -90,11 +90,15 @@ public ContentResponse getContent(Long id) {
         return new ContentResponse(content);
     }
 
-    public List<ContentResponse> getContents(String type) {
+    public List<ContentResponse> getContents(String type, Long clubId) {
+        Club club = clubRepository.findClubById(clubId).orElseThrow(
+                () -> new ClubException(CLUB_NOT_FOUND)
+        );
+
         for (ContentType contentType : ContentType.values()) {
             if (contentType.equals(ContentType.valueOf(type))) {
-                List<Content> contentsByType = contentRepository.findContentsByType(ContentType.valueOf(type));
-                return contentsByType.stream()
+                List<Content> contentsByTypeAndClub = contentRepository.findContentsByTypeAndClub(ContentType.valueOf(type), club);
+                return contentsByTypeAndClub.stream()
                         .map(ContentResponse::new)
                         .toList();
             }

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -7,12 +7,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: create
-    defer-datasource-initialization: true
-
-  sql:
-    init:
-      mode: always
+      ddl-auto: update
 
 jwt:
   secret: ${JWT_SECRET}