Skip to content

Commit 58ebd00

Browse files
authored
Merge pull request #69 from Team-Shaka/feature/67
✨ Feat: 알림조회 시 treehouseId 필드 추가
2 parents 380c27c + ccfb854 commit 58ebd00

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ repositories {
2222
}
2323

2424
dependencies {
25+
implementation 'org.springframework.boot:spring-boot-starter'
2526
// spring data jpa
2627
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
2728

src/main/java/treehouse/server/api/notification/business/NotificationMapper.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public static NotificationResponseDTO.getNotification toGetNotification(Notifica
1717
.profileImageUrl(notification.getSender().getProfileImageUrl())
1818
.userName(notification.getSender().getName())
1919
.receivedTime(String.valueOf(notification.getReceivedTime()))
20+
.treehouseId(notification.getSender().getTreeHouse().getId())
2021
.treehouseName(notification.getSender().getTreeHouse().getName())
2122
.isChecked(notification.isChecked())
2223
.targetId(notification.getTargetId())

src/main/java/treehouse/server/api/notification/presentation/dto/NotificationResponseDTO.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public static class getNotification {
1717
private String profileImageUrl;
1818
private String userName;
1919
private String receivedTime;
20+
private Long treehouseId;
2021
private String treehouseName;
2122
private Boolean isChecked;
2223
private Long targetId;

src/main/java/treehouse/server/api/post/business/PostMapper.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import treehouse.server.api.post.presentation.dto.PostResponseDTO;
77
import treehouse.server.api.member.business.MemberMapper;
88
import treehouse.server.api.reaction.presentation.dto.ReactionResponseDTO;
9-
import treehouse.server.global.common.TimeFormatter;
9+
import treehouse.server.global.common.util.TimeFormatter;
1010
import treehouse.server.global.entity.member.Member;
1111
import treehouse.server.global.entity.post.Post;
1212
import treehouse.server.global.entity.post.PostImage;
13-
import treehouse.server.global.entity.report.Report;
1413
import treehouse.server.global.entity.treeHouse.TreeHouse;
1514
import treehouse.server.global.feign.dto.PresignedUrlDTO;
1615

src/main/java/treehouse/server/global/common/TimeFormatter.java renamed to src/main/java/treehouse/server/global/common/util/TimeFormatter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package treehouse.server.global.common;
1+
package treehouse.server.global.common.util;
22

33
import java.time.Duration;
44
import java.time.LocalDateTime;

0 commit comments

Comments
 (0)