fix: 제휴 지도 & 신고 기능 수정 사항 (20250930) (#249)

* chore: DS 파일 git ignore

* refactor: 만료된 제휴가 보이지 않도록 수정

* feat: 24시간 이내에 댓글 신고 횟수 제한

* refactor: 스웨거 문서 업데이트

* chore: CI/CD test

* chore: CI/CD test

* fix: 공백 제거

* fix: CI/CD 수정 완료

* fix: gemini 수정 사항 반영

* fix: writtenAt 필드 수정

---------

Co-authored-by: 나용준 <141994188+youngJun99@users.noreply.github.com>

Author: yongjun0511

.github/workflows/deploy.yml

@@ -112,7 +112,7 @@ jobs:
             sudo docker run -d -p 9000:9000 \
             --log-driver=json-file \
             --log-opt max-size=20m \
-            --log-opt max-file=5 \            
+            --log-opt max-file=5 \
             -e EATSSU_DB_URL_DEV="${{ secrets.EATSSU_DB_URL_DEV }}" \
             -e EATSSU_DB_USERNAME="${{ secrets.EATSSU_DB_USERNAME }}" \
             -e EATSSU_DB_PASSWORD="${{ secrets.EATSSU_DB_PASSWORD }}" \

.gitignore

@@ -45,4 +45,8 @@ out/
 ### env file ###
 .env
 
-/src/main/resources/application-local.yml
+/src/main/resources/application-local.yml
+
+### DS File ###
+.DS_Store
+*/.DS_Store

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java

@@ -8,10 +8,11 @@
 
 public interface PartnershipRestaurantRepository extends JpaRepository<PartnershipRestaurant, Long> {
     @Query("""
-            SELECT DISTINCT pr FROM PartnershipRestaurant pr
-            LEFT JOIN FETCH pr.partnerships p
-            LEFT JOIN FETCH p.partnershipCollege
-            LEFT JOIN FETCH p.partnershipDepartment
-            WHERE p.endDate is null or p.endDate >= CURRENT_DATE""")
+        SELECT DISTINCT pr FROM PartnershipRestaurant pr
+        JOIN FETCH pr.partnerships p
+        LEFT JOIN FETCH p.partnershipCollege
+        LEFT JOIN FETCH p.partnershipDepartment
+        WHERE p.endDate IS NULL OR p.endDate >= CURRENT_DATE
+    """)
     List<PartnershipRestaurant> findAllWithDetails();
 }

src/main/java/ssu/eatssu/domain/report/dto/ReportCreateRequest.java

@@ -9,10 +9,10 @@ public record ReportCreateRequest(
         @Schema(description = "신고할 리뷰 id", example = "4")
         Long reviewId,
 
-        @Schema(description = "신고 타입", example = "BAD_WORD")
+        @Schema(description = "신고 타입", example = "NO_ASSOCIATE_CONTENT")
         ReportType reportType,
 
-        @Schema(description = "신고 내용", example = "음란성, 욕설 등 부적절한 내용")
+        @Schema(description = "신고 내용", example = "리뷰 작성 취지에 맞지 않는 내용")
         String content) {
 
 }

src/main/java/ssu/eatssu/domain/report/repository/ReportRepository.java

@@ -1,7 +1,22 @@
 package ssu.eatssu.domain.report.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import ssu.eatssu.domain.review.entity.Report;
 
+import java.time.LocalDateTime;
+
 public interface ReportRepository extends JpaRepository<Report, Long> {
+
+    @Query("""
+    SELECT count(r) > 0
+    FROM Report r
+    WHERE r.user.id = :userId
+      AND r.review.id = :reviewId
+      AND r.createdDate >= :threshold
+""")
+    boolean existsRecentReport(@Param("userId") Long userId,
+                               @Param("reviewId") Long reviewId,
+                               @Param("threshold") LocalDateTime threshold);
 }

src/main/java/ssu/eatssu/domain/report/service/ReportService.java

@@ -17,8 +17,9 @@
 import ssu.eatssu.global.handler.response.BaseException;
 import ssu.eatssu.global.log.event.LogEvent;
 
-import static ssu.eatssu.global.handler.response.BaseResponseStatus.NOT_FOUND_REVIEW;
-import static ssu.eatssu.global.handler.response.BaseResponseStatus.NOT_FOUND_USER;
+import java.time.LocalDateTime;
+
+import static ssu.eatssu.global.handler.response.BaseResponseStatus.*;
 
 @RequiredArgsConstructor
 @Service
@@ -37,6 +38,10 @@ public Report reportReview(CustomUserDetails userDetails, ReportCreateRequest re
         Review review = reviewRepository.findById(request.reviewId())
                 .orElseThrow(() -> new BaseException(NOT_FOUND_REVIEW));
 
+        if(reportRepository.existsRecentReport(user.getId(), review.getId(), LocalDateTime.now().minusHours(24))){
+            throw new BaseException(RECENT_REPORT_ON_REVIEW);
+        }
+
         Report report = Report.create(user, review, request, ReportStatus.PENDING);
         reportRepository.save(report);
 

src/main/java/ssu/eatssu/domain/review/dto/ReviewDetail.java

@@ -39,7 +39,7 @@ public class ReviewDetail {
     private Integer rating;
 
     @Schema(description = "리뷰 작성 날짜(format = yyyy-MM-dd)", example = "2023-04-07")
-    private LocalDate writedAt;
+    private LocalDate writtenAt;
 
     @Schema(description = "리뷰 내용", example = "맛있습니당")
     private String content;
@@ -61,7 +61,7 @@ public static ReviewDetail from(Review review, Long userId) {
         ReviewDetailBuilder builder = ReviewDetail.builder()
                                                   .reviewId(review.getId())
                                                   .rating(review.getRatings().getMainRating())
-                                                  .writedAt(review.getCreatedDate().toLocalDate())
+                                                  .writtenAt(review.getCreatedDate().toLocalDate())
                                                   .content(review.getContent())
                                                   .imageUrls(imageUrls)
                                                   .menu(new MenuIdNameLikeDto(menu.getId(),menu.getName(),likedMenuIds.contains(menu.getId())));

src/main/java/ssu/eatssu/global/handler/response/BaseResponseStatus.java

@@ -31,6 +31,7 @@ public enum BaseResponseStatus {
     EXISTED_MEAL(false, HttpStatus.BAD_REQUEST, 40011, "이미 존재하는 식단입니다."),
     INVALID_TARGET_TYPE(false, HttpStatus.BAD_REQUEST, 40012, "잘못된 targetType 입니다."),
     MISSING_USER_DEPARTMENT(false, HttpStatus.BAD_REQUEST, 40013, "사용자의 학과 정보가 없습니다."),
+    RECENT_REPORT_ON_REVIEW(false, HttpStatus.BAD_REQUEST, 40014, "24시간 이내에 동일 댓글을 신고했습니다."),
 
     /**
      * 401 UNAUTHORIZED 권한없음(인증 실패)