Skip to content

fix conflict variant for ApiErrors #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fupelaqu merged 1 commit into from
Apr 19, 2026
Merged

fix conflict variant for ApiErrors #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ThisBuild / organization := "app.softnetwork"

name := "generic-persistence-api"

ThisBuild / version := "0.8.2"
ThisBuild / version := "0.8.3"

lazy val moduleSettings = Seq(
crossScalaVersions := Seq(scala212, scala213),
Expand Down
14 changes: 14 additions & 0 deletions server/src/main/scala/app/softnetwork/api/server/ApiErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ object ApiErrors extends SchemaDerivation with TapirJson4s {
.and(header[ApiErrors.Found](HeaderNames.Location).description("Redirect address"))
)

val conflictVariant: EndpointOutput.OneOfVariant[ApiErrors.Conflict] =
oneOfVariant(
statusCode(StatusCode.Conflict)
.and(jsonBody[ApiErrors.Conflict].description("Conflict"))
)

val badRequestVariant: EndpointOutput.OneOfVariant[ApiErrors.BadRequest] =
oneOfVariant(
statusCode(StatusCode.BadRequest)
Expand Down Expand Up @@ -168,6 +174,7 @@ object ApiErrors extends SchemaDerivation with TapirJson4s {
unauthorizedWithChallengeVariant,
notFoundVariant,
foundVariant,
conflictVariant,
badRequestVariant,
internalServerErrorVariant,
// default case below.
Expand Down Expand Up @@ -206,6 +213,12 @@ object ApiErrors extends SchemaDerivation with TapirJson4s {
) { case Left(ApiErrors.Found(_)) =>
true
},
oneOfVariantValueMatcher(
StatusCode.Conflict,
jsonBody[Left[ApiErrors.Conflict, T]].description("Conflict")
) { case Left(ApiErrors.Conflict(_)) =>
true
},
oneOfVariantValueMatcher(
StatusCode.BadRequest,
jsonBody[Left[ApiErrors.BadRequest, T]].description("Bad request")
Expand Down Expand Up @@ -254,6 +267,7 @@ object ApiErrors extends SchemaDerivation with TapirJson4s {
unauthorizedWithChallengeVariant,
notFoundVariant,
foundVariant,
conflictVariant,
badRequestVariant,
internalServerErrorVariant,
defaultErrorVariant
Expand Down
Loading