[Feat]: 챌린지 리뷰 패키지 분리

KNU-HAEDAL · Sep 1, 2024 · 9c6d0ed · 9c6d0ed
1 parent c8b2676
commit 9c6d0ed
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 41 deletions.
diff --git a/...controller/ChallengeReviewController.java → ...controller/ChallengeReviewController.java b/...controller/ChallengeReviewController.java → ...controller/ChallengeReviewController.java
@@ -1,4 +1,4 @@
-package org.haedal.zzansuni.userchallenge.controller;
+package org.haedal.zzansuni.challengereview.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -7,9 +7,10 @@
 import org.haedal.zzansuni.common.controller.PagingRequest;
 import org.haedal.zzansuni.common.controller.PagingResponse;
 import org.haedal.zzansuni.core.api.ApiResponse;
-import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithChallenge;
-import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithUserInfo;
-import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewService;
+import org.haedal.zzansuni.userchallenge.controller.ChallengeReq;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithChallenge;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithUserInfo;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewService;
 import org.haedal.zzansuni.global.jwt.JwtUser;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;

diff --git a/...llenge/controller/ChallengeReviewRes.java → ...review/controller/ChallengeReviewRes.java b/...llenge/controller/ChallengeReviewRes.java → ...review/controller/ChallengeReviewRes.java
@@ -1,11 +1,11 @@
-package org.haedal.zzansuni.userchallenge.controller;
+package org.haedal.zzansuni.challengereview.controller;
 
 import java.util.Map;
 import lombok.Builder;
 import org.haedal.zzansuni.user.controller.UserRes;
-import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel;
-import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithChallenge;
-import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithUserInfo;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithChallenge;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithUserInfo;
 
 public class ChallengeReviewRes {
 

diff --git a/...userchallenge/domain/ChallengeReview.java → ...allengereview/domain/ChallengeReview.java b/...userchallenge/domain/ChallengeReview.java → ...allengereview/domain/ChallengeReview.java
@@ -1,4 +1,4 @@
-package org.haedal.zzansuni.userchallenge.domain;
+package org.haedal.zzansuni.challengereview.domain;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;
@@ -8,6 +8,7 @@
 import lombok.NoArgsConstructor;
 import org.haedal.zzansuni.common.domain.BaseTimeEntity;
 import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand;
+import org.haedal.zzansuni.userchallenge.domain.UserChallenge;
 
 @Entity
 @AllArgsConstructor

diff --git a/...ain/application/ChallengeReviewModel.java → ...gereview/domain/ChallengeReviewModel.java b/...ain/application/ChallengeReviewModel.java → ...gereview/domain/ChallengeReviewModel.java
@@ -1,4 +1,4 @@
-package org.haedal.zzansuni.userchallenge.domain.application;
+package org.haedal.zzansuni.challengereview.domain;
 
 import java.util.HashMap;
 import java.util.List;
@@ -7,7 +7,6 @@
 import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup;
 import org.haedal.zzansuni.challengegroup.domain.Challenge;
 import org.haedal.zzansuni.user.domain.UserModel;
-import org.haedal.zzansuni.userchallenge.domain.ChallengeReview;
 import org.haedal.zzansuni.userchallenge.domain.UserChallenge;
 
 public class ChallengeReviewModel {

diff --git a/...ge/domain/port/ChallengeReviewReader.java → ...ereview/domain/ChallengeReviewReader.java b/...ge/domain/port/ChallengeReviewReader.java → ...ereview/domain/ChallengeReviewReader.java
@@ -1,10 +1,10 @@
-package org.haedal.zzansuni.userchallenge.domain.port;
+package org.haedal.zzansuni.challengereview.domain;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import org.haedal.zzansuni.userchallenge.domain.ChallengeReview;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

diff --git a/...n/application/ChallengeReviewService.java → ...review/domain/ChallengeReviewService.java b/...n/application/ChallengeReviewService.java → ...review/domain/ChallengeReviewService.java
@@ -1,12 +1,9 @@
-package org.haedal.zzansuni.userchallenge.domain.application;
+package org.haedal.zzansuni.challengereview.domain;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore;
 import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader;
-import org.haedal.zzansuni.userchallenge.domain.ChallengeReview;
 import org.haedal.zzansuni.userchallenge.domain.UserChallenge;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/...er/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewStore.java b/...er/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewStore.java
@@ -0,0 +1,8 @@
+package org.haedal.zzansuni.challengereview.domain;
+
+
+public interface ChallengeReviewStore {
+
+    ChallengeReview store(ChallengeReview challengeReview);
+
+}
diff --git a/...re/adapter/ChallengeReviewReaderImpl.java → ...astructure/ChallengeReviewReaderImpl.java b/...re/adapter/ChallengeReviewReaderImpl.java → ...astructure/ChallengeReviewReaderImpl.java
@@ -1,18 +1,17 @@
-package org.haedal.zzansuni.userchallenge.infrastructure.adapter;
+package org.haedal.zzansuni.challengereview.infrastructure;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader;
-import org.haedal.zzansuni.userchallenge.domain.ChallengeReview;
-import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeReviewRepository;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReview;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
 
-import static org.haedal.zzansuni.userchallenge.domain.QChallengeReview.challengeReview;
+import static org.haedal.zzansuni.challengereview.domain.QChallengeReview.challengeReview;
 
 
 @Component

diff --git a/...astructure/ChallengeReviewRepository.java → ...astructure/ChallengeReviewRepository.java b/...astructure/ChallengeReviewRepository.java → ...astructure/ChallengeReviewRepository.java
@@ -1,6 +1,6 @@
-package org.haedal.zzansuni.userchallenge.infrastructure;
+package org.haedal.zzansuni.challengereview.infrastructure;
 
-import org.haedal.zzansuni.userchallenge.domain.ChallengeReview;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReview;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

diff --git a/...ure/adapter/ChallengeReviewStoreImpl.java → ...rastructure/ChallengeReviewStoreImpl.java b/...ure/adapter/ChallengeReviewStoreImpl.java → ...rastructure/ChallengeReviewStoreImpl.java
@@ -1,9 +1,8 @@
-package org.haedal.zzansuni.userchallenge.infrastructure.adapter;
+package org.haedal.zzansuni.challengereview.infrastructure;
 
 import lombok.RequiredArgsConstructor;
-import org.haedal.zzansuni.userchallenge.domain.ChallengeReview;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore;
-import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeReviewRepository;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewStore;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReview;
 import org.springframework.stereotype.Component;
 
 @Component

diff --git a/.../main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java b/.../main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java
@@ -4,14 +4,14 @@
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader;
 import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader;
 import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore;
 import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore;
 import org.haedal.zzansuni.challengegroup.domain.Challenge;
 import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand;
 import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel;
 import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader;
 import org.haedal.zzansuni.user.domain.User;
 import org.haedal.zzansuni.user.domain.UserReader;
 import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp;

diff --git a/...app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java b/...app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java
diff --git a/...src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java b/...src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java
@@ -4,9 +4,12 @@
 
 import org.haedal.zzansuni.challengegroup.domain.*;
 import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReview;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewService;
 import org.haedal.zzansuni.userchallenge.domain.*;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewStore;
 import org.haedal.zzansuni.userchallenge.domain.port.ChallengeVerificationReader;
 import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader;
 import org.haedal.zzansuni.user.domain.User;

diff --git a/...test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java b/...test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java
@@ -11,7 +11,7 @@
 import org.haedal.zzansuni.userchallenge.domain.ChallengeStatus;
 import org.haedal.zzansuni.userchallenge.domain.UserChallenge;
 import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore;
-import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader;
+import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader;
 import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader;
 import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore;
 import org.junit.jupiter.api.BeforeEach;