Merge pull request #835 from Clubber2024/feat/#834-feat-관리자-캘린더-조회-api-구현

feat : 관리자 페이지 캘린더 조회 api 구현

Author: mjKim1229

src/main/java/com/clubber/ClubberServer/domain/calendar/controller/CalendarController.java

@@ -4,21 +4,29 @@
 import com.clubber.ClubberServer.domain.calendar.dto.CreateCalendarResponse;
 import com.clubber.ClubberServer.domain.calendar.dto.GetCalendarResponse;
 import com.clubber.ClubberServer.domain.calendar.dto.UpdateCalendarRequest;
-import com.clubber.ClubberServer.domain.calendar.service.CalendarService;
+import com.clubber.ClubberServer.domain.calendar.entity.Calendar;
+import com.clubber.ClubberServer.domain.calendar.service.AdminCalendarService;
+import com.clubber.ClubberServer.global.common.page.PageResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/v1/calendars")
+@RequestMapping("/api/v1/admins/calendars")
 public class CalendarController {
-    private final CalendarService calendarService;
+    private final AdminCalendarService calendarService;
 
     @PostMapping
     public CreateCalendarResponse createCalendar(@RequestBody CreateCalendarRequest request) {
         return calendarService.createCalendar(request);
     }
 
+    @GetMapping
+    public PageResponse<Calendar> getCalendars(Pageable pageable) {
+        return calendarService.getCalenderPages(pageable);
+    }
+
     @GetMapping("/{id}")
     public GetCalendarResponse getCalendar(@PathVariable Long id) {
         return calendarService.getCalendar(id);

src/main/java/com/clubber/ClubberServer/domain/calendar/entity/Calendar.java

@@ -1,5 +1,6 @@
 package com.clubber.ClubberServer.domain.calendar.entity;
 
+import com.clubber.ClubberServer.domain.club.domain.Club;
 import com.clubber.ClubberServer.domain.recruit.domain.RecruitType;
 import com.clubber.ClubberServer.domain.user.domain.AccountRole;
 import jakarta.persistence.*;
@@ -40,6 +41,10 @@ public class Calendar {
     @Enumerated(EnumType.STRING)
     private AccountRole writerRole;
 
+    @ManyToOne
+    @JoinColumn(name = "club_id")
+    private Club club;
+
     private boolean isDeleted = false;
 
     @Builder

src/main/java/com/clubber/ClubberServer/domain/calendar/implement/CalendarReader.java

@@ -3,7 +3,10 @@
 import com.clubber.ClubberServer.domain.calendar.entity.Calendar;
 import com.clubber.ClubberServer.domain.calendar.exception.CalendarNotFoundException;
 import com.clubber.ClubberServer.domain.calendar.repository.CalendarRepository;
+import com.clubber.ClubberServer.domain.club.domain.Club;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,4 +20,8 @@ public Calendar readById(Long id) {
         return calendarRepository.findCalendarByIdAndIsDeleted(id, false)
                 .orElseThrow(() -> CalendarNotFoundException.EXCEPTION);
     }
+
+    public Page<Calendar> readClubCalendarPage(Club club, Pageable pageable) {
+        return calendarRepository.findCalendarByClubAndIsDeleted(club, false, pageable);
+    }
 }

src/main/java/com/clubber/ClubberServer/domain/calendar/repository/CalendarRepository.java

@@ -1,10 +1,15 @@
 package com.clubber.ClubberServer.domain.calendar.repository;
 
 import com.clubber.ClubberServer.domain.calendar.entity.Calendar;
+import com.clubber.ClubberServer.domain.club.domain.Club;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
 public interface CalendarRepository extends JpaRepository<Calendar, Long> {
     Optional<Calendar> findCalendarByIdAndIsDeleted(Long id, boolean deleted);
+
+    Page<Calendar> findCalendarByClubAndIsDeleted(Club club, Boolean isDeleted, Pageable pageable);
 }

…in/calendar/service/CalendarService.java …lendar/service/AdminCalendarService.javasrc/main/java/com/clubber/ClubberServer/domain/calendar/service/CalendarService.java renamed to src/main/java/com/clubber/ClubberServer/domain/calendar/service/AdminCalendarService.java src/main/java/com/clubber/ClubberServer/domain/calendar/service/CalendarService.java renamed to src/main/java/com/clubber/ClubberServer/domain/calendar/service/AdminCalendarService.java

@@ -1,29 +1,43 @@
 package com.clubber.ClubberServer.domain.calendar.service;
 
+import com.clubber.ClubberServer.domain.admin.domain.Admin;
+import com.clubber.ClubberServer.domain.admin.implement.AdminReader;
 import com.clubber.ClubberServer.domain.calendar.dto.CreateCalendarRequest;
 import com.clubber.ClubberServer.domain.calendar.dto.CreateCalendarResponse;
 import com.clubber.ClubberServer.domain.calendar.dto.GetCalendarResponse;
 import com.clubber.ClubberServer.domain.calendar.dto.UpdateCalendarRequest;
 import com.clubber.ClubberServer.domain.calendar.entity.Calendar;
 import com.clubber.ClubberServer.domain.calendar.implement.CalendarAppender;
 import com.clubber.ClubberServer.domain.calendar.implement.CalendarReader;
+import com.clubber.ClubberServer.domain.club.domain.Club;
+import com.clubber.ClubberServer.global.common.page.PageResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 @Transactional
-public class CalendarService {
+public class AdminCalendarService {
     private final CalendarAppender calendarAppender;
     private final CalendarReader calendarReader;
+    private final AdminReader adminReader;
 
     public CreateCalendarResponse createCalendar(CreateCalendarRequest request) {
         Calendar calendar = request.toEntity();
         Calendar savedCalendar = calendarAppender.append(calendar);
         return CreateCalendarResponse.from(savedCalendar);
     }
 
+    public PageResponse<Calendar> getCalenderPages(Pageable pageable) {
+        Admin admin = adminReader.getCurrentAdmin();
+        Club club = admin.getClub();
+        Page<Calendar> calendars = calendarReader.readClubCalendarPage(club, pageable);
+        return PageResponse.of(calendars);
+    }
+
     public GetCalendarResponse getCalendar(Long id) {
         Calendar calendar = calendarReader.readById(id);
         return GetCalendarResponse.from(calendar);

src/main/java/com/clubber/ClubberServer/global/config/security/SecurityConfig.java

@@ -89,9 +89,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 .permitAll()
                                 .requestMatchers("/api/v1/perspective/**")
                                 .permitAll()
-                                .requestMatchers(HttpMethod.GET,"/api/v1/calendars/**")
-                                .permitAll()
-                                .requestMatchers("/api/v1/calendars/**")
+                                .requestMatchers("/api/v1/admins/calendars/**")
                                 .hasRole("ADMIN")
                                 .anyRequest()
                                 .hasRole("USER"));