From 1fd949aaaa0798f2e01d649711a4148e31275327 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 1 Jul 2014 10:31:06 -0400 Subject: [PATCH] Add League_Name, AStarter, and HStarter support to Odds. Add another test case for Odds. Rename a few columns (dropping the "game" prefix) in the Odds tables. --- src/TSN/XML/Odds.hs | 143 ++++++++++++++++++++---------- test/shell/import-duplicates.test | 6 +- test/xml/Odds_XML-league-name.xml | 1 + 3 files changed, 101 insertions(+), 49 deletions(-) create mode 100644 test/xml/Odds_XML-league-name.xml diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs index b76be76..8061a3e 100644 --- a/src/TSN/XML/Odds.hs +++ b/src/TSN/XML/Odds.hs @@ -48,7 +48,6 @@ import Test.Tasty.HUnit ( (@?=), testCase ) import Text.Read ( readMaybe ) import Text.XML.HXT.Core ( PU, - xp5Tuple, xp6Tuple, xp8Tuple, xpAttr, @@ -153,6 +152,10 @@ instance XmlImport OddsGameCasinoXml -- This is basically the same as 'OddsGameAwayTeamXml', but the two -- types have different picklers. -- +-- The starter id/name could perhaps be combined into an embedded +-- type, but can you make an entire embedded type optional with +-- Maybe? I doubt it works. +-- data OddsGameHomeTeamXml = OddsGameHomeTeamXml { xml_home_team_id :: String, -- ^ The home/away team IDs @@ -163,10 +166,11 @@ data OddsGameHomeTeamXml = -- so we ignore the probable -- upper bound of three -- characters. - xml_home_rotation_number :: Int, - xml_home_abbr :: String, - xml_home_team_name :: String, - xml_home_casinos :: [OddsGameCasinoXml] } + xml_home_team_rotation_number :: Int, + xml_home_team_abbr :: String, + xml_home_team_name :: String, + xml_home_team_starter :: Maybe (Int, String), -- ^ (id, name) + xml_home_team_casinos :: [OddsGameCasinoXml] } deriving (Eq, Show) instance ToDb OddsGameHomeTeamXml where @@ -183,7 +187,7 @@ instance FromXml OddsGameHomeTeamXml where from_xml OddsGameHomeTeamXml{..} = Team { team_id = xml_home_team_id, - team_abbreviation = Just xml_home_abbr, + team_abbreviation = Just xml_home_team_abbr, team_name = Just xml_home_team_name } -- | This allows us to insert the XML representation @@ -205,10 +209,11 @@ data OddsGameAwayTeamXml = -- on lengthless text fields, so -- we ignore the probable upper -- bound of three characters - xml_away_rotation_number :: Int, - xml_away_abbr :: String, - xml_away_team_name :: String, - xml_away_casinos :: [OddsGameCasinoXml] } + xml_away_team_rotation_number :: Int, + xml_away_team_abbr :: String, + xml_away_team_name :: String, + xml_away_team_starter :: Maybe (Int, String), -- ^ (id, name) + xml_away_team_casinos :: [OddsGameCasinoXml] } deriving (Eq, Show) instance ToDb OddsGameAwayTeamXml where @@ -224,7 +229,7 @@ instance FromXml OddsGameAwayTeamXml where -- from_xml OddsGameAwayTeamXml{..} = Team xml_away_team_id - (Just xml_away_abbr) + (Just xml_away_team_abbr) (Just xml_away_team_name) -- | This allows us to insert the XML representation @@ -287,8 +292,12 @@ data OddsGame = db_odds_id :: DefaultKey Odds, db_game_id :: Int, db_game_time :: UTCTime, -- ^ Contains both the date and time. - db_game_away_team_rotation_number :: Int, - db_game_home_team_rotation_number :: Int } + db_away_team_rotation_number :: Int, + db_home_team_rotation_number :: Int, + db_away_team_starter_id :: Maybe Int, + db_away_team_starter_name :: Maybe String, + db_home_team_starter_id :: Maybe Int, + db_home_team_starter_name :: Maybe String } -- | XML representation of an 'OddsGame'. @@ -298,16 +307,16 @@ data OddsGameXml = xml_game_id :: Int, xml_game_date :: UTCTime, -- ^ Contains only the date xml_game_time :: UTCTime, -- ^ Contains only the time - xml_game_away_team :: OddsGameAwayTeamXml, - xml_game_home_team :: OddsGameHomeTeamXml, - xml_game_over_under :: OddsGameOverUnderXml } + xml_away_team :: OddsGameAwayTeamXml, + xml_home_team :: OddsGameHomeTeamXml, + xml_over_under :: OddsGameOverUnderXml } deriving (Eq, Show) -- | Pseudo-field that lets us get the 'OddsGameCasinoXml's out of --- xml_game_over_under. +-- xml_over_under. -- -xml_game_over_under_casinos :: OddsGameXml -> [OddsGameCasinoXml] -xml_game_over_under_casinos = xml_casinos . xml_game_over_under +xml_over_under_casinos :: OddsGameXml -> [OddsGameCasinoXml] +xml_over_under_casinos = xml_casinos . xml_over_under instance ToDb OddsGameXml where @@ -324,7 +333,7 @@ instance FromXmlFk OddsGameXml where -- | To convert from the XML representation to the database one, we -- drop the home/away teams and the casino lines, but retain the - -- home/away rotation numbers. + -- home/away rotation numbers and the starters. -- from_xml_fk fk OddsGameXml{..} = OddsGame { @@ -335,11 +344,24 @@ instance FromXmlFk OddsGameXml where (utctDay xml_game_date) -- Take the day part from one, (utctDayTime xml_game_time), -- the time from the other. - db_game_away_team_rotation_number = - (xml_away_rotation_number xml_game_away_team), + db_away_team_rotation_number = + (xml_away_team_rotation_number xml_away_team), + + db_home_team_rotation_number = + (xml_home_team_rotation_number xml_home_team), + + db_away_team_starter_id = + (fmap fst $ xml_away_team_starter xml_away_team), + + db_away_team_starter_name = + (fmap snd $ xml_away_team_starter xml_away_team), + + db_home_team_starter_id = + (fmap fst $ xml_home_team_starter xml_home_team), + + db_home_team_starter_name = + (fmap snd $ xml_home_team_starter xml_home_team) } - db_game_home_team_rotation_number = - (xml_home_rotation_number xml_game_home_team) } -- | This lets us insert the XML representation 'OddsGameXml' directly. -- @@ -361,8 +383,17 @@ instance XmlImportFk OddsGameXml -- the notes anyway, we just stick them with an arbitrary -- game. C'est la vie. -- +-- We have to take the same approach with the league. The +-- \ elements are sitting outside of the games, and +-- are presumably supposed to be interpreted in \"chronological\" +-- order; i.e. the current league stays the same until we see +-- another \ element. Unfortunately, that's not how +-- XML works. So we're forced to ignore the league in the database +-- and pull the same trick, pairing them with games. +-- data OddsGameWithNotes = OddsGameWithNotes { + league :: Maybe String, notes :: [String], game :: OddsGameXml } deriving (Eq, Show) @@ -507,8 +538,8 @@ instance DbImport Message where -- Next, we insert the home and away teams. We do this before -- inserting the game itself because the game has two foreign keys -- pointing to "teams". - away_team_id <- insert_xml_or_select (xml_game_away_team g) - home_team_id <- insert_xml_or_select (xml_game_home_team g) + away_team_id <- insert_xml_or_select (xml_away_team g) + home_team_id <- insert_xml_or_select (xml_home_team g) -- Now insert the game, keyed to the "odds", game_id <- insert_xml_fk odds_id g @@ -525,7 +556,7 @@ instance DbImport Message where -- game and the lines for the casinos all wind up in the same -- table, odds_games_lines. We can insert the over/under entries -- freely with empty away/home lines: - forM_ (xml_game_over_under_casinos g) $ \c -> do + forM_ (xml_over_under_casinos g) $ \c -> do -- Start by inderting the casino. ou_casino_id <- insert_xml_or_select c @@ -542,7 +573,7 @@ instance DbImport Message where -- ...but then when we insert the home/away team lines, we -- prefer to update the existing entry rather than overwrite it -- or add a new record. - forM_ (xml_away_casinos $ xml_game_away_team g) $ \c -> do + forM_ (xml_away_team_casinos $ xml_away_team g) $ \c -> do -- insert, or more likely retrieve the existing, casino a_casino_id <- insert_xml_or_select c @@ -554,7 +585,7 @@ instance DbImport Message 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 + forM_ (xml_home_team_casinos $ xml_home_team g) $ \c ->do h_casino_id <- insert_xml_or_select c let home_line = home_away_line c update [Ogl_Home_Line =. home_line] $ -- WHERE @@ -574,12 +605,13 @@ instance DbImport Message where pickle_game_with_notes :: PU OddsGameWithNotes pickle_game_with_notes = xpWrap (from_pair, to_pair) $ - xpPair + xpTriple + (xpOption $ xpElem "League_Name" xpText) (xpList $ xpElem "Notes" xpText) pickle_game where - from_pair = uncurry OddsGameWithNotes - to_pair OddsGameWithNotes{..} = (notes, game) + from_pair = uncurryN OddsGameWithNotes + to_pair OddsGameWithNotes{..} = (league, notes, game) -- | Pickler for an 'OddsGameCasinoXml'. @@ -606,21 +638,25 @@ pickle_home_team :: PU OddsGameHomeTeamXml pickle_home_team = xpElem "HomeTeam" $ xpWrap (from_tuple, to_tuple) $ - xp5Tuple + xp6Tuple (xpElem "HomeTeamID" xpText) (xpElem "HomeRotationNumber" xpInt) (xpElem "HomeAbbr" xpText) (xpElem "HomeTeamName" xpText) + (-- This is an ugly way to get both the HStarter ID attribute + -- and contents. + xpOption (xpElem "HStarter" $ xpPair (xpAttr "ID" xpInt) xpText)) (xpList pickle_casino) where from_tuple = uncurryN OddsGameHomeTeamXml + -- Use record wildcards to avoid unused field warnings. to_tuple OddsGameHomeTeamXml{..} = (xml_home_team_id, - xml_home_rotation_number, - xml_home_abbr, + xml_home_team_rotation_number, + xml_home_team_abbr, xml_home_team_name, - xml_home_casinos) - + xml_home_team_starter, + xml_home_team_casinos) -- | Pickler for an 'OddsGameAwayTeamXml'. -- @@ -628,20 +664,25 @@ pickle_away_team :: PU OddsGameAwayTeamXml pickle_away_team = xpElem "AwayTeam" $ xpWrap (from_tuple, to_tuple) $ - xp5Tuple + xp6Tuple (xpElem "AwayTeamID" xpText) (xpElem "AwayRotationNumber" xpInt) (xpElem "AwayAbbr" xpText) (xpElem "AwayTeamName" xpText) + (-- This is an ugly way to get both the AStarter ID attribute + -- and contents. + xpOption (xpElem "AStarter" $ xpPair (xpAttr "ID" xpInt) xpText)) (xpList pickle_casino) where from_tuple = uncurryN OddsGameAwayTeamXml + -- Use record wildcards to avoid unused field warnings. to_tuple OddsGameAwayTeamXml{..} = (xml_away_team_id, - xml_away_rotation_number, - xml_away_abbr, + xml_away_team_rotation_number, + xml_away_team_abbr, xml_away_team_name, - xml_away_casinos) + xml_away_team_starter, + xml_away_team_casinos) @@ -676,9 +717,9 @@ pickle_game = to_tuple OddsGameXml{..} = (xml_game_id, xml_game_date, xml_game_time, - xml_game_away_team, - xml_game_home_team, - xml_game_over_under) + xml_away_team, + xml_home_team, + xml_over_under) -- | Pickler for the top-level 'Message'. @@ -738,7 +779,10 @@ test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" "test/xml/Odds_XML-positive-line.xml", check "pickle composed with unpickle is the identity (large file)" - "test/xml/Odds_XML-largefile.xml" ] + "test/xml/Odds_XML-largefile.xml", + + check "pickle composed with unpickle is the identity (league name)" + "test/xml/Odds_XML-league-name.xml" ] where check desc path = testCase desc $ do (expected, actual) <- pickle_unpickle pickle_message path @@ -759,7 +803,10 @@ test_unpickle_succeeds = testGroup "unpickle tests" "test/xml/Odds_XML-positive-line.xml", check "unpickling succeeds (large file)" - "test/xml/Odds_XML-largefile.xml" ] + "test/xml/Odds_XML-largefile.xml", + + check "unpickling succeeds (league name)" + "test/xml/Odds_XML-league-name.xml" ] where check desc path = testCase desc $ do actual <- unpickleable path pickle_message @@ -790,6 +837,10 @@ test_on_delete_cascade = testGroup "cascading delete tests" check "deleting odds deleted its children (large file)" "test/xml/Odds_XML-largefile.xml" 189 -- 5 casinos, 184 teams + , + check "deleting odds deleted its children (league name)" + "test/xml/Odds_XML-league-name.xml" + 35 -- 5 casinos, 30 teams ] where check desc path expected = testCase desc $ do diff --git a/test/shell/import-duplicates.test b/test/shell/import-duplicates.test index 20f6d34..a496248 100644 --- a/test/shell/import-duplicates.test +++ b/test/shell/import-duplicates.test @@ -15,15 +15,15 @@ rm -f shelltest.sqlite3 # Heartbeat.xml that doesn't really count. find ./test/xml -maxdepth 1 -name '*.xml' | wc -l >>> -19 +20 >>>= 0 # Run the imports again; we should get complaints about the duplicate -# xml_file_ids. There are 2 errors for each violation, so we expect 2*18 +# xml_file_ids. There are 2 errors for each violation, so we expect 2*19 # occurrences of the string 'ERROR'. ./dist/build/htsn-import/htsn-import -c 'shelltest.sqlite3' test/xml/*.xml 2>&1 | grep ERROR | wc -l >>> -36 +38 >>>= 0 # Finally, clean up after ourselves. diff --git a/test/xml/Odds_XML-league-name.xml b/test/xml/Odds_XML-league-name.xml new file mode 100644 index 0000000..926f190 --- /dev/null +++ b/test/xml/Odds_XML-league-name.xml @@ -0,0 +1 @@ + 21315768 AAO;BB-ODDS Odds MLB Las Vegas Major League Baseball Line Current Line as of 12:30 P.M. ET National League 40280 06/22/2014 01:10 PM 007 951 NYM NY Mets J.Niese -103 -110 -104 -115 -105 014 952 MIA Miami A.DeSclafani -107 -110 -106 -105 -105 7.5u 7.5u 7.5u 7.5u 7.5u 40279 06/22/2014 01:35 PM 001 953 ATL Atlanta E.Santana +113 +110 +116 +115 +115 006 954 WAS Washington T.Roark -123 -130 -126 -135 -125 7o 7o 7o 7o 7o 40283 06/22/2014 02:15 PM 008 955 PHI Philadelphia K.Kendrick +143 +135 +137 +130 +143 012 956 STL St. Louis C.Martinez -153 -160 -152 -150 -153 8o 8.5p 8o 8o 8o 40281 06/22/2014 02:20 PM 009 957 PIT Pittsburgh B.Cumpton +109 +110 +110 even +112 002 958 CHC Chicago Cubs J.Hammel -119 -130 -120 -120 -122 7.5u 7.5u 7.5u 7.5u 7.5u 40285 06/22/2014 04:10 PM 034 959 MIL Milwaukee K.Lohse -123 -135 -125 -120 -125 013 960 COL Colorado T.Matzek +113 +115 +115 even +115 10.5o 10.5o 10.5o 10.5o 10.5o 40286 06/22/2014 04:10 PM 011 961 SFG San Francisco M.Bumgarner -138 -155 -142 -145 -139 055 962 ARI Arizona M.Bolsinger +128 +130 +132 +125 +129 8u 8p 8u 8.5u 8u 40284 06/22/2014 04:10 PM 005 963 LOS Los Angeles H.Ryu -141 -155 -150 -150 -142 010 964 SDP San Diego E.Stults +131 +135 +135 +130 +132 7u 7u 7u 7p 7u American League Time change 40272 06/22/2014 02:05 PM 027 965 BAL Baltimore C.Tillman +190 +195 +190 +170 +190 036 966 NYY NY Yankees M.Tanaka -210 -245 -220 -200 -210 7.5o 7.5u 7.5u 7.5o 7.5p 40274 06/22/2014 01:05 PM 032 967 DET Detroit M.Scherzer -110 -135 -117 -120 -111 031 968 CLE Cleveland J.Tomlin even +110 +107 even +101 8u 8u 8u 8u 8u 40273 06/22/2014 01:40 PM 004 969 HOU Houston D.Keuchel +112 +110 +108 even +109 056 970 TAM Tampa Bay E.Bedard -122 -130 -118 -120 -119 7.5u 7o 7.5u 7.5u 7.5u 40276 06/22/2014 02:10 PM 038 971 SEA Seattle R.Elias +130 +135 +140 +135 +140 033 972 KAN Kansas City Y.Ventura -140 -160 -155 -155 -150 8p 8p 8p 8o 8o 40275 06/22/2014 02:10 PM 030 973 CWS Chicago WSox J.Danks +132 +130 +135 +120 +130 035 974 MIN Minnesota P.Hughes -142 -150 -150 -140 -145 8o 8o 8o 8o 8o 40277 06/22/2014 04:05 PM 028 975 BOS Boston J.Lester +113 -110 +108 +105 +111 037 976 OAK Oakland T.Milone -123 -110 -118 -125 -121 7.5u 7.5u 7.5u 7.5u 7.5u 40278 06/22/2014 08:07 PM 039 977 TEX Texas Y.Darvish -120 -120 -120 -120 -119 029 978 ANA LA Angels M.Shoemaker +110 even +110 even +109 7.5u 7.5u 7.5u 7.5u 7.5u Inter League 40282 06/22/2014 01:10 PM 040 979 TOR Toronto R.Dickey +132 +115 +132 +130 +132 003 980 CIN Cincinnati J.Cueto -142 -135 -142 -150 -142 7.5o 7.5o 7.5o 7.5p 7.5o June 22, 2014, at 12:27 PM ET \ No newline at end of file -- 2.43.2