Merge pull request #162 from 9oormthon-univ/develop

Develop

Author: HyunWoo9930

src/main/java/com/jangburich/domain/order/domain/OrderResponse.java

@@ -10,11 +10,13 @@
 @Getter
 @RequiredArgsConstructor
 public class OrderResponse {
+	private Long id;
 	private String userName;
 	private LocalDateTime date;
 	private String price;
 
-	public OrderResponse(String userName, LocalDateTime date, String price) {
+	public OrderResponse(Long id, String userName, LocalDateTime date, String price) {
+		this.id = id;
 		this.userName = userName;
 		this.date = date;
 		this.price = price;

src/main/java/com/jangburich/domain/store/dto/response/PaymentGroupDetailResponse.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.jangburich.domain.order.domain.OrderResponse;
+import com.jangburich.domain.team.domain.Team;
 import com.jangburich.domain.user.domain.User;
 
 import lombok.Getter;
@@ -14,20 +15,24 @@
 @RequiredArgsConstructor
 public class PaymentGroupDetailResponse {
 	private String teamName;
+	private String teamDescription;
 	private Integer point;
 	private Integer remainPoint;
 	private String teamLeaderName;
 	private String teamLeaderPhoneNum;
+	private String teamLeaderProfileImageUrl;
 	private List<OrderResponse> historyResponses;
 
-	public static PaymentGroupDetailResponse create(String teamName, Integer point, Integer remainPoint,
+	public static PaymentGroupDetailResponse create(Team team, Integer point, Integer remainPoint,
 		User teamLeader, List<OrderResponse> historyResponses) {
 		PaymentGroupDetailResponse paymentGroupDetailResponse = new PaymentGroupDetailResponse();
-		paymentGroupDetailResponse.setTeamName(teamName);
+		paymentGroupDetailResponse.setTeamName(team.getName());
+		paymentGroupDetailResponse.setTeamDescription(team.getDescription());
 		paymentGroupDetailResponse.setPoint(point);
 		paymentGroupDetailResponse.setRemainPoint(remainPoint);
 		paymentGroupDetailResponse.setTeamLeaderName(teamLeader.getNickname());
 		paymentGroupDetailResponse.setTeamLeaderPhoneNum(teamLeader.getPhoneNumber());
+		paymentGroupDetailResponse.setTeamLeaderProfileImageUrl(teamLeader.getProfileImageUrl());
 		paymentGroupDetailResponse.setHistoryResponses(historyResponses);
 		return paymentGroupDetailResponse;
 	}

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;
@@ -35,8 +33,6 @@
 import com.jangburich.domain.store.domain.StoreTeam;
 import com.jangburich.domain.store.domain.StoreUpdateRequestDTO;
 import com.jangburich.domain.store.dto.StoreTeamResponse;
-import com.jangburich.domain.store.dto.condition.StoreSearchCondition;
-import com.jangburich.domain.store.dto.condition.StoreSearchConditionWithType;
 import com.jangburich.domain.store.dto.response.OrdersDetailResponse;
 import com.jangburich.domain.store.dto.response.OrdersGetResponse;
 import com.jangburich.domain.store.dto.response.OrdersTodayResponse;
@@ -215,13 +211,13 @@ public StoreGetResponseDTO getStoreInfo(String authentication) {
 
 	public List<com.jangburich.domain.store.dto.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));
 
 		return storeTeamRepository.findAllByStore(store)
 			.stream()
@@ -273,10 +269,11 @@ public PaymentGroupDetailResponse getPaymentGroupDetail(String userId, Long team
 			for (Cart cart : cartRepository.findAllByOrders(order)) {
 				price += cart.getMenu().getPrice();
 			}
-			return new OrderResponse(order.getUser().getName(), order.getUpdatedAt(), String.valueOf(price));
+			return new OrderResponse(order.getId(), order.getUser().getName(), order.getUpdatedAt(),
+				String.valueOf(price));
 		}).toList();
 
-		return PaymentGroupDetailResponse.create(team.getName(), storeTeam.getPoint(), storeTeam.getRemainPoint(),
+		return PaymentGroupDetailResponse.create(team, storeTeam.getPoint(), storeTeam.getRemainPoint(),
 			teamLeader, orderResponse);
 	}