Merge pull request #23 from 2024-pre-onboarding-backend-F/feat/store

[merge] 맛집 조회 API 개발

src/main/java/wanted/ribbon/store/controller/ReviewController.java

@@ -7,16 +7,22 @@
 import wanted.ribbon.store.dto.CreateReviewRequestDto;
 import wanted.ribbon.store.dto.CreateReviewResponseDto;
 import wanted.ribbon.store.service.ReviewService;
+import wanted.ribbon.user.config.TokenProvider;
+
+import java.util.UUID;
 
 @RestController
 @RequestMapping("/api/reviews")
 @RequiredArgsConstructor
 public class ReviewController {
     private final ReviewService reviewService;
+    private final TokenProvider tokenProvider;
 
     @PostMapping("/{storeId}")
-    public ResponseEntity<CreateReviewResponseDto> createReview(@PathVariable Long storeId, @RequestBody CreateReviewRequestDto requestDto) {
-        CreateReviewResponseDto responseDto = reviewService.createReview(storeId, requestDto);
+    public ResponseEntity<CreateReviewResponseDto> createReview(@PathVariable Long storeId, @RequestHeader(value = "Authorization")String token, @RequestBody CreateReviewRequestDto requestDto) {
+        String accessToken = token.split("Bearer ")[1];
+        String id = tokenProvider.getId(accessToken); // 액세스토큰으로 id 반환
+        CreateReviewResponseDto responseDto = reviewService.createReview(storeId, id, requestDto);
         return ResponseEntity.status(HttpStatus.CREATED).body(responseDto);
     }
 }

src/main/java/wanted/ribbon/store/controller/StoreController.java

@@ -1,36 +1,26 @@
 package wanted.ribbon.store.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import wanted.ribbon.store.dto.StoreResponseDto;
+import org.springframework.web.bind.annotation.*;
 import wanted.ribbon.store.dto.StoreDetailResponseDto;
+import wanted.ribbon.store.dto.StoreListResponseDto;
 import wanted.ribbon.store.service.StoreService;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/api/stores")
 @RequiredArgsConstructor
 public class StoreController {
     private final StoreService storeService;
 
     @GetMapping
-    public ResponseEntity<List<StoreResponseDto>> getStoreList(@RequestParam(value = "lat") double lat,
-                                                               @RequestParam(value = "lon") double lon,
-                                                               @RequestParam(value = "range") double range,
-                                                               @RequestParam(value = "orderBy", defaultValue = "distance", required = false) String orderBy) {
-
-        List<StoreResponseDto> storeList = storeService.findStores(lat, lon, range, orderBy);
-
+    public ResponseEntity<StoreListResponseDto> getStoreList(@RequestParam(value = "lat") double lat,
+                                                             @RequestParam(value = "lon") double lon,
+                                                             @RequestParam(value = "range") double range,
+                                                             @RequestParam(value = "orderBy", defaultValue = "distance", required = false) String orderBy) {
+        StoreListResponseDto storeList = storeService.findStores(lat, lon, range, orderBy);
         if (storeList.isEmpty())
             return ResponseEntity.noContent().build();
-
         return ResponseEntity.ok().body(storeList);
     }
 

src/main/java/wanted/ribbon/store/domain/Review.java

@@ -2,6 +2,7 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import wanted.ribbon.user.domain.User;
 
 @Entity
 @Getter
@@ -24,4 +25,8 @@ public class Review {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "store_id", nullable = false)
     private Store store;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
 }

src/main/java/wanted/ribbon/store/dto/CreateReviewResponseDto.java

@@ -1,4 +1,4 @@
 package wanted.ribbon.store.dto;
 
-public record CreateReviewResponseDto(int score, String content) {
+public record CreateReviewResponseDto(String id, int score, String content) {
 }

src/main/java/wanted/ribbon/store/dto/ReviewListResponseDto.java

@@ -1,4 +1,4 @@
 package wanted.ribbon.store.dto;
 
-public record ReviewListResponseDto(int score, String content) {
+public record ReviewListResponseDto(String id, int score, String content) {
 }

src/main/java/wanted/ribbon/store/dto/StoreListResponseDto.java

@@ -0,0 +1,24 @@
+package wanted.ribbon.store.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import wanted.ribbon.store.domain.Store;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public record StoreListResponseDto(int totalCount, List<StoreResponseDto> stores) {
+
+    public static StoreListResponseDto fromStoreList(List<Store> storeList) {
+        List<StoreResponseDto> storeResponseDto = storeList.stream()
+                .map(StoreResponseDto::from)
+                .collect(Collectors.toList());
+        return new StoreListResponseDto(storeList.size(), storeResponseDto);
+    }
+
+    // record 타입에 메서드를 추가했을 때 Jackson 라이브러리가 record의 모든 메서드를 직렬화 대상 필드로 간주하기 때문에
+    @JsonIgnore // 직렬화 과젱에서 무시하기위해 사용함
+    public boolean isEmpty() {
+        return stores.isEmpty();
+    }
+}

src/main/java/wanted/ribbon/store/service/ReviewService.java

@@ -11,29 +11,38 @@
 import wanted.ribbon.store.dto.CreateReviewResponseDto;
 import wanted.ribbon.store.repository.ReviewRepository;
 import wanted.ribbon.store.repository.StoreRepository;
+import wanted.ribbon.user.domain.User;
+import wanted.ribbon.user.repository.UserRepository;
 
 import java.util.List;
+import java.util.UUID;
 
 @Service
 @RequiredArgsConstructor
 public class ReviewService {
     private final ReviewRepository reviewRepository;
     private final StoreRepository storeRepository;
+    private final UserRepository userRepository;
 
     @Transactional
-    public CreateReviewResponseDto createReview(Long storeId, CreateReviewRequestDto requestDto) {
+    public CreateReviewResponseDto createReview(Long storeId, String id, CreateReviewRequestDto requestDto) {
         Store store = storeRepository.findByStoreId(storeId)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.STORE_NOT_FOUND));
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.ENTITY_NOT_FOUND));
+
         Review review = Review.builder()
                 .score(requestDto.score())
                 .content(requestDto.content())
                 .store(store)
+                .user(user)
                 .build();
         reviewRepository.save(review);
 
+        // 점수 입력되면 해당 맛집의 평점 update
         updateRating(store);
 
-        CreateReviewResponseDto responseDto = new CreateReviewResponseDto(requestDto.score(), requestDto.content());
+        CreateReviewResponseDto responseDto = new CreateReviewResponseDto(id, requestDto.score(), requestDto.content());
         return responseDto;
     }
 

src/main/java/wanted/ribbon/store/service/StoreService.java

@@ -8,7 +8,7 @@
 import wanted.ribbon.store.domain.Store;
 import wanted.ribbon.store.dto.ReviewListResponseDto;
 import wanted.ribbon.store.dto.StoreDetailResponseDto;
-import wanted.ribbon.store.dto.StoreResponseDto;
+import wanted.ribbon.store.dto.StoreListResponseDto;
 import wanted.ribbon.store.repository.ReviewRepository;
 import wanted.ribbon.store.repository.StoreRepository;
 
@@ -26,7 +26,7 @@ public StoreDetailResponseDto getStoreDetail(Long storeId) {
                 .orElseThrow(() -> new NotFoundException(ErrorCode.STORE_NOT_FOUND));
         List<Review> reviewList = reviewRepository.findByStore_StoreId(storeId);
         List<ReviewListResponseDto> reviewListResponseDto = reviewList.stream()
-                .map(list -> new ReviewListResponseDto(list.getScore(), list.getContent()))
+                .map(list -> new ReviewListResponseDto(list.getUser().getId(), list.getScore(), list.getContent()))
                 .collect(Collectors.toList());
 
         StoreDetailResponseDto responseDto = new StoreDetailResponseDto(
@@ -51,7 +51,7 @@ public StoreDetailResponseDto getStoreDetail(Long storeId) {
      * @param range   위도, 경도로 지정한 위치 주변의 검색할 범위 설정 값 (단위는 km이며, range 1.0은 1km이다.)
      * @param orderBy store 데이터 정렬 기준 (거리순과 평점순 2가지)
      */
-    public List<StoreResponseDto> findStores(double lat, double lon, double range, String orderBy) {
+    public StoreListResponseDto findStores(double lat, double lon, double range, String orderBy) {
         // 위도, 경도의 계산을 위해 km를 m로 변환
         double meterRange = range * 1000;
         // bbox를 구하는 4 모서리 좌표 계산에 활용하기 위해 반으로 나눔
@@ -60,7 +60,6 @@ public List<StoreResponseDto> findStores(double lat, double lon, double range, S
         double meterToDegree = moveRange * 0.01 / 1100; // 0.01 : 1100 = meterToDegree : moveRange(몇 m)
 
         List<Store> storeList = storeRepository.findAllStores(lat, lon, meterToDegree, meterRange, orderBy);
-        List<StoreResponseDto> storeListDto = storeList.stream().map(StoreResponseDto::from).collect(Collectors.toList());
-        return storeListDto;    
+        return StoreListResponseDto.fromStoreList(storeList);
     }
 }

src/main/java/wanted/ribbon/user/config/TokenProvider.java

@@ -60,10 +60,10 @@ public Authentication getAuthentication(String token){
         return new UsernamePasswordAuthenticationToken(new org.springframework.security.core.userdetails.User(claims.getSubject(), "", authorities), token, authorities);
     }
 
-    // 토큰 기반으로 유저 ID를 가져오는 메서드
-    public UUID getUserId(String token){
+    // 토큰 기반으로 회원의 ID를 가져오는 메서드
+    public String getId(String token){
         Claims claims = getClaims(token);
-        return claims.get("userId", UUID.class);
+        return claims.getSubject();
     }
 
     private Claims getClaims(String token){

src/main/java/wanted/ribbon/user/config/WebSecurityConfig.java

@@ -25,7 +25,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .httpBasic(AbstractHttpConfigurer::disable)
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeRequests(auth -> auth
-                        .requestMatchers("/api/user/login", "/api/user/signup").permitAll()
+                        .requestMatchers("/api/users/login", "/api/users/signup").permitAll()
                         .anyRequest().authenticated())
                 .formLogin(AbstractHttpConfigurer::disable)
                 .addFilterBefore(new TokenAuthenticationFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);