chore : Lecture, OpenLecture, AttendeeCacheEvent를 Lecture Domain 패키지로…

… 이동 (#62)
binary-ho · Aug 22, 2023 · 8f3816a · 8f3816a
1 parent 6030889
commit 8f3816a
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 25 deletions.
diff --git a/src/main/java/gdsc/binaryho/imhere/core/attendance/Attendance.java b/src/main/java/gdsc/binaryho/imhere/core/attendance/Attendance.java
@@ -1,7 +1,7 @@
 package gdsc.binaryho.imhere.core.attendance;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import gdsc.binaryho.imhere.core.member.Member;
 import java.time.LocalDateTime;
 import javax.persistence.Column;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/attendance/application/AttendanceService.java b/src/main/java/gdsc/binaryho/imhere/core/attendance/application/AttendanceService.java
@@ -11,9 +11,9 @@
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentState;
 import gdsc.binaryho.imhere.core.enrollment.exception.EnrollmentNotApprovedException;
 import gdsc.binaryho.imhere.core.enrollment.infrastructure.EnrollmentInfoRepository;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
 import gdsc.binaryho.imhere.core.lecture.application.OpenLectureService;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import gdsc.binaryho.imhere.core.lecture.exception.LectureNotFoundException;
 import gdsc.binaryho.imhere.core.lecture.exception.LectureNotOpenException;
 import gdsc.binaryho.imhere.core.lecture.infrastructure.LectureRepository;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/attendance/model/response/AttendanceResponse.java b/src/main/java/gdsc/binaryho/imhere/core/attendance/model/response/AttendanceResponse.java
@@ -1,7 +1,7 @@
 package gdsc.binaryho.imhere.core.attendance.model.response;
 
 import gdsc.binaryho.imhere.core.attendance.Attendance;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.time.LocalDateTime;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/enrollment/EnrollmentInfo.java b/src/main/java/gdsc/binaryho/imhere/core/enrollment/EnrollmentInfo.java
@@ -1,6 +1,6 @@
 package gdsc.binaryho.imhere.core.enrollment;
 
-import gdsc.binaryho.imhere.core.lecture.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import gdsc.binaryho.imhere.core.member.Member;
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/enrollment/application/EnrollmentService.java b/src/main/java/gdsc/binaryho/imhere/core/enrollment/application/EnrollmentService.java
@@ -6,12 +6,12 @@
 import gdsc.binaryho.imhere.core.enrollment.exception.EnrollmentNotFoundException;
 import gdsc.binaryho.imhere.core.enrollment.infrastructure.EnrollmentInfoRepository;
 import gdsc.binaryho.imhere.core.enrollment.model.response.EnrollmentInfoResponse;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
-import gdsc.binaryho.imhere.core.lecture.application.AttendeeCacheEvent;
 import gdsc.binaryho.imhere.core.lecture.application.OpenLectureService;
+import gdsc.binaryho.imhere.core.lecture.domain.AttendeeCacheEvent;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.OpenLecture;
 import gdsc.binaryho.imhere.core.lecture.exception.LectureNotFoundException;
 import gdsc.binaryho.imhere.core.lecture.infrastructure.LectureRepository;
-import gdsc.binaryho.imhere.core.lecture.model.OpenLecture;
 import gdsc.binaryho.imhere.core.lecture.model.StudentIds;
 import gdsc.binaryho.imhere.core.member.Member;
 import gdsc.binaryho.imhere.security.util.AuthenticationHelper;

diff --git a/...in/java/gdsc/binaryho/imhere/core/enrollment/infrastructure/EnrollmentInfoRepository.java b/...in/java/gdsc/binaryho/imhere/core/enrollment/infrastructure/EnrollmentInfoRepository.java
@@ -2,7 +2,7 @@
 
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentInfo;
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentState;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...main/java/gdsc/binaryho/imhere/core/enrollment/model/response/EnrollmentInfoResponse.java b/...main/java/gdsc/binaryho/imhere/core/enrollment/model/response/EnrollmentInfoResponse.java
@@ -2,7 +2,7 @@
 
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentInfo;
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentState;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import gdsc.binaryho.imhere.core.member.Member;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -44,7 +44,6 @@ public static class StudentInfo {
         private final Long id;
         private final String univId;
         private final String name;
-        @Schema(description = "학생 수강신청 승인 상태")
         private final EnrollmentState enrollmentState;
 
         private StudentInfo(Long id, String univId, String name,

diff --git a/src/main/java/gdsc/binaryho/imhere/core/lecture/application/AttendeeCacheService.java b/src/main/java/gdsc/binaryho/imhere/core/lecture/application/AttendeeCacheService.java
@@ -1,6 +1,7 @@
 package gdsc.binaryho.imhere.core.lecture.application;
 
 import gdsc.binaryho.imhere.core.lecture.application.port.AttendeeCacheRepository;
+import gdsc.binaryho.imhere.core.lecture.domain.AttendeeCacheEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/lecture/application/LectureService.java b/src/main/java/gdsc/binaryho/imhere/core/lecture/application/LectureService.java
@@ -3,13 +3,14 @@
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentInfo;
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentState;
 import gdsc.binaryho.imhere.core.enrollment.infrastructure.EnrollmentInfoRepository;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
 import gdsc.binaryho.imhere.core.lecture.application.port.AttendeeCacheRepository;
 import gdsc.binaryho.imhere.core.lecture.application.port.OpenLectureCacheRepository;
+import gdsc.binaryho.imhere.core.lecture.domain.AttendeeCacheEvent;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.OpenLecture;
 import gdsc.binaryho.imhere.core.lecture.exception.LectureNotFoundException;
 import gdsc.binaryho.imhere.core.lecture.infrastructure.LectureRepository;
-import gdsc.binaryho.imhere.core.lecture.model.OpenLecture;
 import gdsc.binaryho.imhere.core.lecture.model.StudentIds;
 import gdsc.binaryho.imhere.core.lecture.model.request.LectureCreateRequest;
 import gdsc.binaryho.imhere.core.lecture.model.response.AttendanceNumberResponse;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/lecture/application/OpenLectureService.java b/src/main/java/gdsc/binaryho/imhere/core/lecture/application/OpenLectureService.java
@@ -1,7 +1,7 @@
 package gdsc.binaryho.imhere.core.lecture.application;
 
 import gdsc.binaryho.imhere.core.lecture.application.port.OpenLectureCacheRepository;
-import gdsc.binaryho.imhere.core.lecture.model.OpenLecture;
+import gdsc.binaryho.imhere.core.lecture.domain.OpenLecture;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/lecture/controller/LectureController.java b/src/main/java/gdsc/binaryho/imhere/core/lecture/controller/LectureController.java
@@ -1,8 +1,8 @@
 package gdsc.binaryho.imhere.core.lecture.controller;
 
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
 import gdsc.binaryho.imhere.core.lecture.application.LectureService;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import gdsc.binaryho.imhere.core.lecture.infrastructure.LectureRepository;
 import gdsc.binaryho.imhere.core.lecture.model.request.LectureCreateRequest;
 import gdsc.binaryho.imhere.core.lecture.model.response.AttendanceNumberResponse;

diff --git a/...cture/application/AttendeeCacheEvent.java → ...re/lecture/domain/AttendeeCacheEvent.java b/...cture/application/AttendeeCacheEvent.java → ...re/lecture/domain/AttendeeCacheEvent.java
@@ -1,4 +1,4 @@
-package gdsc.binaryho.imhere.core.lecture.application;
+package gdsc.binaryho.imhere.core.lecture.domain;
 
 import gdsc.binaryho.imhere.core.lecture.model.StudentIds;
 import lombok.Getter;

diff --git a/...binaryho/imhere/core/lecture/Lecture.java → ...o/imhere/core/lecture/domain/Lecture.java b/...binaryho/imhere/core/lecture/Lecture.java → ...o/imhere/core/lecture/domain/Lecture.java
@@ -1,6 +1,7 @@
-package gdsc.binaryho.imhere.core.lecture;
+package gdsc.binaryho.imhere.core.lecture.domain;
 
 
+import gdsc.binaryho.imhere.core.lecture.LectureState;
 import gdsc.binaryho.imhere.core.member.Member;
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/...mhere/core/lecture/model/OpenLecture.java → ...here/core/lecture/domain/OpenLecture.java b/...mhere/core/lecture/model/OpenLecture.java → ...here/core/lecture/domain/OpenLecture.java
@@ -1,6 +1,5 @@
-package gdsc.binaryho.imhere.core.lecture.model;
+package gdsc.binaryho.imhere.core.lecture.domain;
 
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/src/main/java/gdsc/binaryho/imhere/core/lecture/infrastructure/LectureRepository.java b/src/main/java/gdsc/binaryho/imhere/core/lecture/infrastructure/LectureRepository.java
@@ -1,7 +1,7 @@
 package gdsc.binaryho.imhere.core.lecture.infrastructure;
 
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import io.lettuce.core.dynamic.annotation.Param;
 import java.util.List;
 import java.util.Optional;

diff --git a/src/main/java/gdsc/binaryho/imhere/core/lecture/model/response/LectureResponse.java b/src/main/java/gdsc/binaryho/imhere/core/lecture/model/response/LectureResponse.java
@@ -1,9 +1,9 @@
 package gdsc.binaryho.imhere.core.lecture.model.response;
 
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentInfo;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
-import gdsc.binaryho.imhere.core.lecture.model.OpenLecture;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
+import gdsc.binaryho.imhere.core.lecture.domain.OpenLecture;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.ArrayList;

diff --git a/src/test/java/gdsc/binaryho/imhere/core/attendance/application/AttendanceServiceTest.java b/src/test/java/gdsc/binaryho/imhere/core/attendance/application/AttendanceServiceTest.java
@@ -29,9 +29,9 @@
 import gdsc.binaryho.imhere.core.enrollment.infrastructure.EnrollmentInfoRepository;
 import gdsc.binaryho.imhere.core.lecture.application.OpenLectureService;
 import gdsc.binaryho.imhere.core.lecture.application.port.OpenLectureCacheRepository;
+import gdsc.binaryho.imhere.core.lecture.domain.OpenLecture;
 import gdsc.binaryho.imhere.core.lecture.exception.LectureNotOpenException;
 import gdsc.binaryho.imhere.core.lecture.infrastructure.LectureRepository;
-import gdsc.binaryho.imhere.core.lecture.model.OpenLecture;
 import gdsc.binaryho.imhere.core.member.Role;
 import gdsc.binaryho.imhere.fixture.MemberFixture;
 import gdsc.binaryho.imhere.mock.TestContainer;

diff --git a/src/test/java/gdsc/binaryho/imhere/core/lecture/application/LectureServiceTest.java b/src/test/java/gdsc/binaryho/imhere/core/lecture/application/LectureServiceTest.java
@@ -19,8 +19,8 @@
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentInfo;
 import gdsc.binaryho.imhere.core.enrollment.EnrollmentState;
 import gdsc.binaryho.imhere.core.enrollment.infrastructure.EnrollmentInfoRepository;
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 import gdsc.binaryho.imhere.core.lecture.exception.LectureNotFoundException;
 import gdsc.binaryho.imhere.core.lecture.infrastructure.LectureRepository;
 import gdsc.binaryho.imhere.core.lecture.model.request.LectureCreateRequest;

diff --git a/src/test/java/gdsc/binaryho/imhere/fixture/LectureFixture.java b/src/test/java/gdsc/binaryho/imhere/fixture/LectureFixture.java
@@ -2,8 +2,8 @@
 
 import static gdsc.binaryho.imhere.fixture.MemberFixture.LECTURER;
 
-import gdsc.binaryho.imhere.core.lecture.Lecture;
 import gdsc.binaryho.imhere.core.lecture.LectureState;
+import gdsc.binaryho.imhere.core.lecture.domain.Lecture;
 
 public class LectureFixture {
 

diff --git a/src/test/java/gdsc/binaryho/imhere/mock/FakeOpenLectureCacheRepository.java b/src/test/java/gdsc/binaryho/imhere/mock/FakeOpenLectureCacheRepository.java
@@ -1,7 +1,7 @@
 package gdsc.binaryho.imhere.mock;
 
 import gdsc.binaryho.imhere.core.lecture.application.port.OpenLectureCacheRepository;
-import gdsc.binaryho.imhere.core.lecture.model.OpenLecture;
+import gdsc.binaryho.imhere.core.lecture.domain.OpenLecture;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;