-- * WARNING: these are private but exported to silence warnings
OddsCasinoConstructor(..),
OddsConstructor(..),
- OddsGame_OddsGameTeamConstructor(..),
+ OddsGame_TeamConstructor(..),
OddsGameConstructor(..),
- OddsGameLineConstructor(..),
- OddsGameTeamConstructor(..) )
+ OddsGameLineConstructor(..) )
where
-- System imports.
import Text.Read ( readMaybe )
import Text.XML.HXT.Core (
PU,
- xp5Tuple,
xp6Tuple,
xp8Tuple,
xpAttr,
tsn_codegen_config )
import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate )
import TSN.Picklers ( xp_date_padded, xp_time, xp_time_stamp )
+import TSN.Team ( Team(..) )
import TSN.XmlImport ( XmlImport(..), XmlImportFk(..) )
import Xml (
FromXml(..),
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
+-- * OddsGameHomeTeamXml / OddsGameAwayTeamXml
-- | The XML representation of a \<HomeTeam\>, as found in \<Game\>s.
+-- 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 {
-- 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
-- | The database representation of an 'OddsGameHomeTeamXml' is an
-- 'OddsGameTeam'.
--
- type Db OddsGameHomeTeamXml = OddsGameTeam
+ type Db OddsGameHomeTeamXml = Team
instance FromXml OddsGameHomeTeamXml where
-- | We convert from XML to the database by dropping the lines and
-- themselves).
--
from_xml OddsGameHomeTeamXml{..} =
- OddsGameTeam {
- db_team_id = xml_home_team_id,
- db_abbr = xml_home_abbr,
- db_team_name = xml_home_team_name }
+ Team {
+ team_id = xml_home_team_id,
+ team_abbreviation = Just xml_home_team_abbr,
+ team_name = Just xml_home_team_name }
-- | This allows us to insert the XML representation
-- 'OddsGameHomeTeamXml' directly.
instance XmlImport OddsGameHomeTeamXml where
--- * OddsGameAwayTeam/OddsGameAwayTeamXml
-- | The XML representation of a \<AwayTeam\>, as found in \<Game\>s.
+-- This is basically the same as 'OddsGameHomeTeamXml', but the two
+-- types have different picklers.
--
data OddsGameAwayTeamXml =
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
- -- | The database representation of an 'OddsGameAwayTeamXml' is an
- -- 'OddsGameTeam'.
+ -- | The database representation of an 'OddsGameAwayTeamXml' is a
+ -- 'Team'.
--
- type Db OddsGameAwayTeamXml = OddsGameTeam
+ type Db OddsGameAwayTeamXml = Team
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
+ from_xml OddsGameAwayTeamXml{..} = Team
xml_away_team_id
- xml_away_abbr
- xml_away_team_name
+ (Just xml_away_team_abbr)
+ (Just xml_away_team_name)
-- | This allows us to insert the XML representation
-- 'OddsGameAwayTeamXml' directly.
-- | 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 }
+data OddsGame_Team =
+ OddsGame_Team {
+ ogt_odds_games_id :: DefaultKey OddsGame,
+ ogt_away_team_id :: DefaultKey Team,
+ ogt_home_team_id :: DefaultKey Team }
-- * OddsGameOverUnderXml
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'.
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
-- | 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 {
(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.
--
-- 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
+-- \<League_Name\> 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 \<League_Name\> 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)
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:
reference:
onDelete: cascade
-- entity: OddsGame_OddsGameTeam
- dbName: odds_games__odds_games_teams
+- entity: OddsGame_Team
+ dbName: odds_games__teams
constructors:
- - name: OddsGame_OddsGameTeam
+ - name: OddsGame_Team
fields:
- - name: ogogt_odds_games_id
+ - name: ogt_odds_games_id
reference:
onDelete: cascade
- - name: ogogt_away_team_id
+ - name: ogt_away_team_id
reference:
onDelete: cascade
- - name: ogogt_home_team_id
+ - name: ogt_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 :: OddsGame_Team)
migrate (undefined :: OddsGameLine)
dbimport m = do
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",
+ -- First 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
+ -- Next, we insert the home and away teams.
+ away_team_id <- insert_xml_or_select (xml_away_team g)
+ home_team_id <- insert_xml_or_select (xml_home_team g)
+
+ -- Insert a record into 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 }
+ insert_ OddsGame_Team {
+ ogt_odds_games_id = game_id,
+ ogt_away_team_id = away_team_id,
+ ogt_home_team_id = home_team_id }
-- Finaly, 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 g) $ \c -> do
-- Start by inderting the casino.
ou_casino_id <- insert_xml_or_select c
-- ...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
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
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'.
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'.
--
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)
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'.
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",
"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
"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
-- | 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"
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 e = undefined :: OddsGame_Team
let f = undefined :: OddsGameLine
actual <- withSqliteConn ":memory:" $ runDbConn $ do
runMigration silentMigrationLogger $ do
migrate e
migrate f
_ <- dbimport odds
- deleteAll a
+ deleteAll b
count_a <- countAll a
count_b <- countAll b
count_c <- countAll c