5차 스프린트 마감

.env.example

@@ -12,6 +12,9 @@ MYSQL_ROOT_PASSWORD=
 # Durunubi API key
 DURUNUBI_SERVICE_KEY=
 
+# Spot API Key
+SPOT_SERVICE_KEY=
+
 # OpenAI API Key
 OPENAI_API_KEY=
 

docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
       - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}
       - DURUNUBI_SERVICE_KEY=${DURUNUBI_SERVICE_KEY}
+      - SPOT_SERVICE_KEY=${SPOT_SERVICE_KEY}
       - OPENAI_API_KEY=${OPENAI_API_KEY}
       - S3_ACCESS_KEY=${S3_ACCESS_KEY}
       - S3_SECRET_KEY=${S3_SECRET_KEY}

sql/V1_create_course_related_tables.sql

@@ -115,7 +115,46 @@ create table track_point
         foreign key (course_id) references course (course_id)
 );
 
--- 8. review 테이블 생성
+-- 8. spot 테이블 생성
+create table spot (
+    spot_id      BIGINT AUTO_INCREMENT PRIMARY KEY,
+    external_id  VARCHAR(255) NOT NULL UNIQUE,
+    name         VARCHAR(255) NOT NULL,
+    address      VARCHAR(255) NOT NULL,
+    description  TEXT,
+    category     ENUM('NATURE', 'HISTORY', 'RECREATION', 'EXPERIENCE', 'INDUSTRIAL', 'ARCHITECTURE',
+                   'KOREAN_FOOD', 'WESTERN_FOOD', 'JAPANESE_FOOD', 'CHINESE_FOOD', 'GLOBAL_FOOD',
+                   'CAFE', 'CLUB', 'UNKNOWN') NOT NULL,
+    lat          DOUBLE NOT NULL,
+    lon          DOUBLE NOT NULL,
+    created_at   DATETIME(6) NOT NULL,
+    updated_at   DATETIME(6) NOT NULL
+);
+
+-- 9. course_spot 테이블 생성
+CREATE TABLE course_spot (
+    course_spot_id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    course_id      BIGINT NOT NULL,
+    spot_id        BIGINT NOT NULL,
+    created_at     DATETIME(6) NOT NULL,
+    updated_at     DATETIME(6) NOT NULL,
+    CONSTRAINT course_spot_uk UNIQUE (course_id, spot_id),
+    CONSTRAINT fk_course FOREIGN KEY (course_id) REFERENCES course(course_id),
+    CONSTRAINT fk_spot FOREIGN KEY (spot_id) REFERENCES spot(spot_id)
+);
+
+-- 10. spot_image 테이블 생성
+CREATE TABLE spot_image (
+    spot_img_id   BIGINT AUTO_INCREMENT PRIMARY KEY,
+    img_url       VARCHAR(255) NOT NULL,
+    original_url  VARCHAR(255) NOT NULL,
+    spot_id       BIGINT NOT NULL UNIQUE,
+    created_at    DATETIME(6) NOT NULL,
+    updated_at    DATETIME(6) NOT NULL,
+    CONSTRAINT fk_spot_image_spot FOREIGN KEY (spot_id) REFERENCES spot(spot_id)
+);
+
+-- 11. review 테이블 생성
 create table review
 (
     review_id  bigint auto_increment
@@ -138,4 +177,4 @@ create table review
 ALTER TABLE course DROP COLUMN tour_point;
 
 -- course 테이블의 distance 컬럼 타입 변경
-ALTER TABLE course MODIFY COLUMN distance DOUBLE NOT NULL;
+ALTER TABLE course MODIFY COLUMN distance DOUBLE NOT NULL;

src/main/java/com/server/running_handai/RunningHandaiApplication.java

@@ -5,9 +5,11 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableAsync
 @EnableJpaAuditing
+@EnableScheduling
 @SpringBootApplication
 public class RunningHandaiApplication {
 

src/main/java/com/server/running_handai/domain/bookmark/controller/BookmarkController.java

@@ -1,6 +1,8 @@
 package com.server.running_handai.domain.bookmark.controller;
 
+import com.server.running_handai.domain.bookmark.dto.BookmarkedCourseInfoDto;
 import com.server.running_handai.domain.bookmark.service.BookmarkService;
+import com.server.running_handai.domain.course.entity.Area;
 import com.server.running_handai.global.oauth.CustomOAuth2User;
 import com.server.running_handai.global.response.CommonResponse;
 import com.server.running_handai.global.response.ResponseCode;
@@ -9,20 +11,21 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 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;
 
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/courses/{courseId}/bookmarks")
 @Tag(name = "Bookmark", description = "북마크 관련 API")
 public class BookmarkController {
 
@@ -35,7 +38,7 @@ public class BookmarkController {
             @ApiResponse(responseCode = "400", description = "실패 (이미 북마크한 코스)"),
             @ApiResponse(responseCode = "401", description = "실패 (인증 실패)")
     })
-    @PostMapping
+    @PostMapping("/api/courses/{courseId}/bookmarks")
     public ResponseEntity<CommonResponse<?>> registerBookmark(
             @Parameter(description = "북마크 대상 코스", required = true) @PathVariable Long courseId,
             @AuthenticationPrincipal CustomOAuth2User customOAuth2User
@@ -54,7 +57,7 @@ public ResponseEntity<CommonResponse<?>> registerBookmark(
             @ApiResponse(responseCode = "404", description = "실패 (존재하지 않는 북마크)"),
             @ApiResponse(responseCode = "401", description = "실패 (인증 실패)")
     })
-    @DeleteMapping
+    @DeleteMapping("/api/courses/{courseId}/bookmarks")
     public ResponseEntity<CommonResponse<?>> deleteBookmark(
             @Parameter(description = "북마크 대상 코스", required = true) @PathVariable Long courseId,
             @AuthenticationPrincipal CustomOAuth2User customOAuth2User
@@ -66,4 +69,25 @@ public ResponseEntity<CommonResponse<?>> deleteBookmark(
         return ResponseEntity.ok(CommonResponse.success(ResponseCode.SUCCESS_BOOKMARK_DELETE, null));
     }
 
+    @Operation(summary = "북마크한 코스 조회", description = "회원이 북마크한 코스를 조회합니다. 코스의 지역으로 조건 검색이 가능합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "성공"),
+            @ApiResponse(responseCode = "200", description = "성공 (북마크한 코스 없음)"),
+            @ApiResponse(responseCode = "400", description = "실패 (요청 파라미터 오류)"),
+            @ApiResponse(responseCode = "401", description = "실패 (인증 실패)")
+    })
+    @GetMapping("/api/members/me/courses/bookmarks")
+    public ResponseEntity<CommonResponse<?>> getBookmarkedCourses(
+            @Parameter(description = "지역 조건 (전체 보기인 경우 null)")
+            @RequestParam(required = false) Area area,
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
+    ) {
+        Long memberId = customOAuth2User.getMember().getId();
+        log.info("[북마크한 코스 조회] memberId={}, area={}", memberId, (area != null) ? area.name() : null);
+        List<BookmarkedCourseInfoDto> responseData = bookmarkService.getBookmarkedCoursesByMemberAndArea(memberId, area);
+        if (responseData.isEmpty()) {
+            return ResponseEntity.ok(CommonResponse.success(ResponseCode.SUCCESS_EMPTY_BOOKMARKS, responseData));
+        }
+        return ResponseEntity.ok(CommonResponse.success(ResponseCode.SUCCESS, responseData));
+    }
 }

src/main/java/com/server/running_handai/domain/course/dto/BookmarkCountDto.java → src/main/java/com/server/running_handai/domain/bookmark/dto/BookmarkCountDto.java

@@ -1,4 +1,4 @@
-package com.server.running_handai.domain.course.dto;
+package com.server.running_handai.domain.bookmark.dto;
 
 public record BookmarkCountDto(Long courseId, Long bookmarkCount) {
 }

src/main/java/com/server/running_handai/domain/course/dto/BookmarkInfoDto.java → src/main/java/com/server/running_handai/domain/bookmark/dto/BookmarkInfoDto.java

@@ -1,4 +1,4 @@
-package com.server.running_handai.domain.course.dto;
+package com.server.running_handai.domain.bookmark.dto;
 
 public record BookmarkInfoDto(int totalCount, boolean isBookmarked) {
 }

src/main/java/com/server/running_handai/domain/bookmark/dto/BookmarkedCourseInfoDto.java

@@ -0,0 +1,39 @@
+package com.server.running_handai.domain.bookmark.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({
+        "bookmarkId",
+        "courseId",
+        "thumbnailUrl",
+        "distance",
+        "duration",
+        "maxElevation",
+        "isBookmarked",
+        "bookmarkCount"
+})
+public interface BookmarkedCourseInfoDto {
+    long getBookmarkId();
+    long getCourseId();
+    String getThumbnailUrl();
+
+    @JsonIgnore
+    double getRawDistance();
+
+    default int getDistance() {
+        return (int) getRawDistance();
+    }
+
+    int getDuration();
+
+    @JsonIgnore
+    double getRawMaxElevation(); // JPA 전용
+
+    default int getMaxElevation() { // 클라이언트 전용
+        return (int) getRawMaxElevation();
+    }
+
+    boolean getIsBookmarked();
+    int getBookmarkCount();
+}

src/main/java/com/server/running_handai/domain/bookmark/dto/MyBookmarkInfoDto.java

@@ -0,0 +1,11 @@
+package com.server.running_handai.domain.bookmark.dto;
+
+public record MyBookmarkInfoDto(
+        String courseThumbnailUrl,
+        int bookmarkCount,
+        boolean isBookmarked
+) {
+    public static MyBookmarkInfoDto from(String courseThumbnailUrl, int bookmarkCount, boolean isBookmarked) {
+        return new MyBookmarkInfoDto(courseThumbnailUrl, bookmarkCount, isBookmarked);
+    }
+}

src/main/java/com/server/running_handai/domain/bookmark/repository/BookmarkRepository.java

@@ -1,7 +1,9 @@
 package com.server.running_handai.domain.bookmark.repository;
 
+import com.server.running_handai.domain.bookmark.dto.BookmarkedCourseInfoDto;
 import com.server.running_handai.domain.bookmark.entity.Bookmark;
-import com.server.running_handai.domain.course.dto.BookmarkCountDto;
+import com.server.running_handai.domain.bookmark.dto.BookmarkCountDto;
+import com.server.running_handai.domain.course.entity.Area;
 import com.server.running_handai.domain.course.entity.Course;
 import com.server.running_handai.domain.member.entity.Member;
 import java.util.List;
@@ -23,15 +25,51 @@ public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
     int countByCourseId(Long courseId);
 
     // 코스 ID별 북마크 수 조회
-    @Query("SELECT new com.server.running_handai.domain.course.dto.BookmarkCountDto(b.course.id, COUNT(b)) "
+    @Query("SELECT new com.server.running_handai.domain.bookmark.dto.BookmarkCountDto(b.course.id, COUNT(b)) "
             + "FROM Bookmark b "
             + "WHERE b.course.id "
             + "IN :courseIds "
             + "GROUP BY b.course.id")
     List<BookmarkCountDto> countByCourseIdIn(@Param("courseIds") List<Long> courseIds);
 
-    // 사용자가 북마크한 코스 ID 목록 조회
+    // 코스 목록 중에서 사용자가 북마크한 코스 조회
     @Query("SELECT b.course.id FROM Bookmark b WHERE b.course.id IN :courseIds AND b.member.id = :memberId")
     Set<Long> findBookmarkedCourseIdsByMember(@Param("courseIds") List<Long> courseIds, @Param("memberId") Long memberId);
 
+    // 사용자가 북마크한 모든 코스 조회
+    @Query("SELECT "
+            + "b.id AS bookmarkId, "
+            + "c.id AS courseId, "
+            + "ci.imgUrl AS thumbnailUrl, "
+            + "c.distance AS rawDistance, "
+            + "c.duration AS duration, "
+            + "c.maxElevation AS rawMaxElevation, "
+            + "true AS isBookmarked, "
+            + "(SELECT count(b2.id) FROM Bookmark b2 WHERE b2.course.id = c.id) AS bookmarkCount " // 총 북마크 수 계산
+            + "FROM Bookmark b "
+            + "LEFT JOIN b.course c "
+            + "LEFT JOIN c.courseImage ci "
+            + "WHERE b.member.id = :memberId "
+            + "ORDER BY b.createdAt DESC "
+    )
+    List<BookmarkedCourseInfoDto> findBookmarkedCoursesByMemberId(Long memberId);
+
+    // 사용자가 북마크한 코스 중에서 특정 지역의 코스만 조회
+    @Query("SELECT "
+            + "b.id AS bookmarkId, "
+            + "c.id AS courseId, "
+            + "ci.imgUrl AS thumbnailUrl, "
+            + "c.distance AS rawDistance, "
+            + "c.duration AS duration, "
+            + "c.maxElevation AS rawMaxElevation, "
+            + "true AS isBookmarked, "
+            + "(SELECT count(b2.id) FROM Bookmark b2 WHERE b2.course.id = c.id) AS bookmarkCount " // 총 북마크 수 계산
+            + "FROM Bookmark b "
+            + "LEFT JOIN b.course c "
+            + "LEFT JOIN c.courseImage ci "
+            + "WHERE b.member.id = :memberId "
+            + "AND c.area = :area "
+            + "ORDER BY b.createdAt DESC "
+    )
+    List<BookmarkedCourseInfoDto> findBookmarkedCoursesByMemberIdAndArea(Long memberId, Area area);
 }

src/main/java/com/server/running_handai/domain/bookmark/service/BookmarkService.java

@@ -1,19 +1,24 @@
 package com.server.running_handai.domain.bookmark.service;
 
+import com.server.running_handai.domain.bookmark.dto.BookmarkedCourseInfoDto;
 import com.server.running_handai.domain.bookmark.entity.Bookmark;
 import com.server.running_handai.domain.bookmark.repository.BookmarkRepository;
+import com.server.running_handai.domain.course.entity.Area;
 import com.server.running_handai.domain.course.entity.Course;
 import com.server.running_handai.domain.course.repository.CourseRepository;
 import com.server.running_handai.global.response.ResponseCode;
 import com.server.running_handai.global.response.exception.BusinessException;
 import com.server.running_handai.domain.member.entity.Member;
 import com.server.running_handai.domain.member.repository.MemberRepository;
+import java.util.Collections;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class BookmarkService {
 
     private final BookmarkRepository bookmarkRepository;
@@ -53,4 +58,25 @@ public void deleteBookmark(Long memberId, Long courseId) {
         // 북마크 삭제
         bookmarkRepository.delete(bookmark);
     }
+
+    /**
+     * 회원이 북마크한 코스를 조회합니다.
+     *
+     * @param memberId 요청한 회원의 ID
+     * @return 북마크한 코스 정보 DTO
+     */
+    public List<BookmarkedCourseInfoDto> getBookmarkedCoursesByMemberAndArea(Long memberId, Area area) {
+        List<BookmarkedCourseInfoDto> bookmarkedCourseInfoDtos;
+        if (area == null) { // 지역 전체인 경우
+            bookmarkedCourseInfoDtos = bookmarkRepository.findBookmarkedCoursesByMemberId(memberId);
+        } else { // 특정 지역 필터링한 경우
+            bookmarkedCourseInfoDtos = bookmarkRepository.findBookmarkedCoursesByMemberIdAndArea(memberId, area);
+        }
+
+        if (bookmarkedCourseInfoDtos.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        return bookmarkedCourseInfoDtos;
+    }
 }

src/main/java/com/server/running_handai/domain/course/controller/CourseDataController.java

@@ -33,14 +33,14 @@ public ResponseEntity<CommonResponse<?>> updateRoadConditions(@PathVariable Long
 
     @PutMapping(value = "/{courseId}/image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<CommonResponse<?>> updateCourseImage(@PathVariable Long courseId,
-                                                               @RequestParam MultipartFile courseImageFile) throws IOException {
+                                                               @RequestParam MultipartFile courseImageFile) {
         courseDataService.updateCourseImage(courseId, courseImageFile);
         return ResponseEntity.ok().body(CommonResponse.success(ResponseCode.SUCCESS, null));
     }
 
     @PostMapping(value = "/gpx", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<CommonResponse<?>> createCourseToGpx(@RequestPart("courseInfo") GpxCourseRequestDto gpxCourseRequestDto,
-                                                               @RequestParam("courseGpxFile") MultipartFile courseGpxFile) throws IOException {
+                                                               @RequestParam("courseGpxFile") MultipartFile courseGpxFile) {
         courseDataService.createCourseToGpx(gpxCourseRequestDto, courseGpxFile);
         return ResponseEntity.ok().body(CommonResponse.success(ResponseCode.SUCCESS, null));
     }

src/main/java/com/server/running_handai/domain/course/dto/CourseDetailDto.java

@@ -1,13 +1,14 @@
 package com.server.running_handai.domain.course.dto;
 
+import com.server.running_handai.domain.bookmark.dto.BookmarkInfoDto;
 import com.server.running_handai.domain.course.entity.Course;
 import com.server.running_handai.domain.course.entity.RoadCondition;
 import java.util.List;
 
 public record CourseDetailDto(
         Long courseId,
         String courseName,
-        double distance,
+        int distance,
         int duration,
         int minElevation,
         int maxElevation,
@@ -24,7 +25,7 @@ public static CourseDetailDto from(Course course, List<TrackPointDto> trackPoint
         return new CourseDetailDto(
                 course.getId(),
                 course.getName(),
-                course.getDistance(),
+                (int) course.getDistance(),
                 course.getDuration(),
                 (int) course.getMinElevation().doubleValue(),
                 (int) course.getMaxElevation().doubleValue(),