X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FOdds.hs;h=7a2a6cc368d0f470dcfa5879638bf703af2f8e17;hb=9d2fd74804d0b7720fd8d0b68beafc6c2777c5d1;hp=eb017d8131678e2bebd29621bdf4d83a9ebd6c6d;hpb=6ed05f33ffaa8b000d36ab3f5ab62eed4022d27a;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs index eb017d8..7a2a6cc 100644 --- a/src/TSN/XML/Odds.hs +++ b/src/TSN/XML/Odds.hs @@ -13,7 +13,15 @@ -- module TSN.XML.Odds ( odds_tests, - pickle_message ) + pickle_message, + -- * WARNING: these are private but exported to silence warnings + Odds_OddsGameConstructor(..), + OddsCasinoConstructor(..), + OddsConstructor(..), + OddsGame_OddsGameTeamConstructor(..), + OddsGameConstructor(..), + OddsGameLineConstructor(..), + OddsGameTeamConstructor(..) ) where import Control.Monad ( forM_, join ) @@ -43,7 +51,6 @@ import Text.XML.HXT.Core ( xpList, xpOption, xpPair, - xpPrim, xpText, xpTriple, xpWrap ) @@ -51,6 +58,7 @@ import Text.XML.HXT.Core ( import TSN.Codegen ( tsn_codegen_config ) import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) +import TSN.Picklers ( xp_team_id ) import TSN.XmlImport ( XmlImport(..) ) import Xml ( FromXml(..), pickle_unpickle, unpickleable ) @@ -93,16 +101,18 @@ instance FromXml OddsGameCasinoXml where -- We don't need the key argument (from_xml_fk) since the XML type -- contains more information in this case. - from_xml OddsGameCasinoXml{..} = OddsCasino - xml_casino_client_id - xml_casino_name + from_xml OddsGameCasinoXml{..} = + OddsCasino { + casino_client_id = xml_casino_client_id, + casino_name = xml_casino_name } + instance XmlImport OddsGameCasinoXml data OddsGameHomeTeamXml = OddsGameHomeTeamXml { - xml_home_team_id :: Int, + xml_home_team_id :: String, -- ^ These are three-character IDs. xml_home_rotation_number :: Int, xml_home_abbr :: String, xml_home_team_name :: String, @@ -111,17 +121,18 @@ data OddsGameHomeTeamXml = instance FromXml OddsGameHomeTeamXml where type Db OddsGameHomeTeamXml = OddsGameTeam - from_xml OddsGameHomeTeamXml{..} = OddsGameTeam - xml_home_team_id - xml_home_abbr - xml_home_team_name + from_xml OddsGameHomeTeamXml{..} = + OddsGameTeam { + db_team_id = xml_home_team_id, + db_abbr = xml_home_abbr, + db_team_name = xml_home_team_name } instance XmlImport OddsGameHomeTeamXml where data OddsGameTeam = OddsGameTeam { - db_team_id :: Int, + db_team_id :: String, -- ^ The home/away team IDs are 3 characters db_abbr :: String, db_team_name :: String } deriving (Eq, Show) @@ -136,7 +147,7 @@ data OddsGame_OddsGameTeam = data OddsGameAwayTeamXml = OddsGameAwayTeamXml { - xml_away_team_id :: Int, + xml_away_team_id :: String, -- ^ These are 3 character IDs. xml_away_rotation_number :: Int, xml_away_abbr :: String, xml_away_team_name :: String, @@ -204,12 +215,15 @@ xml_game_over_under_casinos = xml_casinos . xml_game_over_under instance FromXml OddsGameXml where type Db OddsGameXml = OddsGame - from_xml OddsGameXml{..} = OddsGame - xml_game_id - xml_game_date - xml_game_time - (xml_away_rotation_number xml_game_away_team) - (xml_home_rotation_number xml_game_home_team) + from_xml OddsGameXml{..} = + OddsGame { + db_game_id = xml_game_id, + db_game_date = xml_game_date, + db_game_time = xml_game_time, + db_game_away_team_rotation_number = + (xml_away_rotation_number xml_game_away_team), + db_game_home_team_rotation_number = + (xml_home_rotation_number xml_game_home_team) } instance XmlImport OddsGameXml @@ -223,10 +237,11 @@ data Odds = -- | Map 'Odds' to their children 'OddsGame's. -data Odds_OddsGame = - Odds_OddsGame { - oog_odds_id :: DefaultKey Odds, - oog_odds_games_id :: DefaultKey OddsGame } +-- +data Odds_OddsGame = Odds_OddsGame + (DefaultKey Odds) + (DefaultKey OddsGame) + -- | This is our best guess at what occurs in the Odds_XML -- documents. It looks like each consecutive set of games can @@ -271,8 +286,11 @@ instance FromXml Message where -- We don't need the key argument (from_xml_fk) since the XML type -- contains more information in this case. - from_xml (Message _ _ _ d e f _ _) = - Odds d e f + from_xml Message{..} = + Odds { + db_sport = xml_sport, + db_title = xml_title, + db_line_time = xml_line_time } instance XmlImport Message @@ -297,6 +315,9 @@ mkPersist tsn_codegen_config [groundhog| dbName: odds_games_teams constructors: - name: OddsGameTeam + fields: + - name: db_team_id + type: varchar(3) uniques: - name: unique_odds_games_team type: constraint @@ -317,6 +338,13 @@ mkPersist tsn_codegen_config [groundhog| - entity: Odds_OddsGame dbName: odds__odds_games + constructors: + - name: Odds_OddsGame + fields: + - name: odds_OddsGame0 + dbName: odds_id + - name: odds_OddsGame1 + dbName: odds_games_id - entity: OddsGame_OddsGameTeam dbName: odds_games__odds_games_teams @@ -350,9 +378,13 @@ instance DbImport Message where away_team_id <- insert_xml_or_select (xml_game_away_team g) home_team_id <- insert_xml_or_select (xml_game_home_team g) - -- Insert a record into odds_games__odds_games_teams - -- mapping the home/away teams to this game. - insert_ (OddsGame_OddsGameTeam game_id away_team_id home_team_id) + -- 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 -- game and the lines for the casinos all wind up in the same @@ -363,12 +395,12 @@ instance DbImport Message where ou_casino_id <- insert_xml_or_select c -- Now add the over/under entry with the casino's id. - let ogl = OddsGameLine - game_id - ou_casino_id - (xml_casino_line c) - Nothing - Nothing + let ogl = OddsGameLine { + ogl_odds_games_id = game_id, + ogl_odds_casinos_id = ou_casino_id, + ogl_over_under = (xml_casino_line c), + ogl_away_line = Nothing, + ogl_home_line = Nothing } insertByAll ogl @@ -430,7 +462,7 @@ pickle_home_team = xpElem "HomeTeam" $ xpWrap (from_tuple, to_tuple) $ xp5Tuple - (xpElem "HomeTeamID" xpInt) + (xpElem "HomeTeamID" xp_team_id) (xpElem "HomeRotationNumber" xpInt) (xpElem "HomeAbbr" xpText) (xpElem "HomeTeamName" xpText) @@ -451,7 +483,7 @@ pickle_away_team = xpElem "AwayTeam" $ xpWrap (from_tuple, to_tuple) $ xp5Tuple - (xpElem "AwayTeamID" xpInt) + (xpElem "AwayTeamID" xp_team_id) (xpElem "AwayRotationNumber" xpInt) (xpElem "AwayAbbr" xpText) (xpElem "AwayTeamName" xpText) @@ -460,10 +492,10 @@ pickle_away_team = 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_name, - xml_away_casinos) + xml_away_rotation_number, + xml_away_abbr, + xml_away_team_name, + xml_away_casinos) @@ -541,8 +573,14 @@ test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" [ check "pickle composed with unpickle is the identity" "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", + check "pickle composed with unpickle is the identity (positive(+) line)" - "test/xml/Odds_XML-positive-line.xml" ] + "test/xml/Odds_XML-positive-line.xml", + + check "pickle composed with unpickle is the identity (large file)" + "test/xml/Odds_XML-largefile.xml" ] where check desc path = testCase desc $ do (expected, actual) <- pickle_unpickle pickle_message path @@ -554,8 +592,14 @@ test_unpickle_succeeds = testGroup "unpickle tests" [ check "unpickling succeeds" "test/xml/Odds_XML.xml", + check "unpickling succeeds (non-int team_id)" + "test/xml/Odds_XML-noninteger-team-id.xml", + check "unpickling succeeds (positive(+) line)" - "test/xml/Odds_XML-positive-line.xml" ] + "test/xml/Odds_XML-positive-line.xml", + + check "unpickling succeeds (large file)" + "test/xml/Odds_XML-largefile.xml" ] where check desc path = testCase desc $ do actual <- unpickleable path pickle_message