From 45238e64a0970402b6270812eba12347e03dffcb Mon Sep 17 00:00:00 2001 From: lsn5963 Date: Fri, 12 Jan 2024 17:35:10 +0900 Subject: [PATCH 1/6] "z" --- .idea/dataSources.xml | 12 ----------- .idea/modules.xml | 3 +++ .idea/vcs.xml | 2 ++ IDEA-CAMPUS-Server | 1 + Idea | 1 + .../src/main/resources/applcation-swagger.yml | 11 ++++++++++ .../main/ideac/domain/idea_post/IdeaPost.java | 2 ++ .../src/main/resources/applcation-mail.yml | 12 +++++++++++ .../domain/home/application/HomeService.java | 3 ++- .../application/IdeaPostService.java | 21 ++++++++++++------- .../domain/idea_post/dto/GetAllIdeasRes.java | 3 ++- .../idea_post/dto/GetDetailIdeaRes.java | 3 ++- .../user/presentation/UserController.java | 2 +- 13 files changed, 53 insertions(+), 23 deletions(-) delete mode 100644 .idea/dataSources.xml create mode 160000 IDEA-CAMPUS-Server create mode 160000 Idea create mode 100644 ideac-admin/src/main/resources/applcation-swagger.yml create mode 100644 ideac-core/src/main/resources/applcation-mail.yml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index 222857b..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://ideacdb.ce84mlt0kgjd.ap-northeast-2.rds.amazonaws.com:3306 - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6197270..5cac8eb 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -10,6 +10,9 @@ + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..fda1536 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/IDEA-CAMPUS-Server b/IDEA-CAMPUS-Server new file mode 160000 index 0000000..0b7dac2 --- /dev/null +++ b/IDEA-CAMPUS-Server @@ -0,0 +1 @@ +Subproject commit 0b7dac27d9e2deacf73e9b80bcc14c76704799bc diff --git a/Idea b/Idea new file mode 160000 index 0000000..d257a6f --- /dev/null +++ b/Idea @@ -0,0 +1 @@ +Subproject commit d257a6f432116443a019fb13b555a12b7c374375 diff --git a/ideac-admin/src/main/resources/applcation-swagger.yml b/ideac-admin/src/main/resources/applcation-swagger.yml new file mode 100644 index 0000000..e2810e6 --- /dev/null +++ b/ideac-admin/src/main/resources/applcation-swagger.yml @@ -0,0 +1,11 @@ +# Swagger springdoc-ui Configuration +springdoc: + default-consumes-media-type: application/json;charset=UTF-8 + default-produces-media-type: application/json;charset=UTF-8 + swagger-ui: + path: / # Swagger UI 경로 => localhost:8000/swagger + tags-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬 + operations-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬 + api-docs: + groups: + enabled: true \ No newline at end of file diff --git a/ideac-core/src/main/java/depth/main/ideac/domain/idea_post/IdeaPost.java b/ideac-core/src/main/java/depth/main/ideac/domain/idea_post/IdeaPost.java index 7798fe3..1d69f10 100644 --- a/ideac-core/src/main/java/depth/main/ideac/domain/idea_post/IdeaPost.java +++ b/ideac-core/src/main/java/depth/main/ideac/domain/idea_post/IdeaPost.java @@ -7,6 +7,8 @@ import jakarta.validation.constraints.Size; import lombok.*; +import java.util.List; + @Entity @Builder diff --git a/ideac-core/src/main/resources/applcation-mail.yml b/ideac-core/src/main/resources/applcation-mail.yml new file mode 100644 index 0000000..210bd97 --- /dev/null +++ b/ideac-core/src/main/resources/applcation-mail.yml @@ -0,0 +1,12 @@ +spring : + mail : + host : smtp.gmail.com + port : 587 + username : ideac2587@gmail.com + password : snve mylt ikyk alpy + properties : + mail : + smtp : + auth : true + starttls : + enable : true \ No newline at end of file diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java b/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java index 0cf9bf6..2aac26f 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -35,7 +36,7 @@ public List getIdeas() { .map(ideaPost -> GetAllIdeasRes.builder() .title(ideaPost.getTitle()) .simpleDescription(ideaPost.getSimpleDescription()) - .keyword(ideaPost.getKeyword()) + .keyword(Arrays.asList(ideaPost.getKeyword().split(","))) .color(ideaPost.getUser().getColor()) .nickName(ideaPost.getUser().getNickname()) .build()) 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 index 8e5bba0..60cb0ab 100644 --- 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 @@ -22,10 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Service @@ -40,6 +37,7 @@ public class IdeaPostService { @Transactional public Long registerIdea(UserPrincipal userPrincipal, RegisterIdeaReq registerIdeaReq){ User user = userRepository.findById(userPrincipal.getId()).get(); + IdeaPost ideapost = IdeaPost.builder() .title(registerIdeaReq.getTitle()) .keyword(registerIdeaReq.getKeyword()) @@ -60,13 +58,18 @@ public Long registerIdea(UserPrincipal userPrincipal, RegisterIdeaReq registerId public ResponseEntity getDetailIdea(Long id) { IdeaPost ideaPost = ideaPostRepository.findById(id).get(); + String[] split = ideaPost.getKeyword().split(","); +// for (String s : split) { +// System.out.println("s = " + s); +// } + List list = Arrays.asList(split); GetDetailIdeaRes getDetailIdeaRes = GetDetailIdeaRes.builder() .id(ideaPost.getId()) .color(ideaPost.getUser().getColor()) .nickName(ideaPost.getUser().getNickname()) .title(ideaPost.getTitle()) .simpleDescription(ideaPost.getSimpleDescription()) - .keyWord(ideaPost.getKeyword()) + .keyWord(list) .detailedDescription(ideaPost.getDetailedDescription()) .url1(ideaPost.getUrl1()) .url2(ideaPost.getUrl2()) @@ -85,7 +88,11 @@ public ResponseEntity getDetailIdea(Long id) { @Transactional public ResponseEntity updateIdea(Long id, UpdateIdeaReq updateIdeaReq) { IdeaPost ideaPost = ideaPostRepository.findById(id).get(); - + String[] split = updateIdeaReq.getKeyWord().split(","); +// for (String s : split) { +// System.out.println("s = " + s); +// } + List list = Arrays.asList(split); ideaPost.setTitle(updateIdeaReq.getTitle()); ideaPost.setKeyword(updateIdeaReq.getKeyWord()); ideaPost.setSimpleDescription(updateIdeaReq.getSimpleDescription()); @@ -128,7 +135,7 @@ public ResponseEntity getAllIdea(int page, int size, String sortBy) { .nickName(tmp.getUser().getNickname()) .title(tmp.getTitle()) .simpleDescription(tmp.getSimpleDescription()) - .keyword(tmp.getKeyword()) + .keyword(Arrays.asList(tmp.getKeyword().split(","))) .hits(tmp.getHits()) .createdAt(tmp.getCreatedAt()).build()) .collect(Collectors.toList()); diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java index 31b8af6..9cdb40b 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java @@ -6,6 +6,7 @@ import lombok.Getter; import java.time.LocalDateTime; +import java.util.List; @Getter @Builder @@ -15,7 +16,7 @@ public class GetAllIdeasRes { private String title; @NotBlank(message = "내용이 입력되지 않았습니다.") private String simpleDescription; - private String keyword; + private List keyword; private String nickName; private String color; private Long hits; diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java index f379d19..f7fce15 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java @@ -4,6 +4,7 @@ import lombok.Getter; import java.time.LocalDateTime; +import java.util.List; @Getter @Builder @@ -13,7 +14,7 @@ public class GetDetailIdeaRes { private String color; private String nickName; private String title; - private String keyWord; + private List keyWord; private String simpleDescription; private String detailedDescription; private String url1; diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/user/presentation/UserController.java b/ideac-user/src/main/java/depth/main/ideac/domain/user/presentation/UserController.java index a28d668..3064e65 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/user/presentation/UserController.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/user/presentation/UserController.java @@ -22,7 +22,7 @@ @RequiredArgsConstructor @RestController @RequestMapping("/api/user") -public class UserController { +public class UserController { private final UserService userService; @Operation(summary = "비밀번호 바꾸기", description = "비밀번호를 바꾼다.") @ApiResponses(value = { From 434986be972de730826ecb2e550134adb20e3b0b Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Fri, 12 Jan 2024 18:10:44 +0900 Subject: [PATCH 2/6] =?UTF-8?q?Feat:=20clubPost=20=EC=9D=91=EB=8B=B5=20id?= =?UTF-8?q?=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../club_post/application/ClubPostService.java | 10 ++++++---- .../club_post/dto/{ => request}/ClubPostReq.java | 6 +++--- .../dto/{ => request}/UpdateClubPostReq.java | 5 +---- .../dto/{ => response}/ClubPostDetailRes.java | 7 +++++-- .../club_post/dto/{ => response}/ClubPostRes.java | 10 ++++++---- .../club_post/presentation/ClubPostController.java | 10 +++++----- .../ideac/domain/home/application/HomeService.java | 12 +++++++++--- .../domain/home/presentation/HomeController.java | 4 ++-- 8 files changed, 37 insertions(+), 27 deletions(-) rename ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/{ => request}/ClubPostReq.java (86%) rename ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/{ => request}/UpdateClubPostReq.java (85%) rename ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/{ => response}/ClubPostDetailRes.java (78%) rename ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/{ => response}/ClubPostRes.java (67%) diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/application/ClubPostService.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/application/ClubPostService.java index 8768498..5bff447 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/application/ClubPostService.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/application/ClubPostService.java @@ -2,12 +2,12 @@ import depth.main.ideac.domain.club_post.ClubPost; import depth.main.ideac.domain.club_post.ClubPostImage; -import depth.main.ideac.domain.club_post.dto.ClubPostReq; -import depth.main.ideac.domain.club_post.dto.ClubPostRes; +import depth.main.ideac.domain.club_post.dto.request.ClubPostReq; +import depth.main.ideac.domain.club_post.dto.response.ClubPostRes; import depth.main.ideac.domain.club_post.repository.ClubPostImageRepository; import depth.main.ideac.domain.club_post.repository.ClubPostRepository; -import depth.main.ideac.domain.club_post.dto.ClubPostDetailRes; -import depth.main.ideac.domain.club_post.dto.UpdateClubPostReq; +import depth.main.ideac.domain.club_post.dto.response.ClubPostDetailRes; +import depth.main.ideac.domain.club_post.dto.request.UpdateClubPostReq; import depth.main.ideac.domain.user.domain.Role; import depth.main.ideac.domain.user.domain.User; import depth.main.ideac.global.error.DefaultException; @@ -42,6 +42,7 @@ public Page getAllClubPosts(Pageable pageable) { List clubPostResList = posts.getContent().stream() .map(clubPost -> ClubPostRes.builder() + .id(clubPost.getId()) .title(clubPost.getTitle()) .description(clubPost.getDetailedDescription()) .createdAt(clubPost.getCreatedAt()) @@ -72,6 +73,7 @@ public ClubPostDetailRes getDetailClubPosts(Long clubId) { .toList(); return ClubPostDetailRes.builder() + .id(clubPost.getId()) .title(clubPost.getTitle()) .description(clubPost.getDetailedDescription()) .url1(clubPost.getUrl1()) diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostReq.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/ClubPostReq.java similarity index 86% rename from ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostReq.java rename to ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/ClubPostReq.java index 38bfea6..3105dd1 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostReq.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/ClubPostReq.java @@ -1,12 +1,13 @@ -package depth.main.ideac.domain.club_post.dto; +package depth.main.ideac.domain.club_post.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; -@Data +@Getter @NoArgsConstructor @AllArgsConstructor public class ClubPostReq { @@ -22,5 +23,4 @@ public class ClubPostReq { private String url2; - // 이미지 path는 추후 추가 } diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/UpdateClubPostReq.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java similarity index 85% rename from ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/UpdateClubPostReq.java rename to ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java index 6d4f190..4912445 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/UpdateClubPostReq.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java @@ -1,4 +1,4 @@ -package depth.main.ideac.domain.club_post.dto; +package depth.main.ideac.domain.club_post.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; -@Data @NoArgsConstructor @AllArgsConstructor @Getter @@ -25,6 +24,4 @@ public class UpdateClubPostReq { private String url2; - // private List clubPostImages; - } diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostDetailRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java similarity index 78% rename from ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostDetailRes.java rename to ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java index 919d443..0af6fe2 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostDetailRes.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java @@ -1,15 +1,18 @@ -package depth.main.ideac.domain.club_post.dto; +package depth.main.ideac.domain.club_post.dto.response; import lombok.Builder; import lombok.Data; +import lombok.Getter; import java.time.LocalDateTime; import java.util.List; -@Data +@Getter @Builder public class ClubPostDetailRes { + private Long id; + private String title; private String description; diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostRes.java similarity index 67% rename from ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostRes.java rename to ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostRes.java index 2f0af4c..729df3f 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/ClubPostRes.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostRes.java @@ -1,15 +1,17 @@ -package depth.main.ideac.domain.club_post.dto; +package depth.main.ideac.domain.club_post.dto.response; -import depth.main.ideac.domain.club_post.ClubPost; import lombok.Builder; -import lombok.Data; +import lombok.Getter; + import java.time.LocalDateTime; -@Data +@Getter @Builder public class ClubPostRes { + private Long id; + private String title; private String description; diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/presentation/ClubPostController.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/presentation/ClubPostController.java index 44035dd..7efa967 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/presentation/ClubPostController.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/presentation/ClubPostController.java @@ -1,10 +1,10 @@ package depth.main.ideac.domain.club_post.presentation; import depth.main.ideac.domain.club_post.application.ClubPostService; -import depth.main.ideac.domain.club_post.dto.ClubPostDetailRes; -import depth.main.ideac.domain.club_post.dto.ClubPostReq; -import depth.main.ideac.domain.club_post.dto.ClubPostRes; -import depth.main.ideac.domain.club_post.dto.UpdateClubPostReq; +import depth.main.ideac.domain.club_post.dto.response.ClubPostDetailRes; +import depth.main.ideac.domain.club_post.dto.request.ClubPostReq; +import depth.main.ideac.domain.club_post.dto.response.ClubPostRes; +import depth.main.ideac.domain.club_post.dto.request.UpdateClubPostReq; import depth.main.ideac.global.config.security.token.CurrentUser; import depth.main.ideac.global.config.security.token.UserPrincipal; import depth.main.ideac.global.payload.ApiResponse; @@ -38,7 +38,7 @@ public class ClubPostController { @Operation(summary = "글 전체 조회", description = "동아리/학회 페이지의 글을 전체 조회하는 API입니다.") @GetMapping public ResponseEntity getAllClubPosts(@RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "10") int size) { + @RequestParam(defaultValue = "10") int size) { Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending()); Page posts = clubPostService.getAllClubPosts(pageable); diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java b/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java index 0cf9bf6..bd34a69 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/home/application/HomeService.java @@ -2,10 +2,10 @@ import depth.main.ideac.domain.club_post.ClubPost; import depth.main.ideac.domain.club_post.ClubPostImage; -import depth.main.ideac.domain.club_post.dto.ClubPostRes; +import depth.main.ideac.domain.club_post.dto.response.ClubPostRes; import depth.main.ideac.domain.club_post.repository.ClubPostRepository; import depth.main.ideac.domain.idea_post.IdeaPost; -import depth.main.ideac.domain.idea_post.dto.GetAllIdeasRes; +import depth.main.ideac.domain.idea_post.dto.response.GetAllIdeasRes; import depth.main.ideac.domain.idea_post.repository.IdeaPostRepository; import depth.main.ideac.domain.project_post.ProjectPost; import depth.main.ideac.domain.project_post.ProjectPostImage; @@ -27,17 +27,19 @@ public class HomeService { private final IdeaPostRepository ideaPostRepository; private final ProjectPostRepository projectPostRepository; - // 아이디어 public List getIdeas() { List ideaPosts = ideaPostRepository.findTop3ByOrderByCreatedAtDesc(); return ideaPosts.stream() .map(ideaPost -> GetAllIdeasRes.builder() + .id(ideaPost.getId()) .title(ideaPost.getTitle()) .simpleDescription(ideaPost.getSimpleDescription()) .keyword(ideaPost.getKeyword()) + .hits(ideaPost.getHits()) .color(ideaPost.getUser().getColor()) .nickName(ideaPost.getUser().getNickname()) + .createdAt(ideaPost.getCreatedAt()) .build()) .collect(Collectors.toList()); } @@ -54,12 +56,15 @@ public List getProjects() { .map(ProjectPostImage::getImagePath) .orElse(null); return ProjectRes.builder() + .id(projectPost.getId()) .booleanWeb(projectPost.isBooleanWeb()) .booleanApp(projectPost.isBooleanApp()) .booleanAi(projectPost.isBooleanAi()) .team(projectPost.getTeam()) .title(projectPost.getTitle()) .simpleDescription(projectPost.getSimpleDescription()) + .hits(projectPost.getHits()) + .createdAt(projectPost.getCreatedAt()) .thumbnail(thumbnail) .build(); }) @@ -72,6 +77,7 @@ public List getClubs() { return clubPosts.stream() .map(clubPost -> ClubPostRes.builder() + .id(clubPost.getId()) .title(clubPost.getTitle()) .description(clubPost.getDetailedDescription()) .thumbnail(clubPost.getClubPostImages().stream() diff --git a/ideac-user/src/main/java/depth/main/ideac/domain/home/presentation/HomeController.java b/ideac-user/src/main/java/depth/main/ideac/domain/home/presentation/HomeController.java index dd27c7e..50e1e89 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/home/presentation/HomeController.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/home/presentation/HomeController.java @@ -1,8 +1,8 @@ package depth.main.ideac.domain.home.presentation; -import depth.main.ideac.domain.club_post.dto.ClubPostRes; +import depth.main.ideac.domain.club_post.dto.response.ClubPostRes; import depth.main.ideac.domain.home.application.HomeService; -import depth.main.ideac.domain.idea_post.dto.GetAllIdeasRes; +import depth.main.ideac.domain.idea_post.dto.response.GetAllIdeasRes; import depth.main.ideac.domain.project_post.dto.response.ProjectRes; import depth.main.ideac.global.payload.ApiResponse; import io.swagger.v3.oas.annotations.Operation; From 954c934e8c29c006b8aa4b968f424c31370542e6 Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Fri, 12 Jan 2024 18:21:34 +0900 Subject: [PATCH 3/6] Delete ideac-core/src/main/resources/applcation-mail.yml --- ideac-core/src/main/resources/applcation-mail.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 ideac-core/src/main/resources/applcation-mail.yml diff --git a/ideac-core/src/main/resources/applcation-mail.yml b/ideac-core/src/main/resources/applcation-mail.yml deleted file mode 100644 index 210bd97..0000000 --- a/ideac-core/src/main/resources/applcation-mail.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring : - mail : - host : smtp.gmail.com - port : 587 - username : ideac2587@gmail.com - password : snve mylt ikyk alpy - properties : - mail : - smtp : - auth : true - starttls : - enable : true \ No newline at end of file From b5025f41a1892795ebc574a44a1dafe6ecf58960 Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:26:52 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Refactor:=20idea=20=EA=B4=80=EB=A0=A8=20dto?= =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ideac/domain/idea_post/application/IdeaPostService.java | 4 +++- .../domain/idea_post/dto/{ => request}/RegisterIdeaReq.java | 2 +- .../domain/idea_post/dto/{ => request}/UpdateIdeaReq.java | 2 +- .../domain/idea_post/dto/{ => response}/GetAllIdeasRes.java | 2 +- .../domain/idea_post/dto/{ => response}/GetDetailIdeaRes.java | 2 +- .../domain/idea_post/presentation/IdeaPostController.java | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) rename ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/{ => request}/RegisterIdeaReq.java (92%) rename ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/{ => request}/UpdateIdeaReq.java (92%) rename ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/{ => response}/GetAllIdeasRes.java (90%) rename ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/{ => response}/GetDetailIdeaRes.java (88%) 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 index 8e5bba0..28aced8 100644 --- 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/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/RegisterIdeaReq.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/request/RegisterIdeaReq.java similarity index 92% rename from ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/RegisterIdeaReq.java rename to ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/request/RegisterIdeaReq.java index d37beab..738ee46 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/RegisterIdeaReq.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/idea_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/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/UpdateIdeaReq.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/request/UpdateIdeaReq.java similarity index 92% rename from ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/UpdateIdeaReq.java rename to ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/request/UpdateIdeaReq.java index 5bbfa4a..fe02dfd 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/UpdateIdeaReq.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/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/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/response/GetAllIdeasRes.java similarity index 90% rename from ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java rename to ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/response/GetAllIdeasRes.java index 31b8af6..23e7ef9 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetAllIdeasRes.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/idea_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/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/response/GetDetailIdeaRes.java similarity index 88% rename from ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java rename to ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/response/GetDetailIdeaRes.java index f379d19..5880833 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/dto/GetDetailIdeaRes.java +++ b/ideac-user/src/main/java/depth/main/ideac/domain/idea_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/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/presentation/IdeaPostController.java b/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/presentation/IdeaPostController.java index b6b77b4..e48f72c 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/idea_post/presentation/IdeaPostController.java +++ b/ideac-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; From 2089799d3849561a1d5b02443d948d2528301189 Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:31:15 +0900 Subject: [PATCH 5/6] Delete ideac-admin/src/main/resources/applcation-swagger.yml --- ideac-admin/src/main/resources/applcation-swagger.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ideac-admin/src/main/resources/applcation-swagger.yml diff --git a/ideac-admin/src/main/resources/applcation-swagger.yml b/ideac-admin/src/main/resources/applcation-swagger.yml deleted file mode 100644 index e2810e6..0000000 --- a/ideac-admin/src/main/resources/applcation-swagger.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Swagger springdoc-ui Configuration -springdoc: - default-consumes-media-type: application/json;charset=UTF-8 - default-produces-media-type: application/json;charset=UTF-8 - swagger-ui: - path: / # Swagger UI 경로 => localhost:8000/swagger - tags-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬 - operations-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬 - api-docs: - groups: - enabled: true \ No newline at end of file From 8e351b8ed5f5b191648866a9408e779e14494280 Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:36:43 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Refactor:=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IDEA-CAMPUS-Server | 1 - Idea | 1 - .../main/ideac/domain/club_post/dto/request/ClubPostReq.java | 1 - .../ideac/domain/club_post/dto/request/UpdateClubPostReq.java | 1 - .../ideac/domain/club_post/dto/response/ClubPostDetailRes.java | 1 - 5 files changed, 5 deletions(-) delete mode 160000 IDEA-CAMPUS-Server delete mode 160000 Idea diff --git a/IDEA-CAMPUS-Server b/IDEA-CAMPUS-Server deleted file mode 160000 index 0b7dac2..0000000 --- a/IDEA-CAMPUS-Server +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b7dac27d9e2deacf73e9b80bcc14c76704799bc diff --git a/Idea b/Idea deleted file mode 160000 index d257a6f..0000000 --- a/Idea +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d257a6f432116443a019fb13b555a12b7c374375 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 index 3105dd1..c17d760 100644 --- 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/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java index 4912445..8416908 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/request/UpdateClubPostReq.java +++ b/ideac-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/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java b/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java index 0af6fe2..9578a57 100644 --- a/ideac-user/src/main/java/depth/main/ideac/domain/club_post/dto/response/ClubPostDetailRes.java +++ b/ideac-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;