[BE] 핀(Pin) 패키지 코드 리팩터링(PinImage 기능 구현 포함)

backend/src/docs/asciidoc/index.adoc

@@ -10,3 +10,4 @@ toc::[]
 
 include::topic.adoc[]
 include::pin.adoc[]
+include::member.adoc[]

backend/src/docs/asciidoc/member.adoc

@@ -0,0 +1,37 @@
+== 유저
+
+=== 유저 권한 부여
+
+operation::member-controller-test/add-member-topic-permission[snippets='http-request,http-response']
+
+=== 유저 권한 삭제
+
+operation::member-controller-test/delete-member-topic-permission[snippets='http-request,http-response']
+
+=== 토픽에 권한을 가진 유저 목록 조회
+
+operation::member-controller-test/find-member-topic-permission-all[snippets='http-request,http-response']
+
+=== 토픽에 권한을 가진 유저 단일 조회
+
+operation::member-controller-test/find-member-topic-permission-by-id[snippets='http-request,http-response']
+
+=== 유저 생성
+
+operation::member-controller-test/add[snippets='http-request,http-response']
+
+=== 유저 목록 조회
+
+operation::member-controller-test/find-all-member[snippets='http-request,http-response']
+
+=== 유저 단일 조회
+
+operation::member-controller-test/find-member-by-id[snippets='http-request,http-response']
+
+=== 유저가 만든 핀 조회
+
+operation::member-controller-test/find-pins-by-member[snippets='http-request,http-response']
+
+=== 유저가 만든 토픽 조회
+
+operation::member-controller-test/find-topics-by-member[snippets='http-request,http-response']

backend/src/docs/asciidoc/pin.adoc

@@ -19,3 +19,10 @@ operation::pin-controller-test/update[snippets='http-request,http-response']
 === 핀 삭제
 
 operation::pin-controller-test/delete[snippets='http-request,http-response']
+
+=== 핀 이미지 추가
+
+operation::pin-controller-test/add-image[snippets='http-request,http-response']
+
+=== 핀 이미지 삭제
+operation::pin-controller-test/remove-image[snippets='http-request,http-response']

backend/src/main/java/com/mapbefine/mapbefine/auth/application/AuthService.java

@@ -23,11 +23,11 @@ public AuthService(MemberRepository memberRepository) {
     }
 
     public boolean isMember(AuthInfo authInfo) {
-        return memberRepository.existsByEmail(authInfo.email());
+        return memberRepository.existsByMemberInfoEmail(authInfo.email());
     }
 
     public AuthMember findAuthMemberByEmail(AuthInfo authInfo) {
-        return memberRepository.findByEmail(authInfo.email())
+        return memberRepository.findByMemberInfoEmail(authInfo.email())
                 .map(this::convertToAuthMember)
                 .orElseGet(Guest::new);
     }
@@ -45,14 +45,14 @@ private AuthMember convertToAuthMember(Member member) {
     }
 
     private List<Long> getTopicsWithPermission(Member member) {
-        return member.getTopicsWithPermission()
+        return member.getTopicsWithPermissions()
                 .stream()
                 .map(Topic::getId)
                 .toList();
     }
 
     private List<Long> getCreatedTopics(Member member) {
-        return member.getCreatedTopic()
+        return member.getCreatedTopics()
                 .stream()
                 .map(Topic::getId)
                 .toList();

backend/src/main/java/com/mapbefine/mapbefine/auth/domain/AuthMember.java

@@ -1,5 +1,8 @@
 package com.mapbefine.mapbefine.auth.domain;
 
+import com.mapbefine.mapbefine.auth.domain.member.Admin;
+import com.mapbefine.mapbefine.auth.domain.member.Guest;
+import com.mapbefine.mapbefine.auth.domain.member.User;
 import com.mapbefine.mapbefine.member.domain.Member;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import java.util.List;
@@ -20,15 +23,27 @@ protected AuthMember(
         this.topicsWithPermission = topicsWithPermission;
     }
 
+    public static AuthMember from(Member member) {
+        if (member == null) {
+            return new Guest();
+        }
+
+        if (member.isUser()) {
+            return new User(member.getId(), getCreatedTopics(member), getTopicsWithPermission(member));
+        }
+
+        return new Admin(member.getId());
+    }
+
     private static List<Long> getTopicsWithPermission(Member member) {
-        return member.getTopicsWithPermission()
+        return member.getTopicsWithPermissions()
                 .stream()
                 .map(Topic::getId)
                 .toList();
     }
 
     private static List<Long> getCreatedTopics(Member member) {
-        return member.getCreatedTopic()
+        return member.getCreatedTopics()
                 .stream()
                 .map(Topic::getId)
                 .toList();
@@ -45,4 +60,5 @@ private static List<Long> getCreatedTopics(Member member) {
     public Long getMemberId() {
         return memberId;
     }
+
 }

backend/src/main/java/com/mapbefine/mapbefine/location/domain/Location.java

@@ -71,4 +71,12 @@ public double getLongitude() {
         return coordinate.getLongitude();
     }
 
+    public String getRoadBaseAddress() {
+        return address.getRoadBaseAddress();
+    }
+
+    public String getLegalDongCode() {
+        return address.getLegalDongCode();
+    }
+
 }

backend/src/main/java/com/mapbefine/mapbefine/member/application/MemberCommandService.java

@@ -1,6 +1,15 @@
 package com.mapbefine.mapbefine.member.application;
 
+import com.mapbefine.mapbefine.auth.domain.AuthMember;
+import com.mapbefine.mapbefine.member.domain.Member;
 import com.mapbefine.mapbefine.member.domain.MemberRepository;
+import com.mapbefine.mapbefine.member.domain.MemberTopicPermission;
+import com.mapbefine.mapbefine.member.domain.MemberTopicPermissionRepository;
+import com.mapbefine.mapbefine.member.dto.request.MemberCreateRequest;
+import com.mapbefine.mapbefine.member.dto.request.MemberTopicPermissionCreateRequest;
+import com.mapbefine.mapbefine.topic.domain.Topic;
+import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import java.util.NoSuchElementException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -9,8 +18,104 @@
 public class MemberCommandService {
 
     private final MemberRepository memberRepository;
+    private final TopicRepository topicRepository;
+    private final MemberTopicPermissionRepository memberTopicPermissionRepository;
 
-    public MemberCommandService(MemberRepository memberRepository) {
+    public MemberCommandService(
+            MemberRepository memberRepository,
+            TopicRepository topicRepository,
+            MemberTopicPermissionRepository memberTopicPermissionRepository
+    ) {
         this.memberRepository = memberRepository;
+        this.topicRepository = topicRepository;
+        this.memberTopicPermissionRepository = memberTopicPermissionRepository;
     }
+
+    public Long save(MemberCreateRequest request) {
+        validateUniqueName(request.name());
+        validateUniqueEmail(request.email());
+
+        Member member = Member.of(
+                request.name(),
+                request.email(),
+                request.imageUrl(),
+                request.role()
+        );
+
+        return memberRepository.save(member)
+                .getId();
+    }
+
+    private void validateUniqueName(String name) {
+        if (memberRepository.existsByMemberInfoName(name)) {
+            throw new IllegalArgumentException("이미 존재하는 이름입니다.");
+        }
+    }
+
+    private void validateUniqueEmail(String email) {
+        if (memberRepository.existsByMemberInfoEmail(email)) {
+            throw new IllegalArgumentException("이미 존재하는 이메일입니다.");
+        }
+    }
+
+    public Long saveMemberTopicPermission(
+            AuthMember authMember,
+            MemberTopicPermissionCreateRequest request
+    ) {
+        Member member = memberRepository.findById(request.memberId())
+                .orElseThrow(NoSuchElementException::new);
+        Topic topic = topicRepository.findById(request.topicId())
+                .orElseThrow(NoSuchElementException::new);
+
+        validateSaveMemberTopicPermission(authMember, request, member, topic);
+
+        MemberTopicPermission memberTopicPermission =
+                MemberTopicPermission.createPermissionAssociatedWithTopicAndMember(topic, member);
+        return memberTopicPermissionRepository.save(memberTopicPermission).getId();
+    }
+
+    private void validateSaveMemberTopicPermission(
+            AuthMember authMember,
+            MemberTopicPermissionCreateRequest request,
+            Member member,
+            Topic topic
+    ) {
+        validateMemberCanTopicUpdate(authMember, topic);
+        validateSelfPermission(authMember, request);
+        validateDuplicatePermission(member, topic);
+    }
+
+    private void validateMemberCanTopicUpdate(AuthMember authMember, Topic topic) {
+        if (!authMember.canTopicUpdate(topic)) {
+            throw new IllegalArgumentException("해당 유저는 해당 토픽에서 다른 유저에게 권한을 줄 수 없습니다.");
+        }
+    }
+
+    private void validateSelfPermission(
+            AuthMember authMember,
+            MemberTopicPermissionCreateRequest request
+    ) {
+        if (authMember.getMemberId().equals(request.memberId())) {
+            throw new IllegalArgumentException("본인에게 권한을 줄 수 없습니다.");
+        }
+    }
+
+    private void validateDuplicatePermission(Member member, Topic topic) {
+        if (memberTopicPermissionRepository.existsByTopicAndMember(topic, member)) {
+            throw new IllegalArgumentException("권한은 중복으로 줄 수 없습니다.");
+        }
+    }
+
+    public void deleteMemberTopicPermission(
+            AuthMember authMember,
+            Long permissionId
+    ) {
+        MemberTopicPermission memberTopicPermission = memberTopicPermissionRepository.findById(permissionId)
+                .orElseThrow(NoSuchElementException::new);
+
+        validateMemberCanTopicUpdate(authMember, memberTopicPermission.getTopic());
+
+        memberTopicPermissionRepository.delete(memberTopicPermission);
+    }
+
 }

backend/src/main/java/com/mapbefine/mapbefine/member/application/MemberQueryService.java

@@ -1,6 +1,20 @@
 package com.mapbefine.mapbefine.member.application;
 
+import com.mapbefine.mapbefine.auth.domain.AuthMember;
+import com.mapbefine.mapbefine.member.domain.Member;
 import com.mapbefine.mapbefine.member.domain.MemberRepository;
+import com.mapbefine.mapbefine.member.domain.MemberTopicPermission;
+import com.mapbefine.mapbefine.member.domain.MemberTopicPermissionRepository;
+import com.mapbefine.mapbefine.member.dto.response.MemberDetailResponse;
+import com.mapbefine.mapbefine.member.dto.response.MemberResponse;
+import com.mapbefine.mapbefine.pin.domain.Pin;
+import com.mapbefine.mapbefine.pin.domain.PinRepository;
+import com.mapbefine.mapbefine.pin.dto.response.PinResponse;
+import com.mapbefine.mapbefine.topic.domain.Topic;
+import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import com.mapbefine.mapbefine.topic.dto.response.TopicResponse;
+import java.util.List;
+import java.util.NoSuchElementException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -9,8 +23,77 @@
 public class MemberQueryService {
 
     private final MemberRepository memberRepository;
+    private final TopicRepository topicRepository;
+    private final PinRepository pinRepository;
+    private final MemberTopicPermissionRepository memberTopicPermissionRepository;
 
-    public MemberQueryService(MemberRepository memberRepository) {
+
+    public MemberQueryService(
+            MemberRepository memberRepository,
+            TopicRepository topicRepository,
+            PinRepository pinRepository,
+            MemberTopicPermissionRepository memberTopicPermissionRepository
+    ) {
         this.memberRepository = memberRepository;
+        this.topicRepository = topicRepository;
+        this.pinRepository = pinRepository;
+        this.memberTopicPermissionRepository = memberTopicPermissionRepository;
+    }
+
+    public MemberDetailResponse findById(Long id) {
+        Member member = memberRepository.findById(id)
+                .orElseThrow(NoSuchElementException::new);
+
+        return MemberDetailResponse.from(member);
+    }
+
+    public List<MemberResponse> findAll() {
+        return memberRepository.findAll()
+                .stream()
+                .map(MemberResponse::from)
+                .toList();
+    }
+
+    public List<TopicResponse> findTopicsByMember(AuthMember authMember) {
+        validateNull(authMember.getMemberId());
+        Member member = memberRepository.findById(authMember.getMemberId())
+                .orElseThrow(NoSuchElementException::new);
+        List<Topic> topicsByCreator = topicRepository.findByCreator(member);
+
+        return topicsByCreator.stream()
+                .map(TopicResponse::from)
+                .toList();
+    }
+
+    public List<PinResponse> findPinsByMember(AuthMember authMember) {
+        validateNull(authMember.getMemberId());
+        Member creator = memberRepository.findById(authMember.getMemberId())
+                .orElseThrow(NoSuchElementException::new);
+        List<Pin> pinsByCreator = pinRepository.findByCreator(creator);
+
+        return pinsByCreator.stream()
+                .map(PinResponse::from)
+                .toList();
+    }
+
+    private void validateNull(Long id) {
+        if (id == null) {
+            throw new IllegalArgumentException("id 는 null 일 수 없습니다.");
+        }
+    }
+
+    public List<MemberResponse> findAllWithPermission(Long topicId) {
+        return memberTopicPermissionRepository.findByTopicId(topicId)
+                .stream()
+                .map(MemberTopicPermission::getMember)
+                .map(MemberResponse::from)
+                .toList();
+    }
+
+    public MemberDetailResponse findMemberTopicPermissionById(Long permissionId) {
+        MemberTopicPermission memberTopicPermission = memberTopicPermissionRepository.findById(permissionId)
+                .orElseThrow(NoSuchElementException::new);
+
+        return MemberDetailResponse.from(memberTopicPermission.getMember());
     }
 }