From 0ea952641468cba65ea27768c0546ac48da248a2 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 02:49:08 +0900 Subject: [PATCH 01/12] =?UTF-8?q?Feat=20:=209=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5f24a4c..a9dc9c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,3 +12,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From c41c97cc7ac43342cab997af5e3a72728360f07a Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 02:51:59 +0900 Subject: [PATCH 02/12] =?UTF-8?q?Feat=20:=2011=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a9dc9c1..172f42d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,3 +13,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From 224e690f5a72cbf25c9290bd24c370d430de2db9 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:05:46 +0900 Subject: [PATCH 03/12] =?UTF-8?q?Feat=20:=2012=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 172f42d..b56b80c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,3 +14,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From 806bb02cee2f2e9b67b1257c2f18041d4e4b1dc1 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:08:55 +0900 Subject: [PATCH 04/12] =?UTF-8?q?Feat=20:=2013=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b56b80c..f93a969 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,3 +15,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From 7446969ad44710ca1a6dadf92f1f0717b1cd14bf Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:10:22 +0900 Subject: [PATCH 05/12] =?UTF-8?q?Feat=20:=2014=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f93a969..d7e7204 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,3 +16,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From a960a8c49a5d2781e3b3351b595db1926ebd14a7 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:18:17 +0900 Subject: [PATCH 06/12] =?UTF-8?q?Feat=20:=2015=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d7e7204..ee6abd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,3 +17,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From b73121b286c82f2199d44d697fa4590bc4190750 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:26:52 +0900 Subject: [PATCH 07/12] =?UTF-8?q?Feat=20:=2016=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ee6abd2..a8d584a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,3 +18,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From 5e3a929deabe28f11156552a0bd9ee54f2c2dce3 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:28:52 +0900 Subject: [PATCH 08/12] =?UTF-8?q?Feat=20:=2017=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a8d584a..b7c84ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,3 +19,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From 050b95ad0c0e6c2b49358d5ab9243704c567a942 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:33:24 +0900 Subject: [PATCH 09/12] =?UTF-8?q?Feat=20:=2018=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b7c84ef..c76a011 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,3 +20,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From 0485659b12454b0d692514e7a32755a755a54f5d Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 03:34:11 +0900 Subject: [PATCH 10/12] =?UTF-8?q?Feat=20:=2019=EC=B0=A8=20=EC=8B=9C?= =?UTF-8?q?=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c76a011..f1ef194 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,3 +21,4 @@ ENTRYPOINT ["java", "-jar", "/app.jar"] + From ac561ab4f07fa23be15611fd76dce1c2f413a125 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 06:31:53 +0900 Subject: [PATCH 11/12] =?UTF-8?q?Feat=20:=20=EB=B3=80=EC=88=98=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/trello/comment/CommentRepository.java | 4 +++- .../com/example/trello/common/exception/CommentErrorCode.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/trello/comment/CommentRepository.java b/src/main/java/com/example/trello/comment/CommentRepository.java index 1d9f114..797dda4 100644 --- a/src/main/java/com/example/trello/comment/CommentRepository.java +++ b/src/main/java/com/example/trello/comment/CommentRepository.java @@ -1,6 +1,8 @@ package com.example.trello.comment; import com.example.trello.board.Board; +import com.example.trello.common.exception.CommentErrorCode; +import com.example.trello.common.exception.CommentException; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -8,6 +10,6 @@ public interface CommentRepository extends JpaRepository { default Comment findByIdOrElseThrow(Long id){ - return findById(id).orElseThrow(()->new RuntimeException()); + return findById(id).orElseThrow(()->new CommentException(CommentErrorCode.COMMENT_NOT_FOUND)); } } diff --git a/src/main/java/com/example/trello/common/exception/CommentErrorCode.java b/src/main/java/com/example/trello/common/exception/CommentErrorCode.java index c6199e4..f6668fa 100644 --- a/src/main/java/com/example/trello/common/exception/CommentErrorCode.java +++ b/src/main/java/com/example/trello/common/exception/CommentErrorCode.java @@ -8,7 +8,8 @@ @Getter public enum CommentErrorCode { - CANNOT_BE_MODIFIED("댓글 수정은 작성자만 가능합니다", HttpStatus.FORBIDDEN); + CANNOT_BE_MODIFIED("댓글 수정은 작성자만 가능합니다", HttpStatus.FORBIDDEN), + COMMENT_NOT_FOUND("댓글을 찾을 수 없습니다", HttpStatus.NOT_FOUND); private final String message; private final HttpStatus httpStatus; From 1bb19cd736cebc00ad54744f5de6585603f41660 Mon Sep 17 00:00:00 2001 From: kangjunhyuk Date: Tue, 31 Dec 2024 06:32:21 +0900 Subject: [PATCH 12/12] =?UTF-8?q?Feat=20:=20=EC=B9=B4=EB=93=9C=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=EC=8B=9C=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=EC=8A=A4=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EB=A7=B4=EB=B2=84?= =?UTF-8?q?=EB=A5=BC=20=EB=B0=94=EA=BF=80=20=EC=88=98=20=EC=9E=88=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/trello/card/Card.java | 1 + src/main/java/com/example/trello/card/CardService.java | 6 ++++-- .../trello/card/requestDto/UpdateCardRequestDto.java | 6 +++--- .../example/trello/card/responsedto/CardResponseDto.java | 6 +++++- .../trello/card/responsedto/UpdateCardResponseDto.java | 6 +++++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/trello/card/Card.java b/src/main/java/com/example/trello/card/Card.java index 621b3b9..58710af 100644 --- a/src/main/java/com/example/trello/card/Card.java +++ b/src/main/java/com/example/trello/card/Card.java @@ -68,6 +68,7 @@ public void updateCard(UpdateCardResponseDto responseDto) { this.cardList = responseDto.getCardList(); this.title = responseDto.getTitle(); this.description = responseDto.getDescription(); + this.workspaceMember = responseDto.getWorkspaceMember(); this.startAt = responseDto.getStartAt(); this.endAt = responseDto.getEndAt(); } diff --git a/src/main/java/com/example/trello/card/CardService.java b/src/main/java/com/example/trello/card/CardService.java index af8a216..1dca14d 100644 --- a/src/main/java/com/example/trello/card/CardService.java +++ b/src/main/java/com/example/trello/card/CardService.java @@ -91,11 +91,13 @@ public CardResponseDto createdCardService(CardRequestDto requestDto, UserDetails public CardResponseDto updateCardService(Long cardId, UpdateCardRequestDto requestDto, UserDetailsImpl userDetails) { Card card = cardRepository.findByIdOrElseThrow(cardId); - WorkspaceMember workspaceMember = findWorkSpaceMember(userDetails, cardId); + WorkspaceMember changeWorkspaceMember = workspaceMemberRepository.findByIdOrElseThrow(requestDto.getWorkspaceMemberId()); CardList cardList = cardRepository.findByIdOrElseThrow(requestDto.getCardListId()).getCardList(); - UpdateCardResponseDto responseDto = new UpdateCardResponseDto(cardList, requestDto.getTitle(), requestDto.getDescription(), requestDto.getStartAt(), requestDto.getEndAt()); + UpdateCardResponseDto responseDto = new UpdateCardResponseDto(cardList, requestDto.getTitle(), requestDto.getDescription(), changeWorkspaceMember, requestDto.getStartAt(), requestDto.getEndAt()); + + WorkspaceMember workspaceMember = findWorkSpaceMember(userDetails, cardId); if (!workspaceMemberRepository.existsByUserIdAndWorkspaceId(workspaceMember.getId(), card.getCardList().getBoard().getWorkspace().getId())) { throw new WorkspaceMemberException(WorkspaceMemberErrorCode.IS_NOT_WORKSPACEMEMBER); diff --git a/src/main/java/com/example/trello/card/requestDto/UpdateCardRequestDto.java b/src/main/java/com/example/trello/card/requestDto/UpdateCardRequestDto.java index 0c06299..745910f 100644 --- a/src/main/java/com/example/trello/card/requestDto/UpdateCardRequestDto.java +++ b/src/main/java/com/example/trello/card/requestDto/UpdateCardRequestDto.java @@ -15,7 +15,7 @@ public class UpdateCardRequestDto { private String description; - private Long workSpaceMemberId; + private Long workspaceMemberId; @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate startAt; @@ -23,11 +23,11 @@ public class UpdateCardRequestDto { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate endAt; - public UpdateCardRequestDto(String title, Long cardListId, String description, Long workSpaceMemberId, LocalDate startAt, LocalDate endAt) { + public UpdateCardRequestDto(String title, Long cardListId, String description, Long workspaceMemberId, LocalDate startAt, LocalDate endAt) { this.title = title; this.CardListId = cardListId; this.description = description; - this.workSpaceMemberId = workSpaceMemberId; + this.workspaceMemberId = workspaceMemberId; this.startAt = startAt; this.endAt = endAt; } diff --git a/src/main/java/com/example/trello/card/responsedto/CardResponseDto.java b/src/main/java/com/example/trello/card/responsedto/CardResponseDto.java index 15a5e3a..41a4b05 100644 --- a/src/main/java/com/example/trello/card/responsedto/CardResponseDto.java +++ b/src/main/java/com/example/trello/card/responsedto/CardResponseDto.java @@ -21,6 +21,8 @@ public class CardResponseDto { private String description; + private Long workspaceMemberId; + @JsonFormat(pattern = "yyyy-MM-dd") LocalDate startAt; @@ -28,11 +30,12 @@ public class CardResponseDto { LocalDate endAt; - public CardResponseDto(Long cardListId, Long cardId, String title, String description, LocalDate startAt, LocalDate endAt) { + public CardResponseDto(Long cardListId, Long cardId, String title, String description, Long workspaceMemberId, LocalDate startAt, LocalDate endAt) { this.cardListId = cardListId; this.cardId = cardId; this.title = title; this.description = description; + this.workspaceMemberId = workspaceMemberId; this.startAt = startAt; this.endAt =endAt; } @@ -43,6 +46,7 @@ public static CardResponseDto toDto(Card card) { card.getId(), card.getTitle(), card.getDescription(), + card.getWorkspaceMember().getId(), card.getStartAt(), card.getEndAt()); } diff --git a/src/main/java/com/example/trello/card/responsedto/UpdateCardResponseDto.java b/src/main/java/com/example/trello/card/responsedto/UpdateCardResponseDto.java index 8cd2901..003149c 100644 --- a/src/main/java/com/example/trello/card/responsedto/UpdateCardResponseDto.java +++ b/src/main/java/com/example/trello/card/responsedto/UpdateCardResponseDto.java @@ -1,6 +1,7 @@ package com.example.trello.card.responsedto; import com.example.trello.cardlist.CardList; +import com.example.trello.workspace_member.WorkspaceMember; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; @@ -15,16 +16,19 @@ public class UpdateCardResponseDto { private String description; + private WorkspaceMember workspaceMember; + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate startAt; @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate endAt; - public UpdateCardResponseDto(CardList cardListId, String title, String description, LocalDate startAt, LocalDate endAt) { + public UpdateCardResponseDto(CardList cardListId, String title, String description, WorkspaceMember workspaceMember, LocalDate startAt, LocalDate endAt) { this.cardList = cardListId; this.title = title; this.description = description; + this.workspaceMember = workspaceMember; this.startAt = startAt; this.endAt = endAt; }