Merge pull request #395 from depromeet/feature/389-mypage-black

feat: 마이페이지 차단 구현
depromeet · Sep 7, 2024 · aa7c267 · aa7c267
2 parents 090b02f + c603592
commit aa7c267
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 26 deletions.
diff --git a/...e-domain/src/main/java/com/depromeet/blacklist/port/in/usecase/BlacklistQueryUseCase.java b/...e-domain/src/main/java/com/depromeet/blacklist/port/in/usecase/BlacklistQueryUseCase.java
@@ -9,4 +9,6 @@ public interface BlacklistQueryUseCase {
     BlacklistPage getBlackMembers(Long memberId, Long cursorId);
 
     Set<Long> getBlackMemberIds(Long memberId);
+
+    Boolean checkBlockOrBlocked(Long loginMemberId, Long memberId);
 }
diff --git a/.../src/main/java/com/depromeet/blacklist/port/out/persistence/BlacklistPersistencePort.java b/.../src/main/java/com/depromeet/blacklist/port/out/persistence/BlacklistPersistencePort.java
@@ -16,4 +16,6 @@ public interface BlacklistPersistencePort {
     List<Long> findBlackMemberIdsByMemberId(Long memberId);
 
     List<Long> findMemberIdsWhoBlockedMe(Long memberId);
+
+    Boolean isBlockOrBlocked(Long loginMemberId, Long memberId);
 }
diff --git a/module-domain/src/main/java/com/depromeet/blacklist/service/BlacklistService.java b/module-domain/src/main/java/com/depromeet/blacklist/service/BlacklistService.java
@@ -63,6 +63,11 @@ public Set<Long> getBlackMemberIds(Long memberId) {
         return new HashSet<>(blackMemberIds);
     }
 
+    @Override
+    public Boolean checkBlockOrBlocked(Long loginMemberId, Long memberId) {
+        return blacklistPersistencePort.isBlockOrBlocked(loginMemberId, memberId);
+    }
+
     private List<Long> getBlackMemberIdsByMemberId(Long memberId) {
         return blacklistPersistencePort.findBlackMemberIdsByMemberId(memberId);
     }

diff --git a/module-domain/src/main/java/com/depromeet/report/domain/ReportReasonCode.java b/module-domain/src/main/java/com/depromeet/report/domain/ReportReasonCode.java
@@ -6,9 +6,9 @@
 public enum ReportReasonCode implements CodedEnum<String> {
     REPORT_REASON_1("스팸, 광고"),
     REPORT_REASON_2("폭력적인 발언"),
-    REPORT_REASON_3("음란성, 선정 내용"),
+    REPORT_REASON_3("음란성, 선정성 내용"),
     REPORT_REASON_4("개인정보 노출"),
-    REPORT_REASON_5("주제와 무관");
+    REPORT_REASON_5("수영과 무관한 내용");
 
     private String value;
 

diff --git a/module-independent/src/main/java/com/depromeet/type/member/MemberErrorType.java b/module-independent/src/main/java/com/depromeet/type/member/MemberErrorType.java
@@ -12,7 +12,8 @@ public enum MemberErrorType implements ErrorType {
     UPDATE_FAILED("MEMBER_7", "멤버의 정보 수정에 실패하였습니다"),
     UPDATE_PROFILE_IMAGE_FAILED("MEMBER_8", "멤버의 프로필 이미지 수정에 실패하였습니다"),
     UPDATE_LAST_VIEWED_FOLLOWING_LOG_AT("MEMBER_9", "멤버의 최근 팔로잉 소식 조회 시간 변경에 실패하였습니다"),
-    NOT_FOUND_FROM_ID_LIST("MEMBER_10", "요청된 멤버 ID 중 존재하지 않는 멤버가 있습니다");
+    NOT_FOUND_FROM_ID_LIST("MEMBER_10", "요청된 멤버 ID 중 존재하지 않는 멤버가 있습니다"),
+    MEMBER_BLOCK_OR_BLOCKED("MEMBER_11", "멤버를 차단했거나 멤버에게 차단 당했습니다");
 
     private final String code;
     private final String message;

diff --git a/...stence-database/src/main/java/com/depromeet/blacklist/repository/BlacklistRepository.java b/...stence-database/src/main/java/com/depromeet/blacklist/repository/BlacklistRepository.java
@@ -21,6 +21,9 @@ public class BlacklistRepository implements BlacklistPersistencePort {
     private final JPAQueryFactory queryFactory;
     private final BlacklistJpaRepository blacklistJpaRepository;
 
+    QMemberEntity member = new QMemberEntity("member"); // 첫 번째 별칭 "member"
+    QMemberEntity blackMember = new QMemberEntity("blackMember");
+
     @Override
     public Blacklist save(Blacklist blacklist) {
         return blacklistJpaRepository.save(BlacklistEntity.from(blacklist)).toModel();
@@ -38,9 +41,6 @@ public void unblackMember(Long memberId, Long blackMemberId) {
 
     @Override
     public List<Member> findBlackMembers(Long memberId, Long cursorId) {
-        QMemberEntity member = new QMemberEntity("member"); // 첫 번째 별칭 "member"
-        QMemberEntity blackMember = new QMemberEntity("blackMember");
-
         return queryFactory
                 .select(
                         Projections.constructor(
@@ -57,20 +57,6 @@ public List<Member> findBlackMembers(Long memberId, Long cursorId) {
                 .fetch();
     }
 
-    private static BooleanExpression memberEq(Long memberId) {
-        if (memberId == null) {
-            return null;
-        }
-        return blacklistEntity.member.id.eq(memberId);
-    }
-
-    private BooleanExpression blacklistIdLoe(Long cursorId) {
-        if (cursorId == null) {
-            return null;
-        }
-        return blacklistEntity.blackMember.id.loe(cursorId);
-    }
-
     @Override
     public List<Long> findBlackMemberIdsByMemberId(Long memberId) {
         return queryFactory
@@ -85,7 +71,40 @@ public List<Long> findMemberIdsWhoBlockedMe(Long memberId) {
         return queryFactory
                 .select(blacklistEntity.member.id)
                 .from(blacklistEntity)
-                .where(blacklistEntity.blackMember.id.eq(memberId))
+                .where(blackMemberEq(memberId))
                 .fetch();
     }
+
+    @Override
+    public Boolean isBlockOrBlocked(Long loginMemberId, Long memberId) {
+        return !queryFactory
+                .select(blacklistEntity.id)
+                .from(blacklistEntity)
+                .join(blacklistEntity.member, member)
+                .join(blacklistEntity.blackMember, blackMember)
+                .where(
+                        memberEq(loginMemberId)
+                                .and(blackMemberEq(memberId))
+                                .or(memberEq(memberId).and(blackMemberEq(loginMemberId))))
+                .fetch()
+                .isEmpty();
+    }
+
+    private static BooleanExpression memberEq(Long memberId) {
+        if (memberId == null) {
+            return null;
+        }
+        return blacklistEntity.member.id.eq(memberId);
+    }
+
+    private static BooleanExpression blackMemberEq(Long memberId) {
+        return blacklistEntity.blackMember.id.eq(memberId);
+    }
+
+    private BooleanExpression blacklistIdLoe(Long cursorId) {
+        if (cursorId == null) {
+            return null;
+        }
+        return blacklistEntity.blackMember.id.loe(cursorId);
+    }
 }
diff --git a/module-presentation/src/main/java/com/depromeet/member/api/MemberController.java b/module-presentation/src/main/java/com/depromeet/member/api/MemberController.java
@@ -25,7 +25,7 @@ public class MemberController implements MemberApi {
     public ApiResponse<MemberProfileResponse> getMember(
             @LoginMember Long memberId, @PathVariable("id") Long id) {
         return ApiResponse.success(
-                MemberSuccessType.GET_SUCCESS, memberFacade.findById(memberId, id));
+                MemberSuccessType.GET_SUCCESS, memberFacade.findByIdAndCheckBlack(memberId, id));
     }
 
     @PatchMapping

diff --git a/module-presentation/src/main/java/com/depromeet/member/facade/MemberFacade.java b/module-presentation/src/main/java/com/depromeet/member/facade/MemberFacade.java
@@ -3,6 +3,7 @@
 import static com.depromeet.member.service.MemberValidator.isMyProfile;
 
 import com.depromeet.blacklist.port.in.usecase.BlacklistQueryUseCase;
+import com.depromeet.exception.ForbiddenException;
 import com.depromeet.friend.domain.vo.FriendCount;
 import com.depromeet.friend.port.in.FollowUseCase;
 import com.depromeet.member.domain.Member;
@@ -18,6 +19,7 @@
 import com.depromeet.member.port.in.command.SocialMemberCommand;
 import com.depromeet.member.port.in.usecase.MemberUpdateUseCase;
 import com.depromeet.member.port.in.usecase.MemberUseCase;
+import com.depromeet.type.member.MemberErrorType;
 import java.util.List;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
@@ -30,15 +32,20 @@
 @Transactional
 public class MemberFacade {
     private final MemberUseCase memberUseCase;
-    private final BlacklistQueryUseCase blacklistQueryUseCase;
-    private final MemberUpdateUseCase memberUpdateUseCase;
     private final FollowUseCase followUseCase;
+    private final MemberUpdateUseCase memberUpdateUseCase;
+    private final BlacklistQueryUseCase blacklistQueryUseCase;
 
     @Value("${cloud-front.domain}")
     private String profileImageOrigin;
 
     @Transactional(readOnly = true)
-    public MemberProfileResponse findById(Long loginMemberId, Long memberId) {
+    public MemberProfileResponse findByIdAndCheckBlack(Long loginMemberId, Long memberId) {
+        Boolean isBlackOrBlacked =
+                blacklistQueryUseCase.checkBlockOrBlocked(loginMemberId, memberId);
+        if (isBlackOrBlacked) {
+            throw new ForbiddenException(MemberErrorType.MEMBER_BLOCK_OR_BLOCKED);
+        }
         Boolean isMyProfile = isMyProfile(memberId, loginMemberId);
         Member member = memberUseCase.findById(memberId);
         FriendCount friendCount = followUseCase.countFriendByMemberId(memberId);

diff --git a/module-presentation/src/main/resources/application-prod.yml b/module-presentation/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@ spring:
     import: optional:application-secret.properties
   jpa:
     hibernate:
-      ddl-auto: update # 실제 서버에서 사용시 모든 데이터가 다 날아가므로 주의
+      ddl-auto: none # 실제 서버에서 사용시 모든 데이터가 다 날아가므로 주의
     defer-datasource-initialization: false
     properties:
       hibernate: