Merge branch 'refs/heads/develop_back_core' into fix/group_invite_lis…

…t_v2-B-#473 # Conflicts: # backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/repository/group_invite_repository/GroupInviteQueryRepository.java # backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/repository/group_invite_repository/GroupInviteQueryRepositoryImpl.java
tukcomCD2024 · Jun 6, 2024 · 971f0b3 · 971f0b3
2 parents d45ac97 + 887019c
commit 971f0b3
Show file tree

Hide file tree

Showing 37 changed files with 771 additions and 149 deletions.
diff --git a/...rc/main/java/site/timecapsulearchive/core/domain/friend/api/command/FriendCommandApi.java b/...rc/main/java/site/timecapsulearchive/core/domain/friend/api/command/FriendCommandApi.java
@@ -42,6 +42,32 @@ ResponseEntity<ApiSpec<String>> acceptFriendRequest(
         Long friendId
     );
 
+    @Operation(
+        summary = "소셜 친구 요청 삭제",
+        description = "사용자가 보낸 소셜 친구 요청을 삭제한다.",
+        security = {@SecurityRequirement(name = "user_token")},
+        tags = {"friend"}
+    )
+    @ApiResponses(value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "처리 완료"
+        ),
+        @ApiResponse(
+            responseCode = "400",
+            description = """
+                잘못된 요청 파라미터 또는 존재하지 않는 사용자로 요청하거나 존재하지 않는 친구에게 친구 요청을 보낼 경우 발생
+                """,
+            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+        )
+    })
+    ResponseEntity<ApiSpec<String>> deleteSendingFriendInvite(
+        Long memberId,
+
+        @Parameter(in = ParameterIn.PATH, required = true, schema = @Schema())
+        Long friendId
+    );
+
     @Operation(
         summary = "소셜 친구 삭제",
         description = "사용자의 소셜 친구를 삭제한다.",

diff --git a/...va/site/timecapsulearchive/core/domain/friend/api/command/FriendCommandApiController.java b/...va/site/timecapsulearchive/core/domain/friend/api/command/FriendCommandApiController.java
@@ -11,6 +11,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import site.timecapsulearchive.core.domain.friend.data.request.SendFriendRequest;
 import site.timecapsulearchive.core.domain.friend.service.command.FriendCommandService;
+import site.timecapsulearchive.core.domain.member.service.MemberService;
 import site.timecapsulearchive.core.global.common.response.ApiSpec;
 import site.timecapsulearchive.core.global.common.response.SuccessCode;
 
@@ -20,6 +21,7 @@
 public class FriendCommandApiController implements FriendCommandApi {
 
     private final FriendCommandService friendCommandService;
+    private final MemberService memberService;
 
     @DeleteMapping(value = "/{friend_id}")
     @Override
@@ -36,6 +38,22 @@ public ResponseEntity<ApiSpec<String>> deleteFriend(
         );
     }
 
+    @DeleteMapping("/{friend_id}/sending-invites")
+    @Override
+    public ResponseEntity<ApiSpec<String>> deleteSendingFriendInvite(
+        @AuthenticationPrincipal final Long memberId,
+        @PathVariable("friend_id") final Long friendId
+    ) {
+        friendCommandService.deleteSendingFriendInvite(memberId, friendId);
+
+        return ResponseEntity.ok(
+            ApiSpec.empty(
+                SuccessCode.SUCCESS
+            )
+        );
+    }
+
+
     @DeleteMapping("/{friend_id}/deny-request")
     @Override
     public ResponseEntity<ApiSpec<String>> denyFriendRequest(
@@ -95,6 +113,4 @@ public ResponseEntity<ApiSpec<String>> acceptFriendRequest(
             )
         );
     }
-
-
 }
diff --git a/...re/src/main/java/site/timecapsulearchive/core/domain/friend/api/query/FriendQueryApi.java b/...re/src/main/java/site/timecapsulearchive/core/domain/friend/api/query/FriendQueryApi.java
@@ -66,10 +66,10 @@ ResponseEntity<ApiSpec<FriendsSliceResponse>> findFriendsBeforeGroupInvite(
     @Operation(
         summary = "소셜 친구 요청 받은 목록 조회",
         description = """
-        사용자가 <b><u>소셜 친구 요청을 받은 목록</u></b>을 보여준다. 
-        <br>
-        수락 대기 중인 요청만 해당한다.
-        """,
+            사용자가 <b><u>소셜 친구 요청을 받은 목록</u></b>을 보여준다. 
+            <br>
+            수락 대기 중인 요청만 해당한다.
+            """,
         security = {@SecurityRequirement(name = "user_token")},
         tags = {"friend"}
     )

diff --git a/...in/java/site/timecapsulearchive/core/domain/friend/data/dto/FriendInviteMemberIdsDto.java b/...in/java/site/timecapsulearchive/core/domain/friend/data/dto/FriendInviteMemberIdsDto.java
@@ -0,0 +1,8 @@
+package site.timecapsulearchive.core.domain.friend.data.dto;
+
+public record FriendInviteMemberIdsDto(
+    Long ownerId,
+    Long friendId
+) {
+
+}
diff --git a/...java/site/timecapsulearchive/core/domain/friend/data/dto/FriendInviteNotificationDto.java b/...java/site/timecapsulearchive/core/domain/friend/data/dto/FriendInviteNotificationDto.java
@@ -0,0 +1,18 @@
+package site.timecapsulearchive.core.domain.friend.data.dto;
+
+import java.util.List;
+
+public record FriendInviteNotificationDto(
+    String nickname,
+    String profileUrl,
+    List<Long> foundFriendIds
+) {
+
+    public static FriendInviteNotificationDto create(
+        final String nickname,
+        final String profileUrl,
+        final List<Long> foundFriendIds
+    ) {
+        return new FriendInviteNotificationDto(nickname, profileUrl, foundFriendIds);
+    }
+}
diff --git a/...nd/core/src/main/java/site/timecapsulearchive/core/domain/friend/entity/FriendInvite.java b/...nd/core/src/main/java/site/timecapsulearchive/core/domain/friend/entity/FriendInvite.java
@@ -1,5 +1,6 @@
 package site.timecapsulearchive.core.domain.friend.entity;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

diff --git a/.../site/timecapsulearchive/core/domain/friend/exception/FriendInviteDuplicateException.java b/.../site/timecapsulearchive/core/domain/friend/exception/FriendInviteDuplicateException.java
@@ -0,0 +1,11 @@
+package site.timecapsulearchive.core.domain.friend.exception;
+
+import site.timecapsulearchive.core.global.error.ErrorCode;
+import site.timecapsulearchive.core.global.error.exception.BusinessException;
+
+public class FriendInviteDuplicateException extends BusinessException {
+
+    public FriendInviteDuplicateException() {
+        super(ErrorCode.FRIEND_INVITE_DUPLICATE_ERROR);
+    }
+}
diff --git a/...exception/FriendDuplicateIdException.java → ...ception/SelfFriendOperationException.java b/...exception/FriendDuplicateIdException.java → ...ception/SelfFriendOperationException.java
@@ -3,9 +3,9 @@
 import site.timecapsulearchive.core.global.error.ErrorCode;
 import site.timecapsulearchive.core.global.error.exception.BusinessException;
 
-public class FriendDuplicateIdException extends BusinessException {
+public class SelfFriendOperationException extends BusinessException {
 
-    public FriendDuplicateIdException() {
-        super(ErrorCode.FRIEND_DUPLICATE_ID_ERROR);
+    public SelfFriendOperationException() {
+        super(ErrorCode.SELF_FRIEND_OPERATION_ERROR);
     }
 }
diff --git a/...psulearchive/core/domain/friend/repository/friend_invite/FriendInviteQueryRepository.java b/...psulearchive/core/domain/friend/repository/friend_invite/FriendInviteQueryRepository.java
@@ -2,7 +2,9 @@
 
 import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.domain.Slice;
+import site.timecapsulearchive.core.domain.friend.data.dto.FriendInviteMemberIdsDto;
 import site.timecapsulearchive.core.domain.friend.data.dto.FriendSummaryDto;
 
 public interface FriendInviteQueryRepository {
@@ -21,4 +23,10 @@ Slice<FriendSummaryDto> findFriendSendingInvitesSlice(
         final int size,
         final ZonedDateTime createdAt
     );
+
+    List<FriendInviteMemberIdsDto> findFriendInviteMemberIdsDtoByMemberIdsAndFriendId(
+        List<Long> memberIds, Long friendId);
+
+    Optional<FriendInviteMemberIdsDto> findFriendInviteMemberIdsDtoByMemberIdAndFriendId(
+        Long memberId, Long friendId);
 }
diff --git a/...earchive/core/domain/friend/repository/friend_invite/FriendInviteQueryRepositoryImpl.java b/...earchive/core/domain/friend/repository/friend_invite/FriendInviteQueryRepositoryImpl.java
@@ -3,6 +3,7 @@
 import static site.timecapsulearchive.core.domain.friend.entity.QFriendInvite.friendInvite;
 import static site.timecapsulearchive.core.domain.member.entity.QMember.member;
 
+import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.sql.PreparedStatement;
@@ -11,13 +12,13 @@
 import java.sql.Types;
 import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.SliceImpl;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
+import site.timecapsulearchive.core.domain.friend.data.dto.FriendInviteMemberIdsDto;
 import site.timecapsulearchive.core.domain.friend.data.dto.FriendSummaryDto;
 import site.timecapsulearchive.core.global.util.SliceUtil;
 
@@ -107,4 +108,49 @@ public Slice<FriendSummaryDto> findFriendSendingInvitesSlice(
 
         return SliceUtil.makeSlice(size, friends);
     }
+
+    @Override
+    public List<FriendInviteMemberIdsDto> findFriendInviteMemberIdsDtoByMemberIdsAndFriendId(
+        List<Long> memberIds, Long friendId) {
+        BooleanBuilder multipleColumnsInCondition = new BooleanBuilder();
+        for (Long memberId : memberIds) {
+            multipleColumnsInCondition.or(friendInvite.owner.id.eq(memberId)
+                .and(friendInvite.friend.id.eq(friendId)));
+
+            multipleColumnsInCondition.or(friendInvite.owner.id.eq(friendId)
+                .and(friendInvite.friend.id.eq(memberId)));
+        }
+
+        return jpaQueryFactory
+            .select(
+                Projections.constructor(
+                    FriendInviteMemberIdsDto.class,
+                    friendInvite.owner.id,
+                    friendInvite.friend.id
+                )
+            )
+            .from(friendInvite)
+            .where(multipleColumnsInCondition)
+            .fetch();
+    }
+
+    @Override
+    public Optional<FriendInviteMemberIdsDto> findFriendInviteMemberIdsDtoByMemberIdAndFriendId(
+        Long memberId, Long friendId) {
+        return Optional.ofNullable(
+            jpaQueryFactory
+                .select(
+                    Projections.constructor(
+                        FriendInviteMemberIdsDto.class,
+                        friendInvite.owner.id,
+                        friendInvite.friend.id
+                    )
+                )
+                .from(friendInvite)
+                .where(friendInvite.owner.id.eq(memberId).and(friendInvite.friend.id.eq(friendId))
+                    .or(friendInvite.owner.id.eq(friendId)
+                        .and(friendInvite.friend.id.eq(memberId))))
+                .fetchOne()
+        );
+    }
 }
diff --git a/...imecapsulearchive/core/domain/friend/repository/friend_invite/FriendInviteRepository.java b/...imecapsulearchive/core/domain/friend/repository/friend_invite/FriendInviteRepository.java
@@ -1,6 +1,5 @@
 package site.timecapsulearchive.core.domain.friend.repository.friend_invite;
 
-import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
@@ -12,21 +11,21 @@ public interface FriendInviteRepository extends Repository<FriendInvite, Long>,
 
     void save(FriendInvite friendInvite);
 
-    @Query(value = "select fi "
-        + "from FriendInvite fi "
-        + "join fetch fi.owner "
-        + "join fetch fi.friend "
-        + "where (fi.owner.id =:friendId and fi.friend.id =:memberId) "
-        + "or (fi.owner.id =: memberId and fi.friend.id =: friendId)")
-    List<FriendInvite> findFriendInviteWithMembersByOwnerIdAndFriendId(
-        @Param(value = "memberId") Long memberId,
+    void delete(FriendInvite friendInvite);
+
+    Optional<FriendInvite> findFriendSendingInviteForUpdateByOwnerIdAndFriendId(Long memberId,
+        Long friendId);
+
+    @Query(value = """
+    select fi
+    from FriendInvite fi
+    join fetch fi.owner
+    join fetch fi.friend
+    where fi.owner.id =:ownerId and fi.friend.id =:friendId
+    """)
+    Optional<FriendInvite> findFriendReceivingInviteForUpdateByOwnerIdAndFriendId(
+        @Param(value = "ownerId") Long ownerId,
         @Param(value = "friendId") Long friendId
     );
-
-    Optional<FriendInvite> findFriendInviteByOwnerIdAndFriendId(Long memberId, Long targetId);
-
-    int deleteFriendInviteByOwnerIdAndFriendId(Long memberId, Long targetId);
-
-    void delete(FriendInvite friendInvite);
 }
 
diff --git a/...psulearchive/core/domain/friend/repository/member_friend/MemberFriendQueryRepository.java b/...psulearchive/core/domain/friend/repository/member_friend/MemberFriendQueryRepository.java
@@ -30,7 +30,7 @@ Optional<SearchFriendSummaryDtoByTag> findFriendsByTag(
 
     List<Long> findFriendIdsByOwnerId(final Long memberId);
 
-    Slice<FriendSummaryDto> findFriendsBeforeGroupInvite(
+    Slice<FriendSummaryDto> findFriends(
         final FriendBeforeGroupInviteRequest request);
 
     List<Long> findFriendIds(final List<Long> groupMemberIds, final Long memberId);

diff --git a/...earchive/core/domain/friend/repository/member_friend/MemberFriendQueryRepositoryImpl.java b/...earchive/core/domain/friend/repository/member_friend/MemberFriendQueryRepositoryImpl.java
@@ -1,10 +1,7 @@
 package site.timecapsulearchive.core.domain.friend.repository.member_friend;
 
-import static com.querydsl.jpa.JPAExpressions.select;
-import static site.timecapsulearchive.core.domain.friend.entity.QFriendInvite.friendInvite;
 import static site.timecapsulearchive.core.domain.friend.entity.QMemberFriend.memberFriend;
 import static site.timecapsulearchive.core.domain.member.entity.QMember.member;
-import static site.timecapsulearchive.core.domain.member_group.entity.QMemberGroup.memberGroup;
 
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Projections;
@@ -73,8 +70,9 @@ private Slice<FriendSummaryDto> getFriendSummaryDtos(final int size,
         return new SliceImpl<>(friendSummaryDtos, Pageable.ofSize(size), hasNext);
     }
 
-    public Slice<FriendSummaryDto> findFriendsBeforeGroupInvite(
-        final FriendBeforeGroupInviteRequest request) {
+    public Slice<FriendSummaryDto> findFriends(
+        final FriendBeforeGroupInviteRequest request
+    ) {
         final List<FriendSummaryDto> friends = jpaQueryFactory
             .select(
                 Projections.constructor(
@@ -86,15 +84,8 @@ public Slice<FriendSummaryDto> findFriendsBeforeGroupInvite(
                 )
             )
             .from(memberFriend)
-            .innerJoin(member).on(memberFriend.owner.id.eq(member.id))
-            .innerJoin(member).on(memberFriend.friend.id.eq(member.id))
             .where(memberFriend.owner.id.eq(request.memberId())
                 .and(memberFriend.createdAt.lt(request.createdAt()))
-                .and(memberFriend.friend.id.notIn(
-                    select(memberGroup.member.id)
-                        .from(memberGroup)
-                        .where(memberGroup.group.id.eq(request.groupId()))
-                ))
             )
             .limit(request.size() + 1)
             .fetch();