remove unused matchesPlayed field

bytes-zone · Sep 15, 2020 · 0fa336e · 0fa336e
1 parent 8bd8c0e
commit 0fa336e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 43 deletions.
diff --git a/src/League.elm b/src/League.elm
@@ -25,7 +25,6 @@ import Random exposing (Generator)
 type League
     = League
         { players : Dict String Player
-        , matchesPlayed : Int
         , currentMatch : Maybe Match
         }
 
@@ -42,46 +41,25 @@ init : League
 init =
     League
         { players = Dict.empty
-        , matchesPlayed = 0
         , currentMatch = Nothing
         }
 
 
 decoder : Decoder League
 decoder =
-    Decode.oneOf
-        [ Decode.map2
-            (\newPlayers matchesPlayed ->
-                League
-                    { players = newPlayers
-                    , matchesPlayed = matchesPlayed
-                    , currentMatch = Nothing
-                    }
-            )
-            playersDecoder
-            (Decode.field "matchesPlayed" Decode.int)
-        , -- old formats
-          Decode.map
-            (\newPlayers ->
-                League
-                    { players = newPlayers
-                    , matchesPlayed =
-                        newPlayers
-                            |> Dict.values
-                            |> List.map .matches
-                            |> List.maximum
-                            |> Maybe.withDefault 0
-                    , currentMatch = Nothing
-                    }
-            )
-            (Decode.oneOf
-                [ -- old format:  : missing matches played
-                  playersDecoder
-                , -- old format: only players as a dict
-                  Decode.dict Player.decoder
-                ]
-            )
-        ]
+    Decode.map
+        (\newPlayers ->
+            League
+                { players = newPlayers
+                , currentMatch = Nothing
+                }
+        )
+        (Decode.oneOf
+            [ playersDecoder
+            , -- old format: only players as a dict
+              Decode.dict Player.decoder
+            ]
+        )
 
 
 playersDecoder : Decoder (Dict String Player)
@@ -95,7 +73,6 @@ encode : League -> Encode.Value
 encode (League league) =
     Encode.object
         [ ( "players", Encode.list Player.encode (Dict.values league.players) )
-        , ( "matchesPlayed", Encode.int league.matchesPlayed )
         ]
 
 

diff --git a/tests/LeagueTest.elm b/tests/LeagueTest.elm
@@ -36,13 +36,6 @@ decoderTests =
                 League.encode league
                     |> Decode.decodeValue League.decoder
                     |> Expect.equal (Ok league)
-        , fuzz leagueFuzzer "is backwards-compatible with the missing matches-played format" <|
-            \league ->
-                Encode.object [ ( "players", Encode.list Player.encode (League.players league) ) ]
-                    |> Decode.decodeValue League.decoder
-                    -- matches played will change with this. That's fine.
-                    |> Result.map League.players
-                    |> Expect.equal (Ok (League.players league))
         , fuzz leagueFuzzer "is backwards-compatible with the older dictionary format" <|
             \league ->
                 League.players league