From f75a7dfae5e7c2711b99ecbd5eca520e73a26199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B5=AC=ED=99=98=EC=A4=80/=EB=AA=A8=EA=B1=B4?= Date: Tue, 25 Jun 2024 20:41:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20Feat:=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20treehouseId=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Feat: 알림조회 시 treehouseId 필드 추가 --- build.gradle | 1 + .../server/api/notification/business/NotificationMapper.java | 1 + .../notification/presentation/dto/NotificationResponseDTO.java | 1 + 3 files changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index bab89af..e15df12 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ repositories { } dependencies { + implementation 'org.springframework.boot:spring-boot-starter' // spring data jpa implementation 'org.springframework.boot:spring-boot-starter-data-jpa' diff --git a/src/main/java/treehouse/server/api/notification/business/NotificationMapper.java b/src/main/java/treehouse/server/api/notification/business/NotificationMapper.java index f8f2f57..221c70b 100644 --- a/src/main/java/treehouse/server/api/notification/business/NotificationMapper.java +++ b/src/main/java/treehouse/server/api/notification/business/NotificationMapper.java @@ -17,6 +17,7 @@ public static NotificationResponseDTO.getNotification toGetNotification(Notifica .profileImageUrl(notification.getSender().getProfileImageUrl()) .userName(notification.getSender().getName()) .receivedTime(String.valueOf(notification.getReceivedTime())) + .treehouseId(notification.getSender().getTreeHouse().getId()) .treehouseName(notification.getSender().getTreeHouse().getName()) .isChecked(notification.isChecked()) .targetId(notification.getTargetId()) diff --git a/src/main/java/treehouse/server/api/notification/presentation/dto/NotificationResponseDTO.java b/src/main/java/treehouse/server/api/notification/presentation/dto/NotificationResponseDTO.java index 5933f02..68887d9 100644 --- a/src/main/java/treehouse/server/api/notification/presentation/dto/NotificationResponseDTO.java +++ b/src/main/java/treehouse/server/api/notification/presentation/dto/NotificationResponseDTO.java @@ -17,6 +17,7 @@ public static class getNotification { private String profileImageUrl; private String userName; private String receivedTime; + private Long treehouseId; private String treehouseName; private Boolean isChecked; private Long targetId; From ccfb854b24854e1a7136065150d4f49ce3d0e82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B5=AC=ED=99=98=EC=A4=80/=EB=AA=A8=EA=B1=B4?= Date: Wed, 26 Jun 2024 11:08:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20Refactor:=20TimeFor?= =?UTF-8?q?matter=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=9C=84=EC=B9=98=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/treehouse/server/api/post/business/PostMapper.java | 3 +-- .../server/global/common/{ => util}/TimeFormatter.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) rename src/main/java/treehouse/server/global/common/{ => util}/TimeFormatter.java (95%) diff --git a/src/main/java/treehouse/server/api/post/business/PostMapper.java b/src/main/java/treehouse/server/api/post/business/PostMapper.java index ebd8ff9..d6473b8 100644 --- a/src/main/java/treehouse/server/api/post/business/PostMapper.java +++ b/src/main/java/treehouse/server/api/post/business/PostMapper.java @@ -6,11 +6,10 @@ import treehouse.server.api.post.presentation.dto.PostResponseDTO; import treehouse.server.api.member.business.MemberMapper; import treehouse.server.api.reaction.presentation.dto.ReactionResponseDTO; -import treehouse.server.global.common.TimeFormatter; +import treehouse.server.global.common.util.TimeFormatter; import treehouse.server.global.entity.member.Member; import treehouse.server.global.entity.post.Post; import treehouse.server.global.entity.post.PostImage; -import treehouse.server.global.entity.report.Report; import treehouse.server.global.entity.treeHouse.TreeHouse; import treehouse.server.global.feign.dto.PresignedUrlDTO; diff --git a/src/main/java/treehouse/server/global/common/TimeFormatter.java b/src/main/java/treehouse/server/global/common/util/TimeFormatter.java similarity index 95% rename from src/main/java/treehouse/server/global/common/TimeFormatter.java rename to src/main/java/treehouse/server/global/common/util/TimeFormatter.java index 6c72430..d59716e 100644 --- a/src/main/java/treehouse/server/global/common/TimeFormatter.java +++ b/src/main/java/treehouse/server/global/common/util/TimeFormatter.java @@ -1,4 +1,4 @@ -package treehouse.server.global.common; +package treehouse.server.global.common.util; import java.time.Duration; import java.time.LocalDateTime;