refact : 주생성자를 사용하여 부생성자 지정으로 코드중복 제거

Author: jhd7130

Diff for: src/main/java/nextstep/courses/BaseTime.java

@@ -7,15 +7,14 @@ public class BaseTime {
   private final LocalDateTime createdAt;
   private final LocalDateTime updatedAt;
 
-  public BaseTime() {
-    this.createdAt = LocalDateTime.now();
-    this.updatedAt = null;
-  }
   public BaseTime(LocalDateTime createdAt, LocalDateTime updatedAt) {
     this.createdAt = createdAt;
     this.updatedAt = updatedAt;
   }
 
+  public BaseTime() {
+    this(LocalDateTime.now(), null);
+  }
 
   public LocalDateTime getCreatedAt() {
     return createdAt;

Diff for: src/main/java/nextstep/courses/domain/coverimage/CoverImage.java

@@ -11,15 +11,6 @@ public class CoverImage extends BaseTime {
   private final ImageFileSize imageFileSize;
   private final ImageSize imageSize;
 
-  private CoverImage(String name, CoverImageType coverImageType, ImageFileSize size, ImageSize imageSize) {
-    super();
-    this.id = 0L;
-    this.name = name;
-    this.coverImageType = coverImageType;
-    this.imageFileSize = size;
-    this.imageSize = imageSize;
-  }
-
   private CoverImage(Long id, String name, CoverImageType coverImageType, ImageFileSize size, ImageSize imageSize, LocalDateTime createdAt, LocalDateTime updatedAt) {
     super(createdAt, updatedAt);
     this.id = id;
@@ -28,6 +19,10 @@ private CoverImage(Long id, String name, CoverImageType coverImageType, ImageFil
     this.imageFileSize = size;
     this.imageSize = imageSize;
   }
+  private CoverImage(String name, CoverImageType coverImageType, ImageFileSize size, ImageSize imageSize) {
+    this(0L, name, coverImageType, size,imageSize, LocalDateTime.now(), null);
+  }
+
 
   public static CoverImage defaultOf(String fileName, long size, long width, long height) {
     String name = fileName(fileName);

Diff for: src/main/java/nextstep/courses/domain/lectures/FreeLecture.java

@@ -18,50 +18,31 @@ public class FreeLecture extends BaseTime implements Lecture {
   private final RegistrationPeriod registrationPeriod;
   private final Students students = Students.defaultOf(); // 강의 기본정보와는 다름
 
+  // primary constructor
   public FreeLecture(Long id, String title, CoverImages coverImages,
-      LectureRecruitingStatus lectureRecruitingStatus,
-      RegistrationPeriod registrationPeriod) {
-    super();
+      LectureRecruitingStatus lectureRecruitingStatus, LectureStatus lectureStatus,
+      RegistrationPeriod registrationPeriod, LocalDateTime createdAt, LocalDateTime updatedAt) {
+    super(createdAt, updatedAt);
     this.id = id;
     this.title = title;
     this.coverImages.addAll(coverImages);
-    this.lectureStatus = LectureStatus.YET;
+    this.lectureStatus = lectureStatus;
     this.lectureRecruitingStatus = lectureRecruitingStatus;
     this.registrationPeriod = registrationPeriod;
   }
 
-  public FreeLecture(Long id, String title, CoverImages coverImages, LectureStatus lectureStatus,
+  public FreeLecture(Long id, String title, CoverImages coverImages,
       LectureRecruitingStatus lectureRecruitingStatus,
       RegistrationPeriod registrationPeriod) {
-    super();
-    this.id = id;
-    this.title = title;
-    this.coverImages.addAll(coverImages);
-    this.lectureStatus = lectureStatus;
-    this.lectureRecruitingStatus = lectureRecruitingStatus;
-    this.registrationPeriod = registrationPeriod;
+    this(id, title, coverImages, lectureRecruitingStatus, LectureStatus.YET, registrationPeriod,
+        LocalDateTime.now(), null);
   }
 
-  public FreeLecture(Long id, String title, CoverImage coverImage, LectureStatus lectureStatus,
+  public FreeLecture(Long id, String title, CoverImages coverImages, LectureStatus lectureStatus,
       LectureRecruitingStatus lectureRecruitingStatus,
-      RegistrationPeriod registrationPeriod, LocalDateTime createdAt, LocalDateTime updatedAt) {
-    super(createdAt, updatedAt);
-    this.id = id;
-    this.title = title;
-    this.coverImages.add(coverImage);
-    this.lectureStatus = lectureStatus;
-    this.lectureRecruitingStatus = lectureRecruitingStatus;
-    this.registrationPeriod = registrationPeriod;
-  }
-
-  public FreeLecture(LectureEntity lecture) {
-    super(lecture.getCreatedAt(), lecture.getUpdatedAt());
-    this.id = lecture.id();
-    this.title = lecture.title();
-    this.coverImages.addAll(lecture.coverImage());
-    this.lectureStatus = lecture.lectureStatus();
-    this.lectureRecruitingStatus = lecture.lectureRecruitingStatus();
-    this.registrationPeriod = lecture.registrationPeriod();
+      RegistrationPeriod registrationPeriod) {
+    this(id, title, coverImages, lectureRecruitingStatus, lectureStatus, registrationPeriod,
+        LocalDateTime.now(), null);
   }
 
   @Override
@@ -87,7 +68,7 @@ public void canEnrollment(NsUser nsUser, Students selectedStudents) {
 
   @Override
   public void enrollment(NsUser nsUser, Students selectedStudents) {
-    this.canEnrollment(nsUser,selectedStudents);
+    this.canEnrollment(nsUser, selectedStudents);
     this.students.add(nsUser);
   }
 

Diff for: src/main/java/nextstep/courses/domain/lectures/PaidLecture.java

@@ -23,14 +23,15 @@ public class PaidLecture extends BaseTime implements Lecture {
   ; // 강의 기본정보와는 다름
 
 
-  public PaidLecture(Long id, String title, CoverImage coverImage,
-      LectureRecruitingStatus lectureRecruitingStatus,
-      RegistrationPeriod registrationPeriod, Price price, Integer limitStudentCount) {
-    super();
+  public PaidLecture(Long id, String title, CoverImages coverImages,
+      LectureRecruitingStatus lectureRecruitingStatus, LectureStatus lectureStatus,
+      RegistrationPeriod registrationPeriod, Price price, Integer limitStudentCount,
+      LocalDateTime createdAt, LocalDateTime updatedAt) {
+    super(createdAt, updatedAt);
     this.id = id;
     this.title = title;
-    this.coverImages.add(coverImage);
-    this.lectureStatus = LectureStatus.YET;
+    this.coverImages.addAll(coverImages);
+    this.lectureStatus = lectureStatus;
     this.lectureRecruitingStatus = lectureRecruitingStatus;
     this.registrationPeriod = registrationPeriod;
     this.price = price;
@@ -40,31 +41,17 @@ public PaidLecture(Long id, String title, CoverImage coverImage,
   public PaidLecture(Long id, String title, CoverImages coverImages,
       LectureRecruitingStatus lectureRecruitingStatus,
       RegistrationPeriod registrationPeriod, Price price, Integer limitStudentCount) {
-    super();
-    this.id = id;
-    this.title = title;
-    this.coverImages.addAll(coverImages);
-    this.lectureStatus = LectureStatus.YET;
-    this.lectureRecruitingStatus = lectureRecruitingStatus;
-    this.registrationPeriod = registrationPeriod;
-    this.price = price;
-    this.limitStudentCount = limitStudentCount;
+    this(id, title, coverImages, LectureStatus.YET, lectureRecruitingStatus, registrationPeriod,
+        price, limitStudentCount, LocalDateTime.now(), null);
   }
 
-  public PaidLecture(Long id, String title, CoverImages coverImage, LectureStatus lectureStatus,
+  public PaidLecture(Long id, String title, CoverImages coverImages, LectureStatus lectureStatus,
       LectureRecruitingStatus lectureRecruitingStatus,
       RegistrationPeriod registrationPeriod, Price price, Integer limitStudentCount
       , LocalDateTime createdAt
       , LocalDateTime updatedAt) {
-    super(createdAt, updatedAt);
-    this.id = id;
-    this.title = title;
-    this.coverImages.addAll(coverImage);
-    this.lectureStatus = lectureStatus;
-    this.lectureRecruitingStatus = lectureRecruitingStatus;
-    this.registrationPeriod = registrationPeriod;
-    this.price = price;
-    this.limitStudentCount = limitStudentCount;
+    this(id, title, coverImages, lectureRecruitingStatus, LectureStatus.YET, registrationPeriod,
+        price, limitStudentCount, createdAt, updatedAt);
   }
 
   public PaidLecture(LectureEntity lecture) {
@@ -106,7 +93,7 @@ public void canEnrollment(NsUser nsUser, Students selectedStudents) {
 
   @Override
   public void enrollment(NsUser nsUser, Students selectedStudents) {
-    this.canEnrollment(nsUser,selectedStudents);
+    this.canEnrollment(nsUser, selectedStudents);
     nsUser.hasPayment(price);
     this.students.addWithLimitCount(nsUser, limitStudentCount);
   }

Diff for: src/test/java/nextstep/courses/infrastructure/LectureRepositoryTest.java

@@ -54,7 +54,7 @@ void crud() {
         PaidLecture lecture = new PaidLecture(
             1L
             , "test"
-            , coverImage
+            , coverImages
             , LectureRecruitingStatus.PREPARING
             , new RegistrationPeriod(LocalDateTime.now(), LocalDateTime.now().plusMonths(1))
             , new Price(BigDecimal.TEN)