Merge pull request #175 from campudus/putEmptyJSON

verify PUT requests on cells should have a value
campudus · Apr 11, 2018 · 4a04aa8 · 4a04aa8
2 parents 8caa0ab + 68dd4e4
commit 4a04aa8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@ uploads*
 classes/
 !src/test/resources/com/campudus/tableaux/uploads
 bin/
+out/
+**.DS_Store
 
 # Gradle
 .gradle/

diff --git a/src/main/scala/com/campudus/tableaux/router/TableauxRouter.scala b/src/main/scala/com/campudus/tableaux/router/TableauxRouter.scala
@@ -5,11 +5,12 @@ import java.util.UUID
 import com.campudus.tableaux.controller.TableauxController
 import com.campudus.tableaux.database.domain.{CellAnnotationType, Pagination}
 import com.campudus.tableaux.helper.JsonUtils._
-import com.campudus.tableaux.{NoJsonFoundException, TableauxConfig}
+import com.campudus.tableaux.{InvalidJsonException, NoJsonFoundException, TableauxConfig}
 import org.vertx.scala.core.json.JsonArray
 import io.vertx.scala.ext.web.RoutingContext
 import org.vertx.scala.router.routing._
 
+import scala.concurrent.Future
 import scala.util.matching.Regex
 
 object TableauxRouter {
@@ -299,7 +300,11 @@ class TableauxRouter(override val config: TableauxConfig, val controller: Tablea
       asyncGetReply {
         for {
           json <- getJson(context)
-          updated <- controller.replaceCellValue(tableId.toLong, columnId.toLong, rowId.toLong, json.getValue("value"))
+          updated <- if (json.containsKey("value")) {
+            controller.replaceCellValue(tableId.toLong, columnId.toLong, rowId.toLong, json.getValue("value"))
+          } else {
+            Future.failed(InvalidJsonException("request must contain a value", "value_is_missing"))
+          }
         } yield updated
       }
 

diff --git a/src/test/scala/com/campudus/tableaux/api/content/LinkTest.scala b/src/test/scala/com/campudus/tableaux/api/content/LinkTest.scala
@@ -643,6 +643,12 @@ class LinkTest extends LinkTestBase {
     }
   }
 
+  @Test
+  def putEmptyLink(implicit c: TestContext): Unit = exceptionTest("error.json.value_is_missing") {
+    setupTwoTablesWithEmptyLinks().flatMap(linkColumnId =>
+      sendRequest("PUT", s"/tables/1/columns/$linkColumnId/rows/1", Json.obj("blub" -> "bla")))
+  }
+
   @Test
   def putLinkValues(implicit c: TestContext): Unit = {
     okTest {