Rename query param to analysisType to fit keen terms, fixing #6

keenlabs · Feb 5, 2014 · 78377ef · 78377ef
1 parent 1420a61
commit 78377ef
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/scala/io/keen/client/scala/Client.scala b/src/main/scala/io/keen/client/scala/Client.scala
@@ -61,7 +61,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = 
 
     doQuery(
-      query = "average",
+      analysisType = "average",
       collection = collection,
       targetProperty = Some(targetProperty),
       filters = filters,
@@ -84,7 +84,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = {
 
     doQuery(
-      query = "count",
+      analysisType = "count",
       collection = collection,
       targetProperty = None,
       filters = filters,
@@ -112,7 +112,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = {
 
     doQuery(
-      query = "count",
+      analysisType = "count",
       collection = collection,
       targetProperty = Some(targetProperty),
       filters = filters,
@@ -140,7 +140,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = 
 
     doQuery(
-      query = "maximum",
+      analysisType = "maximum",
       collection = collection,
       targetProperty = Some(targetProperty),
       filters = filters,
@@ -167,7 +167,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = 
 
     doQuery(
-      query = "minimum",
+      analysisType = "minimum",
       collection = collection,
       targetProperty = Some(targetProperty),
       filters = filters,
@@ -194,7 +194,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = {
 
     doQuery(
-      query = "select_unique",
+      analysisType = "select_unique",
       collection = collection,
       targetProperty = Some(targetProperty),
       filters = filters,
@@ -222,7 +222,7 @@ class Client(
     groupBy: Option[String]= None): Future[Response] = 
 
     doQuery(
-      query = "sum",
+      analysisType = "sum",
       collection = collection,
       targetProperty = Some(targetProperty),
       filters = filters,
@@ -305,15 +305,15 @@ class Client(
   }
 
   private def doQuery(
-    query: String,
+    analysisType: String,
     collection: String,
     targetProperty: Option[String],
     filters: Option[String] = None,
     timeframe: Option[String] = None,
     timezone: Option[String] = None,
     groupBy: Option[String]= None): Future[Response] = {
 
-    val req = (url(apiURL) / version / "projects" / projectId / "queries" / query).secure
+    val req = (url(apiURL) / version / "projects" / projectId / "queries" / analysisType).secure
       .addQueryParameter("event_collection", collection)
 
     val paramNames = List("target_property", "filters", "timeframe", "timezone", "group_by")