Merge pull request #227 from Central-MakeUs/release

Release

Author: HamJina

src/main/java/com/example/ForDay/domain/friend/controller/FriendController.java

@@ -2,10 +2,8 @@
 
 import com.example.ForDay.domain.friend.dto.request.AddFriendReqDto;
 import com.example.ForDay.domain.friend.dto.request.BlockFriendReqDto;
-import com.example.ForDay.domain.friend.dto.response.AddFriendResDto;
-import com.example.ForDay.domain.friend.dto.response.BlockFriendResDto;
-import com.example.ForDay.domain.friend.dto.response.DeleteFriendResDto;
-import com.example.ForDay.domain.friend.dto.response.GetFriendListResDto;
+import com.example.ForDay.domain.friend.dto.request.ReportFriendReqDto;
+import com.example.ForDay.domain.friend.dto.response.*;
 import com.example.ForDay.domain.friend.service.FriendService;
 import com.example.ForDay.global.oauth.CustomUserDetails;
 import jakarta.validation.Valid;
@@ -40,6 +38,13 @@ public BlockFriendResDto blockFriend(@RequestBody @Valid BlockFriendReqDto reqDt
         return friendService.blockFriend(reqDto, user);
     }
 
+    @Override
+    @PostMapping("/report")
+    public ReportFriendResDto reportFriend(@RequestBody @Valid ReportFriendReqDto reqDto,
+                                           @AuthenticationPrincipal CustomUserDetails user) {
+        return friendService.reportFriend(reqDto, user);
+    }
+
     @Override
     @GetMapping
     public GetFriendListResDto getFriendList(@RequestParam(name = "lastUserId", required = false) String lastUserId,

src/main/java/com/example/ForDay/domain/friend/controller/FriendControllerDocs.java

@@ -2,10 +2,9 @@
 
 import com.example.ForDay.domain.friend.dto.request.AddFriendReqDto;
 import com.example.ForDay.domain.friend.dto.request.BlockFriendReqDto;
-import com.example.ForDay.domain.friend.dto.response.AddFriendResDto;
-import com.example.ForDay.domain.friend.dto.response.BlockFriendResDto;
-import com.example.ForDay.domain.friend.dto.response.DeleteFriendResDto;
-import com.example.ForDay.domain.friend.dto.response.GetFriendListResDto;
+import com.example.ForDay.domain.friend.dto.request.ReportFriendReqDto;
+import com.example.ForDay.domain.friend.dto.response.*;
+import com.example.ForDay.global.common.error.ErrorResponse;
 import com.example.ForDay.global.oauth.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -22,7 +21,9 @@
 
 
 @Tag(name = "Friend", description = "친구 관계 관리 API")
-public interface FriendControllerDocs {
+public interface
+
+FriendControllerDocs {
 
     @Operation(
             summary = "친구 맺기 (팔로우)",
@@ -114,4 +115,40 @@ GetFriendListResDto getFriendList(
             @Parameter(description = "한 페이지에 조회할 유저 수", example = "20")
             @RequestParam(name = "size", required = false, defaultValue = "20") Integer size,
             @AuthenticationPrincipal CustomUserDetails user);
+
+    @Operation(
+            summary = "친구 신고",
+            description = "특정 사용자를 신고합니다. 이미 신고한 경우에도 200 OK로 응답합니다."
+    )
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = "200",
+                    description = "신고 성공 또는 이미 신고된 상태"
+            ),
+            @ApiResponse(
+                    responseCode = "400",
+                    description = "자기 자신 신고",
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorResponse.class)
+                    )
+            ),
+            @ApiResponse(
+                    responseCode = "404",
+                    description = "존재하지 않는 사용자",
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorResponse.class)
+                    )
+            )
+    })
+    public ReportFriendResDto reportFriend(
+            @RequestBody
+            @Valid
+            @Parameter(description = "신고 요청 정보", required = true)
+            ReportFriendReqDto reqDto,
+            @AuthenticationPrincipal
+            @Parameter(hidden = true) // Swagger에 표시 안 함
+            CustomUserDetails user
+    );
 }

src/main/java/com/example/ForDay/domain/friend/dto/request/ReportFriendReqDto.java

@@ -0,0 +1,15 @@
+package com.example.ForDay.domain.friend.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportFriendReqDto {
+    @NotBlank(message = "사용자 ID는 필수입니다.")
+    private String userId;
+    private String reason;
+}

src/main/java/com/example/ForDay/domain/friend/dto/response/ReportFriendResDto.java

@@ -0,0 +1,14 @@
+package com.example.ForDay.domain.friend.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReportFriendResDto {
+    private String message;
+    private String nickname;
+    private String userId;
+}

src/main/java/com/example/ForDay/domain/friend/repository/FriendRelationRepository.java

@@ -10,8 +10,6 @@
 import java.util.Optional;
 
 public interface FriendRelationRepository extends JpaRepository<FriendRelation, Long>, FriendRelationRepositoryCustom {
-    Optional<FriendRelation> findByRequesterIdAndTargetUserId(String id, String id1);
-
     boolean existsByRequesterIdAndTargetUserIdAndRelationStatus(String id, String id1, FriendRelationStatus friendRelationStatus);
 
     @Query("SELECT COUNT(f) > 0 FROM FriendRelation f " +
@@ -34,4 +32,15 @@ boolean existsByFriendship(
             "WHERE (f.requester.id = :uid1 AND f.targetUser.id = :uid2) " +
             "OR (f.requester.id = :uid2 AND f.targetUser.id = :uid1)")
     List<FriendRelation> findAllRelationsBetween(@Param("uid1") String uid1, @Param("uid2") String uid2);
+
+    @Query("""
+    SELECT fr
+    FROM FriendRelation fr
+    WHERE (fr.requester.id = :currentUserId AND fr.targetUser.id = :targetUserId)
+       OR (fr.requester.id = :targetUserId AND fr.targetUser.id = :currentUserId)
+""")
+    List<FriendRelation> findBothDirections(@Param("currentUserId") String currentUserId,
+                                            @Param("targetUserId") String targetUserId);
+
+    Optional<FriendRelation> findByRequesterIdAndTargetUserId(String requesterId, String targetUserId);
 }

src/main/java/com/example/ForDay/domain/friend/repository/FriendRelationRepositoryImpl.java

@@ -17,7 +17,7 @@
 import java.util.Set;
 
 @RequiredArgsConstructor
-public class FriendRelationRepositoryImpl implements FriendRelationRepositoryCustom{
+public class FriendRelationRepositoryImpl implements FriendRelationRepositoryCustom {
     private final JPAQueryFactory queryFactory;
     private QUser user = QUser.user;
     private QFriendRelation relation = QFriendRelation.friendRelation;
@@ -57,13 +57,14 @@ public List<GetFriendListResDto.UserInfoDto> findMyFriendList(String currentUser
     public List<String> findAllBlockedIdsByUserId(String userId) {
         QFriendRelation friendRelation = QFriendRelation.friendRelation;
 
-        // 1. 내가 차단한 사람들
+        // 1. 내가 차단하거나 신고한 사람들
         List<String> blockedByMe = queryFactory
                 .select(friendRelation.targetUser.id)
                 .from(friendRelation)
                 .where(friendRelation.requester.id.eq(userId)
-                        .and(friendRelation.relationStatus.eq(FriendRelationStatus.BLOCK)))
-                .fetch();
+                        .and(friendRelation.relationStatus.eq(FriendRelationStatus.BLOCK))
+                                .or(friendRelation.relationStatus.eq(FriendRelationStatus.REPORT)))
+                        .fetch();
 
         // 2. 나를 차단한 사람들
         List<String> blockedMe = queryFactory