Fix issue #257

http4s · Oct 9, 2018 · adb9bb2 · adb9bb2
1 parent d49234f
commit adb9bb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/swagger/src/main/scala/org/http4s/rho/swagger/SwaggerModelsBuilder.scala b/swagger/src/main/scala/org/http4s/rho/swagger/SwaggerModelsBuilder.scala
@@ -346,7 +346,8 @@ private[swagger] class SwaggerModelsBuilder(formats: SwaggerFormats) {
   def mkQueryParam[F[_]](rule: QueryMetaData[F, _]): Parameter = {
     val required = !(rule.m.tpe.isOption || rule.default.isDefined)
 
-    TypeBuilder.DataType(rule.m.tpe) match {
+    val tpe = if(rule.m.tpe.isOption) rule.m.tpe.typeArgs.head else rule.m.tpe
+    TypeBuilder.DataType(tpe) match {
       case TypeBuilder.DataType.ComplexDataType(nm, _) =>
         QueryParameter(
           `type`       = nm.some,

diff --git a/swagger/src/test/scala/org/http4s/rho/swagger/SwaggerModelsBuilderSpec.scala b/swagger/src/test/scala/org/http4s/rho/swagger/SwaggerModelsBuilderSpec.scala
@@ -88,6 +88,17 @@ class SwaggerModelsBuilderSpec extends Specification {
       List(QueryParameter(`type` = "string".some, name = "name".some, required = false))
     }
 
+    "handle an action with one optional seq query parameter" in {
+      val ra = fooPath +? param[Option[Seq[String]]]("name") |>> { (s: Option[Seq[String]]) => "" }
+
+      sb.collectQueryParams[IO](ra) must_==
+        List(
+          QueryParameter(`type` = None, name = "name".some,
+            items = Some(AbstractProperty(`type` = "string")),
+            defaultValue = None, isArray = true, required = false)
+        )
+    }
+
     "handle an action with one query parameter with default value" in {
       val ra = fooPath +? param[Int]("id", 6) |>> { (i: Int) => "" }