Merge branch 'develop' into feature/#301-myInfo-page

backend/src/docs/asciidoc/atlas.adoc

@@ -0,0 +1,11 @@
+== 모아보기
+
+=== 모아보기에 지도 추가하기
+
+operation::atlas-controller-test/add-topic-to-atlas[snippets='http-request,http-response']
+
+=== 모아보기에서 지도 제거하기
+
+operation::atlas-controller-test/remove-topic-from-atlas[snippets='http-request,http-response']
+
+

backend/src/docs/asciidoc/bookmark.adoc

@@ -4,9 +4,7 @@
 
 operation::bookmark-controller-test/add-topic-in-bookmark[snippets='http-request,http-response']
 
-=== 유저의 토픽 즐겨찾기 목록 조회
 
-operation::bookmark-controller-test/find-topics-in-bookmark[snippets='http-request,http-response']
+=== 유저의 토픽 즐겨찾기 삭제
 
-=== 유저의 토픽 즐겨찾기 단일 삭제
 operation::bookmark-controller-test/delete-topic-in-bookmark[snippets='http-request,http-response']

backend/src/docs/asciidoc/index.adoc

@@ -10,6 +10,7 @@ toc::[]
 
 include::topic.adoc[]
 include::pin.adoc[]
+include::atlas.adoc[]
 include::member.adoc[]
 include::permission.adoc[]
 include::oauth.adoc[]

backend/src/docs/asciidoc/member.adoc

@@ -8,10 +8,18 @@ operation::member-controller-test/find-all-member[snippets='http-request,http-re
 
 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-my-all-topics[snippets='http-request,http-response']
 
-=== 유저가 만든 토픽 조회
+=== 유저의 나의 핀 목록 조회
 
-operation::member-controller-test/find-topics-by-member[snippets='http-request,http-response']
+operation::member-controller-test/find-my-all-pins[snippets='http-request,http-response']
+
+=== 유저의 모아보기 조회
+
+operation::member-controller-test/find-all-topics-in-atlas[snippets='http-request,http-response']
+
+=== 유저의 즐겨찾기 조회
+
+operation::member-controller-test/find-all-topics-in-bookmark[snippets='http-request,http-response']

backend/src/docs/asciidoc/pin.adoc

@@ -8,6 +8,10 @@ operation::pin-controller-test/find-all[snippets='http-request,http-response']
 
 operation::pin-controller-test/find-by-id[snippets='http-request,http-response']
 
+=== 멤버별 핀 목록 조회
+
+operation::pin-controller-test/find-all-pins-by-member-id[snippets='http-request,http-response']
+
 === 핀 생성
 
 operation::pin-controller-test/add[snippets='http-request,http-response']

backend/src/docs/asciidoc/topic.adoc

@@ -8,10 +8,17 @@ operation::topic-controller-test/find-all[snippets='http-request,http-response']
 
 operation::location-controller-test/find-nearby-topics-sorted-by-pin-count[snippets='http-request,http-response']
 
+=== 멤버별 토픽 목록 조회
+
+operation::topic-controller-test/find-all-topics-by-member-id[snippets='http-request,http-response']
+
 === 토픽 상세 조회
 
 operation::topic-controller-test/find-by-id[snippets='http-request,http-response']
 
+=== 최신 토픽 목록 조회
+operation::topic-controller-test/find-all-by-order-by-updated-at-desc[snippets='http-request,http-response']
+
 === 토픽 생성
 
 operation::topic-controller-test/create[snippets='http-request,http-response']
@@ -20,10 +27,17 @@ operation::topic-controller-test/create[snippets='http-request,http-response']
 
 operation::topic-controller-test/merge-and-create[snippets='http-request,http-response']
 
+== 토픽에 핀 추가
+operation::topic-controller-test/copy-pin[snippets='http-request,http-response']
+
 === 토픽 수정
 
 operation::topic-controller-test/update[snippets='http-request,http-response']
 
 === 토픽 삭제
 
 operation::topic-controller-test/delete[snippets='http-request,http-response']
+
+=== 인기 급상승 토픽 조회
+
+operation::topic-controller-test/find-all-best-topics[snippets='http-request,http-response']

backend/src/main/java/com/mapbefine/mapbefine/atlas/application/AtlasCommandService.java

@@ -0,0 +1,78 @@
+package com.mapbefine.mapbefine.atlas.application;
+
+import com.mapbefine.mapbefine.atlas.domain.Atlas;
+import com.mapbefine.mapbefine.atlas.domain.AtlasRepository;
+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.topic.domain.Topic;
+import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class AtlasCommandService {
+
+    private final TopicRepository topicRepository;
+    private final MemberRepository memberRepository;
+    private final AtlasRepository atlasRepository;
+
+    public AtlasCommandService(
+            TopicRepository topicRepository,
+            MemberRepository memberRepository,
+            AtlasRepository atlasRepository
+    ) {
+        this.topicRepository = topicRepository;
+        this.memberRepository = memberRepository;
+        this.atlasRepository = atlasRepository;
+    }
+
+    public void addTopic(AuthMember authMember, Long topicId) {
+        Long memberId = authMember.getMemberId();
+
+        if (Objects.isNull(memberId) || Objects.isNull(topicId)) {
+            throw new IllegalArgumentException("잘못된 ID가 입력되었습니다.");
+        }
+
+        if (isTopicAlreadyAdded(topicId, memberId)) {
+            return;
+        }
+
+        Topic topic = findTopicById(topicId);
+        validateReadPermission(authMember, topic);
+
+        Member member = findMemberById(memberId);
+
+        Atlas atlas = Atlas.createWithAssociatedMember(topic, member);
+        atlasRepository.save(atlas);
+    }
+
+    private boolean isTopicAlreadyAdded(Long topicId, Long memberId) {
+        return atlasRepository.existsByMemberIdAndTopicId(memberId, topicId);
+    }
+
+    private Topic findTopicById(Long topicId) {
+        return topicRepository.findById(topicId)
+                .orElseThrow(NoSuchElementException::new);
+    }
+
+    private void validateReadPermission(AuthMember authMember, Topic topic) {
+        if (authMember.canRead(topic)) {
+            return;
+        }
+        throw new IllegalArgumentException("해당 지도에 접근권한이 없습니다.");
+    }
+
+    private Member findMemberById(Long memberId) {
+        return memberRepository.findById(memberId)
+                .orElseThrow(NoSuchElementException::new);
+    }
+
+    public void removeTopic(AuthMember authMember, Long topicId) {
+        atlasRepository.deleteByMemberIdAndTopicId(authMember.getMemberId(), topicId);
+    }
+
+}

backend/src/main/java/com/mapbefine/mapbefine/atlas/domain/Atlas.java

@@ -0,0 +1,54 @@
+package com.mapbefine.mapbefine.atlas.domain;
+
+import static lombok.AccessLevel.PROTECTED;
+
+import com.mapbefine.mapbefine.member.domain.Member;
+import com.mapbefine.mapbefine.topic.domain.Topic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.util.Objects;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = PROTECTED)
+@Getter
+public class Atlas {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "topic_id", nullable = false)
+    private Topic topic;
+
+    @ManyToOne
+    @JoinColumn(name = "member_id", nullable = false)
+    private Member member;
+
+    private Atlas(Topic topic, Member member) {
+        this.topic = topic;
+        this.member = member;
+    }
+
+    public static Atlas createWithAssociatedMember(Topic topic, Member member) {
+        validateNotNull(topic, member);
+        Atlas atlas = new Atlas(topic, member);
+
+        member.addAtlas(atlas);
+
+        return atlas;
+    }
+
+    private static void validateNotNull(Topic topic, Member member) {
+        if (Objects.isNull(topic) || Objects.isNull(member)) {
+            throw new IllegalArgumentException("지도와 유저는 Null이어선 안됩니다.");
+        }
+    }
+
+}

backend/src/main/java/com/mapbefine/mapbefine/atlas/domain/AtlasRepository.java

@@ -0,0 +1,13 @@
+package com.mapbefine.mapbefine.atlas.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AtlasRepository extends JpaRepository<Atlas, Long> {
+
+    boolean existsByMemberIdAndTopicId(Long memberId, Long topicId);
+
+    void deleteByMemberIdAndTopicId(Long memberId, Long topicId);
+
+}

backend/src/main/java/com/mapbefine/mapbefine/atlas/presentation/AtlasController.java

@@ -0,0 +1,40 @@
+package com.mapbefine.mapbefine.atlas.presentation;
+
+import com.mapbefine.mapbefine.atlas.application.AtlasCommandService;
+import com.mapbefine.mapbefine.auth.domain.AuthMember;
+import com.mapbefine.mapbefine.common.interceptor.LoginRequired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/atlas")
+public class AtlasController {
+
+    private final AtlasCommandService atlasCommandService;
+
+    public AtlasController(AtlasCommandService atlasCommandService) {
+        this.atlasCommandService = atlasCommandService;
+    }
+
+    @LoginRequired
+    @PostMapping("/topics")
+    public ResponseEntity<Void> addTopicToAtlas(AuthMember authMember, @RequestParam Long id) {
+        atlasCommandService.addTopic(authMember, id);
+
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+    @LoginRequired
+    @DeleteMapping("/topics")
+    public ResponseEntity<Void> removeTopicFromAtlas(AuthMember authMember, @RequestParam Long id) {
+        atlasCommandService.removeTopic(authMember, id);
+
+        return ResponseEntity.noContent().build();
+    }
+
+}

backend/src/main/java/com/mapbefine/mapbefine/auth/infrastructure/BearerAuthorizationExtractor.java

@@ -28,9 +28,8 @@ private boolean isBearerType(String value) {
     }
 
     private String extractAuthHeaderValue(String value) {
-        String authHeaderValue = value.substring(BEARER_TYPE.length()).trim();
 
-        return authHeaderValue;
+        return value.substring(BEARER_TYPE.length()).trim();
     }
 
 }

backend/src/main/java/com/mapbefine/mapbefine/bookmark/application/BookmarkCommandService.java

@@ -12,7 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
-@Transactional(readOnly = true)
+@Transactional
 public class BookmarkCommandService {
 
     private final BookmarkRepository bookmarkRepository;

backend/src/main/java/com/mapbefine/mapbefine/bookmark/domain/Bookmark.java

@@ -8,6 +8,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import java.util.Objects;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -34,8 +35,8 @@ private Bookmark(Topic topic, Member member) {
         this.member = member;
     }
 
-    // TODO: 2023/08/11 필요한 검증이 무엇이 있을까.. 현재로썬 외부에서 검증하는 방법 밖에 ?
     public static Bookmark createWithAssociatedTopicAndMember(Topic topic, Member member) {
+        validateNotNull(topic, member);
         Bookmark bookmark = new Bookmark(topic, member);
 
         topic.addBookmark(bookmark);
@@ -44,4 +45,10 @@ public static Bookmark createWithAssociatedTopicAndMember(Topic topic, Member me
         return bookmark;
     }
 
+    private static void validateNotNull(Topic topic, Member member) {
+        if (Objects.isNull(topic) || Objects.isNull(member)) {
+            throw new IllegalArgumentException("지도와 유저는 Null이어선 안됩니다.");
+        }
+    }
+
 }

backend/src/main/java/com/mapbefine/mapbefine/bookmark/domain/BookmarkRepository.java

@@ -1,15 +1,12 @@
 package com.mapbefine.mapbefine.bookmark.domain;
 
-import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
 
-    List<Bookmark> findAllByMemberId(Long memberId);
+    boolean existsByMemberIdAndTopicId(Long memberId, Long topicId);
 
     void deleteAllByMemberId(Long memberId);
 
-    boolean existsByMemberIdAndTopicId(Long memberId, Long topicId);
-
     void deleteByMemberIdAndTopicId(Long memberId, Long topicId);
 }