✨ [Feature] 개인일정 수정 api #1057

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/PrivateScheduleController.java

@@ -4,14 +4,18 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import gg.auth.UserDto;
 import gg.auth.argumentresolver.Login;
 import gg.calendar.api.user.schedule.privateschedule.controller.request.PrivateScheduleCreateReqDto;
+import gg.calendar.api.user.schedule.privateschedule.controller.request.PrivateScheduleUpdateReqDto;
+import gg.calendar.api.user.schedule.privateschedule.controller.response.PrivateScheduleUpdateResDto;
 import gg.calendar.api.user.schedule.privateschedule.service.PrivateScheduleService;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
@@ -28,4 +32,14 @@ public ResponseEntity<Void> privateScheduleCreate(@Login @Parameter(hidden = tru
 		privateScheduleService.createPrivateSchedule(userDto, privateScheduleCreateReqDto);
 		return ResponseEntity.status(HttpStatus.CREATED).build();
 	}
+
+	@PutMapping("/{id}")
+	public ResponseEntity<PrivateScheduleUpdateResDto> privateScheduleUpdate(
+		@Login @Parameter(hidden = true) UserDto userDto,
+		@Valid @RequestBody PrivateScheduleUpdateReqDto privateScheduleUpdateReqDto,
+		@PathVariable Long id) {
+		PrivateScheduleUpdateResDto privateScheduleUpdateResDto = privateScheduleService.updatePrivateSchedule(userDto,
+			privateScheduleUpdateReqDto, id);
+		return ResponseEntity.status(HttpStatus.OK).body(privateScheduleUpdateResDto);
+	}
 }

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/request/PrivateScheduleCreateReqDto.java

@@ -21,9 +21,6 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class PrivateScheduleCreateReqDto {
 
-	@NotNull
-	private DetailClassification classification;
-
 	private EventTag eventTag;
 
 	private JobTag jobTag;
@@ -39,6 +36,7 @@ public class PrivateScheduleCreateReqDto {
 
 	private String link;
 
+	@NotNull
 	private ScheduleStatus status;
 
 	@NotNull
@@ -54,11 +52,9 @@ public class PrivateScheduleCreateReqDto {
 	private Long groupId;
 
 	@Builder
-	private PrivateScheduleCreateReqDto(DetailClassification classification, EventTag eventTag, JobTag jobTag,
-		TechTag techTag, String title, String content, String link,
-		LocalDateTime startTime, LocalDateTime endTime, boolean alarm, Long groupId,
+	private PrivateScheduleCreateReqDto(EventTag eventTag, JobTag jobTag, TechTag techTag, String title, String content,
+		String link, LocalDateTime startTime, LocalDateTime endTime, boolean alarm, Long groupId,
 		ScheduleStatus status) {
-		this.classification = classification;
 		this.eventTag = eventTag;
 		this.jobTag = jobTag;
 		this.techTag = techTag;
@@ -74,11 +70,12 @@ private PrivateScheduleCreateReqDto(DetailClassification classification, EventTa
 
 	public static PublicSchedule toEntity(String intraId, PrivateScheduleCreateReqDto privateScheduleCreateReqDto) {
 		return PublicSchedule.builder()
-			.classification(privateScheduleCreateReqDto.classification)
+			.classification(DetailClassification.PRIVATE_SCHEDULE)
 			.eventTag(privateScheduleCreateReqDto.eventTag)
 			.jobTag(privateScheduleCreateReqDto.jobTag)
 			.techTag(privateScheduleCreateReqDto.techTag)
-			.author(intraId).title(privateScheduleCreateReqDto.title)
+			.author(intraId)
+			.title(privateScheduleCreateReqDto.title)
 			.content(privateScheduleCreateReqDto.content)
 			.link(privateScheduleCreateReqDto.link)
 			.startTime(privateScheduleCreateReqDto.startTime)

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/request/PrivateScheduleUpdateReqDto.java

@@ -1,10 +1,66 @@
 package gg.calendar.api.user.schedule.privateschedule.controller.request;
 
+import java.time.LocalDateTime;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import gg.data.calendar.type.EventTag;
+import gg.data.calendar.type.JobTag;
+import gg.data.calendar.type.ScheduleStatus;
+import gg.data.calendar.type.TechTag;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor
 public class PrivateScheduleUpdateReqDto {
+	private EventTag eventTag;
+
+	private JobTag jobTag;
+
+	private TechTag techTag;
+
+	@NotBlank
+	@Size(max = 50)
+	private String title;
+
+	@Size(max = 2000)
+	private String content;
+
+	private String link;
+
+	@NotNull
+	private ScheduleStatus status;
+
+	@NotNull
+	private LocalDateTime startTime;
+
+	@NotNull
+	private LocalDateTime endTime;
+
+	@NotNull
+	private boolean alarm;
+
+	@NotNull
+	private Long groupId;
 
+	@Builder
+	public PrivateScheduleUpdateReqDto(EventTag eventTag, JobTag jobTag, TechTag techTag, String title, String content,
+		String link, ScheduleStatus status, LocalDateTime startTime, LocalDateTime endTime, boolean alarm,
+		Long groupId) {
+		this.eventTag = eventTag;
+		this.jobTag = jobTag;
+		this.techTag = techTag;
+		this.title = title;
+		this.content = content;
+		this.link = link;
+		this.status = status;
+		this.startTime = startTime;
+		this.endTime = endTime;
+		this.alarm = alarm;
+		this.groupId = groupId;
+	}
 }

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/controller/response/PrivateScheduleUpdateResDto.java

@@ -1,11 +1,85 @@
 package gg.calendar.api.user.schedule.privateschedule.controller.response;
 
+import java.time.LocalDateTime;
+
+import gg.data.calendar.PrivateSchedule;
+import gg.data.calendar.type.DetailClassification;
+import gg.data.calendar.type.EventTag;
+import gg.data.calendar.type.JobTag;
+import gg.data.calendar.type.ScheduleStatus;
+import gg.data.calendar.type.TechTag;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class PrivateScheduleUpdateResDto {
+	private Long id;
+
+	private DetailClassification classification;
+
+	private EventTag eventTag;
+
+	private JobTag jobTag;
+
+	private TechTag techTag;
+
+	private String author;
+
+	private String title;
+
+	private String content;
+
+	private String link;
+
+	private ScheduleStatus status;
+
+	private LocalDateTime startTime;
+
+	private LocalDateTime endTime;
+
+	private boolean alarm;
+
+	private Long groupId;
+
+	@Builder
+	private PrivateScheduleUpdateResDto(Long id, DetailClassification classification, EventTag eventTag, JobTag jobTag,
+		TechTag techTag, String author, String title, String content, String link, ScheduleStatus status,
+		LocalDateTime startTime, LocalDateTime endTime, boolean alarm, Long groupId) {
+		this.id = id;
+		this.classification = classification;
+		this.eventTag = eventTag;
+		this.jobTag = jobTag;
+		this.techTag = techTag;
+		this.author = author;
+		this.title = title;
+		this.content = content;
+		this.link = link;
+		this.status = status;
+		this.startTime = startTime;
+		this.endTime = endTime;
+		this.alarm = alarm;
+		this.groupId = groupId;
+	}
 
+	public static PrivateScheduleUpdateResDto toDto(PrivateSchedule privateSchedule) {
+		return PrivateScheduleUpdateResDto.builder()
+			.id(privateSchedule.getId())
+			.classification(privateSchedule.getPublicSchedule().getClassification())
+			.eventTag(privateSchedule.getPublicSchedule().getEventTag())
+			.jobTag(privateSchedule.getPublicSchedule().getJobTag())
+			.techTag(privateSchedule.getPublicSchedule().getTechTag())
+			.author(privateSchedule.getPublicSchedule().getAuthor())
+			.title(privateSchedule.getPublicSchedule().getTitle())
+			.content(privateSchedule.getPublicSchedule().getContent())
+			.link(privateSchedule.getPublicSchedule().getLink())
+			.status(privateSchedule.getStatus())
+			.startTime(privateSchedule.getPublicSchedule().getStartTime())
+			.endTime(privateSchedule.getPublicSchedule().getEndTime())
+			.alarm(privateSchedule.isAlarm())
+			.groupId(privateSchedule.getGroupId())
+			.build();
+	}
 }

gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/privateschedule/service/PrivateScheduleService.java

@@ -7,6 +7,8 @@
 
 import gg.auth.UserDto;
 import gg.calendar.api.user.schedule.privateschedule.controller.request.PrivateScheduleCreateReqDto;
+import gg.calendar.api.user.schedule.privateschedule.controller.request.PrivateScheduleUpdateReqDto;
+import gg.calendar.api.user.schedule.privateschedule.controller.response.PrivateScheduleUpdateResDto;
 import gg.data.calendar.PrivateSchedule;
 import gg.data.calendar.PublicSchedule;
 import gg.data.calendar.ScheduleGroup;
@@ -16,6 +18,7 @@
 import gg.repo.calendar.ScheduleGroupRepository;
 import gg.repo.user.UserRepository;
 import gg.utils.exception.ErrorCode;
+import gg.utils.exception.custom.ForbiddenException;
 import gg.utils.exception.custom.InvalidParameterException;
 import gg.utils.exception.custom.NotExistException;
 import lombok.RequiredArgsConstructor;
@@ -43,9 +46,34 @@ public void createPrivateSchedule(UserDto userDto, PrivateScheduleCreateReqDto p
 		privateScheduleRepository.save(privateSchedule);
 	}
 
+	@Transactional
+	public PrivateScheduleUpdateResDto updatePrivateSchedule(UserDto userDto,
+		PrivateScheduleUpdateReqDto privateScheduleUpdateReqDto, Long privateScheduleId) {
+		validateTimeRange(privateScheduleUpdateReqDto.getStartTime(), privateScheduleUpdateReqDto.getEndTime());
+		PrivateSchedule privateSchedule = privateScheduleRepository.findById(privateScheduleId)
+			.orElseThrow(() -> new NotExistException(ErrorCode.PRIVATE_SCHEDULE_NOT_FOUND));
+		validateAuthor(userDto.getIntraId(), privateSchedule.getPublicSchedule().getAuthor());
+		scheduleGroupRepository.findById(privateScheduleUpdateReqDto.getGroupId())
+			.orElseThrow(() -> new NotExistException(ErrorCode.SCHEDULE_GROUP_NOT_FOUND));
+
+		privateSchedule.update(privateScheduleUpdateReqDto.getEventTag(), privateScheduleUpdateReqDto.getJobTag(),
+			privateScheduleUpdateReqDto.getTechTag(), privateScheduleUpdateReqDto.getTitle(),
+			privateScheduleUpdateReqDto.getContent(), privateScheduleUpdateReqDto.getLink(),
+			privateScheduleUpdateReqDto.getStatus(), privateScheduleUpdateReqDto.getStartTime(),
+			privateScheduleUpdateReqDto.getEndTime(), privateScheduleUpdateReqDto.isAlarm(),
+			privateScheduleUpdateReqDto.getGroupId());
+		return PrivateScheduleUpdateResDto.toDto(privateSchedule);
+	}
+
 	public void validateTimeRange(LocalDateTime startTime, LocalDateTime endTime) {
 		if (endTime.isBefore(startTime)) {
 			throw new InvalidParameterException(ErrorCode.CALENDAR_BEFORE_DATE);
 		}
 	}
+
+	public void validateAuthor(String intraId, String author) {
+		if (!intraId.equals(author)) {
+			throw new ForbiddenException(ErrorCode.CALENDAR_AUTHOR_NOT_MATCH);
+		}
+	}
 }

gg-calendar-api/src/test/java/gg/calendar/api/user/schedule/privateschedule/PrivateScheduleMockData.java

@@ -4,11 +4,13 @@
 
 import org.springframework.stereotype.Component;
 
+import gg.data.calendar.PrivateSchedule;
 import gg.data.calendar.PublicSchedule;
 import gg.data.calendar.ScheduleGroup;
 import gg.data.calendar.type.DetailClassification;
 import gg.data.calendar.type.ScheduleStatus;
 import gg.data.user.User;
+import gg.repo.calendar.PrivateScheduleRepository;
 import gg.repo.calendar.PublicScheduleRepository;
 import gg.repo.calendar.ScheduleGroupRepository;
 import lombok.RequiredArgsConstructor;
@@ -18,15 +20,16 @@
 public class PrivateScheduleMockData {
 	private final PublicScheduleRepository publicScheduleRepository;
 	private final ScheduleGroupRepository scheduleGroupRepository;
+	private final PrivateScheduleRepository privateScheduleRepository;
 
-	public PublicSchedule createPublicSchedule() {
+	public PublicSchedule createPublicSchedule(String author) {
 		PublicSchedule publicSchedule = PublicSchedule.builder()
 			.classification(DetailClassification.EVENT)
 			.eventTag(null)
 			.jobTag(null)
 			.techTag(null)
 			.title("Test Schedule")
-			.author("author")
+			.author(author)
 			.content("Test Content")
 			.link("http://test.com")
 			.status(ScheduleStatus.ACTIVATE)
@@ -44,4 +47,10 @@ public ScheduleGroup createScheduleGroup(User user) {
 			.build();
 		return scheduleGroupRepository.save(scheduleGroup);
 	}
+
+	public PrivateSchedule createPrivateSchedule(PublicSchedule publicSchedule, ScheduleGroup scheduleGroup) {
+		PrivateSchedule privateSchedule = new PrivateSchedule(scheduleGroup.getUser(), publicSchedule, false,
+			scheduleGroup.getId());
+		return privateScheduleRepository.save(privateSchedule);
+	}
 }