Merge pull request #36 from 9oormthonUniv-seoultech/develop

Develop to Main 3

batch/src/main/java/com/pocket/batch/job/AddPlacesJobConfig.java

@@ -4,7 +4,7 @@
 import com.pocket.batch.step.AddPlacesReader;
 import com.pocket.batch.step.AddPlacesWriter;
 import com.pocket.domain.dto.photobooth.PhotoBoothFindResponseDto;
-import com.pocket.outbound.entity.JpaPhotoBooth;
+import com.pocket.outbound.entity.photobooth.JpaPhotoBooth;
 import lombok.RequiredArgsConstructor;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;

batch/src/main/java/com/pocket/batch/step/AddPlacesProcessor.java

@@ -2,7 +2,7 @@
 
 import com.pocket.domain.dto.photobooth.PhotoBoothFindResponseDto;
 import com.pocket.domain.entity.photobooth.PhotoBooth;
-import com.pocket.outbound.entity.JpaPhotoBooth;
+import com.pocket.outbound.entity.photobooth.JpaPhotoBooth;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.stereotype.Component;
 

batch/src/main/java/com/pocket/batch/step/AddPlacesReader.java

@@ -117,8 +117,8 @@ private List<PhotoBoothFindResponseDto> mapToDto(KakaoLocalResponse response) {
             PhotoBoothFindResponseDto dto = new PhotoBoothFindResponseDto(
                     document.getPlace_name(),
                     document.getRoad_address_name(),
-                    Double.parseDouble(document.getX()),
                     Double.parseDouble(document.getY()),
+                    Double.parseDouble(document.getX()),
                     mapToBrand(document.getCategory_name())
             );
             dtoList.add(dto);

batch/src/main/java/com/pocket/batch/step/AddPlacesWriter.java

@@ -1,12 +1,14 @@
 package com.pocket.batch.step;
 
-import com.pocket.outbound.entity.JpaPhotoBooth;
-import com.pocket.outbound.repository.PhotoBoothRepository;
+import com.pocket.outbound.entity.photobooth.JpaPhotoBooth;
+import com.pocket.outbound.repository.photobooth.PhotoBoothRepository;
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Optional;
+
 @Component
 public class AddPlacesWriter implements ItemWriter<JpaPhotoBooth> {
 
@@ -23,7 +25,17 @@ public void write(Chunk<? extends JpaPhotoBooth> chunk) throws Exception {
             if (item == null) {
                 throw new IllegalArgumentException("Item cannot be null");
             }
-            photoBoothRepository.save(item);
+
+            // 중복 체크: 예를 들어 이름과 좌표가 동일한지를 체크
+            Optional<JpaPhotoBooth> existingBooth = photoBoothRepository
+                    .findByPhotoBoothNameAndPhotoBoothXAndPhotoBoothY(item.getPhotoBooth().getName(),
+                            item.getPhotoBooth().getX(),
+                            item.getPhotoBooth().getY());
+
+            // 중복이 없을 경우에만 저장
+            if (existingBooth.isEmpty()) {
+                photoBoothRepository.save(item);
+            }
         }
     }
 }

batch/src/test/java/com/pocket/batch/step/AddPlacesProcessorTest.java

@@ -2,7 +2,7 @@
 
 import com.pocket.domain.dto.photobooth.PhotoBoothFindResponseDto;
 import com.pocket.domain.entity.photobooth.PhotoBoothBrand;
-import com.pocket.outbound.entity.JpaPhotoBooth;
+import com.pocket.outbound.entity.photobooth.JpaPhotoBooth;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

batch/src/test/java/com/pocket/batch/step/AddPlacesWriterTest.java

@@ -2,8 +2,8 @@
 
 import com.pocket.domain.entity.photobooth.PhotoBooth;
 import com.pocket.domain.entity.photobooth.PhotoBoothBrand;
-import com.pocket.outbound.entity.JpaPhotoBooth;
-import com.pocket.outbound.repository.PhotoBoothRepository;
+import com.pocket.outbound.entity.photobooth.JpaPhotoBooth;
+import com.pocket.outbound.repository.photobooth.PhotoBoothRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.3.3'
 	id 'io.spring.dependency-management' version '1.1.6'
+	id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10'
 }
 
 allprojects {

core/src/main/java/com/pocket/core/config/QueryDslConfig.java

@@ -0,0 +1,19 @@
+package com.pocket.core.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QueryDslConfig {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}

core/src/main/java/com/pocket/core/exception/review/ReviewCustomException.java

@@ -0,0 +1,17 @@
+package com.pocket.core.exception.review;
+
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@Getter
+@ResponseStatus(HttpStatus.BAD_REQUEST)
+public class ReviewCustomException extends RuntimeException {
+
+    private final ReviewErrorCode errorCode;
+
+    public ReviewCustomException(ReviewErrorCode errorCode) {
+        this.errorCode = errorCode;
+    }
+}

core/src/main/java/com/pocket/core/exception/review/ReviewErrorCode.java

@@ -0,0 +1,24 @@
+package com.pocket.core.exception.review;
+
+import com.pocket.core.exception.common.ApiResponse;
+import com.pocket.core.exception.common.BaseErrorCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum ReviewErrorCode implements BaseErrorCode {
+    PHOTO_FEATURE_NOT_FOUND(HttpStatus.BAD_REQUEST, "400","해당 설명에 맞는 PhotoFeature가 없습니다"),
+    BOOTH_FEATURE_NOT_FOUND(HttpStatus.BAD_REQUEST, "400","해당 설명에 맞는 BoothFeature가 없습니다");
+
+
+    private final HttpStatus httpStatus;
+    private final String code;
+    private final String message;
+
+    @Override
+    public ApiResponse<Void> getErrorResponse() {
+        return ApiResponse.onFailure(code, message);
+    }
+}

core/src/main/java/com/pocket/core/image/dto/PresignedUrlRequest.java

@@ -0,0 +1,16 @@
+package com.pocket.core.image.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+@Schema(description = "프리사인드 URL 요청 DTO")
+public class PresignedUrlRequest {
+
+    private final String prefix;
+
+    private final String fileName;
+
+}

domain/src/main/java/com/pocket/domain/dto/image/AlbumRegisterRequestDto.java → domain/src/main/java/com/pocket/domain/dto/album/AlbumRegisterRequestDto.java

@@ -1,4 +1,4 @@
-package com.pocket.domain.dto.image;
+package com.pocket.domain.dto.album;
 
 import java.util.List;
 
@@ -9,7 +9,6 @@ public record AlbumRegisterRequestDto(
         String date,
         List<String> hashtag,
         String memo,
-        String imageName, // 이미지 이름
-        String prefix // S3 버킷 내에 저장할 경로
+        String filePath
 ) {
 }

domain/src/main/java/com/pocket/domain/dto/album/AlbumRegisterResponseDto.java

@@ -0,0 +1,15 @@
+package com.pocket.domain.dto.album;
+
+import java.util.List;
+
+public record AlbumRegisterResponseDto(
+        Long photoboothId,
+        String year,
+        String month,
+        String date,
+        List<String> hashtag,
+        String memo,
+        String filePath
+) {
+
+}

domain/src/main/java/com/pocket/domain/dto/photobooth/NearPhotoBoothInfo.java

@@ -1,7 +1,12 @@
 package com.pocket.domain.dto.photobooth;
 
+import com.pocket.domain.entity.photobooth.PhotoBoothBrand;
+
 public record NearPhotoBoothInfo(
         Long id,
-        String name
+        String name,
+        PhotoBoothBrand brand,
+        double x,
+        double y
 ) {
 }

domain/src/main/java/com/pocket/domain/dto/review/BoothFeatureCountDto.java

@@ -0,0 +1,7 @@
+package com.pocket.domain.dto.review;
+
+public record BoothFeatureCountDto(
+        String featureName,
+        Long count
+) {
+}

domain/src/main/java/com/pocket/domain/dto/review/BoothFeatureDto.java

@@ -0,0 +1,8 @@
+package com.pocket.domain.dto.review;
+
+public record BoothFeatureDto(
+        Long id,
+        String featureName
+) {
+
+}

domain/src/main/java/com/pocket/domain/dto/review/PhotoFeatureCountDto.java

@@ -0,0 +1,7 @@
+package com.pocket.domain.dto.review;
+
+public record PhotoFeatureCountDto(
+        String featureName,
+        Long count
+) {
+}

domain/src/main/java/com/pocket/domain/dto/review/PhotoFeatureDto.java

@@ -0,0 +1,7 @@
+package com.pocket.domain.dto.review;
+
+public record PhotoFeatureDto(
+        Long id,
+        String featureName
+) {
+}

domain/src/main/java/com/pocket/domain/dto/review/ReviewGet6ImagesResponseDto.java

@@ -0,0 +1,9 @@
+package com.pocket.domain.dto.review;
+
+import java.util.List;
+
+public record ReviewGet6ImagesResponseDto(
+        List<String> filePaths,
+        int totalImageCount
+) {
+}

domain/src/main/java/com/pocket/domain/dto/review/ReviewGetRecentResponseDto.java

@@ -0,0 +1,9 @@
+package com.pocket.domain.dto.review;
+
+import java.util.List;
+
+public record ReviewGetRecentResponseDto(
+        int reviewCount,
+        List<ReviewPreviewDto> reviews
+) {
+}

domain/src/main/java/com/pocket/domain/dto/review/ReviewPreviewDto.java

@@ -0,0 +1,17 @@
+package com.pocket.domain.dto.review;
+
+import java.util.List;
+
+public record ReviewPreviewDto(
+        Long photoboothId,
+        String name,
+        String year,
+        String month,
+        String date,
+        String contents,
+        List<String> features,
+        String imageUrl,
+        int imageCount
+) {
+
+}

domain/src/main/java/com/pocket/domain/dto/review/ReviewRegisterRequestDto.java

@@ -0,0 +1,14 @@
+package com.pocket.domain.dto.review;
+
+import java.util.List;
+
+public record ReviewRegisterRequestDto(
+        Long photoboothId,
+        int rating,
+        List<Long> boothFeatures,
+        List<Long> photoFeatures,
+        List<String> filePaths,
+        String content
+ ) {
+
+}

domain/src/main/java/com/pocket/domain/dto/review/ReviewRegisterResponseDto.java

@@ -0,0 +1,14 @@
+package com.pocket.domain.dto.review;
+
+import java.util.List;
+
+public record ReviewRegisterResponseDto(
+        Long photoboothId,
+        int rating,
+        List<String> boothFeatures,
+        List<String> photoFeatures,
+        List<String> filePaths,
+        String content
+) {
+
+}

domain/src/main/java/com/pocket/domain/entity/image/Image.java

@@ -1,6 +1,7 @@
 package com.pocket.domain.entity.image;
 
-import com.pocket.domain.dto.image.AlbumRegisterRequestDto;
+import com.pocket.domain.dto.album.AlbumRegisterRequestDto;
+import com.pocket.domain.dto.review.ReviewRegisterRequestDto;
 import com.pocket.domain.entity.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -30,11 +31,16 @@ public Image(ImageType type) {
         this.type = type;
     }
 
-    public void makeImage(AlbumRegisterRequestDto dto, String filePath) {
+    public void makeAlbumImage(AlbumRegisterRequestDto dto, String filePath) {
         this.type = ImageType.PHOTO;
         this.imageUrl = filePath;
         this.year = dto.year();
         this.month = dto.month();
         this.date = dto.date();
     }
+
+    public void makeReviewImage(String filePath) {
+        this.type = ImageType.REVIEW;
+        this.imageUrl = filePath;
+    }
 }

domain/src/main/java/com/pocket/domain/entity/photobooth/PhotoBooth.java

@@ -6,6 +6,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Getter
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -26,16 +28,33 @@ public class PhotoBooth {
     @Column(name = "photo_booth_brand")
     private PhotoBoothBrand photoBoothBrand;
 
+    // 총 리뷰 수
+    private int totalReviews;
+
+    // 평균 별점
+    @Column(precision = 3, scale = 2)
+    private BigDecimal averageRating;  // 기본값을 0으로 설정
+
     private PhotoBooth(String name, String road, Double x, Double y, PhotoBoothBrand photoBoothBrand) {
         this.name = name;
         this.road = road;
         this.x = x;
         this.y = y;
         this.photoBoothBrand = photoBoothBrand;
+        this.totalReviews = 0;
+        this.averageRating = BigDecimal.ZERO;
     }
 
     // 정적 팩토리 메서드
     public static PhotoBooth create(String name, String road, Double x, Double y, PhotoBoothBrand brand) {
         return new PhotoBooth(name, road, x, y, brand);
     }
+
+    public void updateRating(int newRating) {
+        this.totalReviews += 1;
+        BigDecimal totalScore = this.averageRating.multiply(BigDecimal.valueOf(this.totalReviews - 1))
+                .add(BigDecimal.valueOf(newRating));
+        this.averageRating = totalScore.divide(BigDecimal.valueOf(this.totalReviews), 2, BigDecimal.ROUND_HALF_UP);
+    }
+
 }