incorporated feedback and made sure applyMigrations updates version number

Author: akarki2005

app/Database/Database.hs

@@ -15,8 +15,8 @@ import Control.Monad.IO.Class (MonadIO, liftIO)
 import Data.Maybe (fromMaybe)
 import Data.Text as T (findIndex, length, reverse, take, unpack)
 import Database.CourseVideoSeed (seedVideos)
-import Database.Persist.Sqlite (SqlPersistT, Entity(..), entityVal, insert_, runMigration, runMigrationQuiet,
-                                selectFirst, update, (=.))
+import Database.Persist.Sqlite (Entity (..), SqlPersistT, entityVal, insert_, runMigration,
+                                runMigrationQuiet, selectFirst, update, (=.))
 import Database.Tables
 import System.Directory (createDirectoryIfMissing)
 import WebParsing.ArtSciParser (parseCalendar)
@@ -63,7 +63,7 @@ getDatabaseVersion = do
 setDatabaseVersion :: MonadIO m => Int -> SqlPersistT m ()
 setDatabaseVersion newVersion = do
     result <- selectFirst [] []
-    case result of 
+    case result of
         Just (Entity key _) -> update key [SchemaVersionVersion =. newVersion]
         Nothing -> insert_ $ SchemaVersion newVersion
 

app/Database/Migrations.hs

@@ -2,9 +2,9 @@ module Database.Migrations
     (migrateDatabase) where
 
 import Control.Monad.Reader (MonadIO)
-import Database.Database (getDatabaseVersion)
-import Database.Persist.Sql (Migration, SqlPersistT, addMigration, runMigration, runMigrationUnsafe)
-import Database.Tables (migrateAll)
+import Data.List (sortOn)
+import Database.Database (getDatabaseVersion, setDatabaseVersion)
+import Database.Persist.Sql (Migration, SqlPersistT, addMigration, runMigrationUnsafe)
 
 data MigrationWrapper = MigrationWrapper {
     version :: Int,
@@ -14,16 +14,19 @@ data MigrationWrapper = MigrationWrapper {
 -- | Migrates the database
 migrateDatabase :: MonadIO m => SqlPersistT m ()
 migrateDatabase = do
-    -- Run unsafe migrations
     currVersion <- getDatabaseVersion
     applyMigrations currVersion migrationList
-    -- Run safe migrations
-    runMigration migrateAll
 
 -- | Migrates the database by applying only migrations newer than the current version number
 applyMigrations :: MonadIO m => Int -> [MigrationWrapper] -> SqlPersistT m ()
 applyMigrations currVersion migrations = do
-    mapM_ (runMigrationUnsafe . script) $ filter (\migration -> version migration > currVersion) migrations
+    mapM_ (runMigrationUnsafe . script)
+        $ sortOn version
+        $ filter (\migration -> version migration > currVersion) migrations
+
+    case migrations of
+        [] -> return ()
+        _ -> setDatabaseVersion $ maximum $ map version migrations
 
 -- | List of migrations
 migrationList :: [MigrationWrapper]

backend-test/Database/CourseQueriesTests.hs

@@ -34,7 +34,7 @@ runReqsForProgramTest :: String -> T.Text -> T.Text -> String -> TestTree
 runReqsForProgramTest label reqsToInsert program expected =
     testCase label $ do
         currentTime <- liftIO getCurrentTime
-        let testProgram = Program Major "Computer Science" program "Sample post description" reqsToInsert currentTime currentTime
+        let testProgram = Program Major "Computer Science" program "Sample program description" reqsToInsert currentTime currentTime
 
         runDb $ do
             clearDatabase