Added tests and corrections

Author: Antonio171003

spra-play-server/src/main/scala/net/wiringbits/spra/admin/repositories/daos/DatabaseTablesDAO.scala

@@ -82,6 +82,10 @@ object DatabaseTablesDAO {
     List("int", "serial").exists(columnType.contains)
   }
 
+  private def columnTypeIsDate(columnType: String): Boolean = {
+    List("date", "time").exists(columnType.contains)
+  }
+
   private def isUUID(value: String, columnType: String): Boolean = {
     Try(UUID.fromString(value)) match {
       case Success(_) => columnType == "uuid"
@@ -123,9 +127,8 @@ object DatabaseTablesDAO {
           case None => throw Exception(s"Column with name '$filterField' not found.")
         }
         filterValue match {
-          case dateRegex(_, _, _) if columnType == "date" =>
+          case dateRegex(_, _, _) if columnTypeIsDate(columnType) =>
             s"DATE($filterField) = ?"
-
           case _ =>
             if (isNumberOrUUID(filterValue, columnType))
               s"$filterField = ?"
@@ -153,7 +156,7 @@ object DatabaseTablesDAO {
           case None => throw Exception(s"Column with name '$filterField' not found.")
         }
         filterValue match {
-          case dateRegex(year, month, day) =>
+          case dateRegex(year, month, day) if columnTypeIsDate(columnType) =>
             val parsedDate = LocalDate.of(year.toInt, month.toInt, day.toInt)
             preparedStatement.setDate(sqlIndex, Date.valueOf(parsedDate))
 

spra-play-server/src/test/scala/controllers/AdminControllerSpec.scala

@@ -532,6 +532,106 @@ class AdminControllerSpec extends PlayPostgresSpec with AdminUtils {
         .futureValue
       response.headOption.isEmpty must be(true)
     }
+
+    "don't fail when the column is citext or similar, but the value can be interpreted as Int." in withApiClient {
+      client =>
+        val name = "wiringbits"
+        val email = "[email protected]"
+        val request = AdminCreateTable.Request(
+          Map("name" -> name, "email" -> email, "password" -> "wiringbits")
+        )
+        client.createItem(usersSettings.tableName, request).futureValue
+
+        val response = client
+          .getTableMetadata(
+            usersSettings.tableName,
+            List("email", "ASC"),
+            List(0, 9),
+            """{"email":"17"}"""
+          )
+          .futureValue
+        val head = response.headOption.value
+        val nameValue = head.find(_._1 == "name").value._2
+        val emailValue = head.find(_._1 == "email").value._2
+        response.size must be(1)
+        name must be(nameValue)
+        email must be(emailValue)
+    }
+
+    "don't fail when the column is citext or similar, but the value can be interpreted as Decimal." in withApiClient {
+      client =>
+        val name = "wiringbits"
+        val email = "[email protected]"
+        val request = AdminCreateTable.Request(
+          Map("name" -> name, "email" -> email, "password" -> "wiringbits")
+        )
+        client.createItem(usersSettings.tableName, request).futureValue
+
+        val response = client
+          .getTableMetadata(
+            usersSettings.tableName,
+            List("email", "ASC"),
+            List(0, 9),
+            """{"email":"17.10"}"""
+          )
+          .futureValue
+        val head = response.headOption.value
+        val nameValue = head.find(_._1 == "name").value._2
+        val emailValue = head.find(_._1 == "email").value._2
+        response.size must be(1)
+        name must be(nameValue)
+        email must be(emailValue)
+    }
+
+    "don't fail when the column is citext or similar, but the value can be interpreted as Date." in withApiClient {
+      client =>
+        val name = "wiringbits"
+        val email = "[email protected]"
+        val request = AdminCreateTable.Request(
+          Map("name" -> name, "email" -> email, "password" -> "wiringbits")
+        )
+        client.createItem(usersSettings.tableName, request).futureValue
+
+        val response = client
+          .getTableMetadata(
+            usersSettings.tableName,
+            List("email", "ASC"),
+            List(0, 9),
+            """{"email":"2024-06"}"""
+          )
+          .futureValue
+        val head = response.headOption.value
+        val nameValue = head.find(_._1 == "name").value._2
+        val emailValue = head.find(_._1 == "email").value._2
+        response.size must be(1)
+        name must be(nameValue)
+        email must be(emailValue)
+    }
+
+    "don't fail when the column is citext or similar, but the value can be interpreted as UUID." in withApiClient {
+      client =>
+        val name = "wiringbits"
+        val email = "[email protected]"
+        val request = AdminCreateTable.Request(
+          Map("name" -> name, "email" -> email, "password" -> "wiringbits")
+        )
+        client.createItem(usersSettings.tableName, request).futureValue
+
+        val response = client
+          .getTableMetadata(
+            usersSettings.tableName,
+            List("name", "ASC"),
+            List(0, 9),
+            """{"email":"8c861a28-e384-4a9b-b7c2-a0367aa3f3e8"}"""
+          )
+          .futureValue
+        val head = response.headOption.value
+        val nameValue = head.find(_._1 == "name").value._2
+        val emailValue = head.find(_._1 == "email").value._2
+        response.size must be(1)
+        name must be(nameValue)
+        email must be(emailValue)
+    }
   }
 
   "GET /admin/tables/:tableName/:primaryKey" should {
@@ -680,7 +780,7 @@ class AdminControllerSpec extends PlayPostgresSpec with AdminUtils {
 
       responseMetadata.head.nonEmpty mustBe true
     }
-    
+
     "return new user id" in withApiClient { implicit client =>
       val user = createUser.futureValue
       val response = client.getTableMetadata(usersSettings.tableName, List("name", "ASC"), List(0, 9), "{}").futureValue