Skip to content

Commit

Permalink
Merge pull request #56 from Project-Catcher/fix-hs-delete-comment
Browse files Browse the repository at this point in the history
fix : 주석 제거 및 컨트롤러 리퀘스트 매핑 변경
  • Loading branch information
toad0403 authored Dec 23, 2023
2 parents 26c7094 + 13708eb commit 13e6665
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ public static class ScheduleDTO {
private final String thumbnailUrl;
private final Long viewCount;
private final Long budget;
//private final int participantCount;
private final Location location;
private final LocalDateTime startAt;
private final LocalDateTime endAt;
private final LocalDateTime participantStartAt;
private final LocalDateTime participantEndAt;
//private final List<Tag> scheduleTags;

public ScheduleDTO(Schedule schedule) {
this.id = schedule.getId();
Expand All @@ -40,14 +38,11 @@ public ScheduleDTO(Schedule schedule) {
this.thumbnailUrl = schedule.getThumbnailUrl();
this.viewCount = schedule.getViewCount();
this.budget = schedule.getBudget();
//this.participantCount = schedule.getScheduleParticipants().size();
this.location = schedule.getLocation();
this.startAt = schedule.getStartAt();
this.endAt = schedule.getEndAt();
this.participantStartAt = schedule.getParticipateStartAt();
this.participantEndAt = schedule.getParticipateEndAt();
//this.scheduleTags = schedule.getScheduleTags().stream().map(ScheduleTag::getTag).collect(Collectors.toList());

}
}
}
5 changes: 3 additions & 2 deletions src/main/java/com/catcher/resource/ScheduleController.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ public CommonResponse<Object> deleteDraftSchedule(
scheduleService.deleteDraftSchedule(user.getId(), scheduleId);
return CommonResponse.success();
}


@Operation(summary = "일정 메인 조회")
@GetMapping("/list")
public CommonResponse<ScheduleListResponse> getScheduleList(
ScheduleListRequest scheduleListRequest
Expand Down Expand Up @@ -154,7 +155,7 @@ public CommonResponse<Object> deleteScheduleDetail(
}

@Operation(summary = "일정 참여 신청")
@GetMapping("/{scheduleId}")
@PostMapping("/{scheduleId}")
@AuthorizationRequired(value = UserRole.USER)
public CommonResponse<Object> participateSchedule (
@CurrentUser User user,
Expand Down

0 comments on commit 13e6665

Please sign in to comment.