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

.github/workflows/deploy.yml

@@ -3,6 +3,8 @@ name: EAT-SSU Server 개발 & 운영 서버 배포 파이프라인
 on:
   push:
     branches: [ "main", "develop", "hotfix/deploy-prod-fail", "hotfix/deploy-dev-fail" ]
+  pull_request:
+    branches: [ "develop" ]
 
 permissions:
   contents: read
@@ -30,7 +32,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: dev 프로필 설정
-        if: github.ref_name == 'develop' || github.ref_name == 'hotfix/deploy-dev-fail'
+#        if: github.ref_name == 'develop' || github.ref_name == 'hotfix/deploy-dev-fail'
         run: |
           echo "spring:
             profiles:
@@ -64,7 +66,7 @@ jobs:
           docker push ${{ secrets.DOCKER_REPO }}/eatssu-prod
 
       - name: dev 서버 용 Docker 빌드 및 푸시
-        if: github.ref_name == 'develop' || github.ref_name == 'hotfix/deploy-dev-fail'
+#        if: github.ref_name == 'develop' || github.ref_name == 'hotfix/deploy-dev-fail'
         run: |
           docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }}/eatssu-dev .
           docker push ${{ secrets.DOCKER_REPO }}/eatssu-dev
@@ -99,7 +101,7 @@ jobs:
       - name: dev 서버에 배포
         uses: appleboy/ssh-action@master
         id: deploy-dev
-        if: github.ref_name == 'develop' || github.ref_name == 'hotfix/deploy-dev-fail'
+#        if: github.ref_name == 'develop' || github.ref_name == 'hotfix/deploy-dev-fail'
         with:
           host: ${{ secrets.HOST_DEV }}
           username: ${{ secrets.USERNAME }}
@@ -121,4 +123,4 @@ jobs:
             -e EATSSU_AWS_SECRET_KEY_DEV="${{ secrets.EATSSU_AWS_SECRET_KEY_DEV }}" \
             -e EATSSU_SLACK_TOKEN="${{ secrets.EATSSU_SLACK_TOKEN }}" \
             ${{ secrets.DOCKER_REPO }}/eatssu-dev
-            sudo docker image prune -f
+#            sudo docker image prune -f

.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,21 @@
 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 CASE WHEN COUNT(r) > 0 THEN true ELSE false END
+    FROM Report r
+    WHERE r.user.id = :userId
+      AND r.review.id = :reviewId
+      AND r.createdDate >= CURRENT_TIMESTAMP - 1
+""")
+    boolean existsRecentReport(@Param("userId") Long userId,
+                               @Param("reviewId") Long reviewId);
 }

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

@@ -17,8 +17,7 @@
 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 static ssu.eatssu.global.handler.response.BaseResponseStatus.*;
 
 @RequiredArgsConstructor
 @Service
@@ -37,6 +36,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())){
+            throw new BaseException(RECENT_REPORT_ON_REVIEW);
+        }
+
         Report report = Report.create(user, review, request, ReportStatus.PENDING);
         reportRepository.save(report);
 

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 권한없음(인증 실패)