Fix Create and Update request models (#22)

* Fix Create and Update request models

* Minor changes

Author: KapStorm

spra-api/shared/src/main/scala/net/wiringbits/spra/api/AdminDataExplorerApiClient.scala

@@ -24,7 +24,7 @@ trait AdminDataExplorerApiClient {
 
   def createItem(tableName: String, request: AdminCreateTable.Request): Future[AdminCreateTable.Response]
 
-  def updateItem(tableName: String, id: String, request: Map[String, String]): Future[AdminUpdateTable.Response]
+  def updateItem(tableName: String, id: String, request: AdminUpdateTable.Request): Future[AdminUpdateTable.Response]
 
   def deleteItem(tableName: String, id: String): Future[AdminDeleteTable.Response]
 }
@@ -152,7 +152,7 @@ object AdminDataExplorerApiClient {
     override def updateItem(
         tableName: String,
         id: String,
-        request: Map[String, String]
+        request: AdminUpdateTable.Request
     ): Future[AdminUpdateTable.Response] = {
       val path = ServerAPI.path :+ "admin" :+ "tables" :+ tableName :+ id
       val uri = ServerAPI.withPath(path)

spra-api/shared/src/main/scala/net/wiringbits/spra/api/models/AdminCreateTable.scala

@@ -1,14 +1,16 @@
 package net.wiringbits.spra.api.models
 
-import play.api.libs.json.{Format, Json}
+import play.api.libs.json.{Format, Json, Reads, Writes}
 
 object AdminCreateTable {
   case class Request(data: Map[String, String])
 
   case class Response(id: String)
 
-  implicit val adminCreateTableRequestFormat: Format[Request] =
-    Json.format[Request]
+  implicit val adminCreateTableRequestFormat: Format[Request] = Format[Request](
+    fjs = implicitly[Reads[Map[String, String]]].map(Request.apply),
+    tjs = Writes[Request](x => Json.toJson(x.data))
+  )
 
   implicit val adminCreateTableResponseFormat: Format[Response] =
     Json.format[Response]

spra-api/shared/src/main/scala/net/wiringbits/spra/api/models/AdminUpdateTable.scala

@@ -1,13 +1,15 @@
 package net.wiringbits.spra.api.models
 
-import play.api.libs.json.{Format, Json}
+import play.api.libs.json.{Format, Json, Reads, Writes}
 
 object AdminUpdateTable {
   case class Request(data: Map[String, String])
   case class Response(id: String)
 
-  implicit val adminUpdateTableRequestFormat: Format[Request] =
-    Json.format[Request]
+  implicit val adminUpdateTableRequestFormat: Format[Request] = Format[Request](
+    fjs = implicitly[Reads[Map[String, String]]].map(Request.apply),
+    tjs = Writes[Request](x => Json.toJson(x.data))
+  )
 
   implicit val adminUpdateTableResponseFormat: Format[Response] =
     Json.format[Response]

spra-play-server/src/main/scala/net/wiringbits/spra/admin/controllers/AdminController.scala

@@ -54,18 +54,18 @@ class AdminController @Inject() (
     } yield Ok(Json.toJson(response.map(Json.toJson(_))))
   }
 
-  def create(tableName: String) = handleJsonBody[Map[String, String]] { request =>
-    val body = AdminCreateTable.Request(request.body)
+  def create(tableName: String) = handleJsonBody[AdminCreateTable.Request] { request =>
+    val body = request.body
     for {
       _ <- adminUser(request)
       _ = logger.info(s"Create row in $tableName: ${body.data}")
       id <- adminService.create(tableName, body)
     } yield Ok(Json.toJson(AdminCreateTable.Response(id)))
   }
 
-  def update(tableName: String, primaryKeyValue: String) = handleJsonBody[Map[String, String]] { request =>
+  def update(tableName: String, primaryKeyValue: String) = handleJsonBody[AdminUpdateTable.Request] { request =>
     val primaryKeyFieldName = dataExplorerConfig.unsafeFindByName(tableName).primaryKeyField
-    val body = request.body.map {
+    val body = request.body.data.map {
       case ("id", value) => primaryKeyFieldName -> value
       case x => x
     }

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

@@ -5,7 +5,7 @@ import controllers.common.PlayPostgresSpec
 import net.wiringbits.spra.admin.AppRouter
 import net.wiringbits.spra.admin.config.{DataExplorerConfig, PrimaryKeyDataType, TableSettings}
 import net.wiringbits.spra.admin.controllers.{AdminController, ImagesController}
-import net.wiringbits.spra.api.models.AdminCreateTable
+import net.wiringbits.spra.api.models.{AdminCreateTable, AdminUpdateTable}
 import org.apache.commons.lang3.StringUtils
 import play.api.inject
 import play.api.inject.guice.GuiceApplicationBuilder
@@ -758,7 +758,7 @@ class AdminControllerSpec extends PlayPostgresSpec with AdminUtils {
       val userId = response.headOption.value.find(_._1 == "id").value._2
 
       val email = "wiringbits@wiringbits.net"
-      val updateRequest = Map("email" -> email)
+      val updateRequest = AdminUpdateTable.Request(Map("email" -> email))
       val updateResponse = client.updateItem(usersSettings.tableName, userId, updateRequest).futureValue
 
       val newResponse = client.viewItem(usersSettings.tableName, userId).futureValue
@@ -778,7 +778,7 @@ class AdminControllerSpec extends PlayPostgresSpec with AdminUtils {
         val id = response.headOption.value.find(_._1 == "id").value._2
 
         val name = "wiringbitsbitsbits"
-        val updateRequest = Map("name" -> name)
+        val updateRequest = AdminUpdateTable.Request(Map("name" -> name))
         val updateResponse = client.updateItem(table.tableName, id, updateRequest).futureValue
 
         val newResponse = client.viewItem(table.tableName, id).futureValue
@@ -798,7 +798,7 @@ class AdminControllerSpec extends PlayPostgresSpec with AdminUtils {
       val userId = response.headOption.value.find(_._1 == "id").value._2
 
       val email = "wiringbits@wiringbits.net"
-      val updateRequest = Map("nonExistentField" -> email)
+      val updateRequest = AdminUpdateTable.Request(Map("nonExistentField" -> email))
       val error = client.updateItem("users", userId, updateRequest).expectError
       error must be("A field doesn't correspond to this table schema")
     }
@@ -815,7 +815,7 @@ class AdminControllerSpec extends PlayPostgresSpec with AdminUtils {
         val id = response.headOption.value.find(_._1 == "id").value._2
 
         val name = "wiringbits"
-        val updateRequest = Map("nonExistentField" -> name)
+        val updateRequest = AdminUpdateTable.Request(Map("nonExistentField" -> name))
         val error = client.updateItem(table.tableName, id, updateRequest).expectError
         error must be("A field doesn't correspond to this table schema")
       }