Route: Do not add ampersand if optional parameter is None

sparsetech · Jul 8, 2019 · 03ad4bd · 03ad4bd
1 parent 89f7b4a
commit 03ad4bd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/shared/src/main/scala/trail/Route.scala b/shared/src/main/scala/trail/Route.scala
@@ -138,11 +138,12 @@ object Route {
   case class ParamRoute[A, P](route: Route[A], param: Param[P]) extends Route[(A, P)] {
     override def url(value: (A, P)): String = {
       val base = route.url(value._1)
-      val encodedParam =
-        param.codec.encode(value._2).map(v => param.name + "=" + URI.encode(v))
-          .getOrElse("")
-      val delimiter = if (base.contains("?")) "&" else "?"
-      base + delimiter + encodedParam
+      param.codec.encode(value._2)
+        .map(v => param.name + "=" + URI.encode(v))
+        .fold(base) { encodedParam =>
+          val delimiter = if (base.contains("?")) "&" else "?"
+          base + delimiter + encodedParam
+        }
     }
     override def parseInternal(path: Path): Option[((A, P), Path)] =
       for {

diff --git a/shared/src/test/scala/trail/UrlTests.scala b/shared/src/test/scala/trail/UrlTests.scala
@@ -132,4 +132,11 @@ class UrlTests2 extends FunSpec with Matchers {
 
     assert(url == "/list?upload=true")
   }
+
+  it("url() should work with optional parameter set to None") {
+    val route = Root / "disk" / "view" & Param[Long]("disk") & Param[Option[Long]]("folder")
+    val url   = route((48L, None))
+
+    assert(url == "/disk/view?disk=48")
+  }
 }