From 31f2a115124a265f1ea0f0a81b4f0c2c55ae2208 Mon Sep 17 00:00:00 2001
From: Dmitry Marchuk <code@dmarchuk.com>
Date: Fri, 14 Jul 2023 08:48:06 +0300
Subject: [PATCH] Add transformDeferred hook

---
 .idea/codeStyles/Project.xml                  |   3 +
 README.md                                     |   2 +-
 build.gradle.kts                              |   6 +-
 detekt-baseline.xml                           |   2 +-
 .../smaugfm/lunchmoney/api/LunchmoneyApi.kt   |  25 ++--
 .../lunchmoney/api/LunchmoneyApiInternal.kt   |  14 +-
 .../smaugfm/lunchmoney/api/RequestExecutor.kt | 128 ++++++++----------
 .../LunchmoneyApiResponseException.kt         |  24 +++-
 .../smaugfm/lunchmoney/AuthorizationTest.kt   |   5 +-
 .../smaugfm/lunchmoney/TestMockServerBase.kt  |  16 ++-
 .../lunchmoney/api/RequestExecutorTest.kt     |  67 ++++++++-
 .../CreateCategoryGroupRequestTest.kt         |   4 +-
 .../category/CreateCategoryRequestTest.kt     |   4 +-
 13 files changed, 185 insertions(+), 115 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3c8e6a9..ecac876 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -19,6 +19,9 @@
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
       <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 717b022..b6ae6d2 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    implementation("io.github.smaugfm:lunchmoney:1.0.1")
+    implementation("io.github.smaugfm:lunchmoney:1.0.2")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 25f76cb..5e31706 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 }
 
 group = "io.github.smaugfm"
-version = "1.0.1"
+version = "1.0.2"
 val isReleaseVersion = !version.toString().endsWith("SNAPSHOT")
 
 repositories {
@@ -30,6 +30,7 @@ val reactorNetty = "1.1.2"
 val mockserver = "5.15.0"
 val logback = "1.4.5"
 val javaVersion = "11"
+val resilience4jVersion = "1.7.0"
 
 dependencies {
     api("io.projectreactor:reactor-core:$reactorCore")
@@ -39,6 +40,9 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
     testImplementation("org.mock-server:mockserver-netty:$mockserver")
     testImplementation("org.mock-server:mockserver-client-java:$mockserver")
+    testImplementation("io.github.resilience4j:resilience4j-retry:$resilience4jVersion")
+    testImplementation("io.github.resilience4j:resilience4j-reactor:$resilience4jVersion")
+    testImplementation("io.github.resilience4j:resilience4j-kotlin:$resilience4jVersion")
     testImplementation("io.projectreactor:reactor-test:$reactorCore")
     testImplementation("io.mockk:mockk:1.13.4")
     testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 8a3dd7b..c6c17bb 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -10,8 +10,8 @@
     <ID>LongParameterList:LunchmoneyApi.kt$LunchmoneyApi$( name: String, typeName: LunchmoneyAssetType, balance: BigDecimal, subtypeName: String? = null, displayName: String? = null, balanceAsOf: Instant? = null, currency: Currency? = null, institutionName: String? = null, closedOn: LocalDate? = null, excludeTransactions: Boolean? = null )</ID>
     <ID>LongParameterList:LunchmoneyApi.kt$LunchmoneyApi$( tagId: Long? = null, recurringId: Long? = null, plaidAccountId: Long? = null, categoryId: Long? = null, assetId: Long? = null, groupId: Long? = null, isGroup: Boolean? = null, status: LunchmoneyTransactionStatus? = null, offset: Long? = null, limit: Long? = null, startDate: LocalDate? = null, endDate: LocalDate? = null, debitAsNegative: Boolean? = null, pending: Boolean? = null )</ID>
     <ID>LongParameterList:LunchmoneyApi.kt$LunchmoneyApi$( transactions: List&lt;LunchmoneyInsertTransaction>, applyRules: Boolean? = null, skipDuplicates: Boolean? = null, checkForRecurring: Boolean? = null, debitAsNegative: Boolean? = null, skipBalanceUpdate: Boolean? = null )</ID>
-    <ID>TooGenericExceptionCaught:RequestExecutor.kt$RequestExecutor$error: Throwable</ID>
     <ID>TooManyFunctions:LunchmoneyApi.kt$LunchmoneyApi : LunchmoneyApiInternal</ID>
+    <ID>TooManyFunctions:RequestExecutor.kt$RequestExecutor</ID>
     <ID>UtilityClassWithPublicConstructor:TestBase.kt$TestBase</ID>
   </ManuallySuppressedIssues>
 </SmellBaseline>
diff --git a/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApi.kt b/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApi.kt
index fd53ac9..2fa3a56 100644
--- a/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApi.kt
+++ b/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApi.kt
@@ -61,12 +61,14 @@ import io.github.smaugfm.lunchmoney.response.LunchmoneyUpdateTransactionResponse
 import io.github.smaugfm.lunchmoney.response.UpsertBudgetCategoryGroupResponse
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.JsonBuilder
+import org.reactivestreams.Publisher
 import reactor.core.publisher.Mono
 import reactor.netty.resources.ConnectionProvider
 import java.math.BigDecimal
 import java.time.Instant
 import java.time.LocalDate
 import java.util.Currency
+import java.util.function.Function
 
 /**
  * Non-blocking Reactor-based Lunchmoney API
@@ -78,30 +80,35 @@ class LunchmoneyApi internal constructor(
     token: String,
     baseUrl: String,
     port: Int,
-    jsonBuilderActions: List<JsonBuilder.() -> Unit> = listOf(DEFAULT_JSON_BUILDER),
-    reactorNettyConnectionProvider: ConnectionProvider? = null
+    jsonBuilderCustomizer: List<JsonBuilder.() -> Unit> = listOf(DEFAULT_JSON_BUILDER),
+    reactorNettyConnectionProvider: ConnectionProvider? = null,
+    requestTransformer: Function<Publisher<Any>, Publisher<Any>>? = null
 ) : LunchmoneyApiInternal(
     token,
     baseUrl,
     port,
-    jsonBuilderActions,
-    reactorNettyConnectionProvider
+    jsonBuilderCustomizer,
+    reactorNettyConnectionProvider,
+    requestTransformer
 ) {
     /**
      * @param token developer [token](https://lunchmoney.dev/#authentication)
-     * @param jsonBuilderAction customize internal [kotlinx.serialization.json.Json] instance
+     * @param jsonBuilderCustomizer customize internal [kotlinx.serialization.json.Json] instance
      * @param reactorNettyConnectionProvider customize internal netty [reactor.netty.http.client.HttpClient]
+     * @param requestTransformer applies through [Mono.transformDeferred] to all resulting [Mono]'s
      */
     constructor(
         token: String,
-        jsonBuilderAction: JsonBuilder.() -> Unit = {},
-        reactorNettyConnectionProvider: ConnectionProvider? = null
+        jsonBuilderCustomizer: JsonBuilder.() -> Unit = {},
+        reactorNettyConnectionProvider: ConnectionProvider? = null,
+        requestTransformer: Function<Publisher<Any>, Publisher<Any>>? = null
     ) : this(
         token,
         LUNCHMONEY_DEV_BASE_URL,
         DEFAULT_HTTP_PORT,
-        listOf(jsonBuilderAction, DEFAULT_JSON_BUILDER),
-        reactorNettyConnectionProvider
+        listOf(jsonBuilderCustomizer, DEFAULT_JSON_BUILDER),
+        reactorNettyConnectionProvider,
+        requestTransformer
     )
 
     fun createAsset(
diff --git a/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApiInternal.kt b/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApiInternal.kt
index 75cc28e..32bd3cc 100644
--- a/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApiInternal.kt
+++ b/src/main/kotlin/io/github/smaugfm/lunchmoney/api/LunchmoneyApiInternal.kt
@@ -5,28 +5,32 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonBuilder
 import kotlinx.serialization.json.JsonNamingStrategy
 import kotlinx.serialization.serializer
+import org.reactivestreams.Publisher
 import reactor.core.publisher.Mono
 import reactor.netty.http.client.HttpClient
 import reactor.netty.resources.ConnectionProvider
+import java.util.function.Function
 
 open class LunchmoneyApiInternal internal constructor(
     token: String,
     baseUrl: String,
     port: Int,
-    jsonBuilderActions: List<JsonBuilder.() -> Unit>,
-    reactorNettyConnectionProvider: ConnectionProvider?
+    jsonBuilderCustomizer: List<JsonBuilder.() -> Unit>,
+    reactorNettyConnectionProvider: ConnectionProvider?,
+    requestTransformer: Function<Publisher<Any>, Publisher<Any>>?
 ) {
     internal val requestExecutor = RequestExecutor(
         token,
         Json(builderAction = {
-            jsonBuilderActions.forEach { this.it() }
+            jsonBuilderCustomizer.forEach { this.it() }
         }),
-        port,
         if (reactorNettyConnectionProvider != null) {
             HttpClient.create(reactorNettyConnectionProvider).baseUrl(baseUrl)
         } else {
             HttpClient.create().baseUrl(baseUrl)
-        }
+        },
+        port,
+        requestTransformer
     )
 
     internal inline fun <reified R, reified T, A : LunchmoneyAbstractApiRequest<R, T>> execute(
diff --git a/src/main/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutor.kt b/src/main/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutor.kt
index e4e1e9e..4ea804a 100644
--- a/src/main/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutor.kt
+++ b/src/main/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutor.kt
@@ -16,20 +16,22 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.encodeToStream
 import kotlinx.serialization.serializer
 import mu.KotlinLogging
+import org.reactivestreams.Publisher
 import reactor.core.publisher.Mono
 import reactor.netty.ByteBufMono
 import reactor.netty.http.client.HttpClient
 import reactor.netty.http.client.HttpClientResponse
 import java.io.ByteArrayOutputStream
-import java.io.IOException
+import java.util.function.Function
 
 val log = KotlinLogging.logger { }
 
 internal class RequestExecutor(
     token: String,
     val json: Json,
+    private val httpClient: HttpClient,
     private val port: Int = 443,
-    private val httpClient: HttpClient
+    private val requestTransformer: Function<Publisher<Any>, Publisher<Any>>?
 ) {
     private val authorizationHeader = "Bearer $token"
 
@@ -39,20 +41,26 @@ internal class RequestExecutor(
         paramsSerializer: KSerializer<T>
     ): Mono<R> = requestMono
         .flatMap { request: A ->
-            val body = requestBodyToByteBuffer(paramsSerializer, request.body())
             httpClient
                 .port(port)
                 .headers { addHeaders(request.method(), it) }
                 .request(request.method())
                 .uri(request.pathAndQuery())
-                .send(Mono.just(body))
+                .send(requestBodyToByteBuffer(paramsSerializer, request.body()))
                 .responseSingle { resp, byteBufMono ->
                     processResponse(resp, byteBufMono, responseSerializer)
-                        .doOnNext {
-                            log.debug { "Response (${resp.status()}): $it" }
-                        }
+                        .doOnNext { log.debug { "Response (${resp.status()}): $it" } }
                 }.doOnSubscribe {
                     log.debug { "Performing Lunchmoney API request $request" }
+                }.let {
+                    @Suppress("UNCHECKED_CAST")
+                    if (requestTransformer != null) {
+                        it.transformDeferred(
+                            requestTransformer as Function<in Publisher<R>, out Publisher<R>>
+                        )
+                    } else {
+                        it
+                    }
                 }
         }
 
@@ -73,74 +81,48 @@ internal class RequestExecutor(
         resp: HttpClientResponse,
         byteBufMono: ByteBufMono,
         serializer: KSerializer<R>
-    ): Mono<R> {
-        val statusCode = resp.status().code()
-        return byteBufMono
+    ): Mono<R> =
+        byteBufMono
             .asString()
             .flatMap { body: String ->
-                try {
-                    Mono.justOrEmpty(
-                        deserializeResponseBody(
-                            serializer,
-                            statusCode,
-                            body
-                        )
-                    ).switchIfEmpty(
-                        if (isOkResponse(resp)) {
-                            Mono.empty()
-                        } else {
-                            Mono.error(
-                                LunchmoneyApiResponseException(
-                                    body,
-                                    null,
-                                    statusCode
-                                )
-                            )
-                        }
-                    )
-                } catch (e: LunchmoneyApiResponseException) {
-                    Mono.error(e)
-                } catch (error: Throwable) {
-                    Mono.error(
-                        LunchmoneyApiResponseException(
-                            body,
-                            error,
-                            statusCode
-                        )
-                    )
-                }
+                deserializeResponseBody(serializer, resp.status().code(), body)
+                    .transformDeferred { mapUnknownError(it, body, resp.status().code()) }
+            }.transformDeferred { errorOnEmptyResponse(it, resp) }
+
+    private fun <R> errorOnEmptyResponse(mono: Mono<R>, resp: HttpClientResponse): Mono<R> =
+        mono.switchIfEmpty(
+            if (isOkResponse(resp)) {
+                Mono.empty()
+            } else {
+                Mono.error(LunchmoneyApiResponseException(resp.status().code()))
             }
-    }
+        )
+
+    private fun <R> mapUnknownError(mono: Mono<R>, body: String, statusCode: Int): Mono<R> =
+        mono.onErrorMap({ it !is LunchmoneyApiResponseException }) {
+            LunchmoneyApiResponseException(
+                body,
+                it,
+                statusCode
+            )
+        }
 
     private fun <R> deserializeResponseBody(
         serializer: KSerializer<R>,
         status: Int,
         body: String
-    ): R? =
-        try {
-            doDeserialize(serializer, body)
-        } catch (e: SerializationException) {
-            val error = deserializeApiError(body)
-            if (error != null) {
-                throw error.toException(body, status)
-            } else {
-                throw e
+    ): Mono<R> =
+        doDeserialize(serializer, body)
+            .onErrorResume(SerializationException::class.java) {
+                deserializeApiError(body)
+                    .flatMap { Mono.error(it.toException(body, status)) }
             }
-        }
 
-    private fun deserializeApiError(body: String): ApiErrorResponse? =
-        try {
-            doDeserialize<ApiErrorResponse>(
-                json.serializersModule.serializer(),
-                body
-            )
-        } catch (other: SerializationException) {
-            log.warn(other) { "Unknown error response" }
-            null
-        }
+    private fun deserializeApiError(body: String) =
+        doDeserialize<ApiErrorResponse>(json.serializersModule.serializer(), body)
 
-    private fun <T> doDeserialize(serializer: KSerializer<T>, body: String): T =
-        json.decodeFromString(serializer, body)
+    private fun <T> doDeserialize(serializer: KSerializer<T>, body: String): Mono<T> =
+        Mono.fromCallable { json.decodeFromString(serializer, body) }
 
     private fun <T> serializeRequestBody(serializer: KSerializer<T>, body: T): ByteArray {
         val os = ByteArrayOutputStream()
@@ -148,17 +130,13 @@ internal class RequestExecutor(
         return os.toByteArray()
     }
 
-    private fun <T> requestBodyToByteBuffer(serializer: KSerializer<T>, body: T?): ByteBuf {
-        if (body == null) {
-            return Unpooled.EMPTY_BUFFER
-        }
-        return try {
-            val res: ByteArray = serializeRequestBody(serializer, body)
-            Unpooled.wrappedBuffer(res)
-        } catch (e: IOException) {
-            throw LunchmoneyApiRequestException(e)
-        }
-    }
+    private fun <T> requestBodyToByteBuffer(
+        serializer: KSerializer<T>,
+        body: T?
+    ): Mono<ByteBuf> =
+        Mono.justOrEmpty(body)
+            .mapNotNull { Unpooled.wrappedBuffer(serializeRequestBody(serializer, it!!)) }
+            .onErrorMap { LunchmoneyApiRequestException(it) }
 
     private fun isOkResponse(response: HttpClientResponse) =
         response.status().codeAsText().startsWith("2")
diff --git a/src/main/kotlin/io/github/smaugfm/lunchmoney/exception/LunchmoneyApiResponseException.kt b/src/main/kotlin/io/github/smaugfm/lunchmoney/exception/LunchmoneyApiResponseException.kt
index a97b400..a846b55 100644
--- a/src/main/kotlin/io/github/smaugfm/lunchmoney/exception/LunchmoneyApiResponseException.kt
+++ b/src/main/kotlin/io/github/smaugfm/lunchmoney/exception/LunchmoneyApiResponseException.kt
@@ -1,6 +1,7 @@
 package io.github.smaugfm.lunchmoney.exception
 
 import io.github.smaugfm.lunchmoney.response.ApiErrorResponse
+import io.netty.handler.codec.http.HttpResponseStatus
 
 @Suppress("MemberVisibilityCanBePrivate")
 class LunchmoneyApiResponseException : LunchmoneyApiException {
@@ -10,23 +11,32 @@ class LunchmoneyApiResponseException : LunchmoneyApiException {
 
     constructor(
         body: String,
-        cause: Throwable?,
+        cause: ApiErrorResponse,
         statusCode: Int
-    ) : super(cause!!) {
-        this.apiErrorResponse = null
+    ) : super(errorMessage(cause)) {
         this.body = body
+        this.apiErrorResponse = cause
         this.statusCode = statusCode
     }
 
     constructor(
         body: String,
-        apiErrorResponse: ApiErrorResponse,
+        cause: Throwable,
+        statusCode: Int
+    ) : super(cause) {
+        this.body = body
+        this.apiErrorResponse = null
+        this.statusCode = statusCode
+    }
+
+    constructor(
         statusCode: Int
     ) : super(
-        errorMessage(apiErrorResponse)
+        "Response body is empty but status is $statusCode " +
+            HttpResponseStatus.valueOf(statusCode).reasonPhrase()
     ) {
-        this.apiErrorResponse = apiErrorResponse
-        this.body = body
+        this.body = ""
+        this.apiErrorResponse = null
         this.statusCode = statusCode
     }
 
diff --git a/src/test/kotlin/io/github/smaugfm/lunchmoney/AuthorizationTest.kt b/src/test/kotlin/io/github/smaugfm/lunchmoney/AuthorizationTest.kt
index ae34af7..800d64c 100644
--- a/src/test/kotlin/io/github/smaugfm/lunchmoney/AuthorizationTest.kt
+++ b/src/test/kotlin/io/github/smaugfm/lunchmoney/AuthorizationTest.kt
@@ -2,7 +2,7 @@ package io.github.smaugfm.lunchmoney
 
 import assertk.assertThat
 import assertk.assertions.cause
-import assertk.assertions.isEqualTo
+import assertk.assertions.contains
 import assertk.assertions.isFailure
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
@@ -28,6 +28,7 @@ internal class AuthorizationTest : TestMockServerBase() {
             .isNotNull()
             .isInstanceOf(LunchmoneyApiResponseException::class)
             .prop(LunchmoneyApiResponseException::message)
-            .isEqualTo("Access token does not exist.")
+            .isNotNull()
+            .contains("Access token does not exist.")
     }
 }
diff --git a/src/test/kotlin/io/github/smaugfm/lunchmoney/TestMockServerBase.kt b/src/test/kotlin/io/github/smaugfm/lunchmoney/TestMockServerBase.kt
index 388421a..3116ba6 100644
--- a/src/test/kotlin/io/github/smaugfm/lunchmoney/TestMockServerBase.kt
+++ b/src/test/kotlin/io/github/smaugfm/lunchmoney/TestMockServerBase.kt
@@ -10,7 +10,10 @@ import org.mockserver.integration.ClientAndServer
 import org.mockserver.model.HttpRequest
 import org.mockserver.model.HttpResponse
 import org.mockserver.model.NottableString
+import org.reactivestreams.Publisher
 import org.slf4j.event.Level
+import reactor.netty.resources.ConnectionProvider
+import java.util.function.Function
 
 abstract class TestMockServerBase : TestBase() {
     protected val api: LunchmoneyApiInternal = LunchmoneyTest(
@@ -32,8 +35,7 @@ abstract class TestMockServerBase : TestBase() {
                 HttpResponse.response()
                     .withStatusCode(200)
                     .withBody(
-                        " { \"name\": \"Error\", " +
-                            "\"message\": \"Access token does not exist.\" } "
+                        " { \"name\": \"Error\", \"message\": \"Access token does not exist.\" } "
                     )
             )
         mockServer
@@ -47,8 +49,7 @@ abstract class TestMockServerBase : TestBase() {
                 HttpResponse.response()
                     .withStatusCode(200)
                     .withBody(
-                        " { \"name\": \"Error\", " +
-                            "\"message\": \"Access token does not exist.\" } "
+                        " { \"name\": \"Error\", \"message\": \"Access token does not exist.\" } "
                     )
             )
     }
@@ -56,13 +57,16 @@ abstract class TestMockServerBase : TestBase() {
     class LunchmoneyTest(
         token: String,
         baseUrl: String,
-        port: Int
+        port: Int,
+        reactorNettyConnectionProvider: ConnectionProvider? = null,
+        requestTransformer: Function<Publisher<Any>, Publisher<Any>>? = null
     ) : LunchmoneyApiInternal(
         token,
         baseUrl,
         port,
         listOf(DEFAULT_JSON_BUILDER),
-        null
+        reactorNettyConnectionProvider,
+        requestTransformer
     )
 
     companion object {
diff --git a/src/test/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutorTest.kt b/src/test/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutorTest.kt
index 5381cb4..49ec110 100644
--- a/src/test/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutorTest.kt
+++ b/src/test/kotlin/io/github/smaugfm/lunchmoney/api/RequestExecutorTest.kt
@@ -2,19 +2,76 @@ package io.github.smaugfm.lunchmoney.api
 
 import assertk.all
 import assertk.assertThat
+import assertk.assertions.isEmpty
 import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
+import assertk.assertions.isNotNull
 import assertk.assertions.isNull
 import assertk.assertions.prop
+import io.github.resilience4j.core.IntervalFunction
+import io.github.resilience4j.kotlin.retry.RetryConfig
+import io.github.resilience4j.reactor.retry.RetryOperator
+import io.github.resilience4j.retry.Retry
 import io.github.smaugfm.lunchmoney.TestMockServerBase
 import io.github.smaugfm.lunchmoney.exception.LunchmoneyApiResponseException
 import io.github.smaugfm.lunchmoney.request.user.GetCurrentUserRequest
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
 import org.mockserver.model.HttpRequest.request
 import org.mockserver.model.HttpResponse.response
 import org.mockserver.model.MediaType
+import org.mockserver.verify.VerificationTimes
+import java.time.Duration
 
 class RequestExecutorTest : TestMockServerBase() {
+    @Test
+    fun retryTest() {
+        val retry = Retry.of(
+            "vasa",
+            RetryConfig {
+                maxAttempts(3)
+                failAfterMaxAttempts(true)
+                intervalFunction(IntervalFunction.of(Duration.ofMillis(1)))
+            }
+        )
+        val api: LunchmoneyApiInternal = LunchmoneyTest(
+            TOKEN,
+            BASE_URL,
+            PORT,
+            null,
+            RetryOperator.of(retry)
+        )
+
+        mockServer
+            .`when`(
+                request("/me")
+                    .withMethod("GET")
+            ).respond(
+                response()
+                    .withStatusCode(500)
+            )
+        val request = GetCurrentUserRequest()
+        assertThat { api.execute(request).block() }
+            .isFailure()
+            .isInstanceOf(RuntimeException::class)
+            .prop(Throwable::cause)
+            .isNotNull()
+            .isInstanceOf(LunchmoneyApiResponseException::class.java)
+            .all {
+                prop(LunchmoneyApiResponseException::apiErrorResponse)
+                    .isNull()
+                prop(LunchmoneyApiResponseException::body)
+                    .isEmpty()
+                prop(LunchmoneyApiResponseException::statusCode)
+                    .isEqualTo(500)
+            }
+        mockServer.verify(
+            request("/me")
+                .withMethod("GET"),
+            VerificationTimes.exactly(3)
+        )
+    }
+
     @Test
     fun unexpectedResponseTest() {
         val body = """
@@ -33,11 +90,9 @@ class RequestExecutorTest : TestMockServerBase() {
                     .withStatusCode(500)
                     .withBody(body)
             )
-        assertThat(
-            assertThrows<Throwable> {
-                api.execute(GetCurrentUserRequest()).block()
-            }
-        )
+        assertThat { api.execute(GetCurrentUserRequest()).block() }
+            .isFailure()
+            .isInstanceOf(RuntimeException::class)
             .prop(Throwable::cause)
             .transform { it as LunchmoneyApiResponseException }
             .all {
diff --git a/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryGroupRequestTest.kt b/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryGroupRequestTest.kt
index 92c55e4..cebf2ca 100644
--- a/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryGroupRequestTest.kt
+++ b/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryGroupRequestTest.kt
@@ -2,6 +2,7 @@ package io.github.smaugfm.lunchmoney.request.category
 
 import assertk.assertThat
 import assertk.assertions.cause
+import assertk.assertions.contains
 import assertk.assertions.isEqualTo
 import assertk.assertions.isFailure
 import assertk.assertions.isInstanceOf
@@ -63,6 +64,7 @@ internal class CreateCategoryGroupRequestTest : TestMockServerBase() {
             .isNotNull()
             .isInstanceOf(LunchmoneyApiResponseException::class)
             .prop(LunchmoneyApiResponseException::message)
-            .isEqualTo("A category with the same name (vasa) already exists.")
+            .isNotNull()
+            .contains("A category with the same name (vasa) already exists.")
     }
 }
diff --git a/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryRequestTest.kt b/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryRequestTest.kt
index 0bd6fac..bbeb63c 100644
--- a/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryRequestTest.kt
+++ b/src/test/kotlin/io/github/smaugfm/lunchmoney/request/category/CreateCategoryRequestTest.kt
@@ -2,6 +2,7 @@ package io.github.smaugfm.lunchmoney.request.category
 
 import assertk.assertThat
 import assertk.assertions.cause
+import assertk.assertions.contains
 import assertk.assertions.isEqualTo
 import assertk.assertions.isFailure
 import assertk.assertions.isInstanceOf
@@ -75,6 +76,7 @@ internal class CreateCategoryRequestTest : TestMockServerBase() {
             .isNotNull()
             .isInstanceOf(LunchmoneyApiResponseException::class)
             .prop(LunchmoneyApiResponseException::message)
-            .isEqualTo("A category with the same name (vasa) already exists.")
+            .isNotNull()
+            .contains("A category with the same name (vasa) already exists.")
     }
 }