X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FInjuriesDetail.hs;h=a7a7da30904e79a84775fc1d9559f180cc531415;hb=59d56f0ae0da1d4b1898b3c7536ae38473306319;hp=81b915df29b9bcb5f9004d6b77155c02872aceb9;hpb=79cba02a6f520256991b345e9dffdaedf68ddde0;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/InjuriesDetail.hs b/src/TSN/XML/InjuriesDetail.hs
index 81b915d..a7a7da3 100644
--- a/src/TSN/XML/InjuriesDetail.hs
+++ b/src/TSN/XML/InjuriesDetail.hs
@@ -18,15 +18,16 @@
 --   are not retained.
 --
 module TSN.XML.InjuriesDetail (
-  Listing ( player_listings ),
-  Message ( listings ),
-  PlayerListing,
+  Message,
   injuries_detail_tests )
 where
 
 import Data.Time ( UTCTime )
 import Data.Tuple.Curry ( uncurryN )
-import Database.Groundhog()
+import Database.Groundhog (
+  defaultMigrationLogger,
+  migrate,
+  runMigration )
 import Database.Groundhog.TH (
   defaultCodegenConfig,
   groundhog,
@@ -47,9 +48,10 @@ import Text.XML.HXT.Core (
   xpText0,
   xpWrap )
 
-import TSN.DbImport ( DbImport(..), import_generic )
 import TSN.Picklers( xp_date, xp_team_id )
-import Xml ( pickle_unpickle )
+import TSN.DbImport ( DbImport(..), ImportResult(..) )
+import TSN.XmlImport ( XmlImport(..) )
+import Xml ( FromXml(..), pickle_unpickle, unpickleable )
 
 
 data PlayerListing =
@@ -67,6 +69,12 @@ data PlayerListing =
     }
   deriving (Eq, Show)
 
+instance FromXml PlayerListing where
+  type Db PlayerListing = PlayerListing
+  from_xml = id
+
+instance XmlImport PlayerListing
+
 data Listing =
   Listing {
     listing_team_id :: Int -- ^ Avoid conflict with PlayerListing's team_id
@@ -74,6 +82,7 @@ data Listing =
     player_listings :: [PlayerListing] }
   deriving (Eq, Show)
 
+
 data Message =
   Message {
     xml_file_id :: Int,
@@ -84,6 +93,13 @@ data Message =
     time_stamp :: String }
   deriving (Eq, Show)
 
+instance DbImport Message where
+  dbimport msg = do
+    mapM_ insert_xml (concatMap player_listings $ listings msg)
+    return ImportSucceeded
+
+  dbmigrate _ =
+    runMigration defaultMigrationLogger $ migrate (undefined :: PlayerListing)
 
 mkPersist defaultCodegenConfig [groundhog|
 - entity: PlayerListing
@@ -158,21 +174,30 @@ pickle_message =
 instance XmlPickler Message where
   xpickle = pickle_message
 
-instance DbImport PlayerListing where
-  dbimport = import_generic ( (concatMap player_listings) . listings)
-
 
 -- * Tasty Tests
 injuries_detail_tests :: TestTree
 injuries_detail_tests =
   testGroup
     "InjuriesDetail tests"
-    [ test_pickle_of_unpickle_is_identity ]
+    [ test_pickle_of_unpickle_is_identity,
+      test_unpickle_succeeds ]
 
 
+-- | Warning, succeess of this test does not mean that unpickling
+--   succeeded.
 test_pickle_of_unpickle_is_identity :: TestTree
 test_pickle_of_unpickle_is_identity =
   testCase "pickle composed with unpickle is the identity" $ do
     let path = "test/xml/Injuries_Detail_XML.xml"
     (expected :: [Message], actual) <- pickle_unpickle "message" path
     actual @?= expected
+
+
+test_unpickle_succeeds :: TestTree
+test_unpickle_succeeds =
+  testCase "unpickling succeeds" $ do
+  let path = "test/xml/Injuries_Detail_XML.xml"
+  actual <- unpickleable path pickle_message
+  let expected = True
+  actual @?= expected