refactored package structures #4

src/main/java/com/team20/t4/member/domain/Member.java

@@ -1,8 +1,7 @@
 package com.team20.t4.member.domain;
 
 import com.team20.t4.common.entity.BaseTimeEntity;
-import com.team20.t4.plan.RegisterHistory;
-import com.team20.t4.post.Post;
+import com.team20.t4.post.domain.Post;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/team20/t4/plan/PlanController.java

@@ -1,5 +1,11 @@
 package com.team20.t4.plan;
 
+import com.team20.t4.plan.domain.Progress;
+import com.team20.t4.plan.domain.State;
+import com.team20.t4.plan.dto.AppointmentPost;
+import com.team20.t4.plan.dto.AppointmentTimeVO;
+import com.team20.t4.plan.dto.PlanUpdateRequestDto;
+import com.team20.t4.plan.dto.RegisterHistorySaveRequestDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/team20/t4/plan/PlanService.java

@@ -4,6 +4,8 @@
 import com.team20.t4.common.exception.RequestException;
 import com.team20.t4.member.domain.Member;
 import com.team20.t4.member.domain.MemberRepository;
+import com.team20.t4.plan.domain.*;
+import com.team20.t4.plan.dto.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/team20/t4/plan/FoodType.java → src/main/java/com/team20/t4/plan/domain/FoodType.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/team20/t4/plan/Gu.java → src/main/java/com/team20/t4/plan/domain/Gu.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import lombok.AllArgsConstructor;
 

src/main/java/com/team20/t4/plan/Location.java → src/main/java/com/team20/t4/plan/domain/Location.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import javax.persistence.Embeddable;
 

src/main/java/com/team20/t4/plan/Plan.java → src/main/java/com/team20/t4/plan/domain/Plan.java

@@ -1,7 +1,7 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import com.team20.t4.member.domain.Member;
-import com.team20.t4.post.Post;
+import com.team20.t4.post.domain.Post;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/team20/t4/plan/PlanRepository.java → src/main/java/com/team20/t4/plan/domain/PlanRepository.java

@@ -1,6 +1,7 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 
+import com.team20.t4.plan.domain.Plan;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PlanRepository extends JpaRepository<Plan, Long> {

src/main/java/com/team20/t4/plan/Progress.java → src/main/java/com/team20/t4/plan/domain/Progress.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import lombok.AllArgsConstructor;
 

src/main/java/com/team20/t4/plan/RegisterHistory.java → src/main/java/com/team20/t4/plan/domain/RegisterHistory.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import com.team20.t4.common.entity.BaseTimeEntity;
 import com.team20.t4.member.domain.Member;

src/main/java/com/team20/t4/plan/RegisterHistoryRepository.java → src/main/java/com/team20/t4/plan/domain/RegisterHistoryRepository.java

@@ -1,6 +1,7 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import com.team20.t4.member.domain.Member;
+import com.team20.t4.plan.domain.RegisterHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -9,6 +10,6 @@
 
 public interface RegisterHistoryRepository extends JpaRepository<RegisterHistory, Long> {
 
-    @Query("SELECT h FROM RegisterHistory h where h.applicant = :applicant and h.state = com.team20.t4.plan.State.PERMITTED")
+    @Query("SELECT h FROM RegisterHistory h where h.applicant = :applicant and h.state = com.team20.t4.plan.domain.State.PERMITTED")
     List<RegisterHistory> readRegisterHistoriesByMember(@Param("applicant") Member applicant);
 }

src/main/java/com/team20/t4/plan/State.java → src/main/java/com/team20/t4/plan/domain/State.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/team20/t4/plan/AppointmentPost.java → src/main/java/com/team20/t4/plan/dto/AppointmentPost.java

@@ -1,8 +1,7 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
+import com.team20.t4.plan.domain.RegisterHistory;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
 
 @AllArgsConstructor
 public class AppointmentPost {

src/main/java/com/team20/t4/plan/AppointmentTimeVO.java → src/main/java/com/team20/t4/plan/dto/AppointmentTimeVO.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;

src/main/java/com/team20/t4/plan/PlanInfoResponseDto.java → src/main/java/com/team20/t4/plan/dto/PlanInfoResponseDto.java

@@ -1,7 +1,10 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
 
 import com.team20.t4.member.domain.Member;
+import com.team20.t4.plan.domain.FoodType;
+import com.team20.t4.plan.domain.Location;
+import com.team20.t4.plan.domain.Plan;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/team20/t4/plan/PlanSaveRequestDto.java → src/main/java/com/team20/t4/plan/dto/PlanSaveRequestDto.java

@@ -1,8 +1,11 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.team20.t4.member.domain.Member;
+import com.team20.t4.plan.domain.FoodType;
+import com.team20.t4.plan.domain.Location;
+import com.team20.t4.plan.domain.Plan;
+import com.team20.t4.plan.domain.Progress;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/team20/t4/plan/PlanUpdateRequestDto.java → src/main/java/com/team20/t4/plan/dto/PlanUpdateRequestDto.java

@@ -1,6 +1,9 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
-import com.team20.t4.member.domain.Member;
+import com.team20.t4.plan.domain.FoodType;
+import com.team20.t4.plan.domain.Location;
+import com.team20.t4.plan.domain.Plan;
+import com.team20.t4.plan.domain.Progress;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/team20/t4/plan/RegisterHistoryResponseDto.java → src/main/java/com/team20/t4/plan/dto/RegisterHistoryResponseDto.java

@@ -1,4 +1,4 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
 public class RegisterHistoryResponseDto {
 }

src/main/java/com/team20/t4/plan/RegisterHistorySaveRequestDto.java → src/main/java/com/team20/t4/plan/dto/RegisterHistorySaveRequestDto.java

@@ -1,6 +1,7 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
 import com.team20.t4.member.domain.Member;
+import com.team20.t4.plan.domain.Plan;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/team20/t4/plan/RegisterHistoryUpdateDto.java → src/main/java/com/team20/t4/plan/dto/RegisterHistoryUpdateDto.java

@@ -1,6 +1,9 @@
-package com.team20.t4.plan;
+package com.team20.t4.plan.dto;
 
 import com.team20.t4.member.domain.Member;
+import com.team20.t4.plan.domain.Plan;
+import com.team20.t4.plan.domain.RegisterHistory;
+import com.team20.t4.plan.domain.State;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/team20/t4/post/PostController.java

@@ -1,6 +1,9 @@
 package com.team20.t4.post;
 
 import com.team20.t4.common.responseFormat.OnlyResponseString;
+import com.team20.t4.post.dto.PostResponseDto;
+import com.team20.t4.post.dto.PostSaveRequestDto;
+import com.team20.t4.post.dto.PostUpdateRequestDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/team20/t4/post/PostService.java

@@ -3,6 +3,12 @@
 import com.team20.t4.common.exception.RequestErrorCode;
 import com.team20.t4.common.exception.RequestException;
 import com.team20.t4.member.MemberService;
+import com.team20.t4.post.domain.Post;
+import com.team20.t4.post.domain.PostRepository;
+import com.team20.t4.post.dto.PostResponseDto;
+import com.team20.t4.post.dto.PostSaveRequestDto;
+import com.team20.t4.post.dto.PostSaveRequestVo;
+import com.team20.t4.post.dto.PostUpdateRequestDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/team20/t4/post/Post.java → src/main/java/com/team20/t4/post/domain/Post.java

@@ -1,13 +1,12 @@
-package com.team20.t4.post;
+package com.team20.t4.post.domain;
 
 import com.team20.t4.common.entity.BaseTimeEntity;
 import com.team20.t4.member.domain.Member;
-import com.team20.t4.plan.Plan;
+import com.team20.t4.plan.domain.Plan;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.engine.internal.Cascade;
 
 import javax.persistence.*;
 

src/main/java/com/team20/t4/post/PostRepository.java → src/main/java/com/team20/t4/post/domain/PostRepository.java

@@ -1,5 +1,6 @@
-package com.team20.t4.post;
+package com.team20.t4.post.domain;
 
+import com.team20.t4.post.domain.Post;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PostRepository extends JpaRepository<Post, Long> {

src/main/java/com/team20/t4/post/PostResponseDto.java → src/main/java/com/team20/t4/post/dto/PostResponseDto.java

@@ -1,5 +1,6 @@
-package com.team20.t4.post;
+package com.team20.t4.post.dto;
 
+import com.team20.t4.post.domain.Post;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/team20/t4/post/PostSaveRequestDto.java → src/main/java/com/team20/t4/post/dto/PostSaveRequestDto.java

@@ -1,6 +1,6 @@
-package com.team20.t4.post;
+package com.team20.t4.post.dto;
 
-import com.team20.t4.plan.PlanSaveRequestDto;
+import com.team20.t4.plan.dto.PlanSaveRequestDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/team20/t4/post/PostSaveRequestVo.java → src/main/java/com/team20/t4/post/dto/PostSaveRequestVo.java

@@ -1,6 +1,7 @@
-package com.team20.t4.post;
+package com.team20.t4.post.dto;
 
 import com.team20.t4.member.domain.Member;
+import com.team20.t4.post.domain.Post;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.NoArgsConstructor;

src/main/java/com/team20/t4/post/PostUpdateRequestDto.java → src/main/java/com/team20/t4/post/dto/PostUpdateRequestDto.java

@@ -1,5 +1,6 @@
-package com.team20.t4.post;
+package com.team20.t4.post.dto;
 
+import com.team20.t4.post.domain.Post;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;