Merge pull request #23 from moddo-kr/feature/get-settlement

feat: 정산 리스트 조회시 총 정산 금액 응답에 포함하도록 수정

Author: sudhdkso

src/docs/asciidoc/auth.adoc

@@ -103,31 +103,31 @@ include::{snippets}/auth-controller-test/kakao-logout/response-body.adoc[]
 
 == 토큰 상태 확인
 
-쿠키에 담긴 토큰의 유효성을 확인합니다
+쿠키에 담긴 토큰의 유효성을 확인합니다.
 
 === Example
 
-include::{snippets}/auth-controller-test/check-auth_-success/http-request.adoc[]
+include::{snippets}/auth-controller-test/check-auth-success/http-request.adoc[]
 
 === HTTP
 
 ==== 요청
 
-include::{snippets}/auth-controller-test/check-auth_-success/curl-request.adoc[]
+include::{snippets}/auth-controller-test/check-auth-success/curl-request.adoc[]
 
 ==== 응답
 
-include::{snippets}/auth-controller-test/check-auth_-success/http-response.adoc[]
+include::{snippets}/auth-controller-test/check-auth-success/http-response.adoc[]
 
 === Body
 
 ==== 응답 (valid)
 
-include::{snippets}/auth-controller-test/check-auth_-success/response-body.adoc[]
+include::{snippets}/auth-controller-test/check-auth-success/response-body.adoc[]
 
 ==== 응답 (invalid)
 
-include::{snippets}/auth-controller-test/check-auth_-expired/response-body.adoc[]
+include::{snippets}/auth-controller-test/check-auth-expired/response-body.adoc[]
 
-include::{snippets}/auth-controller-test/check-auth_-invalid-token/response-body.adoc[]
+include::{snippets}/auth-controller-test/check-auth-invalid-token/response-body.adoc[]
 

src/docs/asciidoc/settlement.adoc

@@ -146,20 +146,20 @@ user가 속한 정산의 공유 링크 리스트를 조회할 수 있다.
 
 === Example
 
-include::{snippets}/settlement-controller-test/get-share-link-list_-success/curl-request.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list-success/curl-request.adoc[]
 
 === HTTP
 
 ==== 요청
 
-include::{snippets}/settlement-controller-test/get-share-link-list_-success/http-request.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list-success/http-request.adoc[]
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/get-share-link-list_-success/http-response.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list-success/http-response.adoc[]
 
 === Body
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/get-share-link-list_-success/response-body.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list-success/response-body.adoc[]

src/main/java/com/dnd/moddo/auth/presentation/AuthController.java

@@ -1,5 +1,7 @@
 package com.dnd.moddo.auth.presentation;
 
+import static com.dnd.moddo.auth.infrastructure.security.JwtConstants.*;
+
 import java.io.IOException;
 import java.util.Collections;
 
@@ -100,8 +102,8 @@ public ResponseEntity<AuthCheckResponse> checkAuth(
 		try {
 			Claims claims = jwtProvider.parseClaims(token);
 
-			Long userId = jwtProvider.getUserId(token);
-			String role = jwtProvider.getRole(token);
+			Long userId = claims.get(AUTH_ID.getMessage(), Long.class);
+			String role = claims.get(ROLE.getMessage(), String.class);
 
 			return ResponseEntity.ok(
 				AuthCheckResponse.success(userId, role)

src/main/java/com/dnd/moddo/auth/presentation/response/AuthCheckResponse.java

@@ -1,5 +1,8 @@
 package com.dnd.moddo.auth.presentation.response;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public record AuthCheckResponse(
 	boolean authenticated,
 	UserInfo user,

src/main/java/com/dnd/moddo/common/exception/GlobalExceptionHandler.java

@@ -70,12 +70,9 @@ public ResponseEntity<ErrorResponse> handleValidation(
 		MethodArgumentNotValidException e
 	) {
 
-		String message = e.getBindingResult()
-			.getFieldErrors()
-			.stream()
-			.findFirst()
-			.map(error -> error.getField() + " : " + error.getDefaultMessage())
-			.orElse("잘못된 요청입니다.");
+		LoggingUtils.warn(e);
+
+		String message = e.getMessage();
 
 		return ResponseEntity.badRequest()
 			.body(new ErrorResponse(400, message));

src/main/java/com/dnd/moddo/event/application/query/QuerySettlementService.java

@@ -9,6 +9,7 @@
 import com.dnd.moddo.event.application.impl.SettlementValidator;
 import com.dnd.moddo.event.domain.member.Member;
 import com.dnd.moddo.event.domain.settlement.Settlement;
+import com.dnd.moddo.event.domain.settlement.type.SettlementSortType;
 import com.dnd.moddo.event.domain.settlement.type.SettlementStatus;
 import com.dnd.moddo.event.presentation.request.SearchSettlementListRequest;
 import com.dnd.moddo.event.presentation.response.SettlementDetailResponse;
@@ -51,9 +52,12 @@ public List<SettlementListResponse> search(
 		SettlementStatus effectiveStatus =
 			request.status() == null ? SettlementStatus.ALL : request.status();
 
+		SettlementSortType effectiveSort =
+			request.sort() == null ? SettlementSortType.LATEST : request.sort();
+
 		int limit = request.limit() == null ? 10 : request.limit();
 
-		return settlementReader.findListByUserIdAndStatus(userId, effectiveStatus, request.sort(), limit);
+		return settlementReader.findListByUserIdAndStatus(userId, effectiveStatus, effectiveSort, limit);
 	}
 
 	public List<SettlementShareResponse> findSettlementShareList(Long userId) {

src/main/java/com/dnd/moddo/event/infrastructure/SettlementQueryRepositoryImpl.java

@@ -4,6 +4,7 @@
 
 import org.springframework.stereotype.Repository;
 
+import com.dnd.moddo.event.domain.expense.QExpense;
 import com.dnd.moddo.event.domain.member.QMember;
 import com.dnd.moddo.event.domain.settlement.QSettlement;
 import com.dnd.moddo.event.domain.settlement.type.SettlementSortType;
@@ -15,6 +16,8 @@
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.JPQLQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import lombok.RequiredArgsConstructor;
@@ -35,6 +38,7 @@ public List<SettlementListResponse> findByUserAndStatus(
 	) {
 		QSettlement settlement = QSettlement.settlement;
 		QMember member = QMember.member;
+		QExpense expense = QExpense.expense;
 
 		BooleanExpression userCondition =
 			member.user.id.eq(userId);
@@ -61,6 +65,12 @@ public List<SettlementListResponse> findByUserAndStatus(
 				member.isPaid
 			);
 
+		JPQLQuery<Long> totalAmount =
+			JPAExpressions
+				.select(expense.amount.sum().coalesce(0L))
+				.from(expense)
+				.where(expense.settlement.id.eq(settlement.id));
+
 		OrderSpecifier<?> orderSpecifier =
 			getOrderSpecifier(sortType, settlement, memberCount, completedCount);
 
@@ -70,6 +80,7 @@ public List<SettlementListResponse> findByUserAndStatus(
 				settlement.id,
 				settlement.code,
 				settlement.name,
+				totalAmount,
 				memberCount,
 				completedCount.coalesce(0L),
 				settlement.createdAt,

src/main/java/com/dnd/moddo/event/presentation/request/SearchSettlementListRequest.java

@@ -15,6 +15,7 @@ public record SearchSettlementListRequest(
 	@NotNull(message = "정렬 방식은 필수입니다.")
 	SettlementSortType sort,
 
+	@NotNull(message = "limit은 필수입니다.")
 	@Min(value = 1, message = "limit은 1 이상이어야 합니다.")
 	@Max(value = 100, message = "limit은 최대 100까지 가능합니다.")
 	Integer limit

src/main/java/com/dnd/moddo/event/presentation/response/SettlementListResponse.java

@@ -6,6 +6,7 @@ public record SettlementListResponse(
 	Long groupId,
 	String groupCode,
 	String name,
+	Long totalAmount,
 	Long totalMemberCount,
 	Long completedMemberCount,
 	LocalDateTime createdAt,

src/test/java/com/dnd/moddo/domain/Member/entity/MemberTest.java

@@ -1,6 +1,7 @@
 package com.dnd.moddo.domain.Member.entity;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -10,6 +11,7 @@
 import com.dnd.moddo.event.domain.member.Member;
 import com.dnd.moddo.event.domain.settlement.Settlement;
 import com.dnd.moddo.global.support.GroupTestFactory;
+import com.dnd.moddo.user.domain.User;
 
 class MemberTest {
 
@@ -74,4 +76,65 @@ void testUpdatePaymentStatus() {
 		assertThat(member.isPaid()).isTrue();
 		assertThat(member.getPaidAt()).isNotNull();
 	}
+
+	@DisplayName("사용자를 정상적으로 할당할 수 있다.")
+	@Test
+	void assignUser_success() {
+		// given
+		Member member = Member.builder()
+			.name("기존이름")
+			.settlement(mockSettlement)
+			.role(ExpenseRole.PARTICIPANT)
+			.isPaid(false)
+			.build();
+
+		User user = mock(User.class);
+		when(user.getName()).thenReturn("새이름");
+
+		// when
+		member.assignUser(user);
+
+		// then
+		assertThat(member.getUser()).isEqualTo(user);
+		assertThat(member.getName()).isEqualTo("새이름"); // 동기화 확인
+	}
+
+	@DisplayName("이미 사용자가 연결되어 있으면 예외가 발생한다.")
+	@Test
+	void assignUser_throwException_whenUserAlreadyAssigned() {
+		// given
+		Member member = Member.builder()
+			.name("기존이름")
+			.settlement(mockSettlement)
+			.role(ExpenseRole.PARTICIPANT)
+			.isPaid(false)
+			.build();
+
+		User firstUser = mock(User.class);
+		User secondUser = mock(User.class);
+
+		when(firstUser.getName()).thenReturn("첫번째");
+		when(secondUser.getName()).thenReturn("두번째");
+
+		member.assignUser(firstUser);
+
+		// when & then
+		assertThatThrownBy(() -> member.assignUser(secondUser))
+			.isInstanceOf(IllegalStateException.class)
+			.hasMessageContaining("이미 사용자와 연결된 멤버입니다.");
+	}
+
+	@DisplayName("null 사용자를 할당하면 예외가 발생한다.")
+	@Test
+	void assignUser_throwException_whenUserIsNull() {
+		Member member = Member.builder()
+			.name("기존이름")
+			.settlement(mockSettlement)
+			.role(ExpenseRole.PARTICIPANT)
+			.isPaid(false)
+			.build();
+
+		assertThatThrownBy(() -> member.assignUser(null))
+			.isInstanceOf(NullPointerException.class);
+	}
 }