From 782b7a092cfb8a629c3a4269a02c6574b5f9b69a Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Sat, 25 Jan 2025 23:17:24 +0900 Subject: [PATCH 1/2] =?UTF-8?q?hotfix=20:=20=EC=96=91=EB=B0=A9=ED=96=A5=20?= =?UTF-8?q?=EB=A7=A4=ED=95=91=EC=97=90=20=EC=9D=98=ED=95=9C=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EC=83=9D=EC=84=B1=20=EC=8B=A4=ED=8C=A8=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../neighbors/tohero/infrastructure/entity/RecommendEntity.java | 2 +- .../com/neighbors/tohero/infrastructure/entity/UserEntity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/neighbors/tohero/infrastructure/entity/RecommendEntity.java b/src/main/java/com/neighbors/tohero/infrastructure/entity/RecommendEntity.java index 134a188..4096202 100644 --- a/src/main/java/com/neighbors/tohero/infrastructure/entity/RecommendEntity.java +++ b/src/main/java/com/neighbors/tohero/infrastructure/entity/RecommendEntity.java @@ -18,7 +18,7 @@ public class RecommendEntity { private String recommendedPeopleName; @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @JoinColumn(name = "user_id", nullable = false) + @JoinColumn(name = "user_id", nullable = true) private UserEntity userEntity; public RecommendEntity(UserEntity user){ diff --git a/src/main/java/com/neighbors/tohero/infrastructure/entity/UserEntity.java b/src/main/java/com/neighbors/tohero/infrastructure/entity/UserEntity.java index 8a78db9..487d846 100644 --- a/src/main/java/com/neighbors/tohero/infrastructure/entity/UserEntity.java +++ b/src/main/java/com/neighbors/tohero/infrastructure/entity/UserEntity.java @@ -32,7 +32,7 @@ public class UserEntity extends BaseEntity { private String recommenders; @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @JoinColumn(name = "recommend_id", nullable = false) + @JoinColumn(name = "recommend_id", nullable = true) private RecommendEntity recommendEntity; public UserEntity() { From 845885934f534c94ab8e46ab19b73a3442fa2f49 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Sat, 25 Jan 2025 23:31:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?hotfix=20:=20=EC=B6=94=EC=B2=9C=EC=9D=B8=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EA=B0=80=20null=EC=9D=BC=20=EB=95=8C=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infrastructure/query/impl/UserRepositoryImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java index d5824f7..f493657 100644 --- a/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java +++ b/src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java @@ -13,6 +13,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -94,7 +95,10 @@ public void reflectRecommendation(String writer, List recommenderEmails) public List getNameOfWriters(Function> findUserFunction) { UserEntity matchedUserEntity = getUserEntity(findUserFunction); - return Arrays.stream(matchedUserEntity.getRecommendEntity().getRecommendedPeopleName() + String recommendedPeopleName = matchedUserEntity.getRecommendEntity().getRecommendedPeopleName(); + + if(recommendedPeopleName == null) {return new ArrayList<>();} + return Arrays.stream(recommendedPeopleName .split(",")) .toList(); }