From f5c16ac9189e43a8487948ba48ad200b95af6aeb Mon Sep 17 00:00:00 2001
From: Hyoseop Song <crad_on25@naver.com>
Date: Tue, 5 Nov 2024 16:50:52 +0900
Subject: [PATCH] =?UTF-8?q?:recycle:=20refactor:=20=ED=8E=B8=EC=A7=80=20?=
=?UTF-8?q?=EB=B0=9C=EC=8B=A0=EC=9E=90=20=EA=B8=B0=EB=A1=9D=EC=9D=80=20?=
=?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95=EB=B3=B4=EB=A1=9C=20?=
=?UTF-8?q?=EB=B0=94=EC=9D=B8=EB=94=A9=ED=95=98=EB=8F=84=EB=A1=9D=20?=
=?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#117)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../application/RollingPaperService.java | 3 +-
.../toyouserver/domain/SenderSnapshot.java | 14 ++++---
.../application/RollingPaperServiceTest.java | 42 +++++++++----------
3 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java b/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java
index 90d1a2a..8bbd29f 100644
--- a/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java
+++ b/src/main/java/slvtwn/khu/toyouserver/application/RollingPaperService.java
@@ -60,9 +60,8 @@ private RollingPaper generateRollingPaper(Long requestUserId, Long recipientUser
() -> new ToyouException(ResponseType.BAD_REQUEST));
User requestUser = userRepository.findById(requestUserId)
.orElseThrow(() -> new ToyouException(ResponseType.BAD_REQUEST));
-
return new RollingPaper(request.coverImageUrl(), request.title(), request.content(), request.themeId(),
- member, new SenderSnapshot(requestUser.getName(), requestUser.getProfilePicture()));
+ member, SenderSnapshot.of(requestUser));
}
public RollingPaperResponse findById(Long userId, Long rollingPaperId) {
diff --git a/src/main/java/slvtwn/khu/toyouserver/domain/SenderSnapshot.java b/src/main/java/slvtwn/khu/toyouserver/domain/SenderSnapshot.java
index e4f8506..cdd8b7b 100644
--- a/src/main/java/slvtwn/khu/toyouserver/domain/SenderSnapshot.java
+++ b/src/main/java/slvtwn/khu/toyouserver/domain/SenderSnapshot.java
@@ -2,19 +2,21 @@
import jakarta.persistence.Embeddable;
import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
@Embeddable
@Getter
public class SenderSnapshot {
- private String name;
- private String profileImageUrl;
+ private Long senderId;
+ private String name;
+ private String profileImageUrl;
- public SenderSnapshot(String name, String profileImageUrl) {
- this.name = name;
- this.profileImageUrl = profileImageUrl;
- }
+ public static SenderSnapshot of(User user) {
+ return new SenderSnapshot(user.getId(), user.getName(), user.getProfilePicture());
+ }
}
diff --git a/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java b/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java
index e21b70f..608dfe3 100644
--- a/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java
+++ b/src/test/java/slvtwn/khu/toyouserver/application/RollingPaperServiceTest.java
@@ -95,7 +95,7 @@ class RollingPaperServiceTest {
User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
Member member = new Member(user, group);
RollingPaper rollingPaper = new RollingPaper(null, "title", "content", 1L,
- member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group);
@@ -118,7 +118,7 @@ class RollingPaperServiceTest {
User user = new User("name", LocalDate.now(), "introduction", "profile_picture", null);
Member member = new Member(user, group);
RollingPaper rollingPaper = new RollingPaper(null, "title", "content", 1L,
- member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group);
@@ -144,9 +144,9 @@ class RollingPaperServiceTest {
Member member1 = new Member(user, group1);
Member member2 = new Member(user, group2);
RollingPaper rollingPaper = new RollingPaper(null, "title", "rollingPaper", 1L,
- member1, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ member1, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper anotherRollingPaper = new RollingPaper(null, "title", "anotherRollingPaper", 1L,
- member2, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ member2, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group1);
@@ -180,9 +180,9 @@ class RollingPaperServiceTest {
Member member1 = new Member(user, group1);
Member member2 = new Member(user, group2);
RollingPaper rollingPaper = new RollingPaper(null, "title", "rollingPaper", 1L,
- member1, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ member1, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper anotherRollingPaper = new RollingPaper(null, "title", "anotherRollingPaper", 1L,
- member2, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ member2, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group1);
@@ -214,11 +214,11 @@ class RollingPaperServiceTest {
Member member2 = new Member(user, group2);
RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1",
- 1L, member1, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member1, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2",
- 1L, member1, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member1, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3",
- 1L, member2, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member2, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group1);
@@ -254,11 +254,11 @@ class RollingPaperServiceTest {
Member member = new Member(user, group);
RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group);
@@ -293,11 +293,11 @@ class RollingPaperServiceTest {
Member member = new Member(user, group);
RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group);
@@ -331,11 +331,11 @@ class RollingPaperServiceTest {
Member member = new Member(user, group);
RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group);
@@ -363,11 +363,11 @@ class RollingPaperServiceTest {
Member member = new Member(user, group);
RollingPaper rollingPaper1 = new RollingPaper(null, "title1", "rollingPaper1",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper2 = new RollingPaper(null, "title2", "rollingPaper2",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
RollingPaper rollingPaper3 = new RollingPaper(null, "title3", "rollingPaper3",
- 1L, member, new SenderSnapshot(sender.getName(), sender.getProfilePicture()));
+ 1L, member, new SenderSnapshot(sender.getId(), sender.getName(), sender.getProfilePicture()));
entityManager.persist(user);
entityManager.persist(group);