From dc1d7269aac53d2d94a795f3f0cf3c59ff698e07 Mon Sep 17 00:00:00 2001 From: dojin Date: Sun, 3 Mar 2024 22:50:43 +0900 Subject: [PATCH 1/2] r2m (#91) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * v0.1.8-Release (#82) * [etc] logger 추가 및 Exception logging 추가 (#71) * [etc] CODEOWNERS 수정 (#72) * Spring boot version 3.1.2 -> 3.1.6 (#73) * [refactor]cursor 기반 page 타입 변경 (#74) * [refactor] Swagger UI 라이브러리 변경: Spring REST docs -> Springdoc (#75) * Swagger UI 라이브러리 변경 - Spring REST docs -> Springdoc * 컨트롤러 인터페이스 분리 * Update src/main/resources/static/swagger-ui/openapi3.yaml Co-authored-by: 유도진 * build.gradle 의존성 제거 * 인터페이스 이름 변경: ApiPresentation 추가 * 커버리지 체크 제외할 리스트 수정 * postfix 수정 * postfix 수정 * postfix 수정 * postfix 수정 * postfix수정 * REST doc 관련 의존성 및 파일 삭제 * 변경 사항 반영 * 리뷰 반영해서 수정 * 초깃값 동작 체크 --------- Co-authored-by: 유도진 * [etc] version 수정 (#77) * [etc] storeId → cursor 수정 (#79) * [etc] version 수정 (#80) --------- Co-authored-by: 유도진 Co-authored-by: YOON <120346721+0702Yoon@users.noreply.github.com> Co-authored-by: Gopistol <104254012+Gopistol@users.noreply.github.com> * V0.1.9 (#86) * [etc] logger 추가 및 Exception logging 추가 (#71) * [etc] CODEOWNERS 수정 (#72) * Spring boot version 3.1.2 -> 3.1.6 (#73) * [refactor]cursor 기반 page 타입 변경 (#74) * [refactor] Swagger UI 라이브러리 변경: Spring REST docs -> Springdoc (#75) * Swagger UI 라이브러리 변경 - Spring REST docs -> Springdoc * 컨트롤러 인터페이스 분리 * Update src/main/resources/static/swagger-ui/openapi3.yaml Co-authored-by: 유도진 * build.gradle 의존성 제거 * 인터페이스 이름 변경: ApiPresentation 추가 * 커버리지 체크 제외할 리스트 수정 * postfix 수정 * postfix 수정 * postfix 수정 * postfix 수정 * postfix수정 * REST doc 관련 의존성 및 파일 삭제 * 변경 사항 반영 * 리뷰 반영해서 수정 * 초깃값 동작 체크 --------- Co-authored-by: 유도진 * [etc] version 수정 (#77) * [etc] storeId → cursor 수정 (#79) * [etc] version 수정 (#80) * swagger 수정 (#83) * [fix] redis 분리 및 api 추가 (#85) --------- Co-authored-by: Bokyeom <79684339+k-kbk@users.noreply.github.com> Co-authored-by: YOON <120346721+0702Yoon@users.noreply.github.com> Co-authored-by: Gopistol <104254012+Gopistol@users.noreply.github.com> Co-authored-by: k-kbk --------- Co-authored-by: Bokyeom <79684339+k-kbk@users.noreply.github.com> Co-authored-by: YOON <120346721+0702Yoon@users.noreply.github.com> Co-authored-by: Gopistol <104254012+Gopistol@users.noreply.github.com> Co-authored-by: k-kbk --- .../query/StoreQueryServiceDataTest.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/test/kotlin/com/mjucow/eatda/domain/store/service/query/StoreQueryServiceDataTest.kt b/src/test/kotlin/com/mjucow/eatda/domain/store/service/query/StoreQueryServiceDataTest.kt index 8992441..c141272 100644 --- a/src/test/kotlin/com/mjucow/eatda/domain/store/service/query/StoreQueryServiceDataTest.kt +++ b/src/test/kotlin/com/mjucow/eatda/domain/store/service/query/StoreQueryServiceDataTest.kt @@ -73,7 +73,12 @@ class StoreQueryServiceDataTest : AbstractDataTest() { // given val pageSize = 2 val latestId = IntStream.range(0, pageSize * 2).mapToLong { - repository.save(Store(name = "validName$it", address = StoreMother.ADDRESS)).id + repository.save( + Store( + name = "validName$it", + address = StoreMother.ADDRESS + ) + ).id }.max().asLong // when @@ -89,7 +94,12 @@ class StoreQueryServiceDataTest : AbstractDataTest() { // given val pageSize = Store.MAX_NAME_LENGTH - 1 repeat(Store.MAX_NAME_LENGTH) { - repository.save(Store(name = "x".repeat(it + 1), address = StoreMother.ADDRESS)) + repository.save( + Store( + name = "x".repeat(it + 1), + address = StoreMother.ADDRESS + ) + ) } // when @@ -142,7 +152,10 @@ class StoreQueryServiceDataTest : AbstractDataTest() { }.max().asLong // when - val result = storeQueryService.findAllByCategoryAndCursor(categoryId = category.id, size = pageSize) + val result = storeQueryService.findAllByCategoryAndCursor( + categoryId = category.id, + size = pageSize + ) // then assertThat(result).anyMatch { it.id == latestId } From 742f27aae3bd1f986d7e83a42f7f493f4f6a893d Mon Sep 17 00:00:00 2001 From: dojin Date: Sun, 3 Mar 2024 22:58:30 +0900 Subject: [PATCH 2/2] [fix] test ignore and ktlint (#93) * ktlint * ignore test --- build.gradle.kts | 3 ++- .../kotlin/com/mjucow/eatda/health/HealthCheckController.kt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2d9b395..584cbb9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -198,7 +198,8 @@ tasks.jacocoTestCoverageVerification { "com.mjucow.eatda.jooq.*", "*.Companion", "*.s3.*", - "*.popularstore.*" // FIXME: redis 이슈 해결 후 제거 + "*.popularstore.*", // FIXME: redis 이슈 해결 후 제거 + "*.health.*" ) } } diff --git a/src/main/kotlin/com/mjucow/eatda/health/HealthCheckController.kt b/src/main/kotlin/com/mjucow/eatda/health/HealthCheckController.kt index 3f9fc1a..3680b2e 100644 --- a/src/main/kotlin/com/mjucow/eatda/health/HealthCheckController.kt +++ b/src/main/kotlin/com/mjucow/eatda/health/HealthCheckController.kt @@ -15,5 +15,4 @@ class HealthCheckController { fun healthCheck(): String { return "ok" } - }