deploy: 서버 배포

module-domain/src/main/java/com/depromeet/blacklist/domain/vo/BlacklistPage.java

@@ -0,0 +1,10 @@
+package com.depromeet.blacklist.domain.vo;
+
+import com.depromeet.member.domain.Member;
+import java.util.List;
+
+public record BlacklistPage(List<Member> blackMembers, boolean hasNext, Long cursorId) {
+    public static BlacklistPage of(List<Member> blackMembers, boolean hasNext, Long nextCursorId) {
+        return new BlacklistPage(blackMembers, hasNext, nextCursorId);
+    }
+}

module-domain/src/main/java/com/depromeet/blacklist/port/in/usecase/BlacklistCommandUseCase.java

@@ -0,0 +1,9 @@
+package com.depromeet.blacklist.port.in.usecase;
+
+import com.depromeet.blacklist.domain.Blacklist;
+
+public interface BlacklistCommandUseCase {
+    Blacklist blackMember(Long memberId, Long blackMemberId);
+
+    void unblackMember(Long memberId, Long blackMemberId);
+}

module-domain/src/main/java/com/depromeet/blacklist/port/in/usecase/BlacklistQueryUseCase.java

@@ -0,0 +1,12 @@
+package com.depromeet.blacklist.port.in.usecase;
+
+import com.depromeet.blacklist.domain.vo.BlacklistPage;
+import java.util.Set;
+
+public interface BlacklistQueryUseCase {
+    boolean checkBlackMember(Long memberId, Long blackMemberId);
+
+    BlacklistPage getBlackMembers(Long memberId, Long cursorId);
+
+    Set<Long> getBlackMemberIds(Long memberId);
+}

module-domain/src/main/java/com/depromeet/blacklist/port/out/persistence/BlacklistPersistencePort.java

@@ -0,0 +1,19 @@
+package com.depromeet.blacklist.port.out.persistence;
+
+import com.depromeet.blacklist.domain.Blacklist;
+import com.depromeet.member.domain.Member;
+import java.util.List;
+
+public interface BlacklistPersistencePort {
+    Blacklist save(Blacklist blacklist);
+
+    boolean existsByMemberIdAndBlackMemberId(Long memberId, Long blackMemberId);
+
+    void unblackMember(Long memberId, Long blackMemberId);
+
+    List<Member> findBlackMembers(Long memberId, Long cursorId);
+
+    List<Long> findBlackMemberIdsByMemberId(Long memberId);
+
+    List<Long> findMemberIdsWhoBlockedMe(Long memberId);
+}

module-domain/src/main/java/com/depromeet/blacklist/service/BlacklistService.java

@@ -0,0 +1,73 @@
+package com.depromeet.blacklist.service;
+
+import com.depromeet.blacklist.domain.Blacklist;
+import com.depromeet.blacklist.domain.vo.BlacklistPage;
+import com.depromeet.blacklist.port.in.usecase.BlacklistCommandUseCase;
+import com.depromeet.blacklist.port.in.usecase.BlacklistQueryUseCase;
+import com.depromeet.blacklist.port.out.persistence.BlacklistPersistencePort;
+import com.depromeet.member.domain.Member;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class BlacklistService implements BlacklistQueryUseCase, BlacklistCommandUseCase {
+    private final BlacklistPersistencePort blacklistPersistencePort;
+
+    @Override
+    @Transactional
+    public Blacklist blackMember(Long memberId, Long blackMemberId) {
+        return blacklistPersistencePort.save(
+                Blacklist.builder()
+                        .member(Member.builder().id(memberId).build())
+                        .blackMember(Member.builder().id(blackMemberId).build())
+                        .build());
+    }
+
+    @Override
+    @Transactional
+    public void unblackMember(Long memberId, Long blackMemberId) {
+        blacklistPersistencePort.unblackMember(memberId, blackMemberId);
+    }
+
+    @Override
+    public boolean checkBlackMember(Long memberId, Long blackMemberId) {
+        return blacklistPersistencePort.existsByMemberIdAndBlackMemberId(memberId, blackMemberId);
+    }
+
+    @Override
+    public BlacklistPage getBlackMembers(Long memberId, Long cursorId) {
+        List<Member> blackMembers = blacklistPersistencePort.findBlackMembers(memberId, cursorId);
+        boolean hasNext = false;
+        Long nextCursorId = null;
+        if (blackMembers != null && blackMembers.size() > 10) {
+            hasNext = true;
+            Member member = blackMembers.removeLast();
+            nextCursorId = member.getId();
+        }
+        return BlacklistPage.of(blackMembers, hasNext, nextCursorId);
+    }
+
+    @Override
+    public Set<Long> getBlackMemberIds(Long memberId) {
+        List<Long> blackMemberIds = getBlackMemberIdsByMemberId(memberId);
+        List<Long> memberIdsWhoBlockedMe = getMemberIdsWhoBlockedMe(memberId);
+
+        blackMemberIds.addAll(memberIdsWhoBlockedMe);
+
+        return new HashSet<>(blackMemberIds);
+    }
+
+    private List<Long> getBlackMemberIdsByMemberId(Long memberId) {
+        return blacklistPersistencePort.findBlackMemberIdsByMemberId(memberId);
+    }
+
+    private List<Long> getMemberIdsWhoBlockedMe(Long memberId) {
+        return blacklistPersistencePort.findMemberIdsWhoBlockedMe(memberId);
+    }
+}

module-domain/src/main/java/com/depromeet/friend/domain/vo/FollowSlice.java

@@ -10,14 +10,12 @@
 @NoArgsConstructor
 public class FollowSlice<T> {
     private List<T> followContents;
-    private int pageSize;
     private Long cursorId;
     private boolean hasNext;
 
     @Builder
-    public FollowSlice(List<T> followContents, int pageSize, Long cursorId, boolean hasNext) {
+    public FollowSlice(List<T> followContents, Long cursorId, boolean hasNext) {
         this.followContents = followContents != null ? followContents : new ArrayList<>();
-        this.pageSize = pageSize != 0 ? pageSize : 10;
         this.cursorId = cursorId;
         this.hasNext = hasNext;
     }

module-domain/src/main/java/com/depromeet/friend/port/out/persistence/FriendPersistencePort.java

@@ -14,9 +14,9 @@ public interface FriendPersistencePort {
 
     void deleteByMemberIdAndFollowingId(Long memberId, Long followingId);
 
-    FollowSlice<Following> findFollowingsByMemberIdAndCursorId(Long memberId, Long cursorId);
+    List<Following> findFollowingsByMemberIdAndCursorId(Long memberId, Long cursorId);
 
-    FollowSlice<Follower> findFollowersByMemberIdAndCursorId(Long memberId, Long cursorId);
+    List<Follower> findFollowersByMemberIdAndCursorId(Long memberId, Long cursorId);
 
     int countFollowingByMemberId(Long memberId);
 

module-domain/src/main/java/com/depromeet/friend/service/FollowService.java

@@ -7,6 +7,7 @@
 import com.depromeet.friend.port.out.persistence.FriendPersistencePort;
 import com.depromeet.member.domain.Member;
 import com.depromeet.type.friend.FollowErrorType;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -39,12 +40,42 @@ public boolean addOrDeleteFollow(Member member, Member following) {
 
     @Override
     public FollowSlice<Following> getFollowingByMemberIdAndCursorId(Long memberId, Long cursorId) {
-        return friendPersistencePort.findFollowingsByMemberIdAndCursorId(memberId, cursorId);
+        List<Following> followings =
+                friendPersistencePort.findFollowingsByMemberIdAndCursorId(memberId, cursorId);
+
+        boolean hasNext = false;
+        Long nextCursorId = null;
+        if (followings.size() > 10) {
+            followings = new ArrayList<>(followings);
+            followings.removeLast();
+            hasNext = true;
+            nextCursorId = followings.getLast().getFriendId();
+        }
+        return FollowSlice.<Following>builder()
+                .followContents(followings)
+                .cursorId(nextCursorId)
+                .hasNext(hasNext)
+                .build();
     }
 
     @Override
     public FollowSlice<Follower> getFollowerByMemberIdAndCursorId(Long memberId, Long cursorId) {
-        return friendPersistencePort.findFollowersByMemberIdAndCursorId(memberId, cursorId);
+        List<Follower> followers =
+                friendPersistencePort.findFollowersByMemberIdAndCursorId(memberId, cursorId);
+
+        boolean hasNext = false;
+        Long nextCursorId = null;
+        if (followers.size() > 10) {
+            followers = new ArrayList<>(followers);
+            followers.removeLast();
+            hasNext = true;
+            nextCursorId = followers.getLast().getFriendId();
+        }
+        return FollowSlice.<Follower>builder()
+                .followContents(followers)
+                .cursorId(nextCursorId)
+                .hasNext(hasNext)
+                .build();
     }
 
     @Override

module-domain/src/main/java/com/depromeet/member/domain/Member.java

@@ -43,6 +43,13 @@ public Member(
         this.lastViewedFollowingLogAt = lastViewedFollowingLogAt;
     }
 
+    public Member(Long id, String nickname, String profileImageUrl, String introduction) {
+        this.id = id;
+        this.nickname = nickname;
+        this.profileImageUrl = profileImageUrl;
+        this.introduction = introduction;
+    }
+
     public Member updateGoal(Integer goal) {
         this.goal = goal;
         return this;

module-domain/src/main/java/com/depromeet/member/domain/vo/MemberIdAndNickname.java

@@ -0,0 +1,3 @@
+package com.depromeet.member.domain.vo;
+
+public record MemberIdAndNickname(Long id, String nickname) {}

module-domain/src/main/java/com/depromeet/member/port/in/usecase/MemberUseCase.java

@@ -1,6 +1,7 @@
 package com.depromeet.member.port.in.usecase;
 
 import com.depromeet.member.domain.Member;
+import com.depromeet.member.domain.vo.MemberIdAndNickname;
 import com.depromeet.member.domain.vo.MemberSearchPage;
 import com.depromeet.member.port.in.command.SocialMemberCommand;
 
@@ -16,4 +17,6 @@ public interface MemberUseCase {
     Member findByProviderId(String providerId);
 
     Member createMemberBy(SocialMemberCommand command);
+
+    MemberIdAndNickname findIdAndNicknameById(Long memberId);
 }

module-domain/src/main/java/com/depromeet/member/port/out/persistence/MemberPersistencePort.java

@@ -2,6 +2,7 @@
 
 import com.depromeet.member.domain.Member;
 import com.depromeet.member.domain.MemberGender;
+import com.depromeet.member.domain.vo.MemberIdAndNickname;
 import com.depromeet.member.domain.vo.MemberSearchPage;
 import com.depromeet.member.port.in.command.UpdateMemberCommand;
 import java.util.Optional;
@@ -30,4 +31,6 @@ public interface MemberPersistencePort {
     Optional<Member> update(UpdateMemberCommand command);
 
     Optional<Member> updateProfileImageUrl(Long memberId, String profileImageUrl);
+
+    Optional<MemberIdAndNickname> findIdAndNicknameById(Long memberId);
 }

module-domain/src/main/java/com/depromeet/member/service/MemberService.java

@@ -7,6 +7,7 @@
 import com.depromeet.member.domain.Member;
 import com.depromeet.member.domain.MemberGender;
 import com.depromeet.member.domain.MemberRole;
+import com.depromeet.member.domain.vo.MemberIdAndNickname;
 import com.depromeet.member.domain.vo.MemberSearchPage;
 import com.depromeet.member.port.in.command.SocialMemberCommand;
 import com.depromeet.member.port.in.command.UpdateMemberCommand;
@@ -82,6 +83,13 @@ public Member createMemberBy(SocialMemberCommand command) {
         return memberPersistencePort.save(member);
     }
 
+    @Override
+    public MemberIdAndNickname findIdAndNicknameById(Long memberId) {
+        return memberPersistencePort
+                .findIdAndNicknameById(memberId)
+                .orElseThrow(() -> new NotFoundException(MemberErrorType.NOT_FOUND));
+    }
+
     @Override
     public Member update(UpdateMemberCommand command) {
         if (command.nickname() != null && command.nickname().isBlank()) {

module-domain/src/main/java/com/depromeet/memory/domain/vo/MemoryIdAndDiaryAndMember.java

@@ -0,0 +1,5 @@
+package com.depromeet.memory.domain.vo;
+
+import com.depromeet.member.domain.vo.MemberIdAndNickname;
+
+public record MemoryIdAndDiaryAndMember(Long id, String diary, MemberIdAndNickname member) {}

module-domain/src/main/java/com/depromeet/memory/port/in/usecase/GetMemoryUseCase.java

@@ -2,6 +2,7 @@
 
 import com.depromeet.memory.domain.Memory;
 import com.depromeet.memory.domain.vo.MemoryAndDetailId;
+import com.depromeet.memory.domain.vo.MemoryIdAndDiaryAndMember;
 import com.depromeet.memory.domain.vo.MemoryInfo;
 import java.util.List;
 
@@ -17,4 +18,6 @@ public interface GetMemoryUseCase {
     MemoryInfo findByIdWithPrevNext(Long requestMemberId, Long memoryId);
 
     MemoryAndDetailId findMemoryAndDetailIdsByMemberId(Long memberId);
+
+    MemoryIdAndDiaryAndMember findIdAndNicknameById(Long memberId);
 }

module-domain/src/main/java/com/depromeet/memory/port/out/persistence/MemoryPersistencePort.java

@@ -2,6 +2,7 @@
 
 import com.depromeet.memory.domain.Memory;
 import com.depromeet.memory.domain.vo.MemoryAndDetailId;
+import com.depromeet.memory.domain.vo.MemoryIdAndDiaryAndMember;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
@@ -36,4 +37,6 @@ public interface MemoryPersistencePort {
     MemoryAndDetailId findMemoryAndDetailIdsByMemberId(Long memberId);
 
     void deleteById(Long memoryId);
+
+    Optional<MemoryIdAndDiaryAndMember> findIdAndNicknameById(Long memberId);
 }

module-domain/src/main/java/com/depromeet/memory/service/MemoryService.java

@@ -10,6 +10,7 @@
 import com.depromeet.memory.domain.MemoryDetail;
 import com.depromeet.memory.domain.Stroke;
 import com.depromeet.memory.domain.vo.MemoryAndDetailId;
+import com.depromeet.memory.domain.vo.MemoryIdAndDiaryAndMember;
 import com.depromeet.memory.domain.vo.MemoryInfo;
 import com.depromeet.memory.port.in.command.CreateMemoryCommand;
 import com.depromeet.memory.port.in.command.UpdateMemoryCommand;
@@ -110,6 +111,13 @@ public MemoryAndDetailId findMemoryAndDetailIdsByMemberId(Long memberId) {
         return memoryPersistencePort.findMemoryAndDetailIdsByMemberId(memberId);
     }
 
+    @Override
+    public MemoryIdAndDiaryAndMember findIdAndNicknameById(Long memberId) {
+        return memoryPersistencePort
+                .findIdAndNicknameById(memberId)
+                .orElseThrow(() -> new NotFoundException(MemoryErrorType.NOT_FOUND));
+    }
+
     @Override
     @Transactional
     public Memory update(Long memoryId, UpdateMemoryCommand command, List<Stroke> strokes) {

module-domain/src/main/java/com/depromeet/report/domain/ReportReasonCode.java

@@ -0,0 +1,30 @@
+package com.depromeet.report.domain;
+
+import com.depromeet.converter.AbstractCodedEnumConverter;
+import com.depromeet.converter.CodedEnum;
+
+public enum ReportReasonCode implements CodedEnum<String> {
+    REPORT_REASON_1("스팸, 광고"),
+    REPORT_REASON_2("폭력적인 발언"),
+    REPORT_REASON_3("음란성, 선정 내용"),
+    REPORT_REASON_4("개인정보 노출"),
+    REPORT_REASON_5("주제와 무관");
+
+    private String value;
+
+    ReportReasonCode(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @jakarta.persistence.Converter(autoApply = true)
+    static class Converter extends AbstractCodedEnumConverter<ReportReasonCode, String> {
+        public Converter() {
+            super(ReportReasonCode.class);
+        }
+    }
+}

module-domain/src/main/java/com/depromeet/report/port/in/command/CreateReportCommand.java

@@ -0,0 +1,13 @@
+package com.depromeet.report.port.in.command;
+
+import com.depromeet.image.domain.Image;
+import com.depromeet.member.domain.vo.MemberIdAndNickname;
+import com.depromeet.memory.domain.vo.MemoryIdAndDiaryAndMember;
+import com.depromeet.report.domain.ReportReasonCode;
+import java.util.List;
+
+public record CreateReportCommand(
+        MemberIdAndNickname member,
+        MemoryIdAndDiaryAndMember reportMemory,
+        List<Image> images,
+        ReportReasonCode reasonCode) {}

module-domain/src/main/java/com/depromeet/report/port/in/usecase/CreateReportUseCase.java

@@ -0,0 +1,7 @@
+package com.depromeet.report.port.in.usecase;
+
+import com.depromeet.report.port.in.command.CreateReportCommand;
+
+public interface CreateReportUseCase {
+    void save(CreateReportCommand command);
+}

module-domain/src/main/java/com/depromeet/report/port/out/persistence/ReportPersistencePort.java

@@ -0,0 +1,7 @@
+package com.depromeet.report.port.out.persistence;
+
+import com.depromeet.report.port.in.command.CreateReportCommand;
+
+public interface ReportPersistencePort {
+    void writeReportToSheet(CreateReportCommand command);
+}