refactor and rename

yovae · Nov 28, 2015 · 93952cf · 93952cf
1 parent eb657cd
commit 93952cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/modules/insight/src/main/AggregationPipeline.scala b/modules/insight/src/main/AggregationPipeline.scala
@@ -18,6 +18,11 @@ private final class AggregationPipeline {
     "v" -> f,
     "nb" -> SumValue(1)
   ).some
+  private val regroupStacked = GroupField("_id.dimension")(
+    "nb" -> SumField("v"),
+    "stack" -> PushMulti(
+      "metric" -> "_id.metric",
+      "v" -> "v")).some
 
   def apply(question: Question[_], userId: String): NonEmptyList[PipelineOperator] = {
     import question.{ dimension, metric }
@@ -60,23 +65,15 @@ private final class AggregationPipeline {
           GroupMulti("dimension" -> dimension.dbKey, "metric" -> "result")(
             "v" -> SumValue(1)
           ).some,
-          GroupField("_id.dimension")(
-            "nb" -> SumField("v"),
-            "stack" -> PushMulti(
-              "metric" -> "_id.metric",
-              "v" -> "v")).some
+          regroupStacked
         )
         case M.PieceRole => List(
           unwindMoves,
           moveMatcher,
           GroupMulti("dimension" -> dimension.dbKey, "metric" -> "moves.r")(
             "v" -> SumValue(1)
           ).some,
-          GroupField("_id.dimension")(
-            "nb" -> SumField("v"),
-            "stack" -> PushMulti(
-              "metric" -> "_id.metric",
-              "v" -> "v")).some
+          regroupStacked
         )
       }) ::: (dimension match {
         case D.Opening => List(sortNb, limit(12))

diff --git a/modules/insight/src/main/Metric.scala b/modules/insight/src/main/Metric.scala
@@ -24,7 +24,7 @@ object Metric {
   import DataType._
   import Position._
 
-  case object MeanCpl extends Metric("meanCpl", "Mean CPL", Move, Average)
+  case object MeanCpl extends Metric("meanCpl", "Average centipawn loss", Move, Average)
 
   case object Movetime extends Metric("movetime", "Move time", Move, Seconds)