fix: use db to set priority if missing in payload

campudus · Jan 20, 2025 · cbec214 · cbec214
1 parent a0b108b
commit cbec214
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/src/main/scala/com/campudus/tableaux/database/model/CellAnnotationConfigModel.scala b/src/main/scala/com/campudus/tableaux/database/model/CellAnnotationConfigModel.scala
@@ -126,17 +126,16 @@ class CellAnnotationConfigModel(override protected[this] val connection: Databas
                     |  is_multilang,
                     |  is_dashboard)
                     |VALUES
-                    |  (?, ?, ?, ?, ?, ?, ?) RETURNING name""".stripMargin
+                    |  (?, COALESCE(?, (SELECT MAX(priority) FROM $table), 0) + 1, ?, ?, ?, ?, ?) RETURNING name""".stripMargin
 
     for {
       _ <- checkUniqueName(name)
-      newPriority <- getNewPriority()
       result <- connection.query(
         insert,
         Json
           .arr(
             name,
-            priority.getOrElse(newPriority),
+            priority.getOrElse(null),
             fgColor,
             bgColor,
             displayName.getJson.toString,
@@ -186,14 +185,4 @@ class CellAnnotationConfigModel(override protected[this] val connection: Databas
           ))
       })
   }
-
-  private def getNewPriority(): Future[Int] = {
-    val sql = s"SELECT MAX(priority) FROM $table"
-
-    for {
-      maxPriority <- connection.selectSingleValue[Int](sql)
-    } yield {
-      maxPriority + 1
-    }
-  }
 }