Partition key name now parameterized in CassandraRepository, fixes #19

journeymonitor · Jan 12, 2016 · 620d709 · 620d709
1 parent a88185c
commit 620d709
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/api/app/repositories/CassandraRepository.scala b/api/app/repositories/CassandraRepository.scala
@@ -5,14 +5,15 @@ import com.datastax.driver.core.querybuilder.QueryBuilder._
 import com.datastax.driver.core.{Row, Session}
 import models.Model
 
-abstract class CassandraRepository[M <: Model, I](session: Session, tablename: String) extends Repository[M, I] {
+abstract class CassandraRepository[M <: Model, I](session: Session, tablename: String, partitionKeyName: String)
+  extends Repository[M, I] {
   def rowToModel(row: Row): M
 
-  def getOneRowById(id: I): Row = {
+  def getOneRowBySinglePartitionKeyId(partitionKeyValue: I): Row = {
     val selectStmt =
       select()
         .from(tablename)
-        .where(QueryBuilder.eq("testcase_id", id))
+        .where(QueryBuilder.eq(partitionKeyName, partitionKeyValue))
         .limit(1)
 
     val resultSet = session.execute(selectStmt)
@@ -21,7 +22,7 @@ abstract class CassandraRepository[M <: Model, I](session: Session, tablename: S
   }
 
   override def getOneById(id: I): M = {
-    val row = getOneRowById(id)
+    val row = getOneRowBySinglePartitionKeyId(id)
     rowToModel(row)
   }
 }
diff --git a/api/app/repositories/StatisticsRepository.scala b/api/app/repositories/StatisticsRepository.scala
@@ -3,7 +3,8 @@ package repositories
 import com.datastax.driver.core.{Row, Session}
 import models.Statistics
 
-class StatisticsRepository(session: Session) extends CassandraRepository[Statistics, String](session, "statistics") {
+class StatisticsRepository(session: Session)
+  extends CassandraRepository[Statistics, String](session, "statistics", "testcase_id") {
   override def rowToModel(row: Row): Statistics = {
     Statistics(row.getString("testresult_id"), row.getInt("number_of_200"))
   }