-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#60 Added invalid value exception handler
- Loading branch information
Showing
10 changed files
with
97 additions
and
65 deletions.
There are no files selected for viewing
21 changes: 21 additions & 0 deletions
21
botalka/src/main/kotlin/ru/vityaman/lms/botalka/api/http/error/DomainExceptionsMapping.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package ru.vityaman.lms.botalka.api.http.error | ||
|
|
||
| import org.springframework.http.ResponseEntity | ||
| import org.springframework.web.bind.annotation.ExceptionHandler | ||
| import org.springframework.web.bind.annotation.RestControllerAdvice | ||
| import ru.vityaman.lms.botalka.api.http.server.GeneralErrorMessage | ||
| import ru.vityaman.lms.botalka.domain.exception.InvalidValueException | ||
|
|
||
| @RestControllerAdvice | ||
| class DomainExceptionsMapping { | ||
| @ExceptionHandler(InvalidValueException::class) | ||
| fun handle(exception: InvalidValueException): ResponseEntity<Any> = | ||
| ResponseEntity.badRequest() | ||
| .body( | ||
| GeneralErrorMessage( | ||
| code = 400, | ||
| status = "Bad Request", | ||
| message = exception.message!!, | ||
| ), | ||
| ) | ||
| } |
51 changes: 51 additions & 0 deletions
51
...lka/src/main/kotlin/ru/vityaman/lms/botalka/api/http/message/WorkspaceMappingToMessage.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package ru.vityaman.lms.botalka.api.http.message | ||
|
|
||
| import ru.vityaman.lms.botalka.api.http.server.WorkspaceCommentMessage | ||
| import ru.vityaman.lms.botalka.api.http.server.WorkspaceEventKindMessage | ||
| import ru.vityaman.lms.botalka.api.http.server.WorkspaceEventMessage | ||
| import ru.vityaman.lms.botalka.api.http.server.WorkspaceFeedbackMessage | ||
| import ru.vityaman.lms.botalka.api.http.server.WorkspaceSubmissionMessage | ||
| import ru.vityaman.lms.botalka.domain.model.Workspace | ||
|
|
||
| private val Workspace.Event.kind | ||
| get() = | ||
| when (this) { | ||
| is Workspace.Comment -> WorkspaceEventKindMessage.COMMENT | ||
| is Workspace.Feedback -> WorkspaceEventKindMessage.FEEDBACK | ||
| is Workspace.Submission -> WorkspaceEventKindMessage.SUBMISSION | ||
| } | ||
|
|
||
| fun Workspace.Comment.toMessage() = | ||
| WorkspaceCommentMessage( | ||
| kind = this.kind, | ||
| id = this.id.number, | ||
| producerId = this.producer.number, | ||
| text = this.text, | ||
| creationMoment = this.creationMoment, | ||
| ) | ||
|
|
||
| fun Workspace.Feedback.toMessage() = | ||
| WorkspaceFeedbackMessage( | ||
| kind = this.kind, | ||
| id = this.id.number, | ||
| producerId = this.producer.number, | ||
| comment = this.comment, | ||
| score = this.score?.value?.toInt(), | ||
| creationMoment = this.creationMoment, | ||
| ) | ||
|
|
||
| fun Workspace.Submission.toMessage() = | ||
| WorkspaceSubmissionMessage( | ||
| kind = this.kind, | ||
| id = this.id.number, | ||
| producerId = this.producer.number, | ||
| note = this.note, | ||
| creationMoment = this.creationMoment, | ||
| ) | ||
|
|
||
| fun Workspace.Event.toMessage(): WorkspaceEventMessage = | ||
| when (this) { | ||
| is Workspace.Comment -> this.toMessage() | ||
| is Workspace.Feedback -> this.toMessage() | ||
| is Workspace.Submission -> this.toMessage() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
botalka/src/main/kotlin/ru/vityaman/lms/botalka/commons/Require.kt
This file was deleted.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
botalka/src/main/kotlin/ru/vityaman/lms/botalka/domain/Require.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package ru.vityaman.lms.botalka.domain | ||
|
|
||
| import ru.vityaman.lms.botalka.domain.exception.InvalidValueException | ||
|
|
||
| fun expect(isValid: Boolean, message: StringBuilder.() -> Unit) { | ||
| if (!isValid) { | ||
| throw InvalidValueException(buildString(message)) | ||
| } | ||
| } | ||
|
|
||
| fun expectId(number: Int) { | ||
| expect(0 < number) { | ||
| append("Unique id must be a positive, got $number") | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
botalka/src/main/kotlin/ru/vityaman/lms/botalka/domain/exception/InvalidValueException.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package ru.vityaman.lms.botalka.domain.exception | ||
|
|
||
| class InvalidValueException(string: String) : | ||
| DomainException(string) |
4 changes: 2 additions & 2 deletions
4
botalka/src/main/kotlin/ru/vityaman/lms/botalka/domain/model/Homework.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
botalka/src/main/kotlin/ru/vityaman/lms/botalka/domain/model/PromotionRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
botalka/src/main/kotlin/ru/vityaman/lms/botalka/domain/model/User.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
botalka/src/main/kotlin/ru/vityaman/lms/botalka/domain/model/Workspace.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters