Feature/hw 9 io

src/main/kotlin/ru/quipy/apigateway/APIController.kt

@@ -11,6 +11,7 @@ import ru.quipy.orders.repository.OrderRepository
 import ru.quipy.payments.logic.OrderPayer
 import java.time.Duration
 import java.util.*
+import kotlin.random.Random
 
 @RestController
 class APIController(
@@ -23,7 +24,7 @@ class APIController(
     val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
 
     @PostMapping("/users")
-    suspend fun createUser(@RequestBody req: CreateUserRequest): User {
+    fun createUser(@RequestBody req: CreateUserRequest): User {
         return User(UUID.randomUUID(), req.name)
     }
 
@@ -32,7 +33,7 @@ class APIController(
     data class User(val id: UUID, val name: String)
 
     @PostMapping("/orders")
-    suspend fun createOrder(@RequestParam userId: UUID, @RequestParam price: Int): Order {
+    fun createOrder(@RequestParam userId: UUID, @RequestParam price: Int): Order {
         val order = Order(
             UUID.randomUUID(),
             userId,
@@ -58,9 +59,10 @@ class APIController(
     }
 
     @PostMapping("/orders/{orderId}/payment")
-    suspend fun payOrder(@PathVariable orderId: UUID, @RequestParam deadline: Long): PaymentSubmissionDto {
+    fun payOrder(@PathVariable orderId: UUID, @RequestParam deadline: Long): PaymentSubmissionDto {
         if (!rateLimiter.tick()) {
-            throw TooManyRequestsException(deadline)
+            val retryAfterMs = 10L + Random.nextLong(10)
+            throw TooManyRequestsException(retryAfterMs)
         }
         val paymentId = UUID.randomUUID()
         val order = orderRepository.findById(orderId)?.let {

src/main/kotlin/ru/quipy/apigateway/GlobalExceptionHandler.kt

@@ -26,8 +26,13 @@ class GlobalExceptionHandler(
     fun handleTooManyRequests(exception: TooLongRequestException): ResponseEntity<String> {
         return ResponseEntity.status(200).body("your request very long, i am so sorry")
     }
+
     @ExceptionHandler(TooManyRequestsException::class)
     fun handleTooManyRequestsRetriable(exception: TooManyRequestsException): ResponseEntity<String> {
-        return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).header("Retry-After", "1").body("to many requests")
+        val retryAfterSeconds = (exception.retryAfterMs / 1000.0).coerceAtLeast(0.1)
+        return ResponseEntity
+            .status(HttpStatus.TOO_MANY_REQUESTS)
+            .header("Retry-After", retryAfterSeconds.toString())
+            .body("too many requests")
     }
 }

src/main/kotlin/ru/quipy/common/utils/SlidingWindowRateLimiter.kt

@@ -1,7 +1,5 @@
 package ru.quipy.common.utils
 
-import com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.util.Deadline
-import com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.util.Timeout
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
@@ -33,18 +31,26 @@ class SlidingWindowRateLimiter(
         }
     }
 
-    fun tickBlocking() {
+    fun tickBlockingAsync() {
         while (!tick()) {
             Thread.sleep(10)
         }
     }
 
-    suspend fun tickBlocking(timeout: Long): Boolean {
+    fun tickBlockingWithTimeout(timeout: Long): Boolean {
         val timeStarted = System.currentTimeMillis()
-        while (System.currentTimeMillis()-timeStarted < timeout && !tick()) {
+        while (System.currentTimeMillis() - timeStarted < timeout && !tick()) {
+            Thread.sleep(2)
+        }
+        return System.currentTimeMillis() - timeStarted < timeout
+    }
+
+    suspend fun tickBlockingAsync(timeout: Long): Boolean {
+        val timeStarted = System.currentTimeMillis()
+        while (System.currentTimeMillis() - timeStarted < timeout && !tick()) {
             delay(2)
         }
-        return System.currentTimeMillis()-timeStarted < timeout
+        return System.currentTimeMillis() - timeStarted < timeout
     }
 
 

src/main/kotlin/ru/quipy/exceptions/TooManyRequestsException.kt

@@ -1,3 +1,3 @@
 package ru.quipy.exceptions
 
-class TooManyRequestsException(val deadline: Long) : RuntimeException()
+class TooManyRequestsException(val retryAfterMs: Long) : RuntimeException()

src/main/kotlin/ru/quipy/payments/logic/OrderPayer.kt

@@ -26,7 +26,7 @@ class OrderPayer(meterRegistry: MeterRegistry) {
     private lateinit var paymentService: PaymentService
 
 
-    suspend fun processPayment(orderId: UUID, amount: Int, paymentId: UUID, deadline: Long): Long {
+    fun processPayment(orderId: UUID, amount: Int, paymentId: UUID, deadline: Long): Long {
         val createdAt = System.currentTimeMillis()
         plannedRequests.increment()
         val createdEvent = paymentESService.create {