]> gitweb.michael.orlitzky.com - dead/htsn-import.git/blobdiff - src/TSN/XML/Odds.hs
Add League_Name, AStarter, and HStarter support to Odds.
[dead/htsn-import.git] / src / TSN / XML / Odds.hs
index b76be762dee067d4b2125ad28668b21bfc3ab7eb..8061a3e23db2ec2c2eb6c3311ecebcf735fd239e 100644 (file)
@@ -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
+--   \<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)
@@ -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