Parcourir la source

Write stat data as it is instead of some clever tricks

theenglishway (time) il y a 2 ans
Parent
commit
fa742ca06e
2 fichiers modifiés avec 5 ajouts et 29 suppressions
  1. 4 8
      src/main/scala/Extract.scala
  2. 1 21
      src/main/scala/Games.scala

+ 4 - 8
src/main/scala/Extract.scala

@@ -41,14 +41,10 @@ object Extract {
   }
 
   def getStats(local: os.Path, gameIds: List[Int]) = {
-    if (!os.exists(local)) {
-      val data = EndpointResponse.getStats(gameIds)
-      Utils.writeToFile(PlayerGameStats.as_json_value(data), local)
-
-      data
-    } else {
-      println(s"file $local already exists, reading back from it")
-      Utils.readFromFile[List[PlayerGameStats]](local)
+    def getData() = {
+      EndpointResponse.getStats(gameIds)
     }
+
+    writeOrReadBack(local, getData)
   }
 }

+ 1 - 21
src/main/scala/Games.scala

@@ -66,29 +66,9 @@ case class PlayerGameStats(
     player: Player,
     team: Map[String, String],
     game: Map[String, String]
-) {
-  val gameId = game("id").toInt
-  val teamId = team("id").toInt
-
-  def as_json_value(): ujson.Value = {
-    val value = upickle.default.writeJs[PlayerGameStats](this)
-    value.obj.put("game_id", gameId)
-    value.obj.put("team_id", teamId)
-    value.obj.put("player_id", player.id)
-    value.obj.put("player_first_name", player.first_name)
-    value.obj.put("player_last_name", player.last_name)
-    value.obj.put("player_position", player.position)
-    value.obj.put("player_team_id", player.team_id)
-
-    value
-  }
-}
+)
 
 object PlayerGameStats {
   implicit val playerGameStatsRW: ReadWriter[PlayerGameStats] =
     macroRW[PlayerGameStats]
-
-  def as_json_value(stats_list: List[PlayerGameStats]): ujson.Value = {
-    upickle.default.writeJs(stats_list.map(_.as_json_value()))
-  }
 }