From 5376de5f5289cec2d161967b8e92f8efd3075172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=B1=EC=9E=AC=ED=98=81?= <bjh010321@naver.com>
Date: Wed, 15 Jan 2025 03:47:11 +0900
Subject: [PATCH] =?UTF-8?q?[hotfix]=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classfit/category/controller/ClassInfoController.java | 6 ++++--
 .../classfit/category/repository/MainClassRepository.java | 3 +--
 .../classfit/category/service/ClassInfoService.java       | 8 ++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/classfit/example/classfit/category/controller/ClassInfoController.java b/src/main/java/classfit/example/classfit/category/controller/ClassInfoController.java
index 60bcd74a..49e23fdc 100644
--- a/src/main/java/classfit/example/classfit/category/controller/ClassInfoController.java
+++ b/src/main/java/classfit/example/classfit/category/controller/ClassInfoController.java
@@ -1,8 +1,10 @@
 package classfit.example.classfit.category.controller;
 
+import classfit.example.classfit.auth.annotation.AuthMember;
 import classfit.example.classfit.category.dto.response.ClassInfoResponse;
 import classfit.example.classfit.category.service.ClassInfoService;
 import classfit.example.classfit.common.ApiResponse;
+import classfit.example.classfit.member.domain.Member;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -21,8 +23,8 @@ public class ClassInfoController {
 
     @GetMapping("/class-info")
     @Operation(summary = "클래스 정보 조회", description = "클래스 정보 조회 api 입니다.")
-    public ApiResponse<List<ClassInfoResponse>> getClassInfo() {
-        List<ClassInfoResponse> categories = classInfoService.getClasses();
+    public ApiResponse<List<ClassInfoResponse>> getClassInfo(@AuthMember Member member) {
+        List<ClassInfoResponse> categories = classInfoService.getClasses(member);
         return ApiResponse.success(categories, 200, "SUCCESS");
     }
 }
diff --git a/src/main/java/classfit/example/classfit/category/repository/MainClassRepository.java b/src/main/java/classfit/example/classfit/category/repository/MainClassRepository.java
index 6d96666a..4b5ae8d5 100644
--- a/src/main/java/classfit/example/classfit/category/repository/MainClassRepository.java
+++ b/src/main/java/classfit/example/classfit/category/repository/MainClassRepository.java
@@ -2,7 +2,6 @@
 
 import classfit.example.classfit.academy.domain.Academy;
 import classfit.example.classfit.category.domain.MainClass;
-import classfit.example.classfit.member.domain.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,7 +9,7 @@
 
 @Repository
 public interface MainClassRepository extends JpaRepository<MainClass, Long> {
-    List<MainClass> findAllByOrderByMainClassNameAsc();
+    List<MainClass> findAllByAcademyOrderByMainClassNameAsc(Academy academy);
 
     List<MainClass> findByAcademy(Academy academy);
 
diff --git a/src/main/java/classfit/example/classfit/category/service/ClassInfoService.java b/src/main/java/classfit/example/classfit/category/service/ClassInfoService.java
index fd9fdc67..1ffc0b89 100644
--- a/src/main/java/classfit/example/classfit/category/service/ClassInfoService.java
+++ b/src/main/java/classfit/example/classfit/category/service/ClassInfoService.java
@@ -1,10 +1,12 @@
 package classfit.example.classfit.category.service;
 
+import classfit.example.classfit.academy.domain.Academy;
 import classfit.example.classfit.category.domain.MainClass;
 import classfit.example.classfit.category.domain.SubClass;
 import classfit.example.classfit.category.dto.response.ClassInfoResponse;
 import classfit.example.classfit.category.dto.response.SubClassResponse;
 import classfit.example.classfit.category.repository.MainClassRepository;
+import classfit.example.classfit.member.domain.Member;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -18,8 +20,10 @@ public class ClassInfoService {
     private final MainClassRepository mainClassRepository;
 
     @Transactional
-    public List<ClassInfoResponse> getClasses() {
-        List<MainClass> mainClasses = mainClassRepository.findAllByOrderByMainClassNameAsc();
+    public List<ClassInfoResponse> getClasses(Member member) {
+        Academy academy = member.getAcademy();
+
+        List<MainClass> mainClasses = mainClassRepository.findAllByAcademyOrderByMainClassNameAsc(academy);
         return mainClasses.stream()
             .map(this::mapToClassInfoResponse)
             .collect(Collectors.toList());