진행중인 정산/ 완료 정산 api 추가

build.gradle

@@ -58,9 +58,7 @@ dependencies {
 
     //db
     implementation 'mysql:mysql-connector-java:8.0.30'
-
     compileOnly 'org.projectlombok:lombok'
-    implementation 'mysql:mysql-connector-java:8.0.30'
     annotationProcessor 'org.projectlombok:lombok'
 
     //test
@@ -80,6 +78,12 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
+
+    //querydsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta'
+    annotationProcessor 'jakarta.annotation:jakarta.annotation-api'
+    annotationProcessor 'jakarta.persistence:jakarta.persistence-api'
 }
 
 dependencyManagement {
@@ -102,7 +106,7 @@ jacocoTestReport {
         classDirectories.setFrom(
                 files(
                         classDirectories.files.collect {
-                            fileTree(dir: it, includes: ['**/application/**', '**/domain/**'])
+                            fileTree(dir: it, includes: ['**/application/**', '**/domain/**'], excludes: ['**/domain/**/exception/**', '**/domain/**/type/**'])
                         }
                 )
         )
@@ -137,3 +141,18 @@ bootJar {
         into 'static/docs'
     }
 }
+
+// QueryDSL
+def querydslDir = "$buildDir/generated/querydsl"
+
+tasks.withType(JavaCompile).configureEach {
+    options.generatedSourceOutputDirectory = file(querydslDir)
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs += querydslDir
+        }
+    }
+}

src/docs/asciidoc/auth.adoc

@@ -99,4 +99,35 @@ include::{snippets}/auth-controller-test/kakao-logout/http-response.adoc[]
 
 ==== 응답
 
-include::{snippets}/auth-controller-test/kakao-logout/response-body.adoc[]
+include::{snippets}/auth-controller-test/kakao-logout/response-body.adoc[]
+
+== 토큰 상태 확인
+
+쿠키에 담긴 토큰의 유효성을 확인합니다
+
+=== Example
+
+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/http-response.adoc[]
+
+=== Body
+
+==== 응답 (valid)
+
+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_-invalid-token/response-body.adoc[]
+

src/docs/asciidoc/settlement.adoc

@@ -66,79 +66,100 @@ include::{snippets}/settlement-controller-test/update-account/request-body.adoc[
 
 include::{snippets}/settlement-controller-test/update-account/response-body.adoc[]
 
-== 비밀번호 검증
+== 모임 조회
 
-비밀번호를 검증할 수 있습니다.
+모임과 참가자를 조회할 수 있습니다.
 
 === Example
 
-include::{snippets}/settlement-controller-test/is-password-match/curl-request.adoc[]
+include::{snippets}/settlement-controller-test/get-settlement/curl-request.adoc[]
 
 === HTTP
 
 ==== 요청
 
-include::{snippets}/settlement-controller-test/is-password-match/http-request.adoc[]
+include::{snippets}/settlement-controller-test/get-settlement/http-request.adoc[]
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/is-password-match/http-response.adoc[]
+include::{snippets}/settlement-controller-test/get-settlement/http-response.adoc[]
 
 === Body
 
+==== 응답
+
+include::{snippets}/settlement-controller-test/get-settlement/response-body.adoc[]
+
+== 모임 상단 조회
+
+지출 내역의 상단 부분을 조회할 수 있습니다.
+
+=== Example
+
+include::{snippets}/settlement-controller-test/get-header/curl-request.adoc[]
+
+=== HTTP
+
 ==== 요청
 
-include::{snippets}/settlement-controller-test/is-password-match/request-body.adoc[]
+include::{snippets}/settlement-controller-test/get-header/http-request.adoc[]
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/is-password-match/response-body.adoc[]
+include::{snippets}/settlement-controller-test/get-header/http-response.adoc[]
 
-== 모임 조회
+=== Body
 
-모임과 참가자를 조회할 수 있습니다.
+==== 응답
+
+include::{snippets}/settlement-controller-test/get-header/response-body.adoc[]
+
+== 모임(정산) 리스트 조회
+
+user가 속한 정산의 리스트를 상태별로 조회할 수 있습니다.
 
 === Example
 
-include::{snippets}/settlement-controller-test/get-settlement/curl-request.adoc[]
+include::{snippets}/settlement-controller-test/search-settlement-list/curl-request.adoc[]
 
 === HTTP
 
 ==== 요청
 
-include::{snippets}/settlement-controller-test/get-settlement/http-request.adoc[]
+include::{snippets}/settlement-controller-test/search-settlement-list/http-request.adoc[]
+
+include::{snippets}/settlement-controller-test/search-settlement-list/query-parameters.adoc[]
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/get-settlement/http-response.adoc[]
+include::{snippets}/settlement-controller-test/search-settlement-list/http-response.adoc[]
 
 === Body
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/get-settlement/response-body.adoc[]
+include::{snippets}/settlement-controller-test/search-settlement-list/response-body.adoc[]
 
-== 모임 상단 조회
+== 공유 링크 리스트 조회
 
-지출 내역의 상단 부분을 조회할 수 있습니다.
+user가 속한 정산의 공유 링크 리스트를 조회할 수 있다.
 
 === Example
 
-include::{snippets}/settlement-controller-test/get-header/curl-request.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list_-success/curl-request.adoc[]
 
 === HTTP
 
 ==== 요청
 
-include::{snippets}/settlement-controller-test/get-header/http-request.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list_-success/http-request.adoc[]
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/get-header/http-response.adoc[]
+include::{snippets}/settlement-controller-test/get-share-link-list_-success/http-response.adoc[]
 
 === Body
 
 ==== 응답
 
-include::{snippets}/settlement-controller-test/get-header/response-body.adoc[]
-
+include::{snippets}/settlement-controller-test/get-share-link-list_-success/response-body.adoc[]

src/main/java/com/dnd/moddo/auth/infrastructure/security/JwtProvider.java

@@ -12,8 +12,15 @@
 import com.dnd.moddo.auth.presentation.response.TokenResponse;
 import com.dnd.moddo.user.domain.User;
 
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Header;
+import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.security.SecurityException;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -27,16 +34,32 @@ public String generateAccessToken(Long id, String role) {
 	}
 
 	public TokenResponse generateToken(User user) {
-		return generateToken(user.getId(), user.getAuthority().toString(), user.getIsMember());
+		return generateToken(
+			user.getId(),
+			user.getAuthority().toString(),
+			user.getIsMember()
+		);
 	}
 
 	public TokenResponse generateToken(Long id, String role, Boolean isMember) {
-		String accessToken = generateToken(id, role, ACCESS_KEY.getMessage(),
-			jwtProperties.getAccessExpiration());
-		String refreshToken = generateToken(id, role, REFRESH_KEY.getMessage(),
-			jwtProperties.getRefreshExpiration());
+		String accessToken = generateToken(
+			id, role,
+			ACCESS_KEY.getMessage(),
+			jwtProperties.getAccessExpiration()
+		);
 
-		return new TokenResponse(accessToken, refreshToken, getExpiredTime(), isMember);
+		String refreshToken = generateToken(
+			id, role,
+			REFRESH_KEY.getMessage(),
+			jwtProperties.getRefreshExpiration()
+		);
+
+		return new TokenResponse(
+			accessToken,
+			refreshToken,
+			getExpiredTime(),
+			isMember
+		);
 	}
 
 	public String generateGroupToken(Long groupId) {
@@ -49,9 +72,7 @@ private String generateToken(Long id, String role, String type, Long exp) {
 			.setHeaderParam(TYPE.message, type)
 			.claim(ROLE.getMessage(), role)
 			.signWith(jwtProperties.getSecretKey(), SignatureAlgorithm.HS256)
-			.setExpiration(
-				new Date(System.currentTimeMillis() + exp * 1000)
-			)
+			.setExpiration(new Date(System.currentTimeMillis() + exp * 1000))
 			.compact();
 	}
 
@@ -61,12 +82,71 @@ private String generateGroupToken(Long groupId, String type) {
 			.setHeaderParam(TYPE.message, type)
 			.signWith(jwtProperties.getSecretKey(), SignatureAlgorithm.HS256)
 			.setExpiration(
-				Date.from(LocalDate.now().plusMonths(1).atStartOfDay(ZoneId.systemDefault()).toInstant())
+				Date.from(
+					LocalDate.now()
+						.plusMonths(1)
+						.atStartOfDay(ZoneId.systemDefault())
+						.toInstant()
+				)
 			)
 			.compact();
 	}
 
 	private ZonedDateTime getExpiredTime() {
-		return ZonedDateTime.now().plusSeconds(jwtProperties.getRefreshExpiration());
+		return ZonedDateTime.now()
+			.plusSeconds(jwtProperties.getRefreshExpiration());
+	}
+
+	/**
+	 * 토큰 유효성 검증
+	 */
+	public void validate(String token) {
+		try {
+			parseClaims(token);
+		} catch (ExpiredJwtException e) {
+			throw e;
+		} catch (SecurityException | MalformedJwtException |
+				 UnsupportedJwtException | IllegalArgumentException e) {
+			throw new JwtException("Invalid JWT token");
+		}
+	}
+
+	/**
+	 * userId 추출
+	 */
+	public Long getUserId(String token) {
+		Claims claims = parseClaims(token);
+		return claims.get(AUTH_ID.getMessage(), Long.class);
+	}
+
+	/**
+	 * role 추출
+	 */
+	public String getRole(String token) {
+		Claims claims = parseClaims(token);
+		return claims.get(ROLE.getMessage(), String.class);
+	}
+
+	/**
+	 * 토큰 타입 추출 (access / refresh 구분용)
+	 */
+	public String getTokenType(String token) {
+		return (String)parseHeader(token).get(TYPE.message);
+	}
+
+	public Claims parseClaims(String token) {
+		return Jwts.parserBuilder()
+			.setSigningKey(jwtProperties.getSecretKey())
+			.build()
+			.parseClaimsJws(token)
+			.getBody();
+	}
+
+	private Header<?> parseHeader(String token) {
+		return Jwts.parserBuilder()
+			.setSigningKey(jwtProperties.getSecretKey())
+			.build()
+			.parseClaimsJws(token)
+			.getHeader();
 	}
 }