Merge pull request #374 from ungzzang/master

프리미엄 조회 깔끔하게 수정
AcaMatchTeam · Feb 28, 2025 · d6b4e36 · d6b4e36
2 parents 9b48d97 + efcdbb1
commit d6b4e36
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/src/main/java/com/green/acamatch/academy/Controller/BannerController.java b/src/main/java/com/green/acamatch/academy/Controller/BannerController.java
@@ -55,7 +55,7 @@ public ResultResponse<Integer> putBannerShow(@RequestBody BannerPicShowUpdateReq
     }
 
     @GetMapping
-    @Operation(summary = "포지션 별 배너 조회")
+    @Operation(summary = "포지션 별 배너 조회", description = "position 1: TOP, 2: BOTTOM, 3: LEFT, 4: RIGHT")
     public ResultResponse<List<BannerByPositionGetRes>> getBannerByPosition(BannerByPositionGetReq req) {
 
         List<BannerByPositionGetRes> res = bannerService.getBannerByPosition(req.getAcaId(), req.getBannerPosition());

diff --git a/src/main/java/com/green/acamatch/academy/Controller/PremiumController.java b/src/main/java/com/green/acamatch/academy/Controller/PremiumController.java
@@ -3,6 +3,7 @@
 import com.green.acamatch.academy.Service.PremiumService;
 import com.green.acamatch.academy.model.JW.AcademyMessage;
 import com.green.acamatch.academy.premium.model.PremiumDeleteReq;
+import com.green.acamatch.academy.premium.model.PremiumGetRes;
 import com.green.acamatch.academy.premium.model.PremiumPostReq;
 import com.green.acamatch.academy.premium.model.PremiumUpdateReq;
 import com.green.acamatch.config.model.ResultResponse;
@@ -49,9 +50,9 @@ public ResultResponse<Integer> putPremiumCheck(@RequestBody PremiumUpdateReq req
     //프리미엄학원조회
     @GetMapping
     @Operation(summary = "프리미엄학원 조회")
-    public ResultResponse<List<PremiumAcademy>> getPremiumAcademy() {
-        List<PremiumAcademy> resList = premiumService.getPremium();
-        return ResultResponse.<List<PremiumAcademy>>builder()
+    public ResultResponse<List<PremiumGetRes>> getPremiumAcademy() {
+        List<PremiumGetRes> resList = premiumService.getPremium();
+        return ResultResponse.<List<PremiumGetRes>>builder()
                 .resultMessage(academyMessage.getMessage())
                 .resultData(resList)
                 .build();

diff --git a/src/main/java/com/green/acamatch/academy/PremiumRepository.java b/src/main/java/com/green/acamatch/academy/PremiumRepository.java
@@ -1,5 +1,6 @@
 package com.green.acamatch.academy;
 
+import com.green.acamatch.academy.premium.model.PremiumGetRes;
 import com.green.acamatch.entity.academy.PremiumAcademy;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
@@ -30,9 +31,9 @@ public interface PremiumRepository extends JpaRepository<PremiumAcademy, Long> {
     @Query(" update PremiumAcademy a set a.startDate =:startDate, a.endDate =:endDate where a.acaId =:acaId")
     int updateDateByAcaId(@Param("acaId") Long acaId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
-    /*//프리미엄 학원 조회
-    @Query("select from premiumAcademy ")
-    List<PremiumGetRes> findAllByPremium();*/
+    //프리미엄 학원 조회
+    @Query("SELECT new com.green.acamatch.academy.premium.model.PremiumGetRes(a.acaId, b.acaName, a.startDate, a.endDate, a.preCheck, a.createdAt) from PremiumAcademy a join Academy b on a.acaId = b.acaId")
+    List<PremiumGetRes> findAllByPremium();
 
     //프리미엄 학원 삭제
     @Transactional

diff --git a/src/main/java/com/green/acamatch/academy/Service/PremiumService.java b/src/main/java/com/green/acamatch/academy/Service/PremiumService.java
@@ -4,6 +4,7 @@
 import com.green.acamatch.academy.PremiumRepository;
 import com.green.acamatch.academy.model.JW.AcademyMessage;
 import com.green.acamatch.academy.premium.model.PremiumDeleteReq;
+import com.green.acamatch.academy.premium.model.PremiumGetRes;
 import com.green.acamatch.academy.premium.model.PremiumPostReq;
 import com.green.acamatch.academy.premium.model.PremiumUpdateReq;
 import com.green.acamatch.entity.academy.PremiumAcademy;
@@ -70,8 +71,8 @@ public void updateAcademyPremiumIfNeeded(Long acaId) {
     }
 
     //프리미엄학원 조회(관리자)
-    public List<PremiumAcademy> getPremium() {
-        List<PremiumAcademy> resList = premiumRepository.findAll();
+    public List<PremiumGetRes> getPremium() {
+        List<PremiumGetRes> resList = premiumRepository.findAllByPremium();
         academyMessage.setMessage("프리미엄학원을 조회하였습니다.");
         return resList;
     }

diff --git a/src/main/java/com/green/acamatch/academy/premium/model/PremiumGetRes.java b/src/main/java/com/green/acamatch/academy/premium/model/PremiumGetRes.java
@@ -0,0 +1,20 @@
+package com.green.acamatch.academy.premium.model;
+
+import lombok.*;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@EqualsAndHashCode
+public class PremiumGetRes {
+    private Long acaId;
+    private String acaName;
+    private LocalDate startDate;
+    private LocalDate endDate;
+    private int preCheck;
+    private LocalDateTime createdAt;
+}