X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FOdds.hs;h=5174ddb927462266e80af42eb45171bb49975f41;hb=14dc52a2e7d7712281aee2332f7342f67abe4306;hp=6b7d4ab9d831d7fd10dd16d6ca252c0fa1d0d142;hpb=4505b103f3765b6c0278c7be01e65a6b58b271bf;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs index 6b7d4ab..5174ddb 100644 --- a/src/TSN/XML/Odds.hs +++ b/src/TSN/XML/Odds.hs @@ -11,9 +11,6 @@ -- other... disorganized... information. -- module TSN.XML.Odds ( - OddsGameAwayTeamXml(..), -- Used in TSN.XML.JFile - OddsGameHomeTeamXml(..), -- Used in TSN.XML.JFile - OddsGameTeam(..), -- Used in TSN.XML.JFile dtd, pickle_message, -- * Tests @@ -21,13 +18,12 @@ module TSN.XML.Odds ( -- * WARNING: these are private but exported to silence warnings OddsCasinoConstructor(..), OddsConstructor(..), - OddsGame_OddsGameTeamConstructor(..), OddsGameConstructor(..), - OddsGameLineConstructor(..), - OddsGameTeamConstructor(..) ) + OddsGameLineConstructor(..) ) where -- System imports. +import Control.Applicative ( (<$>) ) import Control.Monad ( forM_, join ) import Data.Time ( UTCTime(..) ) import Data.Tuple.Curry ( uncurryN ) @@ -52,7 +48,6 @@ import Test.Tasty.HUnit ( (@?=), testCase ) import Text.Read ( readMaybe ) import Text.XML.HXT.Core ( PU, - xp5Tuple, xp6Tuple, xp8Tuple, xpAttr, @@ -70,10 +65,12 @@ import TSN.Codegen ( tsn_codegen_config ) import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) import TSN.Picklers ( xp_date_padded, xp_time, xp_time_stamp ) -import TSN.XmlImport ( XmlImport(..), XmlImportFk(..) ) +import TSN.Team ( Team(..) ) +import TSN.XmlImport ( XmlImport(..), XmlImportFkTeams(..) ) import Xml ( + Child(..), FromXml(..), - FromXmlFk(..), + FromXmlFkTeams(..), ToDb(..), pickle_unpickle, unpickleable, @@ -150,117 +147,56 @@ instance FromXml OddsGameCasinoXml where instance XmlImport OddsGameCasinoXml --- * OddsGameTeam - - --- | The database representation of teams as they appear in odds --- games. --- -data OddsGameTeam = - OddsGameTeam { - db_team_id :: String, -- ^ The home/away team IDs are - -- three characters but Postgres - -- imposes no performance penalty - -- on lengthless text fields, so - -- we ignore the probable upper - -- bound of three characters. - db_abbr :: String, - db_team_name :: String } - deriving (Eq, Show) - - --- * OddsGameHomeTeam/OddsGameHomeTeamXml - --- | The XML representation of a \, as found in \s. --- -data OddsGameHomeTeamXml = - OddsGameHomeTeamXml { - xml_home_team_id :: String, -- ^ The home/away team IDs - -- are three characters but - -- Postgres imposes no - -- performance penalty on - -- lengthless text fields, - -- 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] } +-- * OddsGameTeamXml + +-- | The XML representation of a \ or \, as +-- found in \s. We can't use the 'Team' representation +-- directly because there are some other fields we need to parse. +-- +-- 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 OddsGameTeamXml = + OddsGameTeamXml { + xml_team_id :: String, -- ^ The home/away team IDs + -- are three characters but + -- Postgres imposes no + -- performance penalty on + -- lengthless text fields, + -- so we ignore the probable + -- upper bound of three + -- characters. + xml_team_rotation_number :: Maybe Int, + xml_team_abbr :: String, + xml_team_name :: String, + xml_team_starter :: Maybe (Int, String), -- ^ (id, name) + xml_team_casinos :: [OddsGameCasinoXml] } deriving (Eq, Show) -instance ToDb OddsGameHomeTeamXml where - -- | The database representation of an 'OddsGameHomeTeamXml' is an +instance ToDb OddsGameTeamXml where + -- | The database representation of an 'OddsGameTeamXml' is an -- 'OddsGameTeam'. -- - type Db OddsGameHomeTeamXml = OddsGameTeam + type Db OddsGameTeamXml = Team -instance FromXml OddsGameHomeTeamXml where +instance FromXml OddsGameTeamXml where -- | We convert from XML to the database by dropping the lines and -- rotation number (which are specific to the games, not the teams -- themselves). -- - from_xml OddsGameHomeTeamXml{..} = - OddsGameTeam { - db_team_id = xml_home_team_id, - db_abbr = xml_home_abbr, - db_team_name = xml_home_team_name } + from_xml OddsGameTeamXml{..} = + Team { + team_id = xml_team_id, + abbreviation = Just xml_team_abbr, + name = Just xml_team_name } -- | This allows us to insert the XML representation --- 'OddsGameHomeTeamXml' directly. +-- 'OddsGameTeamXml' directly. -- -instance XmlImport OddsGameHomeTeamXml where +instance XmlImport OddsGameTeamXml where --- * OddsGameAwayTeam/OddsGameAwayTeamXml - --- | The XML representation of a \, as found in \s. --- -data OddsGameAwayTeamXml = - OddsGameAwayTeamXml { - xml_away_team_id :: String, -- ^ The home/away team IDs are - -- three characters but Postgres - -- imposes no performance penalty - -- 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] } - deriving (Eq, Show) - -instance ToDb OddsGameAwayTeamXml where - -- | The database representation of an 'OddsGameAwayTeamXml' is an - -- 'OddsGameTeam'. - -- - type Db OddsGameAwayTeamXml = OddsGameTeam - -instance FromXml OddsGameAwayTeamXml where - -- | We convert from XML to the database by dropping the lines and - -- rotation number (which are specific to the games, not the teams - -- themselves). - -- - from_xml OddsGameAwayTeamXml{..} = OddsGameTeam - xml_away_team_id - xml_away_abbr - xml_away_team_name - --- | This allows us to insert the XML representation --- 'OddsGameAwayTeamXml' directly. --- -instance XmlImport OddsGameAwayTeamXml where - - --- * OddsGame_OddsGameTeam - --- | Database mapping between games and their home/away teams. --- -data OddsGame_OddsGameTeam = - OddsGame_OddsGameTeam { - ogogt_odds_games_id :: DefaultKey OddsGame, - ogogt_away_team_id :: DefaultKey OddsGameTeam, - ogogt_home_team_id :: DefaultKey OddsGameTeam } -- * OddsGameOverUnderXml @@ -304,10 +240,16 @@ data OddsGameLine = data OddsGame = OddsGame { db_odds_id :: DefaultKey Odds, + db_away_team_id :: DefaultKey Team, + db_home_team_id :: DefaultKey Team, 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 :: Maybe Int, + db_home_team_rotation_number :: Maybe 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'. @@ -317,16 +259,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 :: OddsGameTeamXml, + xml_home_team :: OddsGameTeamXml, + 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 @@ -335,34 +277,53 @@ instance ToDb OddsGameXml where -- type Db OddsGameXml = OddsGame -instance FromXmlFk OddsGameXml where + +instance Child OddsGameXml where -- | Each 'OddsGameXml' is contained in an 'Odds'. In other words -- the foreign key for 'OddsGame' points to an 'Odds'. -- type Parent OddsGameXml = Odds + +instance FromXmlFkTeams 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. + -- drop the casino lines, but retain the home/away rotation + -- numbers and the starters. The foreign keys to 'Odds' and the + -- home/away teams are passed in. -- - from_xml_fk fk OddsGameXml{..} = + from_xml_fk_teams fk fk_away fk_home OddsGameXml{..} = OddsGame { - db_odds_id = fk, + db_odds_id = fk, + db_away_team_id = fk_away, + db_home_team_id = fk_home, db_game_id = xml_game_id, db_game_time = UTCTime (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_team_rotation_number xml_away_team), + + db_home_team_rotation_number = + (xml_team_rotation_number xml_home_team), + + db_away_team_starter_id = + (fst <$> xml_team_starter xml_away_team), + + db_away_team_starter_name = + (snd <$> xml_team_starter xml_away_team), + + db_home_team_starter_id = + (fst <$> xml_team_starter xml_home_team), + + db_home_team_starter_name = + (snd <$> xml_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. -- -instance XmlImportFk OddsGameXml +instance XmlImportFkTeams OddsGameXml -- * OddsGameWithNotes @@ -380,8 +341,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) @@ -471,16 +441,6 @@ mkPersist tsn_codegen_config [groundhog| type: constraint fields: [casino_client_id] -- entity: OddsGameTeam - dbName: odds_games_teams - constructors: - - name: OddsGameTeam - uniques: - - name: unique_odds_games_team - type: constraint - fields: [db_team_id] - - - entity: OddsGame dbName: odds_games constructors: @@ -489,6 +449,12 @@ mkPersist tsn_codegen_config [groundhog| - name: db_odds_id reference: onDelete: cascade + - name: db_away_team_id + reference: + onDelete: cascade + - name: db_home_team_id + reference: + onDelete: cascade - entity: OddsGameLine dbName: odds_games_lines @@ -502,60 +468,34 @@ mkPersist tsn_codegen_config [groundhog| reference: onDelete: cascade -- entity: OddsGame_OddsGameTeam - dbName: odds_games__odds_games_teams - constructors: - - name: OddsGame_OddsGameTeam - fields: - - name: ogogt_odds_games_id - reference: - onDelete: cascade - - name: ogogt_away_team_id - reference: - onDelete: cascade - - name: ogogt_home_team_id - reference: - onDelete: cascade |] instance DbImport Message where dbmigrate _= run_dbmigrate $ do + migrate (undefined :: Team) migrate (undefined :: Odds) migrate (undefined :: OddsCasino) - migrate (undefined :: OddsGameTeam) migrate (undefined :: OddsGame) - migrate (undefined :: OddsGame_OddsGameTeam) migrate (undefined :: OddsGameLine) dbimport m = do -- Insert the root "odds" element and acquire its primary key (id). odds_id <- insert_xml m - forM_ (xml_games m) $ \g -> do - -- 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 odds_games_teams. - -- Next to insert the home and away 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) - - -- Now insert the game, keyed to the "odds", - game_id <- insert_xml_fk odds_id g - - -- Insert a record into odds_games__odds_games_teams mapping the - -- home/away teams to this game. Use the full record syntax - -- because the types would let us mix up the home/away teams. - insert_ OddsGame_OddsGameTeam { - ogogt_odds_games_id = game_id, - ogogt_away_team_id = away_team_id, - ogogt_home_team_id = home_team_id } - - -- Finaly, we insert the lines. The over/under entries for this + forM_ (xml_games m) $ \game -> do + -- First we insert the home and away teams. + away_team_id <- insert_xml_or_select (xml_away_team game) + home_team_id <- insert_xml_or_select (xml_home_team game) + + -- Now insert the game, keyed to the "odds" and its teams. + game_id <- insert_xml_fk_teams odds_id away_team_id home_team_id game + + -- Finally, we insert the lines. The over/under entries for this -- 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 game) $ \c -> do -- Start by inderting the casino. ou_casino_id <- insert_xml_or_select c @@ -572,7 +512,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_team_casinos $ xml_away_team game) $ \c -> do -- insert, or more likely retrieve the existing, casino a_casino_id <- insert_xml_or_select c @@ -584,7 +524,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_team_casinos $ xml_home_team game) $ \c ->do h_casino_id <- insert_xml_or_select c let home_line = home_away_line c update [Ogl_Home_Line =. home_line] $ -- WHERE @@ -604,12 +544,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'. @@ -630,48 +571,57 @@ pickle_casino = xml_casino_line) --- | Pickler for an 'OddsGameHomeTeamXml'. +-- | Pickler for an 'OddsGameTeamXml'. -- -pickle_home_team :: PU OddsGameHomeTeamXml +pickle_home_team :: PU OddsGameTeamXml pickle_home_team = xpElem "HomeTeam" $ xpWrap (from_tuple, to_tuple) $ - xp5Tuple + xp6Tuple (xpElem "HomeTeamID" xpText) - (xpElem "HomeRotationNumber" xpInt) + (xpElem "HomeRotationNumber" (xpOption 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_name, - xml_home_casinos) + from_tuple = uncurryN OddsGameTeamXml + -- Use record wildcards to avoid unused field warnings. + to_tuple OddsGameTeamXml{..} = (xml_team_id, + xml_team_rotation_number, + xml_team_abbr, + xml_team_name, + xml_team_starter, + xml_team_casinos) --- | Pickler for an 'OddsGameAwayTeamXml'. +-- | Pickler for an 'OddsGameTeamXml'. -- -pickle_away_team :: PU OddsGameAwayTeamXml +pickle_away_team :: PU OddsGameTeamXml pickle_away_team = xpElem "AwayTeam" $ xpWrap (from_tuple, to_tuple) $ - xp5Tuple + xp6Tuple (xpElem "AwayTeamID" xpText) - (xpElem "AwayRotationNumber" xpInt) + (xpElem "AwayRotationNumber" (xpOption 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 + from_tuple = uncurryN OddsGameTeamXml + -- 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_name, - xml_away_casinos) + to_tuple OddsGameTeamXml{..} = (xml_team_id, + xml_team_rotation_number, + xml_team_abbr, + xml_team_name, + xml_team_starter, + xml_team_casinos) @@ -706,9 +656,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'. @@ -759,7 +709,7 @@ odds_tests = test_pickle_of_unpickle_is_identity :: TestTree test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" [ check "pickle composed with unpickle is the identity" - "test/xml/Odds_XML.xml", + "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", @@ -768,7 +718,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 @@ -789,7 +742,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 @@ -798,7 +754,7 @@ test_unpickle_succeeds = testGroup "unpickle tests" -- | Make sure everything gets deleted when we delete the top-level --- record. +-- record. The casinos and teams should be left behind. -- test_on_delete_cascade :: TestTree test_on_delete_cascade = testGroup "cascading delete tests" @@ -820,16 +776,19 @@ 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 odds <- unsafe_unpickle path pickle_message - let a = undefined :: Odds - let b = undefined :: OddsCasino - let c = undefined :: OddsGameTeam + let a = undefined :: Team + let b = undefined :: Odds + let c = undefined :: OddsCasino let d = undefined :: OddsGame - let e = undefined :: OddsGame_OddsGameTeam - let f = undefined :: OddsGameLine + let e = undefined :: OddsGameLine actual <- withSqliteConn ":memory:" $ runDbConn $ do runMigration silentMigrationLogger $ do migrate a @@ -837,15 +796,13 @@ test_on_delete_cascade = testGroup "cascading delete tests" migrate c migrate d migrate e - migrate f _ <- dbimport odds - deleteAll a + deleteAll b count_a <- countAll a count_b <- countAll b count_c <- countAll c count_d <- countAll d count_e <- countAll e - count_f <- countAll f return $ sum [count_a, count_b, count_c, - count_d, count_e, count_f ] + count_d, count_e ] actual @?= expected