Merge pull request #88 from IDEA-CAMPUS/fix/conflict-1

Fix/conflict-1
IDEA-CAMPUS · Jan 12, 2024 · 5488ac1 · 5488ac1
2 parents 2089799 + 8e351b8
commit 5488ac1
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 12 deletions.
diff --git a/IDEA-CAMPUS-Server b/IDEA-CAMPUS-Server
diff --git a/Idea b/Idea
diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/ClubPostReq.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/ClubPostReq.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

diff --git a/...c-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java b/...c-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

diff --git a/...-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java b/...-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java
@@ -1,7 +1,6 @@
 package depth.main.ideac.domain.club_post.dto.response;
 
 import lombok.Builder;
-import lombok.Data;
 import lombok.Getter;
 
 import java.time.LocalDateTime;

diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/application/IdeaPostService.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/application/IdeaPostService.java
@@ -1,7 +1,9 @@
 package depth.main.ideac.domain.idea_post.application;
 
 import depth.main.ideac.domain.idea_post.IdeaPost;
-import depth.main.ideac.domain.idea_post.dto.*;
+import depth.main.ideac.domain.idea_post.dto.request.*;
+import depth.main.ideac.domain.idea_post.dto.response.GetAllIdeasRes;
+import depth.main.ideac.domain.idea_post.dto.response.GetDetailIdeaRes;
 import depth.main.ideac.domain.idea_post.repository.IdeaPostRepository;
 import depth.main.ideac.domain.user.domain.Role;
 import depth.main.ideac.domain.user.domain.User;

diff --git a/...domain/idea_post/dto/RegisterIdeaReq.java → ...dea_post/dto/request/RegisterIdeaReq.java b/...domain/idea_post/dto/RegisterIdeaReq.java → ...dea_post/dto/request/RegisterIdeaReq.java
@@ -1,4 +1,4 @@
-package depth.main.ideac.domain.idea_post.dto;
+package depth.main.ideac.domain.idea_post.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

diff --git a/...c/domain/idea_post/dto/UpdateIdeaReq.java → .../idea_post/dto/request/UpdateIdeaReq.java b/...c/domain/idea_post/dto/UpdateIdeaReq.java → .../idea_post/dto/request/UpdateIdeaReq.java
@@ -1,4 +1,4 @@
-package depth.main.ideac.domain.idea_post.dto;
+package depth.main.ideac.domain.idea_post.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

diff --git a/.../domain/idea_post/dto/GetAllIdeasRes.java → ...dea_post/dto/response/GetAllIdeasRes.java b/.../domain/idea_post/dto/GetAllIdeasRes.java → ...dea_post/dto/response/GetAllIdeasRes.java
@@ -1,4 +1,4 @@
-package depth.main.ideac.domain.idea_post.dto;
+package depth.main.ideac.domain.idea_post.dto.response;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;

diff --git a/...omain/idea_post/dto/GetDetailIdeaRes.java → ...a_post/dto/response/GetDetailIdeaRes.java b/...omain/idea_post/dto/GetDetailIdeaRes.java → ...a_post/dto/response/GetDetailIdeaRes.java
@@ -1,4 +1,4 @@
-package depth.main.ideac.domain.idea_post.dto;
+package depth.main.ideac.domain.idea_post.dto.response;
 
 import lombok.Builder;
 import lombok.Getter;

diff --git a/...user/src/main/java/depth/main/ideac/domain/idea_post/presentation/IdeaPostController.java b/...user/src/main/java/depth/main/ideac/domain/idea_post/presentation/IdeaPostController.java
@@ -1,8 +1,8 @@
 package depth.main.ideac.domain.idea_post.presentation;
 
 import depth.main.ideac.domain.idea_post.application.IdeaPostService;
-import depth.main.ideac.domain.idea_post.dto.RegisterIdeaReq;
-import depth.main.ideac.domain.idea_post.dto.UpdateIdeaReq;
+import depth.main.ideac.domain.idea_post.dto.request.RegisterIdeaReq;
+import depth.main.ideac.domain.idea_post.dto.request.UpdateIdeaReq;
 import depth.main.ideac.global.config.security.token.CurrentUser;
 import depth.main.ideac.global.config.security.token.UserPrincipal;
 import depth.main.ideac.global.payload.ErrorResponse;