Merge pull request #97 from Finders-Official/develop

[RELEASE] v0.3.3 (#96)

Author: IISweetHeartII

docs/architecture/ERD.md

@@ -1,7 +1,7 @@
 # Finders ERD
 
 > 필름 현상소 예약 서비스 데이터베이스 설계서
-> v2.4.0 | 2026-01-06
+> v2.4.4 | 2026-01-12
 
 ---
 
@@ -20,6 +20,7 @@
 | | `terms`                   | 약관 버전 관리 |
 | | `token_history`           | AI 토큰 충전/사용 내역 - User 전용 |
 | **store** | `photo_lab`               | 현상소 정보 |
+| | `region`                  | 지역 (시/도, 시/군/구) |
 | | `photo_lab_image`         | 현상소 이미지 |
 | | `photo_lab_keyword`       | 현상소 키워드/태그 |
 | | `photo_lab_notice`        | 현상소 공지사항 |
@@ -366,9 +367,23 @@ CREATE TABLE token_history (    -- AI 토큰 충전/사용 내역
 -- 2. STORE (현상소)
 -- ============================================
 
+CREATE TABLE region (
+    id              BIGINT          NOT NULL AUTO_INCREMENT,
+    sigungu         VARCHAR(50)     NOT NULL,   -- 시/군/구
+    sido            BIGINT          NULL,       -- 상위 시/도 (region.id)
+    created_at      DATETIME        NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at      DATETIME        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    deleted_at      DATETIME        NULL,
+    PRIMARY KEY (id),
+    INDEX idx_region_sido (sido),
+    UNIQUE KEY uk_region_sigungu_sido (sigungu, sido),
+    CONSTRAINT fk_region_sido FOREIGN KEY (sido) REFERENCES region(id)
+) ENGINE=InnoDB COMMENT='지역 (시/도, 시/군/구)';
+
 CREATE TABLE photo_lab (
     id              BIGINT          NOT NULL AUTO_INCREMENT,
     owner_id        BIGINT          NOT NULL,   -- FK → member_owner.member_id (Owner 전용)
+    region_id       BIGINT          NOT NULL,   -- FK region.id (시/군/구)
     name            VARCHAR(100)    NOT NULL,
     description     TEXT            NULL,
     phone           VARCHAR(20)     NULL,
@@ -393,6 +408,7 @@ CREATE TABLE photo_lab (
     INDEX idx_lab_location (latitude, longitude),
     FULLTEXT INDEX ft_lab_name (name),
     CONSTRAINT fk_lab_owner FOREIGN KEY (owner_id) REFERENCES member(id),
+    CONSTRAINT fk_lab_region FOREIGN KEY (region_id) REFERENCES region(id),
     CONSTRAINT chk_lab_status CHECK (status IN ('PENDING', 'ACTIVE', 'SUSPENDED', 'CLOSED'))
 ) ENGINE=InnoDB COMMENT='현상소';
 
@@ -942,3 +958,4 @@ CREATE TABLE payment (  -- 포트원 V2 결제 연동
 | 2.4.1 | 2026-01-07 | **예약 슬롯 엔티티 추가**: `reservation_slot` 테이블 신규 도입. 현상소(`photo_lab`) + 날짜 + 시간 단위의 예약 정원(`max_capacity`, `reserved_count`)을 관리하도록 구조 분리. 동시 예약 시 정원 초과를 방지하기 위해 슬롯 단위 락 기반 처리 적용. |
 | 2.4.2 | 2026-01-08 | `member` 테이블의 `dtype` 컬럼명 `role`로 수정, `social_account` 테이블에 email 컬럼 추가                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | 2.4.3 | 2026-01-08 | `member` 테이블의 `profile_image` 컬럼 `member_user` 테이블로 이동 및 `role` 관련 제약 조건 알맞게 수정                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| 2.4.4 | 2026-01-12 | `region` table (sido/sigungu) 추가 및 `photo_lab.region_id` FK 참조 설정

docs/infra/GCP_LOGGING_GUIDE.md

@@ -127,10 +127,14 @@ gcloud auth application-default login \
 
 ### 4. 애플리케이션 실행
 
+**터미널에서 실행:**
 ```bash
 ./gradlew bootRun
 ```
 
+**IntelliJ에서 실행하는 경우:**
+> ADC 설정 후 **IntelliJ를 완전히 재시작**해야 합니다. (프로젝트 닫기가 아닌 IntelliJ 종료 후 재시작)
+
 ### 5. Swagger에서 테스트
 
 http://localhost:8080/swagger-ui.html 접속 → **[TEST] Storage** 섹션
@@ -177,6 +181,15 @@ http://localhost:8080/swagger-ui.html 접속 → **[TEST] Storage** 섹션
 
 ### 트러블슈팅
 
+#### "401 Unauthorized" 오류
+- ADC 설정이 안 되어 있습니다 → 3번 단계 실행
+- IntelliJ 사용 시 → IntelliJ 완전히 재시작 (종료 후 다시 시작)
+- 기존 ADC가 잘못된 경우:
+  ```bash
+  gcloud auth application-default revoke  # 기존 설정 삭제
+  # 3번 단계 다시 실행
+  ```
+
 #### "403 Forbidden" 오류
 - Impersonation이 만료되었을 수 있습니다 → 3번 단계 다시 실행
 - 서버 재시작 후 다시 시도

src/main/java/com/finders/api/domain/community/controller/PostController.java

@@ -16,6 +16,9 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -126,10 +129,29 @@ public ApiResponse<PostResponse.PostPreviewListDTO> getPopularPosts(
         return ApiResponse.success(SuccessCode.POST_FOUND, postQueryService.getPopularPosts(memberUser));
     }
 
-//    // 현상소 관련
-//    @Operation(summary = "현상소 검색", description = "게시글 작성 시 연결할 현상소를 검색합니다.")
-//    @GetMapping("/labs")
-//    public ApiResponse<String> searchLabs(@RequestParam(required = false) String query) {
-//        return ApiResponse.success(SuccessCode.STORE_LIST_FOUND, "현상소 검색 성공: " + query);
-//    }
+    // 커뮤니티 게시물 검색
+    @Operation(summary = "사진 수다 게시글 검색", description = "사진 수다 페이지에서 게시글을 검색합니다.")
+    @GetMapping("/search")
+    public ApiResponse<PostResponse.PostPreviewListDTO> searchPosts(
+            @RequestParam(name = "keyword") String keyword,
+            @AuthenticationPrincipal MemberUser memberUser,
+            @PageableDefault(size = 10, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable
+    ) {
+        return ApiResponse.success(SuccessCode.POST_FOUND, postQueryService.searchPosts(keyword, memberUser, pageable));
+    }
+
+    // 현상소 검색
+    @Operation(summary = "현상소 검색", description = "게시글 작성 시 연결할 현상소를 검색합니다. 위도/경도가 없으면 거리 없이 주소만 나옵니다.")
+    @GetMapping("/labs")
+    public ApiResponse<PostResponse.PhotoLabSearchListDTO> searchLabs(
+            @RequestParam(name = "keyword") String keyword,
+            @RequestParam(name = "latitude", required = false) Double latitude,
+            @RequestParam(name = "longitude", required = false) Double longitude,
+            @PageableDefault(size = 8) Pageable pageable
+    ) {
+        return ApiResponse.success(
+                SuccessCode.STORE_LIST_FOUND,
+                postQueryService.searchPhotoLabs(keyword, latitude, longitude, pageable)
+        );
+    }
 }

src/main/java/com/finders/api/domain/community/dto/response/PostResponse.java

@@ -1,6 +1,7 @@
 package com.finders.api.domain.community.dto.response;
 
 import com.finders.api.domain.community.entity.Post;
+import com.finders.api.domain.store.entity.PhotoLab;
 import lombok.Builder;
 
 import java.time.LocalDateTime;
@@ -107,4 +108,32 @@ public static PostPreviewListDTO from(List<PostPreviewDTO> previewDTOs) {
             return new PostPreviewListDTO(previewDTOs);
         }
     }
+
+    // 현상소 검색
+    // 개별 항목 DTO
+    @Builder
+    public record PhotoLabSearchDTO(
+            Long labId,
+            String name,
+            String address,
+            String distance
+    ) {
+        public static PhotoLabSearchDTO from(PhotoLab photoLab, String distance) {
+            return PhotoLabSearchDTO.builder()
+                    .labId(photoLab.getId())
+                    .name(photoLab.getName())
+                    .address(photoLab.getAddress())
+                    .distance(distance)
+                    .build();
+        }
+    }
+
+    // 현상소 검색 리스트를 감싸는 DTO
+    public record PhotoLabSearchListDTO(
+            List<PhotoLabSearchDTO> photoLabSearchList
+    ) {
+        public static PhotoLabSearchListDTO from(List<PhotoLabSearchDTO> dtos) {
+            return new PhotoLabSearchListDTO(dtos);
+        }
+    }
 }

src/main/java/com/finders/api/domain/community/entity/FavoritePhotoLab.java

@@ -0,0 +1,51 @@
+package com.finders.api.domain.community.entity;
+
+import com.finders.api.domain.member.entity.MemberUser;
+import com.finders.api.domain.store.entity.PhotoLab;
+import com.finders.api.global.entity.BaseTimeEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(
+        name = "favorite_photo_lab",
+        uniqueConstraints = {
+                @UniqueConstraint(name = "uk_favorite_member_lab", columnNames = {"member_id", "photo_lab_id"})
+        },
+        indexes = {
+                @Index(name = "idx_favorite_member", columnList = "member_id"),
+                @Index(name = "idx_favorite_lab", columnList = "photo_lab_id")
+        }
+)
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class FavoritePhotoLab extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "member_id", nullable = false)
+    private MemberUser member;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "photo_lab_id", nullable = false)
+    private PhotoLab photoLab;
+
+    public FavoritePhotoLab(MemberUser member, PhotoLab photoLab) {
+        this.member = member;
+        this.photoLab = photoLab;
+    }
+}

src/main/java/com/finders/api/domain/community/repository/PostRepository.java

@@ -1,6 +1,9 @@
 package com.finders.api.domain.community.repository;
 
 import com.finders.api.domain.community.entity.Post;
+import com.finders.api.domain.store.entity.PhotoLab;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -13,4 +16,19 @@ public interface PostRepository extends JpaRepository<Post, Long> {
             "LEFT JOIN FETCH p.photoLab " +
             "WHERE p.id = :id AND p.status = 'ACTIVE'")
     Optional<Post> findByIdWithDetails(@Param("id") Long id);
+
+    // 커뮤니티 게시글 검색
+    @Query("SELECT p FROM Post p " +
+            "LEFT JOIN p.photoLab pl " +
+            "WHERE p.status = 'ACTIVE' " +
+            "AND (p.title LIKE %:keyword% " +
+            "OR p.content LIKE %:keyword% " +
+            "OR pl.name LIKE %:keyword%)")
+    Page<Post> searchPostsByKeyword(@Param("keyword") String keyword, Pageable pageable);
+
+    // 현상소 검색
+    @Query("SELECT pl FROM PhotoLab pl " +
+            "WHERE pl.status = 'ACTIVE' " +
+            "AND pl.name LIKE %:keyword%")
+    Page<PhotoLab> searchByName(@Param("keyword") String keyword, Pageable pageable);
 }

src/main/java/com/finders/api/domain/community/service/query/PostQueryService.java

@@ -2,11 +2,17 @@
 
 import com.finders.api.domain.community.dto.response.PostResponse;
 import com.finders.api.domain.member.entity.MemberUser;
+import org.springframework.data.domain.Pageable;
 
 public interface PostQueryService {
     PostResponse.PostPreviewListDTO getPostList(Integer page);
 
     PostResponse.PostDetailResDTO getPostDetail(Long postId, MemberUser memberUser);
 
     PostResponse.PostPreviewListDTO getPopularPosts(MemberUser memberUser);
+
+    PostResponse.PostPreviewListDTO searchPosts(String keyword, MemberUser memberUser, Pageable pageable);
+
+    // 현상소 검색
+    PostResponse.PhotoLabSearchListDTO searchPhotoLabs(String keyword, Double latitude, Double longitude, Pageable pageable);
 }

src/main/java/com/finders/api/domain/community/service/query/PostQueryServiceImpl.java

@@ -6,10 +6,13 @@
 import com.finders.api.domain.community.repository.PostQueryRepository;
 import com.finders.api.domain.community.repository.PostRepository;
 import com.finders.api.domain.member.entity.MemberUser;
+import com.finders.api.domain.store.entity.PhotoLab;
 import com.finders.api.global.exception.CustomException;
 import com.finders.api.global.response.ErrorCode;
 import com.finders.api.infra.storage.StorageService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,6 +27,12 @@ public class PostQueryServiceImpl implements PostQueryService {
     private static final int DEFAULT_PAGE_SIZE = 10;
     private static final int SIGNED_URL_EXPIRY_MINUTES = 60;
 
+    // 현상소 검색 관련
+    private static final String DISTANCE_FORMAT_KM = "%.1fkm";
+    private static final int MINUTES_IN_DEGREE = 60;
+    private static final double STATUTE_MILES_PER_NAUTICAL_MILE = 1.1515;
+    private static final double KILOMETERS_PER_STATUTE_MILE = 1.609344;
+
     private final PostRepository postRepository;
     private final PostLikeRepository postLikeRepository;
     private final PostQueryRepository postQueryRepository;
@@ -82,12 +91,71 @@ public PostResponse.PostPreviewListDTO getPopularPosts(MemberUser memberUser) {
                 })
                 .toList();
 
-        // 4. 리스트를 감싸서 반환
         return PostResponse.PostPreviewListDTO.from(previewDTOs);
     }
 
     private String getFullUrl(String path) {
         if (path == null || path.isBlank()) return null;
         return storageService.getSignedUrl(path, SIGNED_URL_EXPIRY_MINUTES).url();
     }
+
+    // 커뮤니티 게시글 검색
+    @Override
+    public PostResponse.PostPreviewListDTO searchPosts(String keyword, MemberUser memberUser, Pageable pageable) {
+        Page<Post> posts = postRepository.searchPostsByKeyword(keyword, pageable);
+
+        Set<Long> likedPostIds = java.util.Collections.emptySet();
+        if (memberUser != null) {
+            List<Long> postIds = posts.getContent().stream().map(Post::getId).toList();
+            likedPostIds = postLikeRepository.findLikedPostIdsByMemberAndPostIds(memberUser.getId(), postIds);
+        }
+
+        final Set<Long> finalLikedPostIds = likedPostIds;
+        List<PostResponse.PostPreviewDTO> dtos = posts.getContent().stream()
+                .map(post -> {
+                    boolean isLiked = finalLikedPostIds.contains(post.getId());
+                    String mainImageUrl = post.getPostImageList().isEmpty() ? null
+                            : getFullUrl(post.getPostImageList().get(0).getImageUrl());
+                    return PostResponse.PostPreviewDTO.from(post, isLiked, mainImageUrl);
+                })
+                .toList();
+
+        return PostResponse.PostPreviewListDTO.from(dtos);
+    }
+
+    // 현상소 검색
+    @Override
+    public PostResponse.PhotoLabSearchListDTO searchPhotoLabs(String keyword, Double latitude, Double longitude, Pageable pageable) {
+        Page<PhotoLab> labs = postRepository.searchByName(keyword, pageable);
+
+        List<PostResponse.PhotoLabSearchDTO> dtos = labs.getContent().stream()
+                .map(lab -> {
+                    String distanceStr = null;
+
+                    if (latitude != null && longitude != null && lab.getLatitude() != null && lab.getLongitude() != null) {
+                        double distance = calculateDistance(
+                                latitude,
+                                longitude,
+                                lab.getLatitude().doubleValue(),
+                                lab.getLongitude().doubleValue()
+                        );
+                        distanceStr = String.format(DISTANCE_FORMAT_KM, distance);
+                    }
+
+                    return PostResponse.PhotoLabSearchDTO.from(lab, distanceStr);
+                })
+                .toList();
+
+        return PostResponse.PhotoLabSearchListDTO.from(dtos);
+    }
+
+    // 현상소 검색 직선 거리 계산
+    private double calculateDistance(double lat1, double lon1, double lat2, double lon2) {
+        double theta = lon1 - lon2;
+        double dist = Math.sin(Math.toRadians(lat1)) * Math.sin(Math.toRadians(lat2))
+                + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) * Math.cos(Math.toRadians(theta));
+        dist = Math.acos(dist);
+        dist = Math.toDegrees(dist);
+        return dist * MINUTES_IN_DEGREE * STATUTE_MILES_PER_NAUTICAL_MILE * KILOMETERS_PER_STATUTE_MILE;
+    }
 }