Refactor param handling

BlueBrain · Sep 29, 2023 · 8a3b232 · 8a3b232
1 parent 668d5a2
commit 8a3b232
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala
@@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.routes
 
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.server.{Directive1, MissingQueryParamRejection, Route}
+import akka.http.scaladsl.server.{Directive1, Route}
 import cats.implicits._
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution
 import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder
@@ -19,11 +19,11 @@ import ch.epfl.bluebrain.nexus.delta.sdk.identities.model.Caller
 import ch.epfl.bluebrain.nexus.delta.sdk.implicits._
 import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri
 import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams.OrganizationSearchParams
-import ch.epfl.bluebrain.nexus.delta.sdk.model.search.{PaginationConfig, SearchResults}
 import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchResults._
-import ch.epfl.bluebrain.nexus.delta.sdk.organizations.{OrganizationDeleter, Organizations}
-import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.{Organization, OrganizationRejection}
+import ch.epfl.bluebrain.nexus.delta.sdk.model.search.{PaginationConfig, SearchResults}
 import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.OrganizationRejection._
+import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.{Organization, OrganizationRejection}
+import ch.epfl.bluebrain.nexus.delta.sdk.organizations.{OrganizationDeleter, Organizations}
 import ch.epfl.bluebrain.nexus.delta.sdk.permissions.Permissions._
 import io.circe.Decoder
 import io.circe.generic.extras.Configuration
@@ -117,18 +117,18 @@ final class OrganizationsRoutes(
                   },
                   // Deprecate or delete organization
                   delete {
-                    parameter("rev".as[Int].?, "prune".?(false)) {
-                      case (_, true)          =>
+                    concat(
+                      parameter("prune".requiredValue(true)) { _ =>
                         authorizeFor(id, orgs.delete).apply {
                           emitCE(orgDeleter.delete(id).attemptNarrow[OrganizationRejection])
                         }
-                      case (Some(rev), false) =>
+                      },
+                      parameter("rev".as[Int]) { rev =>
                         authorizeFor(id, orgs.write).apply {
                           emit(organizations.deprecate(id, rev).mapValue(_.metadata))
                         }
-                      case (None, false)      =>
-                        reject(MissingQueryParamRejection("rev"))
-                    }
+                      }
+                    )
                   }
                 )
               }