From 13139be3feb0961e075fb7a09ad1e039a26ea578 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Tue, 14 Jan 2025 00:46:31 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore=20:=20cors=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/neighbors/tohero/common/config/SecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java b/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java index 904afd1..5525eae 100644 --- a/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java +++ b/src/main/java/com/neighbors/tohero/common/config/SecurityConfig.java @@ -82,6 +82,7 @@ public CorsFilter corsFilter() { List allowedOrigins = new ArrayList<>(); allowedOrigins.add("https://glittery-madeleine-215e2f.netlify.app"); allowedOrigins.add("https://tohero.co.kr"); + allowedOrigins.add("http://localhost:5173"); config.setAllowedOrigins(allowedOrigins); // 여러 도메인 추가 config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); // 허용할 HTTP 메서드 config.setAllowedHeaders(List.of("*")); // 모든 헤더 허용 From 55fe300ade3aa82be1b9827e96604d8d6e14e0a2 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Wed, 15 Jan 2025 14:55:58 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat(presentation)=20:=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20API=20=EC=97=90=EC=84=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=9D=98=EA=B2=AC=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/user/dto/SignOutRequest.java | 16 ++++++++++++++++ .../application/user/service/UserService.java | 3 ++- .../presentation/controller/UserController.java | 6 ++++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/neighbors/tohero/application/user/dto/SignOutRequest.java diff --git a/src/main/java/com/neighbors/tohero/application/user/dto/SignOutRequest.java b/src/main/java/com/neighbors/tohero/application/user/dto/SignOutRequest.java new file mode 100644 index 0000000..a592886 --- /dev/null +++ b/src/main/java/com/neighbors/tohero/application/user/dto/SignOutRequest.java @@ -0,0 +1,16 @@ +package com.neighbors.tohero.application.user.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.Length; + +public record SignOutRequest( + @NotBlank + @Length(min = 1, max = 30) + String reasonCategory, + + @JsonInclude(JsonInclude.Include.NON_NULL) + @Length(min = 1, max = 500) + String opinionForService +) { +} diff --git a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java index 3ff2cc9..f3553ba 100644 --- a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java +++ b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java @@ -5,6 +5,7 @@ import com.neighbors.tohero.application.baseResponse.BaseResponseStatus; import com.neighbors.tohero.application.user.dto.AuthenticateUserRequest; import com.neighbors.tohero.application.user.dto.AuthenticateUserResponse; +import com.neighbors.tohero.application.user.dto.SignOutRequest; import com.neighbors.tohero.common.enums.Role; import com.neighbors.tohero.common.jwt.AuthTokens; import com.neighbors.tohero.common.jwt.JwtProvider; @@ -51,7 +52,7 @@ public BaseResponse logout(HttpSession httpSession){ ); } - public BaseResponse signout(JwtUserDetails jwtUserDetails, HttpSession httpSession){ + public BaseResponse signout(JwtUserDetails jwtUserDetails, HttpSession httpSession, SignOutRequest signOutRequest){ httpSession.invalidate(); deleteUser.signout(jwtUserDetails.getUserId()); diff --git a/src/main/java/com/neighbors/tohero/presentation/controller/UserController.java b/src/main/java/com/neighbors/tohero/presentation/controller/UserController.java index a129096..dffe015 100644 --- a/src/main/java/com/neighbors/tohero/presentation/controller/UserController.java +++ b/src/main/java/com/neighbors/tohero/presentation/controller/UserController.java @@ -2,6 +2,7 @@ import com.neighbors.tohero.application.baseResponse.BaseResponse; import com.neighbors.tohero.application.user.dto.AuthenticateUserRequest; +import com.neighbors.tohero.application.user.dto.SignOutRequest; import com.neighbors.tohero.application.user.dto.UpdateUserName; import com.neighbors.tohero.application.user.service.UserService; import com.neighbors.tohero.common.jwt.JwtUserDetails; @@ -50,9 +51,10 @@ public ResponseEntity logout(@Parameter(hidden=true) HttpSession h @PostMapping("/signout") public ResponseEntity signout( @Parameter(hidden=true) @AuthenticationPrincipal JwtUserDetails jwtUserDetail, - @Parameter(hidden=true) HttpSession httpSession + @Parameter(hidden=true) HttpSession httpSession, + @RequestBody @Validated SignOutRequest signOutRequest ){ return ResponseEntity.ok() - .body(userService.signout(jwtUserDetail, httpSession)); + .body(userService.signout(jwtUserDetail, httpSession, signOutRequest)); } } From 8e7471d45f565dfb949b25aadad3d717f5c53c8f Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Wed, 15 Jan 2025 14:59:58 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat(application)=20:=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20API=EC=97=90=EC=84=9C=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=20=EC=82=AC=EC=9C=A0=20=EC=9E=85=EB=A0=A5=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/user/service/UserService.java | 3 +++ .../domain/domain/user/model/UserOpinion.java | 4 ++++ .../domain/user/service/CreateUserOpinion.java | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java create mode 100644 src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java diff --git a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java index f3553ba..d40140f 100644 --- a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java +++ b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java @@ -12,6 +12,7 @@ import com.neighbors.tohero.common.jwt.JwtUserDetails; import com.neighbors.tohero.domain.domain.user.model.User; import com.neighbors.tohero.domain.domain.user.service.CreateUser; +import com.neighbors.tohero.domain.domain.user.service.CreateUserOpinion; import com.neighbors.tohero.domain.domain.user.service.DeleteUser; import com.neighbors.tohero.domain.domain.user.service.UpdateUser; import jakarta.servlet.http.HttpSession; @@ -26,6 +27,7 @@ public class UserService { private final CreateUser createUser; private final DeleteUser deleteUser; private final JwtProvider jwtProvider; + private final CreateUserOpinion createUserOpinion; public BaseResponse updateUserName(long userId, String nickname){ @@ -55,6 +57,7 @@ public BaseResponse logout(HttpSession httpSession){ public BaseResponse signout(JwtUserDetails jwtUserDetails, HttpSession httpSession, SignOutRequest signOutRequest){ httpSession.invalidate(); + createUserOpinion.createSignOutOpinion(signOutRequest.reasonCategory(), signOutRequest.opinionForService()); deleteUser.signout(jwtUserDetails.getUserId()); return new BaseResponse<>( diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java b/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java new file mode 100644 index 0000000..071af8d --- /dev/null +++ b/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java @@ -0,0 +1,4 @@ +package com.neighbors.tohero.domain.domain.user.model; + +public class UserOpinion { +} diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java b/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java new file mode 100644 index 0000000..0bd8c88 --- /dev/null +++ b/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java @@ -0,0 +1,13 @@ +package com.neighbors.tohero.domain.domain.user.service; + +import com.neighbors.tohero.common.annotaion.DomainService; +import lombok.RequiredArgsConstructor; + +@DomainService +@RequiredArgsConstructor +public class CreateUserOpinion { + + public void createSignOutOpinion(String signOutCategory, String adviceForService){ + + } +} From 17bafea77d5096f549e575e36b52a2c15997cb97 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Wed, 15 Jan 2025 15:03:48 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat(domain)=20:=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20API=EC=97=90=EC=84=9C=20=ED=83=88=ED=87=B4?= =?UTF-8?q?=20=EC=82=AC=EC=9C=A0=20=EC=9E=85=EB=A0=A5=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/service/CreateUserOpinion.java | 5 ++++- .../tohero/domain/query/UserOpinionRepository.java | 5 +++++ .../query/impl/UserOpinionRepositoryImpl.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java create mode 100644 src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java b/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java index 0bd8c88..70e9a8c 100644 --- a/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java +++ b/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java @@ -1,13 +1,16 @@ package com.neighbors.tohero.domain.domain.user.service; import com.neighbors.tohero.common.annotaion.DomainService; +import com.neighbors.tohero.domain.query.UserOpinionRepository; import lombok.RequiredArgsConstructor; @DomainService @RequiredArgsConstructor public class CreateUserOpinion { - public void createSignOutOpinion(String signOutCategory, String adviceForService){ + private final UserOpinionRepository userOpinionRepository; + public void createSignOutOpinion(String signOutCategory, String adviceForService){ + userOpinionRepository.createSignOutOpinion(signOutCategory, adviceForService); } } diff --git a/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java b/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java new file mode 100644 index 0000000..4a32e26 --- /dev/null +++ b/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java @@ -0,0 +1,5 @@ +package com.neighbors.tohero.domain.query; + +public interface UserOpinionRepository { + void createSignOutOpinion(String signOutCategory, String adviceForService); +} diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java new file mode 100644 index 0000000..3c60931 --- /dev/null +++ b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java @@ -0,0 +1,12 @@ +package com.neighbors.tohero.infrastructure.query.impl; + +import com.neighbors.tohero.domain.query.UserOpinionRepository; +import org.springframework.stereotype.Repository; + +@Repository +public class UserOpinionRepositoryImpl implements UserOpinionRepository { + @Override + public void createSignOutOpinion(String signOutCategory, String adviceForService) { + + } +} From fa2f7c1257fc4971772be96ed7185b285feaff7c Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Wed, 15 Jan 2025 15:16:31 +0900 Subject: [PATCH 5/6] =?UTF-8?q?feat(infrastructure)=20:=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=ED=95=98=EA=B8=B0=20API=EC=97=90=EC=84=9C=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EC=82=AC=EC=9C=A0=20=EC=9E=85=EB=A0=A5=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/user/service/UserService.java | 2 +- .../domain/domain/user/model/UserOpinion.java | 9 +++++ .../user/service/CreateUserOpinion.java | 12 +++++-- .../domain/query/UserOpinionRepository.java | 4 ++- .../entity/UserOpinionEntity.java | 33 +++++++++++++++++++ .../mapper/UserOpinionMapper.java | 13 ++++++++ .../query/impl/UserOpinionRepositoryImpl.java | 15 +++++++-- .../UserOpinionEntityRepository.java | 9 +++++ 8 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/neighbors/tohero/infrastructure/entity/UserOpinionEntity.java create mode 100644 src/main/java/com/neighbors/tohero/infrastructure/mapper/UserOpinionMapper.java create mode 100644 src/main/java/com/neighbors/tohero/infrastructure/repository/UserOpinionEntityRepository.java diff --git a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java index d40140f..7180d30 100644 --- a/src/main/java/com/neighbors/tohero/application/user/service/UserService.java +++ b/src/main/java/com/neighbors/tohero/application/user/service/UserService.java @@ -57,7 +57,7 @@ public BaseResponse logout(HttpSession httpSession){ public BaseResponse signout(JwtUserDetails jwtUserDetails, HttpSession httpSession, SignOutRequest signOutRequest){ httpSession.invalidate(); - createUserOpinion.createSignOutOpinion(signOutRequest.reasonCategory(), signOutRequest.opinionForService()); + createUserOpinion.createSignOutOpinion(signOutRequest.reasonCategory(), signOutRequest.opinionForService(), jwtUserDetails.getEmail()); deleteUser.signout(jwtUserDetails.getUserId()); return new BaseResponse<>( diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java b/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java index 071af8d..86b728b 100644 --- a/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java +++ b/src/main/java/com/neighbors/tohero/domain/domain/user/model/UserOpinion.java @@ -1,4 +1,13 @@ package com.neighbors.tohero.domain.domain.user.model; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder public class UserOpinion { + private int opinionId; + private String signOutCategory; + private String adviceForService; + private String userEmail; } diff --git a/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java b/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java index 70e9a8c..cce5b7b 100644 --- a/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java +++ b/src/main/java/com/neighbors/tohero/domain/domain/user/service/CreateUserOpinion.java @@ -1,6 +1,7 @@ package com.neighbors.tohero.domain.domain.user.service; import com.neighbors.tohero.common.annotaion.DomainService; +import com.neighbors.tohero.domain.domain.user.model.UserOpinion; import com.neighbors.tohero.domain.query.UserOpinionRepository; import lombok.RequiredArgsConstructor; @@ -10,7 +11,14 @@ public class CreateUserOpinion { private final UserOpinionRepository userOpinionRepository; - public void createSignOutOpinion(String signOutCategory, String adviceForService){ - userOpinionRepository.createSignOutOpinion(signOutCategory, adviceForService); + public void createSignOutOpinion(String signOutCategory, String adviceForService, String email){ + + UserOpinion userOpinion = UserOpinion.builder() + .signOutCategory(signOutCategory) + .adviceForService(adviceForService) + .userEmail(email) + .build(); + + userOpinionRepository.createSignOutOpinion(userOpinion); } } diff --git a/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java b/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java index 4a32e26..3dfe015 100644 --- a/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java +++ b/src/main/java/com/neighbors/tohero/domain/query/UserOpinionRepository.java @@ -1,5 +1,7 @@ package com.neighbors.tohero.domain.query; +import com.neighbors.tohero.domain.domain.user.model.UserOpinion; + public interface UserOpinionRepository { - void createSignOutOpinion(String signOutCategory, String adviceForService); + void createSignOutOpinion(UserOpinion userOpinion); } diff --git a/src/main/java/com/neighbors/tohero/infrastructure/entity/UserOpinionEntity.java b/src/main/java/com/neighbors/tohero/infrastructure/entity/UserOpinionEntity.java new file mode 100644 index 0000000..1fa0e0c --- /dev/null +++ b/src/main/java/com/neighbors/tohero/infrastructure/entity/UserOpinionEntity.java @@ -0,0 +1,33 @@ +package com.neighbors.tohero.infrastructure.entity; + +import jakarta.persistence.*; +import lombok.Builder; + +@Entity +@Table(name = "`UserOpinion`") +public class UserOpinionEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "user_opinion_id") + long userOpinionId; + + @Column(name = "signout_category") + String signOutCategory; + + @Column(name = "advice_for_service") + String adviceForService; + + @Column(name = "user_email") + String userEmail; + + private UserOpinionEntity(String signOutCategory, String adviceForService, String email){ + this.signOutCategory = signOutCategory; + this.adviceForService = adviceForService; + this.userEmail = email; + } + + public static UserOpinionEntity of(String signOutCategory, String adviceForService, String email) { + return new UserOpinionEntity(signOutCategory, adviceForService, email); + } +} diff --git a/src/main/java/com/neighbors/tohero/infrastructure/mapper/UserOpinionMapper.java b/src/main/java/com/neighbors/tohero/infrastructure/mapper/UserOpinionMapper.java new file mode 100644 index 0000000..c254c45 --- /dev/null +++ b/src/main/java/com/neighbors/tohero/infrastructure/mapper/UserOpinionMapper.java @@ -0,0 +1,13 @@ +package com.neighbors.tohero.infrastructure.mapper; + +import com.neighbors.tohero.domain.domain.user.model.UserOpinion; +import com.neighbors.tohero.infrastructure.entity.UserOpinionEntity; +import org.springframework.stereotype.Component; + +@Component +public class UserOpinionMapper { + + public UserOpinionEntity toEntity(UserOpinion userOpinion) { + return UserOpinionEntity.of(userOpinion.getSignOutCategory(), userOpinion.getAdviceForService(), userOpinion.getUserEmail()); + } +} diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java index 3c60931..e0e38b7 100644 --- a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java +++ b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserOpinionRepositoryImpl.java @@ -1,12 +1,23 @@ package com.neighbors.tohero.infrastructure.query.impl; +import com.neighbors.tohero.domain.domain.user.model.UserOpinion; import com.neighbors.tohero.domain.query.UserOpinionRepository; +import com.neighbors.tohero.infrastructure.entity.UserOpinionEntity; +import com.neighbors.tohero.infrastructure.mapper.UserOpinionMapper; +import com.neighbors.tohero.infrastructure.repository.UserOpinionEntityRepository; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @Repository +@RequiredArgsConstructor public class UserOpinionRepositoryImpl implements UserOpinionRepository { - @Override - public void createSignOutOpinion(String signOutCategory, String adviceForService) { + private final UserOpinionMapper userOpinionMapper; + private final UserOpinionEntityRepository userOpinionEntityRepository; + + @Override + public void createSignOutOpinion(UserOpinion userOpinion) { + UserOpinionEntity userOpinionEntity = userOpinionMapper.toEntity(userOpinion); + userOpinionEntityRepository.save(userOpinionEntity); } } diff --git a/src/main/java/com/neighbors/tohero/infrastructure/repository/UserOpinionEntityRepository.java b/src/main/java/com/neighbors/tohero/infrastructure/repository/UserOpinionEntityRepository.java new file mode 100644 index 0000000..0cc1b42 --- /dev/null +++ b/src/main/java/com/neighbors/tohero/infrastructure/repository/UserOpinionEntityRepository.java @@ -0,0 +1,9 @@ +package com.neighbors.tohero.infrastructure.repository; + +import com.neighbors.tohero.infrastructure.entity.UserOpinionEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserOpinionEntityRepository extends JpaRepository { +} From f690ad14b96a0a251829b881c29e20f7ba6f4890 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Sun, 19 Jan 2025 04:40:07 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat=20:=20=EB=82=B4=EA=B0=80=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=ED=95=9C=20=ED=8E=B8=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EA=B3=B5=EA=B0=9C=20=EC=97=AC=EB=B6=80=20DTO=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=8F=AC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/letter/dto/GetMyLettersResponse.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/neighbors/tohero/application/letter/dto/GetMyLettersResponse.java b/src/main/java/com/neighbors/tohero/application/letter/dto/GetMyLettersResponse.java index f9beb09..d7e93f5 100644 --- a/src/main/java/com/neighbors/tohero/application/letter/dto/GetMyLettersResponse.java +++ b/src/main/java/com/neighbors/tohero/application/letter/dto/GetMyLettersResponse.java @@ -2,8 +2,6 @@ import com.neighbors.tohero.domain.domain.mainPage.model.Letter; -import java.text.Format; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -16,7 +14,8 @@ public record MyLetterInfo( String from, String createdAt, boolean isOpened, - String content + String content, + boolean isPublic ){ public static MyLetterInfo from(Letter letter){ return new MyLetterInfo( @@ -25,7 +24,9 @@ public static MyLetterInfo from(Letter letter){ letter.getWriter(), letter.getCreatedDate().format(DateTimeFormatter.ofPattern("YY.MM.dd")), letter.isOpened(), - letter.getLetterContent()); + letter.getLetterContent(), + letter.isPublic() + ); } }