From a645a5e3a56675aa3c8b86c90c9a3c2d2cd7c2cf Mon Sep 17 00:00:00 2001 From: yujung7768903 Date: Wed, 3 May 2023 01:43:08 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=EC=9C=A0=EC=A0=80=EA=B0=80=20?= =?UTF-8?q?=EC=B0=B8=EC=97=AC=ED=95=98=EA=B3=A0=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=EC=9D=98=20=EB=B0=98=ED=99=98=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ScheduleResponseDto에 participants(해당 일정에 참여하는 참여자 이름 리스트) 추가 --- .../sswu/meets/controller/ScheduleController.java | 2 +- .../com/sswu/meets/dto/ScheduleResponseDto.java | 12 ++++++++++++ .../com/sswu/meets/service/ScheduleService.java | 9 ++++++++- .../java/com/sswu/meets/service/UserService.java | 13 +++++++++---- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sswu/meets/controller/ScheduleController.java b/src/main/java/com/sswu/meets/controller/ScheduleController.java index 0fd2ad6..fd17fef 100644 --- a/src/main/java/com/sswu/meets/controller/ScheduleController.java +++ b/src/main/java/com/sswu/meets/controller/ScheduleController.java @@ -36,7 +36,7 @@ public Long saveTuneDate(@LoginUser SessionUser sessionUser, @RequestBody TuneSc @ApiImplicitParam(name = "scheduleNo", value = "일정 번호") @GetMapping("/schedule/userlist/{scheduleNo}") public List getUserListOfSchedule(@PathVariable Long scheduleNo) { - return scheduleService.getUserListOfSchedule(scheduleNo); + return scheduleService.getUserListByScheduleNo(scheduleNo); } @ApiOperation(value = "모임 일정 조회") diff --git a/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java b/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java index 6d94de9..414e895 100644 --- a/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java +++ b/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java @@ -3,6 +3,8 @@ import com.sswu.meets.domain.schedule.Schedule; import lombok.Getter; +import java.util.List; + @Getter public class ScheduleResponseDto { private Long no; @@ -10,6 +12,7 @@ public class ScheduleResponseDto { private String scheduleName; private Boolean dateTuneState; private Boolean placeTuneState; + private List participants; public ScheduleResponseDto(Schedule entity){ this.no = entity.getScheduleNo(); @@ -18,4 +21,13 @@ public ScheduleResponseDto(Schedule entity){ this.dateTuneState = entity.getDateTuneState(); this.placeTuneState = entity.getPlaceTuneState(); } + + public ScheduleResponseDto(Schedule entity, List participants){ + this.no = entity.getScheduleNo(); + this.meetingNo = entity.getMeeting() != null ? entity.getMeeting().getMeeting_no() : null; + this.scheduleName = entity.getScheduleName(); + this.dateTuneState = entity.getDateTuneState(); + this.placeTuneState = entity.getPlaceTuneState(); + this.participants = participants; + } } diff --git a/src/main/java/com/sswu/meets/service/ScheduleService.java b/src/main/java/com/sswu/meets/service/ScheduleService.java index 2073b5d..b4987b3 100644 --- a/src/main/java/com/sswu/meets/service/ScheduleService.java +++ b/src/main/java/com/sswu/meets/service/ScheduleService.java @@ -63,7 +63,14 @@ public Long saveTuneDate(SessionUser sessionUser, TuneScheduleSaveRequestDto tun } // 일정에 참여하는 유저 조회 - public List getUserListOfSchedule(Long scheduleNo) { + public List getUserNameListBySchedule(Schedule schedule) { + return attendanceRepository.findAttendanceBySchedule(schedule).stream() + .map(p -> p.getUser().getName()) + .collect(Collectors.toList()); + } + + // 일정 번호로 일정에 참여하는 유저 조회 + public List getUserListByScheduleNo(Long scheduleNo) { Schedule schedule = scheduleRepository.getById(scheduleNo); return attendanceRepository.findAttendanceBySchedule(schedule).stream() .map(p -> p.getUser()) diff --git a/src/main/java/com/sswu/meets/service/UserService.java b/src/main/java/com/sswu/meets/service/UserService.java index 707a39f..2d5f169 100644 --- a/src/main/java/com/sswu/meets/service/UserService.java +++ b/src/main/java/com/sswu/meets/service/UserService.java @@ -24,6 +24,7 @@ @Service public class UserService { private final UserRepository userRepository; + private final ScheduleService scheduleService; private final ParticipationRepository participationRepository; private final AttendanceRepository attendanceRepository; private RestTemplate restTemplate = new RestTemplate(); @@ -61,20 +62,24 @@ public List getMeetingList(Long userNo) { } // 유저가 참여하고 있는 일정 조회 + // 해당 일정에 참여하고 있는 모든 유저 조회 @Transactional public List getScheduleList(SessionUser sessionUser) { return attendanceRepository.findAttendanceByUser(userRepository.getById(sessionUser.getUserNo())).stream() - .map(p -> p.getSchedule()) - .map(ScheduleResponseDto::new) + .map(p -> new ScheduleResponseDto( + p.getSchedule(), + scheduleService.getUserNameListBySchedule(p.getSchedule()) + ) + ) .collect(Collectors.toList()); } @Transactional public boolean update(Long userNo, UserUpdateRequestDto userSaveRequestDto) { - try{ + try { userRepository.save(userSaveRequestDto.toEntity()); return true; - }catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { log.error("error: {}", e.getMessage()); return false; } From a5bad70aeeadb44b38bf60e7efb08f2a1b232b3e Mon Sep 17 00:00:00 2001 From: yujung7768903 Date: Tue, 23 May 2023 23:59:18 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20n=20+=201=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=20=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 일정 날짜도 조회 가능하도록 변경 --- .../attendance/AttendanceRepository.java | 8 +++- .../sswu/meets/dto/ScheduleResponseDto.java | 33 ------------- .../response/ScheduleResponseDto.java | 48 +++++++++++++++++++ .../sswu/meets/service/ScheduleService.java | 35 +++++++++++++- .../com/sswu/meets/service/UserService.java | 10 ++-- 5 files changed, 92 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java create mode 100644 src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java diff --git a/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java b/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java index 1b5207c..f22f6c9 100644 --- a/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java +++ b/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java @@ -3,11 +3,17 @@ import com.sswu.meets.domain.schedule.Schedule; import com.sswu.meets.domain.user.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; public interface AttendanceRepository extends JpaRepository { - List findAttendanceByUser (User user); + @Query("select a " + + "from Attendance a " + + "join fetch a.schedule " + + "where a.user = :user ") + List findAttendanceByUser (@Param("user") User user); List findAttendanceBySchedule (Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java b/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java deleted file mode 100644 index 414e895..0000000 --- a/src/main/java/com/sswu/meets/dto/ScheduleResponseDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sswu.meets.dto; - -import com.sswu.meets.domain.schedule.Schedule; -import lombok.Getter; - -import java.util.List; - -@Getter -public class ScheduleResponseDto { - private Long no; - private Long meetingNo; - private String scheduleName; - private Boolean dateTuneState; - private Boolean placeTuneState; - private List participants; - - public ScheduleResponseDto(Schedule entity){ - this.no = entity.getScheduleNo(); - this.meetingNo = entity.getMeeting() != null ? entity.getMeeting().getMeeting_no() : null; - this.scheduleName = entity.getScheduleName(); - this.dateTuneState = entity.getDateTuneState(); - this.placeTuneState = entity.getPlaceTuneState(); - } - - public ScheduleResponseDto(Schedule entity, List participants){ - this.no = entity.getScheduleNo(); - this.meetingNo = entity.getMeeting() != null ? entity.getMeeting().getMeeting_no() : null; - this.scheduleName = entity.getScheduleName(); - this.dateTuneState = entity.getDateTuneState(); - this.placeTuneState = entity.getPlaceTuneState(); - this.participants = participants; - } -} diff --git a/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java b/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java new file mode 100644 index 0000000..ea6f765 --- /dev/null +++ b/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java @@ -0,0 +1,48 @@ +package com.sswu.meets.dto.schedule.response; + +import com.sswu.meets.domain.schedule.Schedule; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.List; +import java.util.stream.Collectors; + +@Getter +public class ScheduleResponseDto { + private Long no; + private Long meetingNo; + private String scheduleName; + private LocalDate fixStartDate; // 고정 일정인 경우 시작 날짜 + private LocalDate fixEndDate; // 고정 일정인 경우 종료 날짜 + private List tuneDateList; // 종료 일정인 경우 날짜 리스트 + private LocalTime startTime; + private LocalTime endTime; + private Boolean dateTuneState; + private Boolean placeTuneState; + private List participants; + + @Builder + public ScheduleResponseDto( + Schedule schedule, + LocalDate fixStartDate, + LocalDate fixEndDate, + List tuneDateList + ) { + this.no = schedule.getScheduleNo(); + this.meetingNo = schedule.getMeeting() != null ? schedule.getMeeting().getMeeting_no() : null; + this.scheduleName = schedule.getScheduleName(); + this.fixStartDate = fixStartDate; + this.fixEndDate = fixEndDate; + this.tuneDateList = tuneDateList; + this.startTime = schedule.getStartTime(); + this.endTime = schedule.getEndTime(); + this.dateTuneState = schedule.getDateTuneState(); + this.placeTuneState = schedule.getPlaceTuneState(); + this.participants = schedule.getAttendanceList().stream() + .map(a -> a.getUser().getName()) + .collect(Collectors.toList()); + } + +} diff --git a/src/main/java/com/sswu/meets/service/ScheduleService.java b/src/main/java/com/sswu/meets/service/ScheduleService.java index b4987b3..8271a2a 100644 --- a/src/main/java/com/sswu/meets/service/ScheduleService.java +++ b/src/main/java/com/sswu/meets/service/ScheduleService.java @@ -7,12 +7,17 @@ import com.sswu.meets.domain.meeting.MeetingRepository; import com.sswu.meets.domain.schedule.Schedule; import com.sswu.meets.domain.schedule.ScheduleRepository; +import com.sswu.meets.domain.scheduleDateFix.ScheduleDateFix; +import com.sswu.meets.domain.scheduleDateFix.ScheduleDateFixRepository; +import com.sswu.meets.domain.scheduleDateTune.ScheduleDateTuneRepository; import com.sswu.meets.domain.user.UserRepository; import com.sswu.meets.dto.*; +import com.sswu.meets.dto.schedule.response.ScheduleResponseDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import javax.transaction.Transactional; +import java.time.LocalDate; import java.util.List; import java.util.stream.Collectors; @@ -25,6 +30,8 @@ public class ScheduleService { private final AttendanceRepository attendanceRepository; private final ScheduleDateTuneService scheduleDateTuneService; private final ScheduleDateFixService scheduleDateFixService; + private final ScheduleDateFixRepository scheduleDateFixRepository; + private final ScheduleDateTuneRepository scheduleDateTuneRepository; // 고정 일정 등록 @Transactional @@ -84,7 +91,7 @@ public List getScheduleList(Long meetingNo) { Meeting meeting = meetingRepository.getById(meetingNo); return scheduleRepository.findByMeeting(meeting).stream() - .map(ScheduleResponseDto::new) + .map(this::getSchedule) .collect(Collectors.toList()); } @@ -92,12 +99,36 @@ public List getScheduleList(Long meetingNo) { @Transactional public ScheduleResponseDto getSchedule(Long scheduleNo, String scheduleCode) { return scheduleRepository.findByScheduleNoAndScheduleCode(scheduleNo, scheduleCode) - .map(ScheduleResponseDto::new) + .map(this::getSchedule) .orElseThrow(() -> new IllegalArgumentException( "해당 일정은 존재하지 않습니다. scheduleNo: " + scheduleNo + ", scheduleCode: " + scheduleCode )); } + // 일정 상세 조회 + @Transactional + public ScheduleResponseDto getSchedule(Schedule schedule) { + // 조율 일정인 경우 + if (schedule.getDateTuneState()) { + List tuneDateList = scheduleDateTuneRepository.findBySchedule(schedule).stream() + .map(s -> s.getTuneDate()) + .collect(Collectors.toList()); + + return ScheduleResponseDto.builder() + .schedule(schedule) + .tuneDateList(tuneDateList) + .build(); + } + + // 고정 일정인 경우 + ScheduleDateFix scheduleDateFix = scheduleDateFixRepository.findBySchedule(schedule); + return ScheduleResponseDto.builder() + .schedule(schedule) + .fixStartDate(scheduleDateFix.getStartDate()) + .fixEndDate(scheduleDateFix.getEndDate()) + .build(); + } + // 일정 수정 @Transactional public Boolean update(Long scheduleNo, ScheduleUpdateRequestDto scheduleUpdateRequestDto) { diff --git a/src/main/java/com/sswu/meets/service/UserService.java b/src/main/java/com/sswu/meets/service/UserService.java index 2d5f169..27c5d54 100644 --- a/src/main/java/com/sswu/meets/service/UserService.java +++ b/src/main/java/com/sswu/meets/service/UserService.java @@ -6,6 +6,7 @@ import com.sswu.meets.domain.user.User; import com.sswu.meets.domain.user.UserRepository; import com.sswu.meets.dto.*; +import com.sswu.meets.dto.schedule.response.ScheduleResponseDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -65,12 +66,9 @@ public List getMeetingList(Long userNo) { // 해당 일정에 참여하고 있는 모든 유저 조회 @Transactional public List getScheduleList(SessionUser sessionUser) { - return attendanceRepository.findAttendanceByUser(userRepository.getById(sessionUser.getUserNo())).stream() - .map(p -> new ScheduleResponseDto( - p.getSchedule(), - scheduleService.getUserNameListBySchedule(p.getSchedule()) - ) - ) + User user = userRepository.getById(sessionUser.getUserNo()); + return attendanceRepository.findAttendanceByUser(user).stream() + .map(a -> scheduleService.getSchedule(a.getSchedule())) .collect(Collectors.toList()); } From b6f34572b8aa240ff56ac30bbe467d12548055b2 Mon Sep 17 00:00:00 2001 From: yujung7768903 Date: Wed, 24 May 2023 01:37:43 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=EC=9D=98=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EB=B0=9C?= =?UTF-8?q?=EC=83=9D=ED=95=98=EB=8A=94=20N=20+=201=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meets/domain/attendance/AttendanceRepository.java | 4 ++-- .../scheduleDateFix/ScheduleDateFixRepository.java | 8 ++++++++ .../scheduleDateTune/ScheduleDateTuneRepository.java | 10 ++++++++-- .../dto/schedule/response/ScheduleResponseDto.java | 1 - 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java b/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java index f22f6c9..ad6c1cf 100644 --- a/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java +++ b/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java @@ -13,7 +13,7 @@ public interface AttendanceRepository extends JpaRepository { + "from Attendance a " + "join fetch a.schedule " + "where a.user = :user ") - List findAttendanceByUser (@Param("user") User user); + List findAttendanceByUser(@Param("user") User user); - List findAttendanceBySchedule (Schedule schedule); + List findAttendanceBySchedule(Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java b/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java index 2fd2df5..29afb39 100644 --- a/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java +++ b/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java @@ -1,6 +1,14 @@ package com.sswu.meets.domain.scheduleDateFix; +import com.sswu.meets.domain.schedule.Schedule; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ScheduleDateFixRepository extends JpaRepository { + @Query("select s " + + "from ScheduleDateFix s " + + "join fetch s.schedule " + + "where s.schedule = :schedule ") + public ScheduleDateFix findBySchedule(@Param("schedule") Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java b/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java index 1f66bd5..e7dc991 100644 --- a/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java +++ b/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java @@ -2,9 +2,15 @@ import com.sswu.meets.domain.schedule.Schedule; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; -public interface ScheduleDateTuneRepository extends JpaRepository { - List findBySchedule(Schedule schedule); +public interface ScheduleDateTuneRepository extends JpaRepository { + @Query("select s " + + "from ScheduleDateTune s " + + "join fetch s.schedule " + + "where s.schedule = :schedule ") + List findBySchedule(@Param("schedule") Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java b/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java index ea6f765..8a6962d 100644 --- a/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java +++ b/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java @@ -44,5 +44,4 @@ public ScheduleResponseDto( .map(a -> a.getUser().getName()) .collect(Collectors.toList()); } - } From bb6f5123b587bb1308e396feb9883e7b31c9b1a1 Mon Sep 17 00:00:00 2001 From: yujung7768903 Date: Wed, 24 May 2023 01:56:30 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"fix:=20=EC=9D=BC=EC=A0=95?= =?UTF-8?q?=EC=9D=98=20=EB=82=A0=EC=A7=9C=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?= =?UTF-8?q?=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20N=20+=201=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EA=B0=9C=EC=84=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b6f34572b8aa240ff56ac30bbe467d12548055b2. --- .../meets/domain/attendance/AttendanceRepository.java | 4 ++-- .../scheduleDateFix/ScheduleDateFixRepository.java | 8 -------- .../scheduleDateTune/ScheduleDateTuneRepository.java | 10 ++-------- .../dto/schedule/response/ScheduleResponseDto.java | 1 + 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java b/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java index ad6c1cf..f22f6c9 100644 --- a/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java +++ b/src/main/java/com/sswu/meets/domain/attendance/AttendanceRepository.java @@ -13,7 +13,7 @@ public interface AttendanceRepository extends JpaRepository { + "from Attendance a " + "join fetch a.schedule " + "where a.user = :user ") - List findAttendanceByUser(@Param("user") User user); + List findAttendanceByUser (@Param("user") User user); - List findAttendanceBySchedule(Schedule schedule); + List findAttendanceBySchedule (Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java b/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java index 29afb39..2fd2df5 100644 --- a/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java +++ b/src/main/java/com/sswu/meets/domain/scheduleDateFix/ScheduleDateFixRepository.java @@ -1,14 +1,6 @@ package com.sswu.meets.domain.scheduleDateFix; -import com.sswu.meets.domain.schedule.Schedule; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; public interface ScheduleDateFixRepository extends JpaRepository { - @Query("select s " - + "from ScheduleDateFix s " - + "join fetch s.schedule " - + "where s.schedule = :schedule ") - public ScheduleDateFix findBySchedule(@Param("schedule") Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java b/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java index e7dc991..1f66bd5 100644 --- a/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java +++ b/src/main/java/com/sswu/meets/domain/scheduleDateTune/ScheduleDateTuneRepository.java @@ -2,15 +2,9 @@ import com.sswu.meets.domain.schedule.Schedule; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.List; -public interface ScheduleDateTuneRepository extends JpaRepository { - @Query("select s " - + "from ScheduleDateTune s " - + "join fetch s.schedule " - + "where s.schedule = :schedule ") - List findBySchedule(@Param("schedule") Schedule schedule); +public interface ScheduleDateTuneRepository extends JpaRepository { + List findBySchedule(Schedule schedule); } diff --git a/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java b/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java index 8a6962d..ea6f765 100644 --- a/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java +++ b/src/main/java/com/sswu/meets/dto/schedule/response/ScheduleResponseDto.java @@ -44,4 +44,5 @@ public ScheduleResponseDto( .map(a -> a.getUser().getName()) .collect(Collectors.toList()); } + }