feat : 공유하기에서 로그인 유저가 작성한 경우 추천인 중복 안되도록 설정 (1.30 QA 내용 반영 )

Author: imscow11253

src/main/java/com/neighbors/tohero/application/letter/service/LetterService.java

@@ -30,6 +30,7 @@ public class LetterService {
     private final UpdateLetter updateLetter;
     private final DeleteLetter deleteLetter;
 
+    @Transactional
     public BaseResponse<CreateLetterResponse> createLetter(final JwtUserDetails jwtUserDetail, final CreateLetterRequest createLetterRequest) {
 
         throwExceptionIfAddressIsNotExist(createLetterRequest.addressId());

src/main/java/com/neighbors/tohero/domain/domain/letter/service/CreateLetter.java

@@ -31,6 +31,7 @@ public long createLetter(long userId, String writer, CreateLetterRequest createL
             recommenderEmailDividedBySlash = jwtProvider.getRecommenderEmails(createLetterRequest.recommenderCode());
         }
         User user = userRepository.getUserAndUpdateRecommenders(repo -> repo.findByUserId(userId), recommenderEmailDividedBySlash);
+
         Letter newLetter;
         try{
             Address address = addressRepository.getAddressById(createLetterRequest.addressId());
@@ -110,7 +111,7 @@ private void reflectRecommendation(User user, String writer, String recommenderC
         if(recommenderCode != null){
             String recommenderEmailsDividedBySlash = jwtProvider.getRecommenderEmails(recommenderCode);
             List<String> recommenderEmails = List.of(recommenderEmailsDividedBySlash.split("/"));
-            userRepository.reflectRecommendation(writer, recommenderEmails);
+            userRepository.reflectRecommendation(writer, recommenderEmails, user.getUserId());
         }
     }
 }

src/main/java/com/neighbors/tohero/domain/query/UserRepository.java

@@ -15,6 +15,7 @@ public interface UserRepository {
     User getUser(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction);
     void deleteUser(Consumer<UserEntityRepository> findUserConsumer);
     void reflectRecommendation(String writer, List<String> recommenderEmails);
+    void reflectRecommendation(String writer, List<String> recommenderEmails, long userId);
     User getUserForSharing(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction);
     User getUserAndUpdateRecommenders(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction, String recommenderCode);
 }

src/main/java/com/neighbors/tohero/infrastructure/entity/RecommendEntity.java

@@ -7,16 +7,19 @@
 @Entity
 @Table(name = "`Recommend`")
 @NoArgsConstructor
+@Getter
 public class RecommendEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "recommend_id")
     private long recommendId;
 
     @Column(name = "recommendedPeopleName")
-    @Getter
     private String recommendedPeopleName;
 
+    @Column(name = "recommendedPeopleId")
+    private String recommendedPeopleId = null;
+
     @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name = "user_id", nullable = true)
     private UserEntity userEntity;
@@ -34,10 +37,25 @@ public void addRecommendedPeopleName(String recommendedPeopleName){
         this.recommendedPeopleName = recommendedPeopleName;
     }
 
+    public void addRecommendedPeopleId(long recommendedPeopleId){
+        if(this.recommendedPeopleId != null){
+            this.recommendedPeopleId += "," +recommendedPeopleId;
+            return;
+        }
+        this.recommendedPeopleId = String.valueOf(recommendedPeopleId);
+    }
+
     public String getRecommendedPeopleName(){
         if(recommendedPeopleName == null){
             return "";
         }
         return recommendedPeopleName;
     }
+
+    public String getRecommendedPeopleId(){
+        if(recommendedPeopleId == null){
+            return "";
+        }
+        return recommendedPeopleId;
+    }
 }

src/main/java/com/neighbors/tohero/infrastructure/query/impl/UserRepositoryImpl.java

@@ -13,9 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -90,6 +88,24 @@ public void reflectRecommendation(String writer, List<String> recommenderEmails)
         recommendEntityRepository.saveAll(recommendEntities);
     }
 
+    @Override
+    public void reflectRecommendation(String writer, List<String> recommenderEmails, long userId) {
+        List<RecommendEntity> recommendEntities = recommendEntityRepository.findAllByUserEmailIn(recommenderEmails);
+
+        String userIdStr = String.valueOf(userId);
+        recommendEntities.stream()
+                        .filter(entity ->
+                            Arrays.stream(entity.getRecommendedPeopleId().split(","))
+                                    .noneMatch(id -> id.equals(userIdStr))
+                        )
+                        .forEach(entity -> {
+                            entity.addRecommendedPeopleId(userId);
+                            entity.addRecommendedPeopleName(writer);
+                        });
+
+        recommendEntityRepository.saveAll(recommendEntities);
+    }
+
     @Override
     public User getUserForSharing(Function<UserEntityRepository, Optional<UserEntity>> findUserFunction) {
         UserEntity matchedUserEntity = getUserEntity(findUserFunction);
@@ -125,23 +141,32 @@ private void updateUserRecommenders(UserEntity userEntity, String recommenderEma
         //이전 사람 이름 저장
         String lastUserEmail = recommenderEmailsDividedBySlash.split("/")[recommenderEmailsDividedBySlash.split("/").length - 1];
         UserEntity lastUserEntity = getUserEntity(repo -> repo.findByEmail(lastUserEmail));
-        userEntity.getRecommendEntity().addRecommendedPeopleName(lastUserEntity.getNickName());
+
+        boolean isNotExistId = false;
+        isNotExistId = Arrays.stream(userEntity.getRecommendEntity().getRecommendedPeopleId().split(","))
+                .noneMatch(id -> id.equals(String.valueOf(lastUserEntity.getUserId())));
+
+        if(isNotExistId){
+            userEntity.getRecommendEntity().addRecommendedPeopleName(lastUserEntity.getNickName());
+            userEntity.getRecommendEntity().addRecommendedPeopleId(lastUserEntity.getUserId());
+        }
         userEntityRepository.save(userEntity);
     }
 
     private void queueingUserRecommenders(UserEntity userEntity, String recommenderEmailsDividedBySlash) {
-        List<String> existedRecommendersEmail = new java.util.ArrayList<>(Arrays.stream(userEntity.getRecommenders().split("/")).toList());
-        List<String> addedRecommendersEmail = Arrays.stream(recommenderEmailsDividedBySlash.split("/")).toList();
+        List<String> existedRecommendersEmail = new ArrayList<>(Arrays.asList(userEntity.getRecommenders().split("/")));
+        List<String> addedRecommendersEmail = Arrays.asList(recommenderEmailsDividedBySlash.split("/"));
 
-        String result = userEntity.getRecommenders() + "/" + recommenderEmailsDividedBySlash;
-        if(existedRecommendersEmail.size() + addedRecommendersEmail.size() > 5){
-            existedRecommendersEmail.addAll(addedRecommendersEmail);
+        // 순서를 유지하며 중복 제거
+        LinkedHashSet<String> uniqueEmails = new LinkedHashSet<>(existedRecommendersEmail);
+        uniqueEmails.addAll(addedRecommendersEmail);
 
-            int size = existedRecommendersEmail.size();
-            List<String> lastFive = existedRecommendersEmail.subList(Math.max(0, size - 5), size);
+        // 마지막 5개만 유지
+        List<String> lastFive = new ArrayList<>(uniqueEmails);
+        int size = lastFive.size();
+        List<String> resultEmails = lastFive.subList(Math.max(0, size - 5), size);
 
-            result = String.join("/", lastFive);
-        }
-        userEntity.setRecommenders(result);
+        // 추천인 리스트 업데이트
+        userEntity.setRecommenders(String.join("/", resultEmails));
     }
 }