#60 Catch MinIO NoSuchKey error

Signed-off-by: vityaman <vityaman.dev@yandex.ru>

Author: vityaman

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/storage/minio/MinioPictureContentStorage.kt

@@ -4,13 +4,17 @@ import io.minio.GetObjectArgs
 import io.minio.MinioClient
 import io.minio.PutObjectArgs
 import io.minio.RemoveObjectArgs
+import io.minio.errors.ErrorResponseException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.http.entity.ContentType
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Repository
+import ru.ifmo.se.dating.exception.NotFoundException
 import ru.ifmo.se.dating.people.model.Picture
 import ru.ifmo.se.dating.people.storage.PictureContentStorage
+import ru.ifmo.se.dating.people.storage.minio.exception.NoSuchKeyException
+import ru.ifmo.se.dating.people.storage.minio.exception.UnknownException
 import java.io.ByteArrayInputStream
 
 @Repository
@@ -22,23 +26,22 @@ class MinioPictureContentStorage(
 ) : PictureContentStorage {
     private val contentType = ContentType.IMAGE_JPEG
 
-    override suspend fun upload(id: Picture.Id, content: Picture.Content): Unit =
-        withContext(Dispatchers.IO) {
-            PutObjectArgs.builder()
-                .bucket(bucket)
-                .`object`(objectName(id))
-                .stream(
-                    ByteArrayInputStream(content.bytes),
-                    content.bytes.size.toLong(),
-                    /* partSize = */ -1,
-                )
-                .contentType(contentType.mimeType)
-                .build()
-                .let { minio.putObject(it) }
-        }
+    override suspend fun upload(id: Picture.Id, content: Picture.Content): Unit = wrapped {
+        PutObjectArgs.builder()
+            .bucket(bucket)
+            .`object`(objectName(id))
+            .stream(
+                ByteArrayInputStream(content.bytes),
+                content.bytes.size.toLong(),
+                /* partSize = */ -1,
+            )
+            .contentType(contentType.mimeType)
+            .build()
+            .let { minio.putObject(it) }
+    }
 
-    override suspend fun download(id: Picture.Id): Picture.Content =
-        withContext(Dispatchers.IO) {
+    override suspend fun download(id: Picture.Id): Picture.Content = try {
+        wrapped {
             GetObjectArgs.builder()
                 .bucket(bucket)
                 .`object`(objectName(id))
@@ -47,15 +50,31 @@ class MinioPictureContentStorage(
                 .use { it.readBytes() }
                 .let { Picture.Content(it) }
         }
+    } catch (e: NoSuchKeyException) {
+        throw NotFoundException(e.message!!, e)
+    }
 
-    override suspend fun remove(id: Picture.Id) =
-        withContext(Dispatchers.IO) {
-            RemoveObjectArgs.builder()
-                .bucket(bucket)
-                .`object`(objectName(id))
-                .build()
-                .let { minio.removeObject(it) }
-        }
+    override suspend fun remove(id: Picture.Id) = wrapped {
+        RemoveObjectArgs.builder()
+            .bucket(bucket)
+            .`object`(objectName(id))
+            .build()
+            .let { minio.removeObject(it) }
+    }
 
     private fun objectName(id: Picture.Id) = "$id.jpg"
+
+    private suspend fun <T> wrapped(action: () -> T) = try {
+        withContext(Dispatchers.IO) { action() }
+    } catch (e: ErrorResponseException) {
+        val bucketName: String? = e.errorResponse().bucketName()
+        val objectName: String? = e.errorResponse().objectName()
+        when (e.errorResponse().code()) {
+            "NoSuchKey" ->
+                throw NoSuchKeyException("Key (bucket: $bucketName, object: $objectName) not found")
+
+            else ->
+                throw UnknownException("Unknown error: ${e.errorResponse().message()}", e)
+        }
+    }
 }

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/storage/minio/exception/MinioException.kt

@@ -0,0 +1,6 @@
+package ru.ifmo.se.dating.people.storage.minio.exception
+
+import ru.ifmo.se.dating.exception.GenericException
+
+sealed class MinioException(message: String, cause: Throwable? = null) :
+    GenericException(message, cause)

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/storage/minio/exception/NoSuchKeyException.kt

@@ -0,0 +1,4 @@
+package ru.ifmo.se.dating.people.storage.minio.exception
+
+class NoSuchKeyException(message: String, cause: Throwable? = null) :
+    MinioException(message, cause)

backend/people/src/main/kotlin/ru/ifmo/se/dating/people/storage/minio/exception/UnknownException.kt

@@ -0,0 +1,4 @@
+package ru.ifmo.se.dating.people.storage.minio.exception
+
+class UnknownException(message: String, cause: Throwable? = null) :
+    MinioException(message, cause)