Merge pull request #147 from 9oormthon-univ/fix/store

fix : data constructor 수정

Author: HyunWoo9930

src/main/java/com/jangburich/domain/store/dto/StoreTeamResponse.java

@@ -3,6 +3,13 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@RequiredArgsConstructor
 public class StoreTeamResponse {
     Long id;
     Integer remainPoint;

src/main/java/com/jangburich/domain/store/service/StoreService.java

@@ -1,7 +1,5 @@
 package com.jangburich.domain.store.service;
 
-import com.jangburich.domain.store.dto.StoreTeamResponse;
-import com.jangburich.domain.store.dto.response.StoreSearchDetailsResponse;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -33,15 +31,14 @@
 import com.jangburich.domain.store.domain.StoreCreateRequestDTO;
 import com.jangburich.domain.store.domain.StoreGetResponseDTO;
 import com.jangburich.domain.store.domain.StoreTeam;
-import com.jangburich.domain.store.domain.StoreTeamResponseDTO;
 import com.jangburich.domain.store.domain.StoreUpdateRequestDTO;
-import com.jangburich.domain.store.dto.condition.StoreSearchCondition;
-import com.jangburich.domain.store.dto.condition.StoreSearchConditionWithType;
+import com.jangburich.domain.store.dto.StoreTeamResponse;
 import com.jangburich.domain.store.dto.response.OrdersDetailResponse;
 import com.jangburich.domain.store.dto.response.OrdersGetResponse;
 import com.jangburich.domain.store.dto.response.OrdersTodayResponse;
 import com.jangburich.domain.store.dto.response.PaymentGroupDetailResponse;
 import com.jangburich.domain.store.dto.response.SearchStoresResponse;
+import com.jangburich.domain.store.dto.response.StoreSearchDetailsResponse;
 import com.jangburich.domain.store.exception.OrdersNotFoundException;
 import com.jangburich.domain.store.repository.StoreRepository;
 import com.jangburich.domain.store.repository.StoreTeamRepository;
@@ -212,20 +209,23 @@ public StoreGetResponseDTO getStoreInfo(String authentication) {
 		return new StoreGetResponseDTO().of(store);
 	}
 
-	public List<com.jangburich.domain.store.dto.StoreTeamResponse> getPaymentGroup(String userId) {
+	public List<StoreTeamResponse> getPaymentGroup(String userId) {
 		User user = userRepository.findByProviderId(userId)
-				.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
+			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
 
 		Owner owner = ownerRepository.findByUser(user)
-				.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
+			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
 
 		Store store = storeRepository.findByOwner(owner)
-				.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
+			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
 
-		List<com.jangburich.domain.store.dto.StoreTeamResponse> list = storeTeamRepository.findAllByStore(store).stream().map(storeTeamResponseDTO -> new StoreTeamResponse(storeTeamResponseDTO.id(), storeTeamResponseDTO.remainPoint(),
+		return storeTeamRepository.findAllByStore(store)
+			.stream()
+			.map(storeTeamResponseDTO -> new StoreTeamResponse(storeTeamResponseDTO.id(),
+				storeTeamResponseDTO.remainPoint(),
 				storeTeamResponseDTO.teamId(), storeTeamResponseDTO.teamName(), storeTeamResponseDTO.teamDescription(),
-				storeTeamResponseDTO.storeId(), storeTeamResponseDTO.updatedAt(), store.getMaxReservation())).toList();
-		return list;
+				storeTeamResponseDTO.storeId(), storeTeamResponseDTO.updatedAt(), store.getMaxReservation()))
+			.toList();
 	}
 
 	public Page<SearchStoresResponse> searchByCategory(final String authentication, final Integer searchRadius,
@@ -236,7 +236,8 @@ public Page<SearchStoresResponse> searchByCategory(final String authentication,
 			pageable);
 	}
 
-	public Page<SearchStoresResponse> searchStores(final String authentication, final String keyword, final Pageable pageable) {
+	public Page<SearchStoresResponse> searchStores(final String authentication, final String keyword,
+		final Pageable pageable) {
 		User user = userRepository.findByProviderId(authentication)
 			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
 		return storeRepository.findStores(user.getUserId(), keyword, pageable);
@@ -399,13 +400,13 @@ public OrdersDetailResponse getOrderDetails(String userId, Long orderId) {
 		return ordersDetailResponse;
 	}
 
-    public StoreSearchDetailsResponse storeSearchDetails(String userId, Long storeId) {
+	public StoreSearchDetailsResponse storeSearchDetails(String userId, Long storeId) {
 		User user = userRepository.findByProviderId(userId)
-				.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
+			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
 
 		StoreSearchDetailsResponse storeSearchDetails = storeRepository.findStoreSearchDetails(user.getUserId(),
-				storeId);
+			storeId);
 
 		return storeSearchDetails;
-    }
+	}
 }