TouchInstinct
/
Backend-common
313
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added dependency, exception (#63)

This commit is contained in:
Denis Kazantsev 2022-01-23 23:20:50 +03:00 committed by GitHub
parent 9bf9ae2695
commit 40254bfd58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s3-storage/build.gradle.kts
View File

@ -5,6 +5,8 @@ plugins {
}
dependencies {
api(project(":common"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.springframework.boot:spring-boot")

6
s3-storage/src/main/kotlin/ru/touchin/s3/storage/exceptions/FileLocationNotFoundException.kt Normal file
View File

@ -0,0 +1,6 @@
package ru.touchin.s3.storage.exceptions
import ru.touchin.common.exceptions.CommonNotFoundException
import java.util.*
class FileLocationNotFoundException(id: String) : CommonNotFoundException("File location not found id=$id")

5
s3-storage/src/main/kotlin/ru/touchin/s3/storage/services/S3FileStorageServiceImpl.kt
View File

@ -1,6 +1,7 @@
package ru.touchin.s3.storage.services
import org.springframework.stereotype.Service
import ru.touchin.s3.storage.exceptions.FileLocationNotFoundException
import ru.touchin.s3.storage.properties.S3Properties
import ru.touchin.s3.storage.services.dto.DeleteData
import ru.touchin.s3.storage.services.dto.GetUrl
@ -16,6 +17,7 @@ import software.amazon.awssdk.services.s3.presigner.S3Presigner
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest
import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest
import java.net.URL
import java.util.*
@Service
class S3FileStorageServiceImpl(
@ -50,7 +52,7 @@ class S3FileStorageServiceImpl(
s3Client.deleteObject(deleteObjectRequest)
}
override fun getUrl(getUrl: GetUrl): URL? {
override fun getUrl(getUrl: GetUrl): URL {
val getObjectRequest = GetObjectRequest.builder()
.bucket(s3Properties.bucket)
.key(keyOf(getUrl.id))
@ -66,6 +68,7 @@ class S3FileStorageServiceImpl(
.takeIf(PresignedGetObjectRequest::isBrowserExecutable)
return presignedGetObjectRequest?.url()
?: throw FileLocationNotFoundException(getUrl.id)
}
fun keyOf(fileId: String) = folder + fileId