Make constructQuery typesafe (closes #62)

snowplow · Jul 6, 2018 · 9dd2f12 · 9dd2f12
1 parent f45679b
commit 9dd2f12
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/build.sbt b/build.sbt
@@ -37,7 +37,6 @@ lazy val root = project
       Dependencies.Libraries.collUtil,
       Dependencies.Libraries.hammockCore,
       Dependencies.Libraries.hammockCirce,
-      Dependencies.Libraries.circeLiteral,
       Dependencies.Libraries.specs2,
       Dependencies.Libraries.specs2Mock,
       Dependencies.Libraries.specsScalaCheck

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -27,7 +27,6 @@ object Dependencies {
     // Scala
     val collUtil = "6.39.0"
     val hammock  = "0.8.5"
-    val circe    = "0.9.3"
     // Tests
     val specs2   = "3.9.4"
   }
@@ -41,7 +40,6 @@ object Dependencies {
     val hammockCore     = "com.pepegar" %% "hammock-core"      % V.hammock
     val hammockCirce    = "com.pepegar" %% "hammock-circe"     % V.hammock
     // Tests
-    val circeLiteral    = "io.circe"    %% "circe-literal"     % V.circe  % "test"
     val specs2          = "org.specs2"  %% "specs2-core"       % V.specs2 % "test"
     val specs2Mock      = "org.specs2"  %% "specs2-mock"       % V.specs2 % "test"
     val specsScalaCheck = "org.specs2"  %% "specs2-scalacheck" % V.specs2 % "test"

diff --git a/src/main/scala/com.snowplowanalytics/weather/providers/openweather/OwmAsyncClient.scala b/src/main/scala/com.snowplowanalytics/weather/providers/openweather/OwmAsyncClient.scala
@@ -42,20 +42,21 @@ case class OwmAsyncClient[F[_]: Sync](appId: String, apiHost: String = "api.open
 
   def receive[W <: OwmResponse: Decoder](request: OwmRequest): F[Either[WeatherError, W]] = {
 
-    val uri    = request.constructQuery(appId)
-    val scheme = if (ssl) "https://" else "http://"
-    val url    = scheme + apiHost + uri
+    val scheme = if (ssl) "https" else "http"
 
-    Uri
-      .fromString(url)
+    val uriOrError = Uri
+      .fromString(s"$scheme://$apiHost")
+      .map(request.constructQuery(_, appId))
       .leftMap(InternalError)
+
+    uriOrError
       .traverse { uri =>
         Hammock
           .request(Method.GET, uri, Map())
           .map(uri => processResponse(uri))
           .exec[F]
       }
-      .map(x => x.joinRight)
+      .map(_.joinRight)
   }
 
   /**

diff --git a/src/main/scala/com.snowplowanalytics/weather/providers/openweather/Requests.scala b/src/main/scala/com.snowplowanalytics/weather/providers/openweather/Requests.scala
@@ -12,29 +12,28 @@
  */
 package com.snowplowanalytics.weather.providers.openweather
 
+import cats.data.NonEmptyList
+import hammock.Uri
+
 private[weather] object Requests {
 
   sealed trait WeatherRequest {
-    def constructQuery(appId: String): String
+    def constructQuery(baseUri: Uri, apiKey: String): Uri
   }
 
   sealed trait OwmRequest extends WeatherRequest {
     val endpoint: Option[String]
     val resource: String
     val parameters: Map[String, String]
 
-    /**
-     * Construct URI for specific type of request and all other data
-     *
-     * @param appId API key
-     * @return URI string ready to be sent
-     */
-    def constructQuery(appId: String): String = {
-      val end         = endpoint.map(e => s"$e/$resource").getOrElse(s"$resource")
-      val params      = parameters ++ Map("appid" -> appId)
-      val queryString = params.map { case (a, b) => s"$a=$b" }.mkString("&")
-      s"/data/2.5/$end?$queryString"
+    def constructQuery(baseUri: Uri, apiKey: String): Uri = {
+      val versionedBaseUri = baseUri / "data" / "2.5"
+      val uriWithPath      = endpoint.map(e => versionedBaseUri / e / resource).getOrElse(versionedBaseUri / resource)
+      val params           = NonEmptyList.of("appid" -> apiKey) ++ parameters.toList
+
+      uriWithPath ? params
     }
+
   }
 
   final case class OwmHistoryRequest(resource: String, parameters: Map[String, String]) extends OwmRequest {