Skip to content

Commit 5aa6e6f

Browse files
committed
refactor(schedule): DTO 이름명 변경
1 parent 7743930 commit 5aa6e6f

File tree

11 files changed

+78
-81
lines changed

11 files changed

+78
-81
lines changed

src/main/java/back/kalender/domain/schedule/controller/ScheduleController.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package back.kalender.domain.schedule.controller;
22

3-
import back.kalender.domain.schedule.dto.response.UpcomingEventsResponse;
4-
import back.kalender.domain.schedule.dto.response.DailySchedulesResponse;
5-
import back.kalender.domain.schedule.dto.response.MonthlySchedulesResponse;
3+
import back.kalender.domain.schedule.dto.response.UpcomingEventsListResponse;
4+
import back.kalender.domain.schedule.dto.response.DailySchedulesListResponse;
5+
import back.kalender.domain.schedule.dto.response.MonthlySchedulesListResponse;
66
import back.kalender.domain.schedule.service.ScheduleService;
77
import io.swagger.v3.oas.annotations.Operation;
88
import io.swagger.v3.oas.annotations.Parameter;
@@ -32,7 +32,7 @@ public class ScheduleController {
3232
)
3333
@ApiResponses({
3434
@ApiResponse(responseCode = "200", description = "조회 성공",
35-
content = @Content(schema = @Schema(implementation = MonthlySchedulesResponse.class),
35+
content = @Content(schema = @Schema(implementation = MonthlySchedulesListResponse.class),
3636
examples = @ExampleObject(value = """
3737
{
3838
"schedules": [
@@ -83,13 +83,13 @@ public class ScheduleController {
8383
""")))
8484
})
8585
@GetMapping("/following")
86-
public ResponseEntity<MonthlySchedulesResponse> getFollowingSchedules(
86+
public ResponseEntity<MonthlySchedulesListResponse> getFollowingSchedules(
8787
@RequestParam int year,
8888
@RequestParam int month
8989
) {
9090
Long userId = 1L; //TODO: 임시 userId
9191

92-
MonthlySchedulesResponse response = scheduleService.getFollowingSchedules(userId, year, month);
92+
MonthlySchedulesListResponse response = scheduleService.getFollowingSchedules(userId, year, month);
9393

9494
return ResponseEntity.ok(response);
9595
}
@@ -100,7 +100,7 @@ public ResponseEntity<MonthlySchedulesResponse> getFollowingSchedules(
100100
)
101101
@ApiResponses({
102102
@ApiResponse(responseCode = "200", description = "조회 성공",
103-
content = @Content(schema = @Schema(implementation = MonthlySchedulesResponse.class))),
103+
content = @Content(schema = @Schema(implementation = MonthlySchedulesListResponse.class))),
104104
@ApiResponse(responseCode = "400", description = "잘못된 요청",
105105
content = @Content(examples = @ExampleObject(value = """
106106
{
@@ -123,14 +123,14 @@ public ResponseEntity<MonthlySchedulesResponse> getFollowingSchedules(
123123
""")))
124124
})
125125
@GetMapping("/artist/{artistId}")
126-
public ResponseEntity<MonthlySchedulesResponse> getSchedulesPerArtist(
126+
public ResponseEntity<MonthlySchedulesListResponse> getSchedulesPerArtist(
127127
@PathVariable Long artistId,
128128
@RequestParam int year,
129129
@RequestParam int month
130130
) {
131131
Long userId = 1L; //TODO: 임시 userId
132132

133-
MonthlySchedulesResponse response = scheduleService.getSchedulesPerArtist(userId, artistId, year, month);
133+
MonthlySchedulesListResponse response = scheduleService.getSchedulesPerArtist(userId, artistId, year, month);
134134
return ResponseEntity.ok(response);
135135
}
136136

@@ -140,7 +140,7 @@ public ResponseEntity<MonthlySchedulesResponse> getSchedulesPerArtist(
140140
)
141141
@ApiResponses({
142142
@ApiResponse(responseCode = "200", description = "조회 성공",
143-
content = @Content(schema = @Schema(implementation = DailySchedulesResponse.class),
143+
content = @Content(schema = @Schema(implementation = DailySchedulesListResponse.class),
144144
examples = @ExampleObject(value = """
145145
{
146146
"dailySchedules": [
@@ -199,13 +199,13 @@ public ResponseEntity<MonthlySchedulesResponse> getSchedulesPerArtist(
199199
""")))
200200
})
201201
@GetMapping("/daily")
202-
public ResponseEntity<DailySchedulesResponse> getDailySchedules(
202+
public ResponseEntity<DailySchedulesListResponse> getDailySchedules(
203203
@RequestParam String date,
204204
@RequestParam(required = false) Optional<Long> artistId
205205
) {
206206
Long userId = 1L; //TODO: 임시 userId
207207

208-
DailySchedulesResponse response = scheduleService.getDailySchedules(userId, date, artistId);
208+
DailySchedulesListResponse response = scheduleService.getDailySchedules(userId, date, artistId);
209209
return ResponseEntity.ok(response);
210210
}
211211

@@ -215,7 +215,7 @@ public ResponseEntity<DailySchedulesResponse> getDailySchedules(
215215
)
216216
@ApiResponses({
217217
@ApiResponse(responseCode = "200", description = "조회 성공",
218-
content = @Content(schema = @Schema(implementation = UpcomingEventsResponse.class),
218+
content = @Content(schema = @Schema(implementation = UpcomingEventsListResponse.class),
219219
examples = @ExampleObject(value = """
220220
{
221221
"upcomingEvents": [
@@ -265,14 +265,14 @@ public ResponseEntity<DailySchedulesResponse> getDailySchedules(
265265
""")))
266266
})
267267
@GetMapping("/upcoming")
268-
public ResponseEntity<UpcomingEventsResponse> getUpcomingSchedules(
268+
public ResponseEntity<UpcomingEventsListResponse> getUpcomingSchedules(
269269
@RequestParam(required = false) Optional<Long> artistId,
270270
@Parameter(description = "가져올 일정 개수 (기본값 10)", example = "5")
271271
@RequestParam(required = false, defaultValue = "10") int limit
272272
){
273273
Long userId = 1L; //TODO: 임시 userId
274274

275-
UpcomingEventsResponse response = scheduleService.getUpcomingEvents(userId, artistId, limit);
275+
UpcomingEventsListResponse response = scheduleService.getUpcomingEvents(userId, artistId, limit);
276276
return ResponseEntity.ok(response);
277277
}
278278
}

src/main/java/back/kalender/domain/schedule/dto/response/DailyScheduleItem.java renamed to src/main/java/back/kalender/domain/schedule/dto/response/DailyScheduleResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.time.LocalDateTime;
77
import java.util.Optional;
88

9-
public record DailyScheduleItem(
9+
public record DailyScheduleResponse(
1010
@Schema(description = "일정 ID", example = "120")
1111
Long scheduleId,
1212

@@ -31,7 +31,7 @@ public record DailyScheduleItem(
3131
@Schema(description = "일정 장소 (선택 사항)", example = "KBS 신관 공개홀")
3232
Optional<String> location
3333
) {
34-
public DailyScheduleItem(
34+
public DailyScheduleResponse(
3535
Long scheduleId,
3636
String artistName,
3737
String title,

src/main/java/back/kalender/domain/schedule/dto/response/DailySchedulesResponse.java renamed to src/main/java/back/kalender/domain/schedule/dto/response/DailySchedulesListResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import java.util.List;
66

7-
public record DailySchedulesResponse(
7+
public record DailySchedulesListResponse(
88
@Schema(description = "해당 날짜의 상세 일정 목록")
9-
List<DailyScheduleItem> dailySchedules
9+
List<DailyScheduleResponse> dailySchedules
1010
) {
1111
}

src/main/java/back/kalender/domain/schedule/dto/response/MonthlyScheduleItem.java renamed to src/main/java/back/kalender/domain/schedule/dto/response/MonthlyScheduleResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import back.kalender.domain.schedule.entity.ScheduleCategory;
44
import io.swagger.v3.oas.annotations.media.Schema;
55

6-
import java.time.LocalDate;
76
import java.time.LocalDateTime;
87
import java.util.Optional;
98

10-
public record MonthlyScheduleItem(
9+
public record MonthlyScheduleResponse(
1110
@Schema(description = "일정 ID", example = "101")
1211
Long scheduleId,
1312

@@ -32,7 +31,7 @@ public record MonthlyScheduleItem(
3231
@Schema(description = "일정 장소 (선택 사항)", example = "고척 스카이돔")
3332
Optional<String> location
3433
) {
35-
public MonthlyScheduleItem(
34+
public MonthlyScheduleResponse(
3635
Long scheduleId,
3736
Long artistId,
3837
String artistName,

src/main/java/back/kalender/domain/schedule/dto/response/MonthlySchedulesResponse.java renamed to src/main/java/back/kalender/domain/schedule/dto/response/MonthlySchedulesListResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import java.util.List;
66

7-
public record MonthlySchedulesResponse(
7+
public record MonthlySchedulesListResponse(
88
@Schema(description = "월별 일정 목록")
9-
List<MonthlyScheduleItem> schedules
9+
List<MonthlyScheduleResponse> schedules
1010
) {
1111
}

src/main/java/back/kalender/domain/schedule/dto/response/UpcomingEventItem.java renamed to src/main/java/back/kalender/domain/schedule/dto/response/UpcomingEventResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.time.LocalDateTime;
77
import java.util.Optional;
88

9-
public record UpcomingEventItem(
9+
public record UpcomingEventResponse(
1010
@Schema(description = "일정 ID", example = "205")
1111
Long scheduleId,
1212

@@ -34,7 +34,7 @@ public record UpcomingEventItem(
3434
@Schema(description = "일정 장소 (선택 사항)", example = "코엑스 라이브플라자")
3535
Optional<String> location
3636
) {
37-
public UpcomingEventItem(
37+
public UpcomingEventResponse(
3838
Long scheduleId,
3939
String artistName,
4040
String title,

src/main/java/back/kalender/domain/schedule/dto/response/UpcomingEventsResponse.java renamed to src/main/java/back/kalender/domain/schedule/dto/response/UpcomingEventsListResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import java.util.List;
66

7-
public record UpcomingEventsResponse(
7+
public record UpcomingEventsListResponse(
88
@Schema(description = "다가오는 이벤트 목록 (시간순 정렬)")
9-
List<UpcomingEventItem> upcomingEvents
9+
List<UpcomingEventResponse> upcomingEvents
1010
) {
1111
}

src/main/java/back/kalender/domain/schedule/repository/ScheduleRepository.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package back.kalender.domain.schedule.repository;
22

3-
import back.kalender.domain.schedule.dto.response.DailyScheduleItem;
4-
import back.kalender.domain.schedule.dto.response.MonthlyScheduleItem;
5-
import back.kalender.domain.schedule.dto.response.UpcomingEventItem;
3+
import back.kalender.domain.schedule.dto.response.DailyScheduleResponse;
4+
import back.kalender.domain.schedule.dto.response.MonthlyScheduleResponse;
5+
import back.kalender.domain.schedule.dto.response.UpcomingEventResponse;
66
import back.kalender.domain.schedule.entity.Schedule;
77
import org.springframework.data.domain.Pageable;
88
import org.springframework.data.jpa.repository.JpaRepository;
@@ -14,7 +14,7 @@
1414

1515
public interface ScheduleRepository extends JpaRepository<Schedule, Long> {
1616
@Query("""
17-
SELECT new back.kalender.domain.schedule.dto.response.MonthlyScheduleItem(
17+
SELECT new back.kalender.domain.schedule.dto.response.MonthlyScheduleResponse(
1818
s.id,
1919
s.artistId,
2020
a.name,
@@ -30,14 +30,14 @@ public interface ScheduleRepository extends JpaRepository<Schedule, Long> {
3030
AND s.scheduleTime BETWEEN :startDateTime AND :endDateTime
3131
ORDER BY s.scheduleTime ASC
3232
""")
33-
List<MonthlyScheduleItem> findMonthlySchedules(
33+
List<MonthlyScheduleResponse> findMonthlySchedules(
3434
@Param("artistIds") List<Long> artistIds,
3535
@Param("startDateTime") LocalDateTime startDateTime,
3636
@Param("endDateTime") LocalDateTime endDateTime
3737
);
3838

3939
@Query("""
40-
SELECT new back.kalender.domain.schedule.dto.response.DailyScheduleItem(
40+
SELECT new back.kalender.domain.schedule.dto.response.DailyScheduleResponse(
4141
s.id,
4242
a.name,
4343
s.title,
@@ -53,14 +53,14 @@ List<MonthlyScheduleItem> findMonthlySchedules(
5353
AND s.scheduleTime BETWEEN :startOfDay AND :endOfDay
5454
ORDER BY s.scheduleTime ASC
5555
""")
56-
List<DailyScheduleItem> findDailySchedules(
56+
List<DailyScheduleResponse> findDailySchedules(
5757
@Param("artistIds") List<Long> artistIds,
5858
@Param("startOfDay") LocalDateTime startOfDay,
5959
@Param("endOfDay") LocalDateTime endOfDay
6060
);
6161

6262
@Query("""
63-
SELECT new back.kalender.domain.schedule.dto.response.UpcomingEventItem(
63+
SELECT new back.kalender.domain.schedule.dto.response.UpcomingEventResponse(
6464
s.id,
6565
a.name,
6666
s.title,
@@ -77,7 +77,7 @@ List<DailyScheduleItem> findDailySchedules(
7777
AND s.scheduleTime >= :now
7878
ORDER BY s.scheduleTime ASC
7979
""")
80-
List<UpcomingEventItem> findUpcomingEvents(
80+
List<UpcomingEventResponse> findUpcomingEvents(
8181
@Param("artistIds") List<Long> artistIds,
8282
@Param("now") LocalDateTime now,
8383
Pageable pageable
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package back.kalender.domain.schedule.service;
22

3-
import back.kalender.domain.schedule.dto.response.DailySchedulesResponse;
4-
import back.kalender.domain.schedule.dto.response.MonthlySchedulesResponse;
5-
import back.kalender.domain.schedule.dto.response.UpcomingEventsResponse;
3+
import back.kalender.domain.schedule.dto.response.DailySchedulesListResponse;
4+
import back.kalender.domain.schedule.dto.response.MonthlySchedulesListResponse;
5+
import back.kalender.domain.schedule.dto.response.UpcomingEventsListResponse;
66

77
import java.util.Optional;
88

99
public interface ScheduleService {
10-
MonthlySchedulesResponse getFollowingSchedules(Long userId, int year, int month);
10+
MonthlySchedulesListResponse getFollowingSchedules(Long userId, int year, int month);
1111

12-
MonthlySchedulesResponse getSchedulesPerArtist(Long userId, Long artistId, int year, int month);
12+
MonthlySchedulesListResponse getSchedulesPerArtist(Long userId, Long artistId, int year, int month);
1313

14-
DailySchedulesResponse getDailySchedules(Long userId, String date, Optional<Long> artistId);
14+
DailySchedulesListResponse getDailySchedules(Long userId, String date, Optional<Long> artistId);
1515

16-
UpcomingEventsResponse getUpcomingEvents(Long userId, Optional<Long> artistId, int limit);
16+
UpcomingEventsListResponse getUpcomingEvents(Long userId, Optional<Long> artistId, int limit);
1717
}

0 commit comments

Comments
 (0)