Switch to pickerWithoutName for ChartSpec.AggregationPeriod

nymanjens · Nov 1, 2024 · 6bba3ea · 6bba3ea
1 parent f006cd0
commit 6bba3ea
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/app/shared/src/main/scala/app/api/Picklers.scala b/app/shared/src/main/scala/app/api/Picklers.scala
@@ -95,9 +95,8 @@ object Picklers extends StandardPicklers {
     }
   }
   implicit val chartSpecAggregationPeriodPickler: Pickler[ChartSpec.AggregationPeriod] =
-    enumPickler(
-      _.getClass.getSimpleName,
-      Seq(ChartSpec.AggregationPeriod.Month, ChartSpec.AggregationPeriod.Year),
+    enumPicklerWithoutName(
+      Seq(ChartSpec.AggregationPeriod.Month, ChartSpec.AggregationPeriod.Year)
     )
 
   override implicit val entityPickler: Pickler[Entity] = compositePickler[Entity]

diff --git a/app/shared/src/main/scala/hydro/api/StandardPicklers.scala b/app/shared/src/main/scala/hydro/api/StandardPicklers.scala
@@ -71,7 +71,29 @@ abstract class StandardPicklers {
         state.pickle(valueToNumber.get(value))
       }
       override def unpickle(implicit state: UnpickleState): T = {
-        valueToNumber.inverse().get(state.unpickle[Int])
+        val intValue = state.unpickle[Int]
+        try {
+          valueToNumber.inverse().get(intValue)
+        } catch {
+          case t: Throwable =>
+            throw new RuntimeException(
+              s"Could not unpickle intValue=$intValue (valueToNumber=$valueToNumber)",
+              t,
+            )
+        }
+      }
+    }
+  }
+
+  def enumPicklerWithoutName[T](values: Seq[T]): Pickler[T] = {
+    val valueToNumber: Map[T, Int] = values.zipWithIndex.toMap
+
+    new Pickler[T] {
+      override def pickle(value: T)(implicit state: PickleState): Unit = {
+        state.pickle(valueToNumber(value))
+      }
+      override def unpickle(implicit state: UnpickleState): T = {
+        values(state.unpickle[Int])
       }
     }
   }