Merge pull request #131 from Mojacknong/bug_130/클라이언트-버그-수정

Bug 130/클라이언트 버그 수정
Mojacknong · Sep 18, 2024 · 1458bae · 1458bae
2 parents c27af1f + 80ada2d
commit 1458bae
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 15 deletions.
diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/helper/UserFarmClubHelper.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/helper/UserFarmClubHelper.java
@@ -9,6 +9,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.util.Optional;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -30,6 +32,10 @@ public UserFarmClub findByUserIdAndFarmClubId(Long userId, Long farmClubId) {
                 .orElseThrow(() -> new FarmClubEntityNotFoundException("해당 팜클럽에 가입한 유저가 아닙니다.", FarmClubErrorCode.USER_FARM_CLUB_NOT_FOUND));
     }
 
+    public Optional<UserFarmClub> findFarmClubByMyVeggieId(Long myVeggieId){
+        return userFarmClubRepository.findFarmClubByMyVeggieId(myVeggieId);
+    }
+
     public SuccessFarmClubVo getFarmClubRecord(Long userId, Long farmClubId) {
         return userFarmClubRepository.getFarmClubRecord(userId, farmClubId);
     }

diff --git a/...om/modernfarmer/farmusspring/domain/farmclub/repository/UserFarmClubRepositoryCustom.java b/...om/modernfarmer/farmusspring/domain/farmclub/repository/UserFarmClubRepositoryCustom.java
@@ -15,4 +15,6 @@ public interface UserFarmClubRepositoryCustom {
     SuccessFarmClubVo getFarmClubRecord(Long userId, Long farmClubId);
 
     void deleteFarmClubDomain(List<MyVeggie> myVeggieList);
+
+    Optional<UserFarmClub> findFarmClubByMyVeggieId(Long myVeggieId);
 }
diff --git a/.../com/modernfarmer/farmusspring/domain/farmclub/repository/UserFarmClubRepositoryImpl.java b/.../com/modernfarmer/farmusspring/domain/farmclub/repository/UserFarmClubRepositoryImpl.java
@@ -59,10 +59,20 @@ public SuccessFarmClubVo getFarmClubRecord(Long userId, Long farmClubId) {
 
 
     @Override
-    public void deleteFarmClubDomain(List<MyVeggie> myVeggieList){
+    public void deleteFarmClubDomain(List<MyVeggie> myVeggieList) {
         queryFactory
                 .delete(userFarmClub)
                 .where(userFarmClub.myVeggie.id.in(myVeggieList.stream().map(MyVeggie::getId).toList()))
                 .execute();
     }
+
+    @Override
+    public Optional<UserFarmClub> findFarmClubByMyVeggieId(Long myVeggieId) {
+        return Optional.ofNullable(queryFactory
+                .select(userFarmClub)
+                .from(userFarmClub)
+                .where(userFarmClub.myVeggie.id.eq(myVeggieId))
+                .fetchOne());
+    }
 }
+
diff --git a/.../com/modernfarmer/farmusspring/domain/myveggiegarden/dto/request/MyVeggieDiaryInsert.java b/.../com/modernfarmer/farmusspring/domain/myveggiegarden/dto/request/MyVeggieDiaryInsert.java
@@ -12,10 +12,10 @@
 public class MyVeggieDiaryInsert {
      @NotNull(message = "null 값을 가지면 안됩니다.")
      String content;
-
      Boolean isOpen;
      @NotNull(message = "null 값을 가지면 안됩니다.")
      String state;
      @NotNull(message = "null 값을 가지면 안됩니다.")
      Long myVeggieId;
+
 }
diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/myveggiegarden/entity/Diary.java b/src/main/java/com/modernfarmer/farmusspring/domain/myveggiegarden/entity/Diary.java
@@ -61,13 +61,14 @@ public class Diary extends BaseEntity {
     @JoinColumn(name = "farm_club_id")
     private FarmClub farmClub;
 
-    public static Diary createDiary(String content, Boolean isOpen, String image, String state, MyVeggie myVeggie){
+    public static Diary createDiary(String content, Boolean isOpen, String image, String state, MyVeggie myVeggie, FarmClub farmClubId){
         Diary newDiary = Diary.builder()
                 .content(content)
                 .isOpen(isOpen)
                 .image(image)
                 .state(state)
                 .myVeggie(myVeggie)
+                .farmClub(farmClubId)
                 .build();
 
         myVeggie.addDiary(newDiary);

diff --git a/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieDiaryService.java b/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieDiaryService.java
@@ -1,5 +1,8 @@
 package com.modernfarmer.farmusspring.domain.myveggiegarden.service;
 
+import com.modernfarmer.farmusspring.domain.farmclub.entity.FarmClub;
+import com.modernfarmer.farmusspring.domain.farmclub.entity.UserFarmClub;
+import com.modernfarmer.farmusspring.domain.farmclub.helper.UserFarmClubHelper;
 import com.modernfarmer.farmusspring.domain.myveggiegarden.dto.SortedMyLikeDiary;
 import com.modernfarmer.farmusspring.domain.myveggiegarden.dto.request.DiaryCommentReportDto;
 import com.modernfarmer.farmusspring.domain.myveggiegarden.dto.request.DiaryDeleteDto;
@@ -44,7 +47,7 @@ public class MyVeggieDiaryService {
     private final MyVeggieRepository myVeggieRepository;
     private final UserService userService;
     private final DiaryRepository diaryRepository;
-    private final DiaryCommentRepository diaryCommentRepository;
+    private final UserFarmClubHelper userFarmClubHelper;
     private final DiaryLikeRepository diaryLikeRepository;
     private final UserHelper userHelper;
     private final DiaryCommentHelper diaryCommentHelper;
@@ -59,12 +62,24 @@ public BaseResponseDto<Void> settingMyVeggieDiary(
             Long myVeggieId
     ) throws IOException {
         String imageUrl = getImageUrl(multipartFile);
-        addMyyVeggieDiary(
-                content,
-                isOpen,
-                imageUrl,
-                state,
-                myVeggieId
+        Optional<UserFarmClub> userFarmClub = userFarmClubHelper.findFarmClubByMyVeggieId(myVeggieId);
+        userFarmClub.ifPresentOrElse(
+                farmClub -> addMyyVeggieDiary(
+                        content,
+                        isOpen,
+                        imageUrl,
+                        state,
+                        myVeggieId,
+                        farmClub.getFarmClub()
+                ),
+                () -> addMyyVeggieDiary(
+                        content,
+                        isOpen,
+                        imageUrl,
+                        state,
+                        myVeggieId,
+                        null
+                )
         );
         return BaseResponseDto.of(SuccessCode.SUCCESS,null);
     }
@@ -126,12 +141,19 @@ private List<FarmClubDiary> proccessFarmClubData(List<SortedMyLikeDiary> diaryAl
                     user,
                     DateManager.dotDateTime(allDiary.getDiary().getCreatedDate()),
                     allDiary.getDiary().getDiaryLikes().size(),
-                    allDiary.getDiary().getDiaryComments().size(),
+                    distinguishReportComment(allDiary.getDiary().getDiaryComments(), user.getId()),
                     allDiary.isMyLike(),
                     allDiary.isMyDiary(),
                     allDiary.getDiary().getState()
                     );}).toList();
     }
+
+    private int distinguishReportComment(List<DiaryComment> diaryCommentList, Long userId) {
+        return (int) diaryCommentList.stream()
+                .filter(comment -> comment.getDiaryCommentReports().stream()
+                        .noneMatch(report -> report.getUser().getId().equals(userId)))
+                .count();
+    }
     @Transactional
     public List<AllDairy> selectDiaryAll(MyVeggie myVeggie, Long userId) {
         List<SortedMyLikeDiary> diaryList = diaryRepository.findDiariesByMyVeggie(myVeggie, userId);
@@ -197,10 +219,11 @@ public DiaryInteractionsDto selectComment(Long userId, Long diaryId)  {
         List<DiaryComment> diaryCommentList = diaryRepository.findDiaryByIdWithUserId(diaryId, userId);
         List<DiaryCommentContent> diaryCommentContent = DiaryCommentContent.processData(diaryCommentList, userId);
         int likeCount = diaryLikeRepository.findDiaryLikeCountById(diaryId);
-        int commentCount = diaryCommentRepository.findDiaryCommentCountById(diaryId);
         Optional<DiaryLike> diaryLike = diaryLikeRepository.findDiaryLikeByDiaryIdAndUserId(diaryId, userId);
-        return DiaryInteractionsDto.of(diaryCommentContent,likeCount,commentCount, diaryLike.isPresent());
+        return DiaryInteractionsDto.of(diaryCommentContent,likeCount,diaryCommentList.size(), diaryLike.isPresent());
     }
+
+
     public void insertComment(String content, User user, Diary diary){
         DiaryComment diaryComment = DiaryComment.createDiaryComment(content, diary, user);
         diary.addDiaryComment(diaryComment);
@@ -244,15 +267,17 @@ private void addMyyVeggieDiary(
             Boolean isOpen,
             String image,
             String state,
-            Long myVeggieId
+            Long myVeggieId,
+            FarmClub farmClub
     ){
         MyVeggie myVeggie = myVeggieGardenService.getMyVeggie(myVeggieId);
         Diary newDiary = Diary.createDiary(
                 content,
                 isOpen,
                 image,
                 state,
-                myVeggie
+                myVeggie,
+                farmClub
         );
         myVeggie.addDiary(newDiary);
     }