Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.dongsoop.dongsoop.calendar.entity.MemberSchedule;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -27,12 +28,16 @@ public class CreateMemberScheduleRequest {
@NotNull
private LocalDateTime endAt;

@Pattern(regexp = "^[A-Fa-f0-9]{6}$", message = "색상은 # 없이 6자리 HEX 형식이어야 합니다 (예: FFFFFF)")
private String color;

public MemberSchedule toEntity() {
return MemberSchedule.builder()
.title(title)
.location(location)
.startAt(startAt)
.endAt(endAt)
.color(color)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dongsoop.dongsoop.calendar.dto;

import jakarta.validation.constraints.Pattern;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -20,4 +21,7 @@ public class MemberScheduleUpdateRequest {
private LocalDateTime startAt;

private LocalDateTime endAt;

@Pattern(regexp = "^[A-Fa-f0-9]{6}$", message = "색상은 # 없이 6자리 HEX 형식이어야 합니다 (예: FFFFFF)")
private String color;
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ public class ScheduleDetails {
private LocalDateTime endAt;

private ScheduleType type;

private String color;
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public class MemberSchedule extends BaseEntity {
@Column(name = "end_at", nullable = false)
private LocalDateTime endAt;

@Column(name = "color", length = 6)
private String color;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id", nullable = false)
@Getter
Expand All @@ -72,6 +75,7 @@ public ScheduleDetails toDetails() {
.startAt(startAt)
.endAt(endAt)
.type(ScheduleType.MEMBER)
.color(color)
.build();
}

Expand All @@ -91,5 +95,9 @@ public void update(MemberScheduleUpdateRequest request) {
if (request.getEndAt() != null) {
this.endAt = request.getEndAt();
}

if (request.getColor() != null) {
this.color = request.getColor();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ void setUp() {

// 회원 일정 추가
MemberSchedule memberSchedule1 = new MemberSchedule(null, "title", "content", LocalDateTime.now(),
LocalDateTime.now(), member1);
LocalDateTime.now(), null, member1);
MemberSchedule memberSchedule2 = new MemberSchedule(null, "title", "content", LocalDateTime.now(),
LocalDateTime.now(), member2);
LocalDateTime.now(), null, member2);
MemberSchedule memberSchedule3 = new MemberSchedule(null, "title", "content", LocalDateTime.now(),
LocalDateTime.now(), member3);
LocalDateTime.now(), null, member3);

memberScheduleRepository.saveAll(List.of(memberSchedule1, memberSchedule2, memberSchedule3));

Expand Down
Loading