YAGNI cleanup, corrected route

Fixes #6 Fixes #22
journeymonitor · Jan 21, 2016 · 1b7236d · 1b7236d
1 parent c30cc64
commit 1b7236d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 32 deletions.
diff --git a/api/app/controllers/Statistics.scala b/api/app/controllers/Statistics.scala
@@ -17,12 +17,7 @@ class Statistics(statisticsRepository: Repository[StatisticsModel, String]) exte
   )(unlift(StatisticsModel.unapply))
 
   def show(testcaseId: String, n: Int) = Action {
-    if (n == 1) {
-      Ok(Json.toJson(List(statisticsRepository.getOneById(testcaseId))))
-    } else {
-      Ok(Json.toJson(statisticsRepository.getNById(testcaseId, n)))
-    }
-
+    Ok(Json.toJson(statisticsRepository.getNById(testcaseId, n)))
   }
 
 }
diff --git a/api/app/repositories/CassandraRepository.scala b/api/app/repositories/CassandraRepository.scala
@@ -10,18 +10,6 @@ abstract class CassandraRepository[M <: Model, I](session: Session, tablename: S
   extends Repository[M, I] {
   def rowToModel(row: Row): M
 
-  def getOneRowBySinglePartitionKeyValue(partitionKeyValue: I): Row = {
-    val selectStmt =
-      select()
-        .from(tablename)
-        .where(QueryBuilder.eq(partitionKeyName, partitionKeyValue))
-        .limit(1)
-
-    val resultSet = session.execute(selectStmt)
-    val row = resultSet.one()
-    row
-  }
-
   def getNBySinglePartitionKeyValue(partitionKeyValue: I, n: Int): ResultSet = {
     val selectStmt =
       select()
@@ -32,11 +20,6 @@ abstract class CassandraRepository[M <: Model, I](session: Session, tablename: S
     session.execute(selectStmt)
   }
 
-  override def getOneById(id: I): M = {
-    val row = getOneRowBySinglePartitionKeyValue(id)
-    rowToModel(row)
-  }
-
   override def getNById(id: I, n: Int): List[M] = {
     val rows = getNBySinglePartitionKeyValue(id, n).all().toList
     rows.map(row => rowToModel(row))

diff --git a/api/app/repositories/Repository.scala b/api/app/repositories/Repository.scala
@@ -3,6 +3,5 @@ package repositories
 import models.Model
 
 abstract trait Repository[M <: Model, I] {
-  def getOneById(id: I): M
   def getNById(id: I, n: Int): List[M]
 }
diff --git a/api/conf/routes b/api/conf/routes
@@ -9,4 +9,4 @@ GET     /                           controllers.Application.index
 GET     /assets/*file               controllers.Assets.versioned(path="/public", file: Asset)
 
 # REST API
-GET     /testresults/:testcaseId/statistics/latest/    controllers.Statistics.show(testcaseId: String, n: Int ?= 1)
+GET     /testcases/:testcaseId/statistics/latest/    controllers.Statistics.show(testcaseId: String, n: Int ?= 1)
diff --git a/api/test/ApplicationSpec.scala b/api/test/ApplicationSpec.scala
@@ -10,10 +10,6 @@ import play.api.{ApplicationLoader, Environment, Mode}
 import repositories.Repository
 
 class MockStatisticsRepository extends Repository[StatisticsModel, String] {
-  override def getOneById(id: String): StatisticsModel = {
-    StatisticsModel("mocked-testresult-" + id, 987, 123, 456, 789)
-  }
-
   override def getNById(id: String, n: Int): List[StatisticsModel] = {
     List(
       StatisticsModel("mocked-testresult-" + id, 987, 123, 456, 789)
@@ -61,7 +57,7 @@ class ApplicationSpec extends PlaySpec with OneAppPerSuite {
     }
 
     "return a JSON array with the latest statistics entry for a given testcase id" in {
-      val Some(response) = route(FakeRequest(GET, "/testresults/abcd/statistics/latest/?n=1"))
+      val Some(response) = route(FakeRequest(GET, "/testcases/abcd/statistics/latest/?n=1"))
 
       status(response) mustBe OK
       contentType(response) mustBe Some("application/json")

diff --git a/api/test/IntegrationSpec.scala b/api/test/IntegrationSpec.scala
@@ -69,7 +69,7 @@ class IntegrationSpec extends PlaySpec with OneBrowserPerSuite with OneServerPer
     }
 
     "return a JSON array with the latest statistics entry for a given testcase id" in {
-      go to "http://localhost:" + port + "/testresults/testcase1/statistics/latest/?n=1"
+      go to "http://localhost:" + port + "/testcases/testcase1/statistics/latest/?n=1"
       pageSource mustBe
         """
           |[
@@ -85,7 +85,7 @@ class IntegrationSpec extends PlaySpec with OneBrowserPerSuite with OneServerPer
     }
 
     "return a JSON array with the latest N statistics entries for a given testcase id" in {
-      go to "http://localhost:" + port + "/testresults/testcase1/statistics/latest/?n=2"
+      go to "http://localhost:" + port + "/testcases/testcase1/statistics/latest/?n=2"
       pageSource mustBe
         """
           |[