Dev backend

backend/core/build.gradle

@@ -45,12 +45,12 @@ dependencies {
 	annotationProcessor 'org.projectlombok:lombok'
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 
+	testCompileOnly 'org.projectlombok:lombok'
+	testAnnotationProcessor 'org.projectlombok:lombok'
 	testAnnotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final"
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
-	testCompileOnly 'org.projectlombok:lombok'
-	testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
 tasks.named('bootBuildImage') {

backend/core/src/main/java/com/rollthedice/backend/domain/bookmark/api/BookmarkApi.java

@@ -1,5 +1,6 @@
 package com.rollthedice.backend.domain.bookmark.api;
 
+import com.rollthedice.backend.domain.bookmark.dto.response.BookmarkResponse;
 import com.rollthedice.backend.domain.news.dto.response.NewsResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -12,24 +13,40 @@
 
 public interface BookmarkApi {
     @Operation(
-            summary = "북마크 조회",
+            summary = "북마크 전체 조회",
             description = "회원이 북마크한 뉴스를 페이지로 나누어 조회합니다.",
             security = {@SecurityRequirement(name = "access_token")},
-            tags = {"bookmark"}
+            tags = {"북마크"}
     )
     @ApiResponse(
             responseCode = "200",
             description = "OK"
     )
-    List<NewsResponse> getBookmarked(
+    List<NewsResponse> getAllBookmarkedNews(
             Pageable pageable
     );
 
+    @Operation(
+            summary = "뉴스 북마크 여부 조회",
+            description = "로그인한 회원이 해당 뉴스를 북마크 했는지 여부를 조회합니다.",
+            security = {@SecurityRequirement(name = "access_token")},
+            tags = {"북마크"}
+    )
+    @ApiResponse(
+            responseCode = "200",
+            description = "OK"
+    )
+    BookmarkResponse getIsBookmarked(
+            @Parameter(in = ParameterIn.PATH, description = "뉴스 ID", required = true)
+            Long newsId
+    );
+
+
     @Operation(
             summary = "북마크 저장",
             description = "뉴스에 대하여 북마크로 저장합니다.",
             security = {@SecurityRequirement(name = "access_token")},
-            tags = {"bookmark"}
+            tags = {"북마크"}
     )
     @ApiResponse(
             responseCode = "201",
@@ -44,7 +61,7 @@ void saveBookmark(
             summary = "북마크 삭제",
             description = "저장된 북마크를 해제합니다.",
             security = {@SecurityRequirement(name = "access_token")},
-            tags = {"bookmark"}
+            tags = {"북마크"}
     )
     @ApiResponse(
             responseCode = "204",

backend/core/src/main/java/com/rollthedice/backend/domain/bookmark/api/BookmarkController.java

@@ -1,5 +1,6 @@
 package com.rollthedice.backend.domain.bookmark.api;
 
+import com.rollthedice.backend.domain.bookmark.dto.response.BookmarkResponse;
 import com.rollthedice.backend.domain.bookmark.service.BookmarkService;
 import com.rollthedice.backend.domain.news.dto.response.NewsResponse;
 import lombok.RequiredArgsConstructor;
@@ -18,8 +19,15 @@ public class BookmarkController implements BookmarkApi {
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("")
     @Override
-    public List<NewsResponse> getBookmarked(final Pageable pageable) {
-        return bookmarkService.getBookmarkedNews(pageable);
+    public List<NewsResponse> getAllBookmarkedNews(final Pageable pageable) {
+        return bookmarkService.getAllBookmarkedNews(pageable);
+    }
+
+    @ResponseStatus(HttpStatus.OK)
+    @GetMapping("/{newsId}")
+    @Override
+    public BookmarkResponse getIsBookmarked(@PathVariable final Long newsId) {
+        return bookmarkService.getIsBookmarked(newsId);
     }
 
     @ResponseStatus(HttpStatus.CREATED)

backend/core/src/main/java/com/rollthedice/backend/domain/bookmark/dto/response/BookmarkResponse.java

@@ -0,0 +1,16 @@
+package com.rollthedice.backend.domain.bookmark.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BookmarkResponse {
+    private Long id;
+    private Boolean isBookmarked;
+
+}

backend/core/src/main/java/com/rollthedice/backend/domain/bookmark/repository/BookmarkRepository.java

@@ -12,6 +12,7 @@
 @Repository
 public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
     Boolean existsBookmarkByMemberAndNews(Member member, News news);
+    Boolean existsBookmarkByMemberAndNewsId(Member member, Long newsId);
 
     List<Bookmark> findAllByMemberOrderByCreatedAt(Member member, Pageable pageable);
 

backend/core/src/main/java/com/rollthedice/backend/domain/bookmark/service/BookmarkService.java

@@ -1,5 +1,6 @@
 package com.rollthedice.backend.domain.bookmark.service;
 
+import com.rollthedice.backend.domain.bookmark.dto.response.BookmarkResponse;
 import com.rollthedice.backend.domain.bookmark.entity.Bookmark;
 import com.rollthedice.backend.domain.bookmark.repository.BookmarkRepository;
 import com.rollthedice.backend.domain.member.entity.Member;
@@ -11,14 +12,15 @@
 import com.rollthedice.backend.domain.news.repository.NewsRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-@RequiredArgsConstructor
 @Service
+@RequiredArgsConstructor
 public class BookmarkService {
     private final AuthService authService;
     private final BookmarkRepository bookmarkRepository;
@@ -31,7 +33,7 @@ public boolean isBookmarked(Member member, News news) {
     }
 
     @Transactional(readOnly = true)
-    public List<NewsResponse> getBookmarkedNews(Pageable pageable) {
+    public List<NewsResponse> getAllBookmarkedNews(Pageable pageable) {
         Member member = authService.getMember();
         return bookmarkRepository.findAllByMemberOrderByCreatedAt(member, pageable).stream()
                 .map(bookmark -> newsMapper.toResponse(bookmark.getNews(), true))
@@ -53,5 +55,14 @@ public void saveBookmark(Long newsId) {
     public void deleteBookmark(Long newsId) {
         bookmarkRepository.deleteByNewsId(newsId);
     }
+
+    public BookmarkResponse getIsBookmarked(Long newsId) {
+        Member member = authService.getMember();
+        Boolean isBookmarked = bookmarkRepository.existsBookmarkByMemberAndNewsId(member, newsId);
+        return BookmarkResponse.builder()
+                .id(newsId)
+                .isBookmarked(isBookmarked)
+                .build();
+    }
 }
 

backend/core/src/main/java/com/rollthedice/backend/domain/news/dto/response/NewsDetailResponse.java

@@ -16,5 +16,4 @@ public class NewsDetailResponse {
     private String content;
     private String thumbnailUrl;
     private String postDate;
-    private Boolean isBookmarked;
 }

backend/core/src/main/java/com/rollthedice/backend/domain/news/dto/response/NewsResponse.java

@@ -12,7 +12,6 @@
 public class NewsResponse {
     private Long id;
     private String title;
-    private String content;
     private String thumbnail;
     private String postDate;
     private Boolean isBookmarked;

backend/core/src/main/java/com/rollthedice/backend/domain/news/mapper/NewsMapper.java

@@ -11,5 +11,5 @@ public interface NewsMapper {
 
     NewsResponse toResponse(final News news, boolean isBookmarked);
 
-    NewsDetailResponse toDetailResponse(final News news, boolean isBookmarked);
+    NewsDetailResponse toDetailResponse(final News news);
 }

backend/core/src/main/java/com/rollthedice/backend/domain/news/service/NewsService.java

@@ -68,8 +68,7 @@ public List<NewsResponse> getNews(final Pageable pageable) {
     }
 
     public NewsDetailResponse getDetailNews(Long newsId) {
-        Member member = authService.getMember();
         final News news = newsRepository.findById(newsId).orElseThrow(NewsNotFoundException::new);
-        return newsMapper.toDetailResponse(news, bookmarkService.isBookmarked(member, news));
+        return newsMapper.toDetailResponse(news);
     }
 }

backend/core/src/main/java/com/rollthedice/backend/global/config/SwaggerConfig.java

@@ -14,7 +14,10 @@
 @Configuration
 public class SwaggerConfig {
     private final String JWT = "JWT";
-    private final String BEARER = "Bearer";
+    private final String BEARER = "bearer";
+    private final String AUTHORIZATION = "Authorization";
+    private final String ACCESS_TOKEN = "access_token";
+
 
     @Bean
     public OpenAPI openAPI() {
@@ -28,21 +31,22 @@ public OpenAPI openAPI() {
 
     private List<Server> getServers() {
         return List.of(new Server()
-                        .url("/api")
-                        .description("백엔드 api 서버")
+                .url("/")
+                .description("백엔드 api 서버")
         );
     }
 
     private Info getInfo() {
         return new Info()
-                .title("Roll The Dice API")
-                .description("요약된 뉴스를 AR로 재미있게 즐기는 서비스")
+                .title("Scoop API")
+                .description("ChatGPT기반, 생성형 AI로 요약한 뉴스 학습 어플")
                 .version("demo");
     }
 
     private Components getComponents() {
-        return new Components().addSecuritySchemes(JWT, new SecurityScheme()
-                .name(JWT)
+        return new Components().addSecuritySchemes(ACCESS_TOKEN, new SecurityScheme()
+                .name(AUTHORIZATION)
+                .in(SecurityScheme.In.HEADER)
                 .type(SecurityScheme.Type.HTTP)
                 .scheme(BEARER)
                 .bearerFormat(JWT)