]> gitweb.michael.orlitzky.com - dead/htsn-import.git/blobdiff - src/TSN/XML/Odds.hs
Fix hlint warnings.
[dead/htsn-import.git] / src / TSN / XML / Odds.hs
index 2ad2d93ebb14111896f35fe6638b36a3a40cc424..5174ddb927462266e80af42eb45171bb49975f41 100644 (file)
@@ -18,12 +18,12 @@ module TSN.XML.Odds (
   -- * WARNING: these are private but exported to silence warnings
   OddsCasinoConstructor(..),
   OddsConstructor(..),
-  OddsGame_TeamConstructor(..),
   OddsGameConstructor(..),
   OddsGameLineConstructor(..) )
 where
 
 -- System imports.
+import Control.Applicative ( (<$>) )
 import Control.Monad ( forM_, join )
 import Data.Time ( UTCTime(..) )
 import Data.Tuple.Curry ( uncurryN )
@@ -66,10 +66,11 @@ import TSN.Codegen (
 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 TSN.XmlImport ( XmlImport(..), XmlImportFkTeams(..) )
 import Xml (
+  Child(..),
   FromXml(..),
-  FromXmlFk(..),
+  FromXmlFkTeams(..),
   ToDb(..),
   pickle_unpickle,
   unpickleable,
@@ -146,108 +147,57 @@ instance FromXml OddsGameCasinoXml where
 instance XmlImport OddsGameCasinoXml
 
 
--- * OddsGameHomeTeamXml / OddsGameAwayTeamXml
+-- * OddsGameTeamXml
 
--- | 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 XML representation of a \<HomeTeam\> or \<AwayTeam\>, as
+--   found in \<Game\>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 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_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] }
+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 = Team
+  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{..} =
+  from_xml OddsGameTeamXml{..} =
     Team {
-      team_id   = xml_home_team_id,
-      team_abbreviation = Just xml_home_team_abbr,
-      team_name = Just xml_home_team_name }
+      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
 
 
 
--- | 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 {
-    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_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 a
-  --   'Team'.
-  --
-  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{..} = Team
-                                       xml_away_team_id
-                                       (Just xml_away_team_abbr)
-                                       (Just 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_Team =
-  OddsGame_Team {
-    ogt_odds_games_id :: DefaultKey OddsGame,
-    ogt_away_team_id  :: DefaultKey Team,
-    ogt_home_team_id  :: DefaultKey Team }
-
 
 -- * OddsGameOverUnderXml
 
@@ -290,10 +240,12 @@ 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_away_team_rotation_number :: Int,
-    db_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,
@@ -307,8 +259,8 @@ data OddsGameXml =
     xml_game_id         :: Int,
     xml_game_date       :: UTCTime, -- ^ Contains only the date
     xml_game_time       :: UTCTime, -- ^ Contains only the time
-    xml_away_team  :: OddsGameAwayTeamXml,
-    xml_home_team  :: OddsGameHomeTeamXml,
+    xml_away_team  :: OddsGameTeamXml,
+    xml_home_team  :: OddsGameTeamXml,
     xml_over_under :: OddsGameOverUnderXml }
   deriving (Eq, Show)
 
@@ -325,19 +277,25 @@ 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 and the starters.
+  --   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
@@ -345,27 +303,27 @@ instance FromXmlFk OddsGameXml where
                        (utctDayTime xml_game_time), -- the time from the other.
 
       db_away_team_rotation_number =
-        (xml_away_team_rotation_number xml_away_team),
+        (xml_team_rotation_number xml_away_team),
 
       db_home_team_rotation_number =
-        (xml_home_team_rotation_number xml_home_team),
+        (xml_team_rotation_number xml_home_team),
 
       db_away_team_starter_id =
-        (fmap fst $ xml_away_team_starter xml_away_team),
+        (fst <$> xml_team_starter xml_away_team),
 
       db_away_team_starter_name =
-        (fmap snd $ xml_away_team_starter xml_away_team),
+        (snd <$> xml_team_starter xml_away_team),
 
       db_home_team_starter_id =
-        (fmap fst $ xml_home_team_starter xml_home_team),
+        (fst <$> xml_team_starter xml_home_team),
 
       db_home_team_starter_name =
-        (fmap snd $ xml_home_team_starter xml_home_team) }
+        (snd <$> xml_team_starter xml_home_team) }
 
 
 -- | This lets us insert the XML representation 'OddsGameXml' directly.
 --
-instance XmlImportFk OddsGameXml
+instance XmlImportFkTeams OddsGameXml
 
 
 -- * OddsGameWithNotes
@@ -491,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
@@ -504,20 +468,6 @@ mkPersist tsn_codegen_config [groundhog|
           reference:
             onDelete: cascade
 
-- entity: OddsGame_Team
-  dbName: odds_games__teams
-  constructors:
-    - name: OddsGame_Team
-      fields:
-        - name: ogt_odds_games_id
-          reference:
-            onDelete: cascade
-        - name: ogt_away_team_id
-          reference:
-            onDelete: cascade
-        - name: ogt_home_team_id
-          reference:
-            onDelete: cascade
 |]
 
 instance DbImport Message where
@@ -527,34 +477,25 @@ instance DbImport Message where
       migrate (undefined :: Odds)
       migrate (undefined :: OddsCasino)
       migrate (undefined :: OddsGame)
-      migrate (undefined :: OddsGame_Team)
       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
-      -- First insert the game, keyed to the "odds",
-      game_id <- insert_xml_fk odds_id g
-
-      -- 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)
+    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)
 
-      -- 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_Team {
-                ogt_odds_games_id = game_id,
-                ogt_away_team_id = away_team_id,
-                ogt_home_team_id = home_team_id }
+      -- 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
 
-      -- Finaly, we insert the lines. The over/under entries for this
+      -- 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_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
 
@@ -571,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_team_casinos $ xml_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
 
@@ -583,7 +524,7 @@ instance DbImport Message where
           Ogl_Odds_Casinos_Id ==. a_casino_id
 
       -- Repeat all that for the home team.
-      forM_ (xml_home_team_casinos $ xml_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
@@ -630,15 +571,15 @@ 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) $
       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
@@ -646,25 +587,25 @@ pickle_home_team =
          xpOption (xpElem "HStarter" $ xpPair (xpAttr "ID" xpInt) xpText))
         (xpList pickle_casino)
   where
-    from_tuple = uncurryN OddsGameHomeTeamXml
+    from_tuple = uncurryN OddsGameTeamXml
 
     -- Use record wildcards to avoid unused field warnings.
-    to_tuple OddsGameHomeTeamXml{..} = (xml_home_team_id,
-                                        xml_home_team_rotation_number,
-                                        xml_home_team_abbr,
-                                        xml_home_team_name,
-                                        xml_home_team_starter,
-                                        xml_home_team_casinos)
+    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) $
       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
@@ -672,15 +613,15 @@ pickle_away_team =
          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_team_rotation_number,
-                                        xml_away_team_abbr,
-                                        xml_away_team_name,
-                                        xml_away_team_starter,
-                                        xml_away_team_casinos)
+    to_tuple OddsGameTeamXml{..} = (xml_team_id,
+                                    xml_team_rotation_number,
+                                    xml_team_abbr,
+                                    xml_team_name,
+                                    xml_team_starter,
+                                    xml_team_casinos)
 
 
 
@@ -847,8 +788,7 @@ test_on_delete_cascade = testGroup "cascading delete tests"
       let b = undefined :: Odds
       let c = undefined :: OddsCasino
       let d = undefined :: OddsGame
-      let e = undefined :: OddsGame_Team
-      let f = undefined :: OddsGameLine
+      let e = undefined :: OddsGameLine
       actual <- withSqliteConn ":memory:" $ runDbConn $ do
                   runMigration silentMigrationLogger $ do
                     migrate a
@@ -856,7 +796,6 @@ test_on_delete_cascade = testGroup "cascading delete tests"
                     migrate c
                     migrate d
                     migrate e
-                    migrate f
                   _ <- dbimport odds
                   deleteAll b
                   count_a <- countAll a
@@ -864,7 +803,6 @@ test_on_delete_cascade = testGroup "cascading delete tests"
                   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