fix:conflict

src/main/java/com/jangburich/domain/store/controller/StoreController.java

@@ -1,5 +1,6 @@
 package com.jangburich.domain.store.controller;
 
+import com.jangburich.domain.store.dto.response.StoreSearchDetailsResponse;
 import java.util.List;
 
 import org.springframework.data.domain.Page;
@@ -20,14 +21,13 @@
 import com.jangburich.domain.store.domain.Category;
 import com.jangburich.domain.store.domain.StoreCreateRequestDTO;
 import com.jangburich.domain.store.domain.StoreGetResponseDTO;
+import com.jangburich.domain.store.domain.StoreTeamResponseDTO;
 import com.jangburich.domain.store.domain.StoreUpdateRequestDTO;
-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.service.StoreService;
 import com.jangburich.global.payload.Message;
 import com.jangburich.global.payload.ResponseCustom;
@@ -44,110 +44,109 @@
 @RequestMapping("/store")
 public class StoreController {
 
-	private final StoreService storeService;
-
-	@Operation(summary = "카테고리 별 가게 목록 조회", description = "카테고리 별로 가게 목록을 조회합니다.")
-	@PostMapping("/category")
-	public ResponseCustom<Page<SearchStoresResponse>> searchByCategory(
-		Authentication authentication,
-		@RequestParam(required = false, defaultValue = "3") Integer searchRadius,
-		@RequestParam(required = false, defaultValue = "ALL") Category category,
-		Double lat,
-		Double lon, Pageable pageable) {
-		return ResponseCustom.OK(
-			storeService.searchByCategory(AuthenticationParser.parseUserId(authentication), searchRadius, category, lat,
-				lon,
-				pageable));
-	}
-
-	@Operation(summary = "매장 찾기(검색)", description = "검색어와 매장 유형에 맞는 매장을 검색합니다.")
-	@GetMapping("/search")
-	public ResponseCustom<Page<SearchStoresResponse>> searchStores(
-		Authentication authentication,
-		@RequestParam(required = false, defaultValue = "") String keyword, Pageable pageable) {
-		return ResponseCustom.OK(
-			storeService.searchStores(AuthenticationParser.parseUserId(authentication), keyword, pageable));
-	}
-
-	@Operation(summary = "매장 찾기 상세 페이지 조회", description = "매장을 상세 조회합니다.")
-	@GetMapping("/{storeId}")
-	public ResponseCustom<StoreSearchDetailsResponse> storeSearchDetails(
-		Authentication authentication,
-		@PathVariable Long storeId
-	) {
-		System.out.println("authentication = " + authentication);
-		return ResponseCustom.OK(
-			storeService.storeSearchDetails(AuthenticationParser.parseUserId(authentication), storeId));
-	}
-
-	@Operation(summary = "가게 등록", description = "신규 파트너 가게를 등록합니다.")
-	@PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-	public ResponseCustom<Message> createStore(
-		Authentication authentication,
-		@Parameter(name = "image", description = "업로드 사진 데이터") @RequestPart(value = "image") MultipartFile image,
-		@RequestPart(value = "store") StoreCreateRequestDTO storeCreateRequestDTO,
-		@RequestPart(value = "menuImages", required = false) List<MultipartFile> menuImages) {
-
-		storeService.createStore(AuthenticationParser.parseUserId(authentication), storeCreateRequestDTO, image,
-			menuImages);
-		return ResponseCustom.OK(Message.builder().message("success").build());
-	}
-
-	@Operation(summary = "가게 정보 수정", description = "가게 정보를 수정합니다.")
-	@PatchMapping("/update")
-	public ResponseCustom<Message> updateStore(Authentication authentication,
-		@RequestBody StoreUpdateRequestDTO storeUpdateRequestDTO) {
-		storeService.updateStore(AuthenticationParser.parseUserId(authentication), storeUpdateRequestDTO);
-		return ResponseCustom.OK(Message.builder().message("success").build());
-	}
-
-	@Operation(summary = "가게 정보 조회", description = "가게 상세 정보를 조회합니다.")
-	@GetMapping("")
-	public ResponseCustom<StoreGetResponseDTO> getStoreInfo(Authentication authentication) {
-		return ResponseCustom.OK(storeService.getStoreInfo(AuthenticationParser.parseUserId(authentication)));
-	}
-
-	@Operation(summary = "결제 그룹 조회", description = "장부 결제 그룹을 조회합니다.")
-	@GetMapping("/payment_group")
-	public ResponseCustom<List<StoreTeamResponse>> getPaymentGroup(Authentication authentication) {
-		return ResponseCustom.OK(
-			storeService.getPaymentGroup(AuthenticationParser.parseUserId(authentication)));
-	}
-
-	@Operation(summary = "결제 그룹 상세 조회", description = "장부 결제 그룹을 상세 조회합니다.")
-	@GetMapping("/payment_group/{teamId}")
-	public ResponseCustom<PaymentGroupDetailResponse> getPaymentGroupDetail(Authentication authentication,
-		@PathVariable Long teamId) {
-		return ResponseCustom.OK(
-			storeService.getPaymentGroupDetail(AuthenticationParser.parseUserId(authentication), teamId));
-	}
-
-	@Operation(summary = "결제 내역 조회", description = "가게에서 일어난 결제 내역을 조회합니다.")
-	@GetMapping("/payment_history")
-	public ResponseCustom<?> getPaymentHistory(Authentication authentication) {
-		return ResponseCustom.OK(
-			storeService.getPaymentHistory(AuthenticationParser.parseUserId(authentication)));
-	}
-
-	@Operation(summary = "지난 주문 조회", description = "가게에 있는 지난 주문을 조회합니다")
-	@GetMapping("/orders/last")
-	public ResponseCustom<List<OrdersGetResponse>> getLastOrders(Authentication authentication) {
-		List<OrdersGetResponse> ordersLast = storeService.getOrdersLast(
-			AuthenticationParser.parseUserId(authentication));
-		return ResponseCustom.OK(ordersLast);
-	}
-
-	@Operation(summary = "오늘 주문 조회", description = "가게에 있는 오늘 주문을 조회합니다")
-	@GetMapping("/orders/today")
-	public ResponseCustom<OrdersTodayResponse> getTodayOrders(Authentication authentication) {
-		return ResponseCustom.OK(storeService.getTodayOrders(
-			AuthenticationParser.parseUserId(authentication)));
-	}
-
-	@Operation(summary = "주문 상세 조회", description = "가게에 있는 주문을 상세 조회합니다")
-	@GetMapping("/orders/{ordersId}")
-	public ResponseCustom<OrdersDetailResponse> getOrders(Authentication authentication, @RequestParam Long orderId) {
-		return ResponseCustom.OK(
-			storeService.getOrderDetails(AuthenticationParser.parseUserId(authentication), orderId));
-	}
+    private final StoreService storeService;
+
+    @Operation(summary = "카테고리 별 가게 목록 조회", description = "카테고리 별로 가게 목록을 조회합니다.")
+    @PostMapping("/category")
+    public ResponseCustom<Page<SearchStoresResponse>> searchByCategory(
+            Authentication authentication,
+            @RequestParam(required = false, defaultValue = "3") Integer searchRadius,
+            @RequestParam(required = false, defaultValue = "ALL") Category category,
+            Double lat,
+            Double lon, Pageable pageable) {
+        return ResponseCustom.OK(
+                storeService.searchByCategory(AuthenticationParser.parseUserId(authentication), searchRadius, category, lat, lon,
+                        pageable));
+    }
+
+    @Operation(summary = "매장 찾기(검색)", description = "검색어와 매장 유형에 맞는 매장을 검색합니다.")
+    @GetMapping("/search")
+    public ResponseCustom<Page<SearchStoresResponse>> searchStores(
+            Authentication authentication,
+            @RequestParam(required = false, defaultValue = "") String keyword, Pageable pageable) {
+        return ResponseCustom.OK(
+                storeService.searchStores(AuthenticationParser.parseUserId(authentication), keyword, pageable));
+    }
+
+    @Operation(summary = "매장 찾기 상세 페이지 조회", description = "매장을 상세 조회합니다.")
+    @GetMapping("/{storeId}")
+    public ResponseCustom<StoreSearchDetailsResponse> storeSearchDetails(
+            Authentication authentication,
+            @PathVariable Long storeId
+    ) {
+        System.out.println("authentication = " + authentication);
+        return ResponseCustom.OK(storeService.storeSearchDetails(AuthenticationParser.parseUserId(authentication), storeId));
+    }
+
+    @Operation(summary = "가게 등록", description = "신규 파트너 가게를 등록합니다.")
+    @PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseCustom<Message> createStore(
+            Authentication authentication,
+            @Parameter(name = "image", description = "업로드 사진 데이터") @RequestPart(value = "image") MultipartFile image,
+            @RequestPart(value = "store") StoreCreateRequestDTO storeCreateRequestDTO,
+            @RequestPart(value = "menuImages", required = false) List<MultipartFile> menuImages) {
+
+        storeService.createStore(AuthenticationParser.parseUserId(authentication), storeCreateRequestDTO, image,
+                menuImages);
+        return ResponseCustom.OK(Message.builder().message("success").build());
+    }
+
+
+    @Operation(summary = "가게 정보 수정", description = "가게 정보를 수정합니다.")
+    @PatchMapping("/update")
+    public ResponseCustom<Message> updateStore(Authentication authentication,
+                                               @RequestBody StoreUpdateRequestDTO storeUpdateRequestDTO) {
+        storeService.updateStore(AuthenticationParser.parseUserId(authentication), storeUpdateRequestDTO);
+        return ResponseCustom.OK(Message.builder().message("success").build());
+    }
+
+    @Operation(summary = "가게 정보 조회", description = "가게 상세 정보를 조회합니다.")
+    @GetMapping("")
+    public ResponseCustom<StoreGetResponseDTO> getStoreInfo(Authentication authentication) {
+        return ResponseCustom.OK(storeService.getStoreInfo(AuthenticationParser.parseUserId(authentication)));
+    }
+
+    @Operation(summary = "결제 그룹 조회", description = "장부 결제 그룹을 조회합니다.")
+    @GetMapping("/payment_group")
+    public ResponseCustom<List<com.jangburich.domain.store.dto.StoreTeamResponse>> getPaymentGroup(Authentication authentication) {
+        return ResponseCustom.OK(
+                storeService.getPaymentGroup(AuthenticationParser.parseUserId(authentication)));
+    }
+
+    @Operation(summary = "결제 그룹 상세 조회", description = "장부 결제 그룹을 상세 조회합니다.")
+    @GetMapping("/payment_group/{teamId}")
+    public ResponseCustom<PaymentGroupDetailResponse> getPaymentGroupDetail(Authentication authentication,
+                                                                            @PathVariable Long teamId) {
+        return ResponseCustom.OK(
+                storeService.getPaymentGroupDetail(AuthenticationParser.parseUserId(authentication), teamId));
+    }
+
+    @Operation(summary = "결제 내역 조회", description = "가게에서 일어난 결제 내역을 조회합니다.")
+    @GetMapping("/payment_history")
+    public ResponseCustom<?> getPaymentHistory(Authentication authentication) {
+        return ResponseCustom.OK(
+                storeService.getPaymentHistory(AuthenticationParser.parseUserId(authentication)));
+    }
+
+    @Operation(summary = "지난 주문 조회", description = "가게에 있는 지난 주문을 조회합니다")
+    @GetMapping("/orders/last")
+    public ResponseCustom<List<OrdersGetResponse>> getLastOrders(Authentication authentication) {
+        List<OrdersGetResponse> ordersLast = storeService.getOrdersLast(
+                AuthenticationParser.parseUserId(authentication));
+        return ResponseCustom.OK(ordersLast);
+    }
+
+    @Operation(summary = "오늘 주문 조회", description = "가게에 있는 오늘 주문을 조회합니다")
+    @GetMapping("/orders/today")
+    public ResponseCustom<OrdersTodayResponse> getTodayOrders(Authentication authentication) {
+        return ResponseCustom.OK(storeService.getTodayOrders(
+                AuthenticationParser.parseUserId(authentication)));
+    }
+
+    @Operation(summary = "주문 상세 조회", description = "가게에 있는 주문을 상세 조회합니다")
+    @GetMapping("/orders/{ordersId}")
+    public ResponseCustom<OrdersDetailResponse> getOrders(Authentication authentication, @RequestParam Long orderId) {
+        return ResponseCustom.OK(
+                storeService.getOrderDetails(AuthenticationParser.parseUserId(authentication), orderId));
+    }
 }

src/main/java/com/jangburich/domain/store/domain/StoreTeamResponseDTO.java

@@ -8,18 +8,18 @@
 
 @Builder
 public record StoreTeamResponseDTO(
-	Long id,
-	Integer remainPoint,
-	Long teamId,
-	String teamName,
-	String teamDescription,
-	Long storeId,
-	LocalDateTime updatedAt
+		Long id,
+		Integer remainPoint,
+		Long teamId,
+		String teamName,
+		String teamDescription,
+		Long storeId,
+		LocalDateTime updatedAt
 
 ) {
 	@QueryProjection
 	public StoreTeamResponseDTO(Long id, Integer remainPoint, Long teamId, String teamName, String teamDescription,
-		Long storeId, LocalDateTime updatedAt) {
+								Long storeId, LocalDateTime updatedAt) {
 		this.id = id;
 		this.remainPoint = remainPoint;
 		this.teamId = teamId;
@@ -28,4 +28,4 @@ public StoreTeamResponseDTO(Long id, Integer remainPoint, Long teamId, String te
 		this.storeId = storeId;
 		this.updatedAt = updatedAt;
 	}
-}
+}

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

@@ -4,36 +4,33 @@
 import java.time.format.DateTimeFormatter;
 
 public class StoreTeamResponse {
-	Long id;
-	Integer remainPoint;
-	Long teamId;
-	String teamName;
-	String teamDescription;
-	Long storeId;
-	String period;
+    Long id;
+    Integer remainPoint;
+    Long teamId;
+    String teamName;
+    String teamDescription;
+    Long storeId;
+    String period;
 
-	public StoreTeamResponse(Long id, Integer remainPoint, Long teamId, String teamName, String teamDescription,
-		Long storeId, LocalDateTime period, long maxReservation) {
-		this.id = id;
-		this.remainPoint = remainPoint;
-		this.teamId = teamId;
-		this.teamName = teamName;
-		this.teamDescription = teamDescription;
-		this.storeId = storeId;
-		this.period = calculateDateRange(period, maxReservation);
-	}
+    public StoreTeamResponse(Long id, Integer remainPoint, Long teamId, String teamName, String teamDescription,
+                             Long storeId, LocalDateTime period, long maxReservation) {
+        this.id = id;
+        this.remainPoint = remainPoint;
+        this.teamId = teamId;
+        this.teamName = teamName;
+        this.teamDescription = teamDescription;
+        this.storeId = storeId;
+        this.period = calculateDateRange(period, maxReservation);
+    }
 
-	private String calculateDateRange(LocalDateTime updatedAt, long maxReservation) {
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");
-
-		// 시작 날짜
-		String startDate = updatedAt.format(formatter);
-
-		// 종료 날짜
-		LocalDateTime endDateTime = updatedAt.plusDays(maxReservation);
-		String endDate = endDateTime.format(formatter);
-
-		// 범위 문자열 생성
-		return startDate + " ~ " + endDate;
-	}
+    private String calculateDateRange(LocalDateTime updatedAt, long maxReservation) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");
+        // 시작 날짜
+        String startDate = updatedAt.format(formatter);
+        // 종료 날짜
+        LocalDateTime endDateTime = updatedAt.plusDays(maxReservation);
+        String endDate = endDateTime.format(formatter);
+        // 범위 문자열 생성
+        return startDate + " ~ " + endDate;
+    }
 }