fingerprint/mtlstats
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed (redundant) gsGoalsAgainst

Browse Source
This commit is contained in:
Jonathan Lamothe 2019-10-19 00:58:41 -04:00
parent 6b30e27836
commit a234d8e802
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mtlstats/Types.hs
View File

@ -94,7 +94,6 @@ module Mtlstats.Types (
gsGames, gsGames,
gsMinsPlayed, gsMinsPlayed,
gsGoalsAllowed, gsGoalsAllowed,
gsGoalsAgainst,
gsWins, gsWins,
gsLosses, gsLosses,
gsTies, gsTies,
@ -396,8 +395,6 @@ data GoalieStats = GoalieStats
-- ^ The number of minutes played -- ^ The number of minutes played
, _gsGoalsAllowed :: Int , _gsGoalsAllowed :: Int
-- ^ The number of goals allowed -- ^ The number of goals allowed
, _gsGoalsAgainst :: Int
-- ^ The number of goals against
, _gsWins :: Int , _gsWins :: Int
-- ^ The number of wins -- ^ The number of wins
, _gsLosses :: Int , _gsLosses :: Int
@ -411,28 +408,25 @@ instance FromJSON GoalieStats where
<$> v .: "games" <$> v .: "games"
<*> v .: "mins_played" <*> v .: "mins_played"
<*> v .: "goals_allowed" <*> v .: "goals_allowed"
<*> v .: "goals_against"
<*> v .: "wins" <*> v .: "wins"
<*> v .: "losses" <*> v .: "losses"
<*> v .: "ties" <*> v .: "ties"
instance ToJSON GoalieStats where instance ToJSON GoalieStats where
toJSON (GoalieStats g m al ag w l t) = object toJSON (GoalieStats g m a w l t) = object
[ "games" .= g [ "games" .= g
, "mins_played" .= m , "mins_played" .= m
, "goals_allowed" .= al , "goals_allowed" .= a
, "goals_against" .= ag
, "wins" .= w , "wins" .= w
, "losses" .= l , "losses" .= l
, "ties" .= t , "ties" .= t
] ]
toEncoding (GoalieStats g m al ag w l t) = pairs $ toEncoding (GoalieStats g m a w l t) = pairs $
"games" .= g <> "games" .= g <>
"mins_played" .= m <> "mins_played" .= m <>
"goals_allowed" .= al <> "goals_allowed" .= a <>
"goals_against" .= ag <> "wins" .= w <>
"wins" .= w <> "losses" .= l <>
"losses" .= l <>
"ties" .= t "ties" .= t
-- | Game statistics -- | Game statistics
@ -603,7 +597,6 @@ newGoalieStats = GoalieStats
{ _gsGames = 0 { _gsGames = 0
, _gsMinsPlayed = 0 , _gsMinsPlayed = 0
, _gsGoalsAllowed = 0 , _gsGoalsAllowed = 0
, _gsGoalsAgainst = 0
, _gsWins = 0 , _gsWins = 0
, _gsLosses = 0 , _gsLosses = 0
, _gsTies = 0 , _gsTies = 0

3
test/ActionsSpec.hs
View File

@ -117,14 +117,12 @@ resetYtdSpec = describe "resetYtd" $
ytd ^. gsGames `shouldBe` 0 ytd ^. gsGames `shouldBe` 0
ytd ^. gsMinsPlayed `shouldBe` 0 ytd ^. gsMinsPlayed `shouldBe` 0
ytd ^. gsGoalsAllowed `shouldBe` 0 ytd ^. gsGoalsAllowed `shouldBe` 0
ytd ^. gsGoalsAgainst `shouldBe` 0
ytd ^. gsWins `shouldBe` 0 ytd ^. gsWins `shouldBe` 0
ytd ^. gsLosses `shouldBe` 0 ytd ^. gsLosses `shouldBe` 0
ytd ^. gsTies `shouldBe` 0 ytd ^. gsTies `shouldBe` 0
lt ^. gsGames `shouldNotBe` 0 lt ^. gsGames `shouldNotBe` 0
lt ^. gsMinsPlayed `shouldNotBe` 0 lt ^. gsMinsPlayed `shouldNotBe` 0
lt ^. gsGoalsAllowed `shouldNotBe` 0 lt ^. gsGoalsAllowed `shouldNotBe` 0
lt ^. gsGoalsAgainst `shouldNotBe` 0
lt ^. gsWins `shouldNotBe` 0 lt ^. gsWins `shouldNotBe` 0
lt ^. gsLosses `shouldNotBe` 0 lt ^. gsLosses `shouldNotBe` 0
lt ^. gsTies `shouldNotBe` 0) $ lt ^. gsTies `shouldNotBe` 0) $
@ -647,7 +645,6 @@ makeGoalieStats = GoalieStats
<*> makeNum <*> makeNum
<*> makeNum <*> makeNum
<*> makeNum <*> makeNum
<*> makeNum
makeNum :: IO Int makeNum :: IO Int
makeNum = randomRIO (1, 10) makeNum = randomRIO (1, 10)

14
test/TypesSpec.hs
View File

@ -241,20 +241,18 @@ goalieStats n = newGoalieStats
& gsGames .~ n & gsGames .~ n
& gsMinsPlayed .~ n + 1 & gsMinsPlayed .~ n + 1
& gsGoalsAllowed .~ n + 2 & gsGoalsAllowed .~ n + 2
& gsGoalsAgainst .~ n + 3 & gsWins .~ n + 3
& gsWins .~ n + 4 & gsLosses .~ n + 4
& gsLosses .~ n + 5 & gsTies .~ n + 5
& gsTies .~ n + 6
goalieStatsJSON :: Int -> Value goalieStatsJSON :: Int -> Value
goalieStatsJSON n = Object $ HM.fromList goalieStatsJSON n = Object $ HM.fromList
[ ( "games", toJSON n ) [ ( "games", toJSON n )
, ( "mins_played", toJSON $ n + 1 ) , ( "mins_played", toJSON $ n + 1 )
, ( "goals_allowed", toJSON $ n + 2 ) , ( "goals_allowed", toJSON $ n + 2 )
, ( "goals_against", toJSON $ n + 3 ) , ( "wins", toJSON $ n + 3 )
, ( "wins", toJSON $ n + 4 ) , ( "losses", toJSON $ n + 4 )
, ( "losses", toJSON $ n + 5 ) , ( "ties", toJSON $ n + 5 )
, ( "ties", toJSON $ n + 6 )
] ]
gameStats :: Int -> GameStats gameStats :: Int -> GameStats