Insertion working

ChangeLog.md

@@ -1,3 +1,3 @@
-# Changelog for Holidays-in-UK
-
-## Unreleased changes
+# Changelog for Holidays-in-UK
+
+## Unreleased changes

LICENSE

@@ -1,30 +1,30 @@
-Copyright Author name here (c) 2020
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Author name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright Author name here (c) 2020
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Author name here nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Setup.hs

@@ -1,2 +1,2 @@
-import Distribution.Simple
-main = defaultMain
+import Distribution.Simple
+main = defaultMain

app/Main.hs

@@ -1,26 +1,29 @@
-module Main where
-
-import Http
-import Parse
-import Database
-
-main :: IO ()
-main = do 
-    let url = "https://date.nager.at/api/v2/publicholidays/2020/GB"
-    print "Downloading..."
-    json <- download url
-    print "Parsing"
-    case (parse json) of
-          Left err -> print err
-          -- Print first record
-          Right recs -> do 
-                    print recs
-                    -- Print 5 records
-                    -- Right recs -> print . (take 5) $ (HolidayRecord recs)
-                    print "Saving on DB"
-                    conn <- initialiseDB
-                    insertDB conn recs 
-                    print "Done!"
-
-        -- P.S It Outputs the haskell datatype we specified
-
+module Main where
+
+import Http
+import Parse
+import Database
+
+main :: IO ()
+main = do 
+    let url = "https://date.nager.at/api/v2/publicholidays/2020/GB"
+    print "Downloading..."
+    json <- download url
+    print "Parsing"
+    case (parse json) of
+          Left err -> print err
+          -- Print first record
+          Right recs -> do 
+                    print recs
+                    -- Print 5 records
+                    -- Right recs -> print . (take 5) $ (HolidayRecord recs)
+                    print "Saving on DB"
+                    conn <- initialiseDB
+                    insertDB conn recs 
+                    insertSB conn recs
+                    insertLB conn recs  
+                    print "Done!"
+
+
+        -- P.S It Outputs the haskell datatype we specified
+

package.yaml

@@ -1,53 +1,53 @@
-name:                Holidays-in-UK
-version:             0.1.0.0
-github:              "githubuser/Holidays-in-UK"
-license:             BSD3
-author:              "Author name here"
-maintainer:          "[email protected]"
-copyright:           "2020 Author name here"
-
-extra-source-files:
-- README.md
-- ChangeLog.md
-
-# Metadata used when publishing your package
-# synopsis:            Short description of your package
-# category:            Web
-
-# To avoid duplicated efforts in documentation and dealing with the
-# complications of embedding Haddock markup inside cabal files, it is
-# common to point users to the README.md file.
-description:         Please see the README on GitHub at <https://github.com/githubuser/Holidays-in-UK#readme>
-
-dependencies:
-- base >= 4.7 && < 5
-- http-conduit
-- bytestring
-- aeson
-- HDBC
-- HDBC-sqlite3
-
-library:
-  source-dirs: src
-
-executables:
-  Holidays-in-UK-exe:
-    main:                Main.hs
-    source-dirs:         app
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - Holidays-in-UK
-
-tests:
-  Holidays-in-UK-test:
-    main:                Spec.hs
-    source-dirs:         test
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - Holidays-in-UK
+name:                Holidays-in-UK
+version:             0.1.0.0
+github:              "githubuser/Holidays-in-UK"
+license:             BSD3
+author:              "Author name here"
+maintainer:          "[email protected]"
+copyright:           "2020 Author name here"
+
+extra-source-files:
+- README.md
+- ChangeLog.md
+
+# Metadata used when publishing your package
+# synopsis:            Short description of your package
+# category:            Web
+
+# To avoid duplicated efforts in documentation and dealing with the
+# complications of embedding Haddock markup inside cabal files, it is
+# common to point users to the README.md file.
+description:         Please see the README on GitHub at <https://github.com/githubuser/Holidays-in-UK#readme>
+
+dependencies:
+- base >= 4.7 && < 5
+- http-conduit
+- bytestring
+- aeson
+- HDBC
+- HDBC-sqlite3
+
+library:
+  source-dirs: src
+
+executables:
+  Holidays-in-UK-exe:
+    main:                Main.hs
+    source-dirs:         app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - Holidays-in-UK
+
+tests:
+  Holidays-in-UK-test:
+    main:                Spec.hs
+    source-dirs:         test
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - Holidays-in-UK

src/Database.hs

@@ -14,8 +14,6 @@ import Database.HDBC
   )
 import Database.HDBC.Sqlite3 (Connection, connectSqlite3)
 import Parse
-  ( HolidayRecord (countryCode, date, global, localName, name),
-  )
 
 -- This is a function that creates the tables
 -- if the tables do not exists yet
@@ -27,15 +25,15 @@ initialiseDB = do
     "CREATE TABLE IF NOT EXISTS holidays (\
     \ date VARCHAR(40) NOT NULL, \
     \ localName VARCHAR(40) NOT NULL, \
-    \ name VARCHAR(40) NOT NULL, \
-    \ global BOOL DEFAULT NULL \
+    \ name VARCHAR(40) NOT NULL \
     \)"
     []
   commit conn
   run
     conn
     "CREATE TABLE IF NOT EXISTS countries (\
-    \ countryCode VARCHAR(40) NOT NULL \
+    \ countryCode VARCHAR(40) NOT NULL, \
+    \ global BOOL DEFAULT NULL \
     \)"
     []
   commit conn
@@ -61,12 +59,30 @@ insertDB :: Connection -> [HolidayRecord] -> IO ()
 insertDB conn records = do
   let xs = records -- need to use records and produce xs, this seems easiest possibility
   -- xs' <- filter (dateNotInDB conn) (nub xs)
-  stmt <- prepare conn "INSERT INTO holidays (date,localName,name,global) VALUES (?,?,?,?)"
+  stmt <- prepare conn "INSERT INTO holidays (date,localName,name) VALUES (?,?,?)"
   putStrLn "Adding"
   -- let xs'' = mapM_ (\x -> putStrLn $ " - " ++ x) xs'
-  executeMany stmt (map (\x -> [toSql (date x), toSql (localName x), toSql (name x), toSql (global x)]) xs)
+  executeMany stmt (map (\x -> [toSql (date x), toSql (localName x), toSql (name x)]) xs)
   commit conn
 
+-- This function will insert the country records into the dsatabase
+insertLB :: Connection -> [HolidayRecord] -> IO ()
+insertLB conn records = do
+    let xs = records
+    stmt <- prepare conn "INSERT INTO countries (countryCode,global) VALUES (?,?)"
+    putStrLn "Adding"
+    executeMany stmt (map (\x -> [toSql (countryCode x), toSql (global x)]) xs)
+    commit conn
+
+-- This function will insert the country_holidays records into the dsatabase
+insertSB :: Connection -> [HolidayRecord] -> IO ()
+insertSB conn records = do
+    let xs = records
+    stmt <- prepare conn "INSERT INTO country_holidays (countryCode,localName) VALUES (?,?)"
+    putStrLn "Adding"
+    executeMany stmt (map (\x -> [toSql (countryCode x), toSql (localName x)]) xs)
+    commit conn
+
 -- This function will select all the holidays of a given country
 queryDB :: Connection -> String -> IO [[SqlValue]]
 queryDB conn countryCode = do
@@ -76,7 +92,9 @@ queryDB conn countryCode = do
 --This function will select all the holidays in the date specified of a given country
 querySQ :: Connection -> String -> IO Bool
 querySQ conn date = do
-  res <- quickQuery' conn "SELECT localName FROM holidays WHERE date BETWEEN'1-JAN-20'AND'31-JUL-20'"[toSql date]
+  let d1 = "31-JUL-20"
+  let d2 = "1-JAN-20"
+  res <- quickQuery' conn "SELECT localName FROM holidays WHERE date BETWEEN (?) AND (?)" [toSql date]
   return (length res == 0)
 
 -- This function will call all the names on the database.
@@ -90,28 +108,34 @@ recordToSqlValues :: HolidayRecord -> [SqlValue]
 recordToSqlValues holidays =
   [ toSql $ date holidays,
     toSql $ localName holidays,
-    toSql $ name holidays,
-    toSql $ global holidays
+    toSql $ name holidays
   ]
 
 holidayToSqlValues :: HolidayRecord -> [SqlValue]
 holidayToSqlValues countries =
-  [ toSql $ countryCode countries
+  [ toSql $ countryCode countries,
+      toSql $ global countries
   ]
 
+
 prepareInsertRecordStmt :: Connection -> IO Statement
 prepareInsertRecordStmt conn = prepare conn "INSERT INTO holidays VALUES (?,?)"
-{- 
-prepareInsertHolidayStmt conn = prepare conn "INSERT INTO holiday VALUES (?,?,?)"
 
-prepareInsertGlobalStmt conn = prepare conn "INSERT INTO country_holidays VALUES (?,?,?)"
--}
+prepareSelectRecordStma :: Connection -> IO Statement
+prepareSelectRecordStma conn = prepare conn "SELECT FROM Country_holidays VALUES (?,?)"
+
+
 saveHolidayRecord :: [HolidayRecord] -> Connection -> IO ()
 saveHolidayRecord records conn = do
-  stmt <- prepareInsertRecordStmt conn
-  executeMany stmt (map recordToSqlValues records)
-  commit conn
-
-dateNotInDB = undefined  
+       stmt <- prepareInsertRecordStmt conn
+       executeMany stmt (map recordToSqlValues records)
+       commit conn
+savecountriesRecord :: [HolidayRecord] -> Connection -> IO ()
+savecountriesRecord record conn = do
+       stma <- prepareSelectRecordStma conn
+       executeMany stma (map recordToSqlValues record)
+       commit conn
+
+dateNotInDB = undefined
 
 nub = undefined

src/Http.hs

@@ -1,15 +1,15 @@
-module Http
-    ( download
-    ) where
-
-import qualified Data.ByteString.Lazy.Char8 as L8
-import Network.HTTP.Simple
-
-type URL = String
-
-download :: String -> IO L8.ByteString
-download url = do
-    request <- parseRequest url
-    response <- httpLBS request
-    return $ getResponseBody response
-
+module Http
+    ( download
+    ) where
+
+import qualified Data.ByteString.Lazy.Char8 as L8
+import Network.HTTP.Simple
+
+type URL = String
+
+download :: String -> IO L8.ByteString
+download url = do
+    request <- parseRequest url
+    response <- httpLBS request
+    return $ getResponseBody response
+