reactivate ignored test

campudus · Aug 2, 2024 · 98cf628 · 98cf628
1 parent 7532f32
commit 98cf628
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 27 deletions.
diff --git a/src/main/scala/com/campudus/tableaux/controller/SystemController.scala b/src/main/scala/com/campudus/tableaux/controller/SystemController.scala
@@ -101,6 +101,7 @@ class SystemController(
     for {
       _ <- roleModel.checkAuthorization(EditSystem)
       _ <- repository.uninstall()
+      _ <- repository.installShortCutFunction()
       _ <- repository.install()
       _ <- invalidateCache()
       _ <- structureModel.columnStruc.removeAllCache()

diff --git a/src/main/scala/com/campudus/tableaux/database/model/SystemModel.scala b/src/main/scala/com/campudus/tableaux/database/model/SystemModel.scala
@@ -20,18 +20,19 @@ object SystemModel {
 class SystemModel(override protected[this] val connection: DatabaseConnection) extends DatabaseQuery {
 
   /**
-    * Runs all setup functions.
+    * Runs all needed setup functions.
     */
   def install(version: Option[Int] = None): Future[Unit] = {
     for {
       t <- connection.begin()
 
       // retrieve but ignore version
-      (t, _) <- retrieveCurrentVersion(t)
+      (t, installedVersions) <- retrieveCurrentVersion(t)
 
       t <- version
         .map(i => setupFunctions.take(i))
         .getOrElse(setupFunctions)
+        .drop(installedVersions)
         .foldLeft(Future(t)) {
           case (t, setup) =>
             t.flatMap(setup)
@@ -43,6 +44,28 @@ class SystemModel(override protected[this] val connection: DatabaseConnection) e
     } yield ()
   }
 
+  /**
+    * Runs all setup functions.
+    */
+  def installShortCutFunction(): Future[Unit] = {
+    for {
+      t <- connection.begin()
+
+      // retrieve but ignore version
+      (t, _) <- retrieveCurrentVersion(t)
+
+      t <- setupShortCutFunction
+        .foldLeft(Future(t)) {
+          case (t, setup) =>
+            t.flatMap(setup)
+        }
+
+      _ = logger.info("Setup shortcut schema finished")
+
+      _ <- t.commit()
+    } yield ()
+  }
+
   /**
     * Runs only necessary setup functions based on current version.
     *
@@ -127,6 +150,44 @@ class SystemModel(override protected[this] val connection: DatabaseConnection) e
   }
 
   private val setupFunctions: Seq[DbTransaction => Future[DbTransaction]] = Seq(
+    setupVersion(readSchemaFile("schema_v1"), 1),
+    setupVersion(readSchemaFile("schema_v2"), 2),
+    setupVersion(readSchemaFile("schema_v3"), 3),
+    setupVersion(readSchemaFile("schema_v4"), 4),
+    setupVersion(readSchemaFile("schema_v5"), 5),
+    setupVersion(readSchemaFile("schema_v6"), 6),
+    setupVersion(readSchemaFile("schema_v7"), 7),
+    setupVersion(readSchemaFile("schema_v8"), 8),
+    setupVersion(readSchemaFile("schema_v9"), 9),
+    setupVersion(readSchemaFile("schema_v10"), 10),
+    setupVersion(readSchemaFile("schema_v11"), 11),
+    setupVersion(readSchemaFile("schema_v12"), 12),
+    setupVersion(readSchemaFile("schema_v13"), 13),
+    setupVersion(readSchemaFile("schema_v14"), 14),
+    setupVersion(readSchemaFile("schema_v15"), 15),
+    setupVersion(readSchemaFile("schema_v16"), 16),
+    setupVersion(readSchemaFile("schema_v17"), 17),
+    setupVersion(readSchemaFile("schema_v18"), 18),
+    setupVersion(readSchemaFile("schema_v19"), 19),
+    setupVersion(readSchemaFile("schema_v20"), 20),
+    setupVersion(readSchemaFile("schema_v21"), 21),
+    setupVersion(readSchemaFile("schema_v22"), 22),
+    setupVersion(readSchemaFile("schema_v23"), 23),
+    setupVersion(readSchemaFile("schema_v24"), 24),
+    setupVersion(readSchemaFile("schema_v25"), 25),
+    setupVersion(readSchemaFile("schema_v26"), 26),
+    setupVersion(readSchemaFile("schema_v27"), 27),
+    setupVersion(readSchemaFile("schema_v28"), 28),
+    setupVersion(readSchemaFile("schema_v29"), 29),
+    setupVersion(readSchemaFile("schema_v30"), 30),
+    setupVersion(readSchemaFile("schema_v31"), 31),
+    setupVersion(readSchemaFile("schema_v32"), 32),
+    setupVersion(readSchemaFile("schema_v33"), 33),
+    setupVersion(readSchemaFile("schema_v34"), 34),
+    setupVersion(readSchemaFile("schema_v35"), 35)
+  )
+
+  private val setupShortCutFunction: Seq[DbTransaction => Future[DbTransaction]] = Seq(
     setupVersion(readSchemaFile("merged_schema_until_v35"), 35)
   )
 

diff --git a/src/test/scala/com/campudus/tableaux/controller/SystemControllerTest.scala b/src/test/scala/com/campudus/tableaux/controller/SystemControllerTest.scala
@@ -68,31 +68,31 @@ class SystemControllerTest extends TableauxTestBase {
     }
   }
 
-  // @Test
-  // def retrieveVersions(implicit c: TestContext): Unit = {
-  //   okTest {
-  //     val expectedJson = Json.obj(
-  //       "database" -> Json.obj(
-  //         "current" -> 35,
-  //         "specification" -> 35
-  //       )
-  //     )
-
-  //     for {
-  //       _ <- {
-  //         val nonce = SystemRouter.generateNonce()
-  //         sendRequest("POST", s"/system/reset?nonce=$nonce")
-  //       }
-  //       _ <- {
-  //         val nonce = SystemRouter.generateNonce()
-  //         sendRequest("POST", s"/system/resetDemo?nonce=$nonce")
-  //       }
-  //       versions <- sendRequest("GET", "/system/versions")
-  //     } yield {
-  //       assertJSONEquals(expectedJson, versions.getJsonObject("versions"))
-  //     }
-  //   }
-  // }
+  @Test
+  def retrieveVersions(implicit c: TestContext): Unit = {
+    okTest {
+      val expectedJson = Json.obj(
+        "database" -> Json.obj(
+          "current" -> 35,
+          "specification" -> 35
+        )
+      )
+
+      for {
+        _ <- {
+          val nonce = SystemRouter.generateNonce()
+          sendRequest("POST", s"/system/reset?nonce=$nonce")
+        }
+        _ <- {
+          val nonce = SystemRouter.generateNonce()
+          sendRequest("POST", s"/system/resetDemo?nonce=$nonce")
+        }
+        versions <- sendRequest("GET", "/system/versions")
+      } yield {
+        assertJSONEquals(expectedJson, versions.getJsonObject("versions"))
+      }
+    }
+  }
 
   @Test
   def resetWithInvalidatedNonceAndNoRequestNonce(implicit c: TestContext): Unit = {

diff --git a/src/test/scala/com/campudus/tableaux/testtools/TableauxTestBase.scala b/src/test/scala/com/campudus/tableaux/testtools/TableauxTestBase.scala
@@ -116,6 +116,7 @@ trait TableauxTestBase
 
         for {
           _ <- system.uninstall()
+          _ <- system.installShortCutFunction()
           _ <- system.install()
         } yield async.complete()