From f84acef93414e70679e0b57ca80cb19c83704717 Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 25 Aug 2024 19:55:06 +0300 Subject: [PATCH] fix(ci): run locally --- .../mu/muse/{usecase => common}/exceptions.kt | 2 +- .../main/kotlin/mu/muse/rest/GlobalErrorHandler.kt | 13 +++++++------ .../mu/muse/rest/favorite/AddFavoriteEndpoint.kt | 2 +- .../mu/muse/rest/favorite/RemoveFavoriteEndpoint.kt | 2 +- .../src/main/kotlin/mu/muse/usecase/AddFavorite.kt | 1 + .../src/main/kotlin/mu/muse/usecase/BasicLogin.kt | 1 + .../kotlin/mu/muse/usecase/GetFavoriteByUsername.kt | 1 + .../app/src/main/kotlin/mu/muse/usecase/GetUser.kt | 1 + .../main/kotlin/mu/muse/usecase/RemoveFavorite.kt | 1 + .../access/instrument/InstrumentExtractor.kt | 2 +- 10 files changed, 16 insertions(+), 10 deletions(-) rename server/app/src/main/kotlin/mu/muse/{usecase => common}/exceptions.kt (87%) diff --git a/server/app/src/main/kotlin/mu/muse/usecase/exceptions.kt b/server/app/src/main/kotlin/mu/muse/common/exceptions.kt similarity index 87% rename from server/app/src/main/kotlin/mu/muse/usecase/exceptions.kt rename to server/app/src/main/kotlin/mu/muse/common/exceptions.kt index 9e480a9b..76778c59 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/exceptions.kt +++ b/server/app/src/main/kotlin/mu/muse/common/exceptions.kt @@ -1,4 +1,4 @@ -package mu.muse.usecase +package mu.muse.common open class ClientException(override val message: String) : RuntimeException(message) open class ServerException(override val message: String) : RuntimeException(message) diff --git a/server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt b/server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt index 2f2b8784..2cede00d 100644 --- a/server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt +++ b/server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt @@ -2,8 +2,8 @@ package mu.muse.rest import mu.muse.rest.dto.ClientError import mu.muse.rest.dto.ServerError -import mu.muse.usecase.ClientException -import mu.muse.usecase.ServerException +import mu.muse.common.ClientException +import mu.muse.common.ServerException import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.http.ResponseEntity @@ -23,8 +23,8 @@ class GlobalErrorHandler { return ResponseEntity.badRequest().body( ClientError( message = e.message, - cause = e.cause?.message - ) + cause = e.cause?.message, + ), ) } @@ -35,7 +35,7 @@ class GlobalErrorHandler { ServerError( message = e.message, cause = e.cause?.message, - ) + ), ) } @@ -45,7 +45,8 @@ class GlobalErrorHandler { return ResponseEntity.internalServerError().body( ServerError( message = e.message, - ) + cause = e.cause?.message, + ), ) } } diff --git a/server/app/src/main/kotlin/mu/muse/rest/favorite/AddFavoriteEndpoint.kt b/server/app/src/main/kotlin/mu/muse/rest/favorite/AddFavoriteEndpoint.kt index ed0d3419..bb0a7c72 100644 --- a/server/app/src/main/kotlin/mu/muse/rest/favorite/AddFavoriteEndpoint.kt +++ b/server/app/src/main/kotlin/mu/muse/rest/favorite/AddFavoriteEndpoint.kt @@ -20,7 +20,7 @@ class AddFavoriteEndpoint( val username = Username.from(principal.username) addFavorite.execute( username = username, - instrumentId = instrumentId + instrumentId = instrumentId, ) return ResponseEntity.ok().build() } diff --git a/server/app/src/main/kotlin/mu/muse/rest/favorite/RemoveFavoriteEndpoint.kt b/server/app/src/main/kotlin/mu/muse/rest/favorite/RemoveFavoriteEndpoint.kt index 40b7a883..d4234c62 100644 --- a/server/app/src/main/kotlin/mu/muse/rest/favorite/RemoveFavoriteEndpoint.kt +++ b/server/app/src/main/kotlin/mu/muse/rest/favorite/RemoveFavoriteEndpoint.kt @@ -20,7 +20,7 @@ class RemoveFavoriteEndpoint( val username = Username.from(principal.username) removeFavorite.execute( username = username, - instrumentId = instrumentId + instrumentId = instrumentId, ) return ResponseEntity.ok().build() } diff --git a/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt b/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt index d12cf09d..b80acc9f 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt +++ b/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt @@ -1,5 +1,6 @@ package mu.muse.usecase +import mu.muse.common.ServerException import mu.muse.common.types.BusinessError import mu.muse.domain.instrument.InstrumentId import mu.muse.domain.user.Username diff --git a/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt b/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt index 7f1b327f..cfe5ac00 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt +++ b/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt @@ -1,5 +1,6 @@ package mu.muse.usecase +import mu.muse.common.ServerException import mu.muse.common.types.BusinessError import mu.muse.domain.user.Password import mu.muse.domain.user.Username diff --git a/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt b/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt index 05580664..fc3cbcf8 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt +++ b/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt @@ -1,5 +1,6 @@ package mu.muse.usecase +import mu.muse.common.ServerException import mu.muse.common.types.BusinessError import mu.muse.domain.instrument.Instrument import mu.muse.domain.user.Username diff --git a/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt b/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt index 6c78f345..dfa97c4c 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt +++ b/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt @@ -1,5 +1,6 @@ package mu.muse.usecase +import mu.muse.common.ServerException import mu.muse.common.types.BusinessError import mu.muse.domain.user.User import mu.muse.domain.user.Username diff --git a/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt b/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt index a6ab7ab8..1b5a8967 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt +++ b/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt @@ -1,5 +1,6 @@ package mu.muse.usecase +import mu.muse.common.ServerException import mu.muse.common.types.BusinessError import mu.muse.domain.instrument.InstrumentId import mu.muse.domain.user.Username diff --git a/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt b/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt index e8b03e4e..0c207374 100644 --- a/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt +++ b/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt @@ -1,6 +1,6 @@ package mu.muse.usecase.access.instrument -import mu.muse.usecase.ServerException +import mu.muse.common.ServerException import mu.muse.domain.instrument.Country import mu.muse.domain.instrument.Instrument import mu.muse.domain.instrument.InstrumentId