#16 [Update] 임시 업장 리스트 조회

프론트에서 사용할 수 있게끔 임시로 업장 리스트 조회 구현
MeongPanNyaengPan-MPNP · Jul 11, 2022 · 691b793 · 691b793
1 parent fe1a5cb
commit 691b793
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 11 deletions.
diff --git a/src/main/java/com/mpnp/baechelin/api/controller/LocationController.java b/src/main/java/com/mpnp/baechelin/api/controller/LocationController.java
@@ -1,8 +1,8 @@
 package com.mpnp.baechelin.api.controller;
 
+import com.mpnp.baechelin.api.repository.MapQueryRepository;
 import com.mpnp.baechelin.api.service.LocationService;
 import com.mpnp.baechelin.store.domain.Store;
-import com.mpnp.baechelin.api.repository.MapQueryRepository;
 import com.mpnp.baechelin.store.repository.StoreRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

diff --git a/src/main/java/com/mpnp/baechelin/review/repository/ReviewRepository.java b/src/main/java/com/mpnp/baechelin/review/repository/ReviewRepository.java
@@ -1,7 +1,12 @@
 package com.mpnp.baechelin.review.repository;
 
 import com.mpnp.baechelin.review.domain.Review;
+import com.mpnp.baechelin.store.domain.Store;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface ReviewRepository extends JpaRepository<Review, Integer> {
+
+    List<Review> findAllByStoreId(Store store);
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/controller/StoreController.java b/src/main/java/com/mpnp/baechelin/store/controller/StoreController.java
@@ -18,6 +18,7 @@ public class StoreController {
 
     @GetMapping
     public List<StoreResponseDto> getStoreList() {
-        return null;
+        List<StoreResponseDto> storeList = storeService.getStoreList();
+        return storeList;
     }
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/dto/StoreResponseDto.java b/src/main/java/com/mpnp/baechelin/store/dto/StoreResponseDto.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Getter
@@ -13,8 +13,8 @@ public class StoreResponseDto {
     private int storeId;
     private String category;
     private String name;
-    private String latitude;
-    private String longitude;
+    private BigDecimal latitude;
+    private BigDecimal longitude;
     private String address;
     private String elevator;
     private String toilet;
@@ -23,7 +23,6 @@ public class StoreResponseDto {
     private String heightDifferent;
     private String approach;
     private List<StoreImgResponseDto> storeImgList;
-    private LocalDateTime storeModifiedAt;
     private double pointAvg;
 //    private List<ReviewResDTO> reviewList;
 
@@ -32,8 +31,8 @@ public StoreResponseDto(
             int storeId,
             String category,
             String name,
-            String latitude,
-            String longitude,
+            BigDecimal latitude,
+            BigDecimal longitude,
             String address,
             String elevator,
             String toilet,
@@ -42,7 +41,6 @@ public StoreResponseDto(
             String heightDifferent,
             String approach,
             List<StoreImgResponseDto> storeImgList,
-            LocalDateTime storeModifiedAt,
             double pointAvg) {
 
         this.storeId = storeId;
@@ -58,7 +56,6 @@ public StoreResponseDto(
         this.heightDifferent = heightDifferent;
         this.approach = approach;
         this.storeImgList = storeImgList;
-        this.storeModifiedAt = storeModifiedAt;
         this.pointAvg = pointAvg;
     }
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/service/StoreService.java b/src/main/java/com/mpnp/baechelin/store/service/StoreService.java
@@ -1,19 +1,64 @@
 package com.mpnp.baechelin.store.service;
 
+import com.mpnp.baechelin.review.domain.Review;
+import com.mpnp.baechelin.review.repository.ReviewRepository;
+import com.mpnp.baechelin.store.domain.Store;
 import com.mpnp.baechelin.store.dto.StoreResponseDto;
 import com.mpnp.baechelin.store.repository.StoreRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 @RequiredArgsConstructor
 public class StoreService {
 
     private final StoreRepository storeRepository;
+    private final ReviewRepository reviewRepository;
 
     public List<StoreResponseDto> getStoreList() {
-        return null;
+        List<Store> storeList = storeRepository.findAll();
+
+        List<StoreResponseDto> storeResponseList = new ArrayList<>();
+
+        for (Store store : storeList) {
+            List<Review> reviewList = reviewRepository.findAllByStoreId(store);
+
+            double totalPoint = 0;
+
+            double pointAvg = 0;
+            if (reviewList.size() > 0) {
+                for (Review review : reviewList) {
+                    totalPoint += review.getPoint();
+                }
+
+                pointAvg = Double.parseDouble(String.format("%.1f", totalPoint / reviewList.size()));
+            } else {
+                pointAvg = 0;
+            }
+
+            StoreResponseDto storeResponse = StoreResponseDto.builder()
+                    .storeId(store.getId())
+                    .category(store.getCategory())
+                    .name(store.getName())
+                    .latitude(store.getLatitude())
+                    .longitude(store.getLongitude())
+                    .address(store.getAddress())
+                    .elevator(store.getElevator())
+                    .toilet(store.getToilet())
+                    .parking(store.getParking())
+                    .phoneNumber(store.getPhoneNumber())
+                    .heightDifferent(store.getHeightDifferent())
+                    .approach(store.getApproach())
+                    .storeImgList(null)
+                    .pointAvg(pointAvg)
+                    .build();
+            storeResponseList.add(storeResponse);
+        }
+
+
+        return storeResponseList;
     }
 }