From d9eb1429e26fa2db245cf4278527c38ddc2fecad Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Wed, 22 Jan 2025 20:49:30 +0900 Subject: [PATCH 01/11] =?UTF-8?q?docs:=20=ED=88=AC=EB=91=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/recruitment/domain/RecruitmentRoundValidator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RecruitmentRoundValidator.java b/src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RecruitmentRoundValidator.java index fcaa0d6a1..00005a2a6 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RecruitmentRoundValidator.java +++ b/src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RecruitmentRoundValidator.java @@ -61,6 +61,7 @@ private void validateDateTimeWithinTwoWeeks(LocalDateTime dateTime, LocalDateTim private void validatePeriodOverlap( List recruitmentRounds, LocalDateTime startDate, LocalDateTime endDate) { + // TODO: recruitmentRound.getPeriod().validatePeriodOverlap(startDate, endDate)로 변경 recruitmentRounds.forEach(recruitmentRound -> recruitmentRound.validatePeriodOverlap(startDate, endDate)); } From 19ff1f599b48de432430d20a188427d76d28cb14 Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Wed, 22 Jan 2025 20:50:11 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=ED=95=99=EA=B8=B0=20VO=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdsc/domain/common/vo/Semester.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/com/gdschongik/gdsc/domain/common/vo/Semester.java diff --git a/src/main/java/com/gdschongik/gdsc/domain/common/vo/Semester.java b/src/main/java/com/gdschongik/gdsc/domain/common/vo/Semester.java new file mode 100644 index 000000000..b00ed60c6 --- /dev/null +++ b/src/main/java/com/gdschongik/gdsc/domain/common/vo/Semester.java @@ -0,0 +1,22 @@ +package com.gdschongik.gdsc.domain.common.vo; + +import com.gdschongik.gdsc.domain.common.model.SemesterType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.AccessLevel; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Embeddable +@EqualsAndHashCode +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Semester { + + private Integer academicYear; + + @Enumerated(EnumType.STRING) + private SemesterType semesterType; +} From 16866bc05dda28ca6883ec1137f74c9343551636 Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 20:31:12 +0900 Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=EC=8A=A4=ED=84=B0=EB=94=94=20V2?= =?UTF-8?q?=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdsc/domain/studyv2/domain/StudyV2.java | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java new file mode 100644 index 000000000..e3284e6d8 --- /dev/null +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -0,0 +1,135 @@ +package com.gdschongik.gdsc.domain.studyv2.domain; + +import com.gdschongik.gdsc.domain.common.model.BaseEntity; +import com.gdschongik.gdsc.domain.common.vo.Period; +import com.gdschongik.gdsc.domain.common.vo.Semester; +import com.gdschongik.gdsc.domain.member.domain.Member; +import com.gdschongik.gdsc.domain.study.domain.StudyType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.time.DayOfWeek; +import java.time.LocalTime; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +/** + * 스터디 애그리거트 루트 엔티티입니다. + * [메타] 태그가 있는 필드는 수강 신청 시 참고용으로만 사용되며, 스터디회차 엔티티 내부 상태 검증에 사용되지 않습니다. + * 혼동이 예상되는 경우 코멘트에 해당 태그가 명시되어 있습니다. + * 그 외 필드의 경우 스터디 애그리거트 내부 상태 검증에 사용될 수 있습니다. (ex: 총 회차 수) + */ +@Getter +@Entity +@Table(name = "study_v2") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class StudyV2 extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "study_v2_id") + private Long id; + + private StudyType type; + + @Comment("스터디 이름") + private String title; + + @Comment("스터디 소개") + private String description; + + @Comment("스터디 소개 노션 링크") + @Column(columnDefinition = "TEXT") + private String descriptionNotionLink; + + @Enumerated(EnumType.STRING) + private Semester semester; + + @Comment("총 회차 수") + private Integer totalWeek; + + @Comment("[메타] 스터디 요일") + @Enumerated(EnumType.STRING) + private DayOfWeek dayOfWeek; + + @Comment("[메타] 스터디 시작 시간") + private LocalTime startTime; + + @Comment("[메타] 스터디 종료 시간") + private LocalTime endTime; + + @Embedded + @AttributeOverride(name = "startDate", column = @Column(name = "application_start_date")) + @AttributeOverride(name = "endDate", column = @Column(name = "application_end_date")) + private Period applicationPeriod; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member mentor; + + @Builder(access = AccessLevel.PRIVATE) + private StudyV2( + StudyType type, + String title, + String description, + String descriptionNotionLink, + Semester semester, + Integer totalWeek, + DayOfWeek dayOfWeek, + LocalTime startTime, + LocalTime endTime, + Period applicationPeriod, + Member mentor) { + this.type = type; + this.title = title; + this.description = description; + this.descriptionNotionLink = descriptionNotionLink; + this.semester = semester; + this.totalWeek = totalWeek; + this.dayOfWeek = dayOfWeek; + this.startTime = startTime; + this.endTime = endTime; + this.applicationPeriod = applicationPeriod; + this.mentor = mentor; + } + + public static StudyV2 create( + StudyType type, + String title, + String description, + String descriptionNotionLink, + Semester semester, + Integer totalWeek, + DayOfWeek dayOfWeek, + LocalTime startTime, + LocalTime endTime, + Period applicationPeriod, + Member mentor) { + return StudyV2.builder() + .type(type) + .title(title) + .description(description) + .descriptionNotionLink(descriptionNotionLink) + .semester(semester) + .totalWeek(totalWeek) + .dayOfWeek(dayOfWeek) + .startTime(startTime) + .endTime(endTime) + .applicationPeriod(applicationPeriod) + .mentor(mentor) + .build(); + } +} From 3584563d02c736769b93d456ee9fef9f14a677f1 Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 20:53:31 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=EB=94=94=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EA=B4=80=EB=A0=A8=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdsc/domain/studyv2/domain/StudyV2.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java index e3284e6d8..50a491ef6 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -76,6 +76,12 @@ public class StudyV2 extends BaseEntity { @AttributeOverride(name = "endDate", column = @Column(name = "application_end_date")) private Period applicationPeriod; + @Comment("디스코드 채널 ID") + private String discordChannelId; + + @Comment("디스코드 역할 ID") + private String discordRoleId; + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "member_id") private Member mentor; @@ -92,6 +98,8 @@ private StudyV2( LocalTime startTime, LocalTime endTime, Period applicationPeriod, + String discordChannelId, + String discordRoleId, Member mentor) { this.type = type; this.title = title; @@ -103,6 +111,8 @@ private StudyV2( this.startTime = startTime; this.endTime = endTime; this.applicationPeriod = applicationPeriod; + this.discordChannelId = discordChannelId; + this.discordRoleId = discordRoleId; this.mentor = mentor; } @@ -117,6 +127,8 @@ public static StudyV2 create( LocalTime startTime, LocalTime endTime, Period applicationPeriod, + String discordChannelId, + String discordRoleId, Member mentor) { return StudyV2.builder() .type(type) @@ -129,6 +141,8 @@ public static StudyV2 create( .startTime(startTime) .endTime(endTime) .applicationPeriod(applicationPeriod) + .discordChannelId(discordChannelId) + .discordRoleId(discordRoleId) .mentor(mentor) .build(); } From 40b4076adb1c6747a7c9213bd430571a2a54f40d Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:12:21 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=EC=8A=A4=ED=84=B0=EB=94=94?= =?UTF-8?q?=ED=9A=8C=EC=B0=A8=20=EC=BB=AC=EB=A0=89=EC=85=98=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java index 50a491ef6..efe9d185f 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -17,9 +17,12 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import java.time.DayOfWeek; import java.time.LocalTime; +import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -86,6 +89,9 @@ public class StudyV2 extends BaseEntity { @JoinColumn(name = "member_id") private Member mentor; + @OneToMany(mappedBy = "studyV2") + private List studySessions = new ArrayList<>(); + @Builder(access = AccessLevel.PRIVATE) private StudyV2( StudyType type, From 0022119ad79df780b67de19c1be70f0dc647b87d Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:12:26 +0900 Subject: [PATCH 06/11] =?UTF-8?q?feat:=20=EC=8A=A4=ED=84=B0=EB=94=94?= =?UTF-8?q?=ED=9A=8C=EC=B0=A8=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/studyv2/domain/StudySessionV2.java | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java new file mode 100644 index 000000000..a3f7f5ca4 --- /dev/null +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java @@ -0,0 +1,108 @@ +package com.gdschongik.gdsc.domain.studyv2.domain; + +import com.gdschongik.gdsc.domain.common.model.BaseEntity; +import com.gdschongik.gdsc.domain.common.vo.Period; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.hibernate.annotations.Comment; + +@Getter +@Entity +@Table(name = "study_session_v2") +@RequiredArgsConstructor(access = AccessLevel.PROTECTED) +public class StudySessionV2 extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "study_session_v2_id") + private Long id; + + @Comment("회차 제목") + private String title; + + @Comment("회차 설명") + private String description; + + // 수업 관련 필드 + + @Comment("수업 출석 번호") + private Integer lessonAttendanceNumber; + + @Embedded + @AttributeOverride(name = "startDate", column = @Column(name = "lesson_start_at")) + @AttributeOverride(name = "endDate", column = @Column(name = "lesson_end_at")) + private Period lessonPeriod; + + // 과제 관련 필드 + + @Comment("과제 명세 링크") + private String assignmentDescriptionLink; + + @Embedded + @AttributeOverride(name = "startDate", column = @Column(name = "assignment_start_at")) + @AttributeOverride(name = "endDate", column = @Column(name = "assignment_end_at")) + private Period assignmentPeriod; + + // 참조 필드 + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "study_v2_id") + private StudyV2 studyV2; + + /** + * 모든 스터디회차는 인자로 전달되는 스터디 애그리거트 루트 엔티티에 종속됩니다. + * 따라서 스터디회차 생성 팩토리 메서드 생성 시 자기 자신을 반환하지 않고, + * 스터디 애그리거트 루트 엔티티의 스터디회차 컬렉션에 자기 자신을 추가하는 식으로 생성합니다. + * 부모 클래스에서 위 로직을 수행하기 때문에, 생성 팩토리 메서드는 void 타입을 반환해야 합니다. + */ + @Builder(access = AccessLevel.PRIVATE) + private StudySessionV2( + String title, + String description, + Integer lessonAttendanceNumber, + Period lessonPeriod, + String assignmentDescriptionLink, + Period assignmentPeriod, + StudyV2 studyV2) { + this.title = title; + this.description = description; + this.lessonAttendanceNumber = lessonAttendanceNumber; + this.lessonPeriod = lessonPeriod; + this.assignmentDescriptionLink = assignmentDescriptionLink; + this.assignmentPeriod = assignmentPeriod; + this.studyV2 = studyV2; + studyV2.getStudySessions().add(this); + } + + public void create( + String title, + String description, + Integer lessonAttendanceNumber, + Period lessonPeriod, + String assignmentDescriptionLink, + Period assignmentPeriod, + StudyV2 studyV2) { + StudySessionV2.builder() + .title(title) + .description(description) + .lessonAttendanceNumber(lessonAttendanceNumber) + .lessonPeriod(lessonPeriod) + .assignmentDescriptionLink(assignmentDescriptionLink) + .assignmentPeriod(assignmentPeriod) + .studyV2(studyV2) + .build(); + } +} From 07236688d15f0a03a2bad1c01fc3052b1a37bdfe Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:22:28 +0900 Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=EC=98=81=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=A0=84=EC=9D=B4=20=EB=B0=8F=20=EA=B3=A0=EC=95=84=EA=B0=9D?= =?UTF-8?q?=EC=B2=B4=20=EC=A0=9C=EA=B1=B0=20=EC=98=B5=EC=85=98=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java index efe9d185f..9051c69a2 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -6,6 +6,7 @@ import com.gdschongik.gdsc.domain.member.domain.Member; import com.gdschongik.gdsc.domain.study.domain.StudyType; import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; @@ -89,7 +90,7 @@ public class StudyV2 extends BaseEntity { @JoinColumn(name = "member_id") private Member mentor; - @OneToMany(mappedBy = "studyV2") + @OneToMany(mappedBy = "studyV2", cascade = CascadeType.ALL, orphanRemoval = true) private List studySessions = new ArrayList<>(); @Builder(access = AccessLevel.PRIVATE) From 2a32eda87e278bd6e38b89ebe59cf59f28ad079c Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:29:39 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20`@Embedded`=20=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java index 9051c69a2..6843203ce 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -59,7 +59,7 @@ public class StudyV2 extends BaseEntity { @Column(columnDefinition = "TEXT") private String descriptionNotionLink; - @Enumerated(EnumType.STRING) + @Embedded private Semester semester; @Comment("총 회차 수") From db5f993e469804b7b075a111805bbd32a12ca6f3 Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:30:29 +0900 Subject: [PATCH 09/11] =?UTF-8?q?refactor:=20totalRound=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java index 6843203ce..fcc10dd34 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -63,7 +63,7 @@ public class StudyV2 extends BaseEntity { private Semester semester; @Comment("총 회차 수") - private Integer totalWeek; + private Integer totalRound; @Comment("[메타] 스터디 요일") @Enumerated(EnumType.STRING) @@ -100,7 +100,7 @@ private StudyV2( String description, String descriptionNotionLink, Semester semester, - Integer totalWeek, + Integer totalRound, DayOfWeek dayOfWeek, LocalTime startTime, LocalTime endTime, @@ -113,7 +113,7 @@ private StudyV2( this.description = description; this.descriptionNotionLink = descriptionNotionLink; this.semester = semester; - this.totalWeek = totalWeek; + this.totalRound = totalRound; this.dayOfWeek = dayOfWeek; this.startTime = startTime; this.endTime = endTime; From 8c2f0106daaac2d3445631461224ddb6be39051b Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:32:43 +0900 Subject: [PATCH 10/11] =?UTF-8?q?fix:=20totalRound=20=EB=AF=B8=EB=B0=98?= =?UTF-8?q?=EC=98=81=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java index fcc10dd34..370a31840 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudyV2.java @@ -129,7 +129,7 @@ public static StudyV2 create( String description, String descriptionNotionLink, Semester semester, - Integer totalWeek, + Integer totalRound, DayOfWeek dayOfWeek, LocalTime startTime, LocalTime endTime, @@ -143,7 +143,7 @@ public static StudyV2 create( .description(description) .descriptionNotionLink(descriptionNotionLink) .semester(semester) - .totalWeek(totalWeek) + .totalRound(totalRound) .dayOfWeek(dayOfWeek) .startTime(startTime) .endTime(endTime) From 2d47f1c069654d5888c16b331812ad668879b548 Mon Sep 17 00:00:00 2001 From: Jaehyun Ahn Date: Tue, 28 Jan 2025 21:40:16 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20static=20=ED=82=A4=EC=9B=8C?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java index a3f7f5ca4..73f35759a 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java +++ b/src/main/java/com/gdschongik/gdsc/domain/studyv2/domain/StudySessionV2.java @@ -87,7 +87,7 @@ private StudySessionV2( studyV2.getStudySessions().add(this); } - public void create( + public static void create( String title, String description, Integer lessonAttendanceNumber,