X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FOdds.hs;h=3aef4f1d8503329c06c644c92cd1026649a6fb5b;hb=71e4436c45b1694fbc550d5cfc2a0cde216610f6;hp=c5b5c01454555f826277033cb550112716451a29;hpb=ef96e8bf0cadf5d602022f8c91914d3cabeb35a0;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs index c5b5c01..3aef4f1 100644 --- a/src/TSN/XML/Odds.hs +++ b/src/TSN/XML/Odds.hs @@ -16,7 +16,7 @@ module TSN.XML.Odds ( pickle_message ) where -import Control.Monad ( forM_ ) +import Control.Monad ( forM_, join ) import Data.Tuple.Curry ( uncurryN ) import Database.Groundhog ( (=.), @@ -31,9 +31,9 @@ import Database.Groundhog.TH ( mkPersist ) import Test.Tasty ( TestTree, testGroup ) import Test.Tasty.HUnit ( (@?=), testCase ) +import Text.Read ( readMaybe ) import Text.XML.HXT.Core ( PU, - XmlPickler(..), xp5Tuple, xp6Tuple, xp8Tuple, @@ -51,19 +51,31 @@ import Text.XML.HXT.Core ( import TSN.Codegen ( tsn_codegen_config ) import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) +import TSN.Picklers ( xp_team_id ) import TSN.XmlImport ( XmlImport(..) ) import Xml ( FromXml(..), pickle_unpickle, unpickleable ) +-- | The home/away lines are 'Double's, but the over/under lines are +-- textual. If we want to use one data type for both, we have to go +-- with a String and then attempt to 'read' a 'Double' later when we +-- go to insert the thing. +-- data OddsGameCasinoXml = OddsGameCasinoXml { xml_casino_client_id :: Int, xml_casino_name :: String, - xml_casino_line :: Maybe Double } + xml_casino_line :: Maybe String } deriving (Eq, Show) +-- | Try to get a 'Double' out of the 'xml_casino_line' which is a +-- priori textual (because it might be an over/under line). +-- +home_away_line :: OddsGameCasinoXml -> Maybe Double +home_away_line = join . (fmap readMaybe) . xml_casino_line + -- | The casinos should have their own table, but the lines don't -- belong in that table. (There should be another table joining the -- casinos and the thing the lines are for together.) @@ -91,7 +103,7 @@ instance XmlImport OddsGameCasinoXml data OddsGameHomeTeamXml = OddsGameHomeTeamXml { - xml_home_team_id :: Int, + xml_home_team_id :: String, -- ^ These are three-character IDs. xml_home_rotation_number :: Int, xml_home_abbr :: String, xml_home_team_name :: String, @@ -110,7 +122,7 @@ instance XmlImport OddsGameHomeTeamXml where data OddsGameTeam = OddsGameTeam { - db_team_id :: Int, + db_team_id :: String, -- ^ The home/away team IDs are 3 characters db_abbr :: String, db_team_name :: String } deriving (Eq, Show) @@ -125,7 +137,7 @@ data OddsGame_OddsGameTeam = data OddsGameAwayTeamXml = OddsGameAwayTeamXml { - xml_away_team_id :: Int, + xml_away_team_id :: String, -- ^ These are 3 character IDs. xml_away_rotation_number :: Int, xml_away_abbr :: String, xml_away_team_name :: String, @@ -148,14 +160,20 @@ newtype OddsGameOverUnderXml = -- | This database representation of the casino lines can't be -- constructed from the one in the XML. The casinos within --- Game>HomeTeam, Game>AwayTeam, and Game>Over_Under are all the --- same. We don't need a bajillion different tables to store that -- --- just one tying the casino/game pair to the three lines. +-- Game>HomeTeam, Game>AwayTeam, and Game>Over_Under are all more or +-- less the same. We don't need a bajillion different tables to +-- store that, just one tying the casino/game pair to the three +-- lines. +-- +-- The one small difference between the over/under casinos and the +-- home/away ones is that the home/away lines are all 'Double's, but +-- the over/under lines appear to be textual. +-- data OddsGameLine = OddsGameLine { ogl_odds_games_id :: DefaultKey OddsGame, ogl_odds_casinos_id :: DefaultKey OddsCasino, - ogl_over_under :: Maybe Double, + ogl_over_under :: Maybe String, ogl_away_line :: Maybe Double, ogl_home_line :: Maybe Double } @@ -280,6 +298,9 @@ mkPersist tsn_codegen_config [groundhog| dbName: odds_games_teams constructors: - name: OddsGameTeam + fields: + - name: db_team_id + type: varchar(3) uniques: - name: unique_odds_games_team type: constraint @@ -362,14 +383,18 @@ instance DbImport Message where -- insert, or more likely retrieve the existing, casino a_casino_id <- insert_xml_or_select c + -- Get a Maybe Double instead of the Maybe String that's in there. + let away_line = home_away_line c + -- Unconditionally update that casino's away team line with ours. - update [Ogl_Away_Line =. (xml_casino_line c)] $ -- WHERE + update [Ogl_Away_Line =. away_line] $ -- WHERE Ogl_Odds_Casinos_Id ==. a_casino_id -- Repeat all that for the home team. forM_ (xml_home_casinos $ xml_game_home_team g) $ \c ->do h_casino_id <- insert_xml_or_select c - update [Ogl_Home_Line =. (xml_casino_line c)] $ -- WHERE + let home_line = home_away_line c + update [Ogl_Home_Line =. home_line] $ -- WHERE Ogl_Odds_Casinos_Id ==. h_casino_id return game_id @@ -395,7 +420,7 @@ pickle_casino = xpTriple (xpAttr "ClientID" xpInt) (xpAttr "Name" xpText) - (xpOption xpPrim) -- Double + (xpOption xpText) where from_tuple = uncurryN OddsGameCasinoXml -- Use record wildcards to avoid unused field warnings. @@ -409,7 +434,7 @@ pickle_home_team = xpElem "HomeTeam" $ xpWrap (from_tuple, to_tuple) $ xp5Tuple - (xpElem "HomeTeamID" xpInt) + (xpElem "HomeTeamID" xp_team_id) (xpElem "HomeRotationNumber" xpInt) (xpElem "HomeAbbr" xpText) (xpElem "HomeTeamName" xpText) @@ -430,7 +455,7 @@ pickle_away_team = xpElem "AwayTeam" $ xpWrap (from_tuple, to_tuple) $ xp5Tuple - (xpElem "AwayTeamID" xpInt) + (xpElem "AwayTeamID" xp_team_id) (xpElem "AwayRotationNumber" xpInt) (xpElem "AwayAbbr" xpText) (xpElem "AwayTeamName" xpText) @@ -516,17 +541,39 @@ odds_tests = -- | Warning, succeess of this test does not mean that unpickling -- succeeded. test_pickle_of_unpickle_is_identity :: TestTree -test_pickle_of_unpickle_is_identity = - testCase "pickle composed with unpickle is the identity" $ do - let path = "test/xml/Odds_XML.xml" - (expected, actual) <- pickle_unpickle pickle_message path - actual @?= expected +test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" + [ check "pickle composed with unpickle is the identity" + "test/xml/Odds_XML.xml", + + check "pickle composed with unpickle is the identity (non-int team_id)" + "test/xml/Odds_XML-noninteger-team-id.xml", + + check "pickle composed with unpickle is the identity (positive(+) line)" + "test/xml/Odds_XML-positive-line.xml", + + check "pickle composed with unpickle is the identity (large file)" + "test/xml/Odds_XML-largefile.xml" ] + where + check desc path = testCase desc $ do + (expected, actual) <- pickle_unpickle pickle_message path + actual @?= expected test_unpickle_succeeds :: TestTree -test_unpickle_succeeds = - testCase "unpickling succeeds" $ do - let path = "test/xml/Odds_XML.xml" - actual <- unpickleable path pickle_message - let expected = True - actual @?= expected +test_unpickle_succeeds = testGroup "unpickle tests" + [ check "unpickling succeeds" + "test/xml/Odds_XML.xml", + + check "unpickling succeeds (non-int team_id)" + "test/xml/Odds_XML-noninteger-team-id.xml", + + check "unpickling succeeds (positive(+) line)" + "test/xml/Odds_XML-positive-line.xml", + + check "unpickling succeeds (large file)" + "test/xml/Odds_XML-largefile.xml" ] + where + check desc path = testCase desc $ do + actual <- unpickleable path pickle_message + let expected = True + actual @?= expected