Bulk Update Entities: when a single JSON is in the request HTTP 500 i…

…s returned #46

rest/src/main/java/io/jmix/rest/impl/service/EntitiesControllerManager.java

@@ -574,7 +574,14 @@ public ResponseInfo updateEntities(String entitiesJson,
             responseFetchPlan = restControllerUtils.getView(metaClass, responseView);
         }
 
-        JsonArray entitiesJsonArray = new JsonParser().parse(entitiesJson).getAsJsonArray();
+        JsonElement entitiesJsonElement = new JsonParser().parse(entitiesJson);
+        if (!entitiesJsonElement.isJsonArray()) {
+            throw new RestAPIException("The body of bulk update request should be an array",
+                    "The body of bulk update request should be an array",
+                    HttpStatus.BAD_REQUEST);
+        }
+
+        JsonArray entitiesJsonArray = entitiesJsonElement.getAsJsonArray();
         Collection<Object> entities = new ArrayList<>();
         if (restProperties.isResponseFetchPlanEnabled() && responseFetchPlan != null) {
             for (JsonElement jsonElement : entitiesJsonArray) {

sample-rest/src/test/groovy/entities/EntitiesControllerTest.groovy

@@ -16,6 +16,7 @@
 
 package entities
 
+
 import test_support.RestSpec
 
 import static test_support.DataUtils.createGroup
@@ -29,6 +30,8 @@ class EntitiesControllerTest extends RestSpec {
 
         createUser(dirtyData, sql, "admin", groupId)
         createUser(dirtyData, sql, "anonymous", groupId)
+        createUser(dirtyData, sql, "login1", "testFirstName", groupId)
+        createUser(dirtyData, sql, "login2", "testFirstName", groupId)
     }
 
     def "GET-request with filter for obtaining the count of entities"() {
@@ -71,4 +74,45 @@ class EntitiesControllerTest extends RestSpec {
         response.statusCode() == 200
         response.body.as(Integer) == 1
     }
+
+    def "PUT-request to bulk update (handling case of body containing one object instead of array)"() {
+        def body =
+                [
+                        'firstName': 'Some name'
+                ]
+
+        when:
+        def request = createRequest(userToken).body(body)
+        def response = request.with().put(baseUrl + "/entities/sec\$User")
+
+        then:
+        noExceptionThrown()
+        response.statusCode == 400
+    }
+
+    def "PUT-request to bulk update"() {
+        def userRows = sql.rows("select * from SAMPLE_REST_SEC_USER where FIRST_NAME = 'testFirstName'")
+        def body =
+                [
+                        [
+                                'id'       : userRows[0].id,
+                                'firstName': 'Some name'
+                        ],
+                        [
+
+                                'id'       : userRows[1].id,
+                                'firstName': 'Some name'
+
+                        ]
+                ]
+
+        when:
+        def request = createRequest(userToken).body(body)
+        def response = request.with().put(baseUrl + "/entities/sec\$User")
+
+        then:
+        response.statusCode == 200
+        sql.rows("select * from SAMPLE_REST_SEC_USER where FIRST_NAME = 'testFirstName'").size() == 0
+        sql.rows("select * from SAMPLE_REST_SEC_USER where FIRST_NAME = 'Some name'").size() == 2
+    }
 }

sample-rest/src/test/groovy/test_support/DataUtils.groovy

@@ -68,6 +68,22 @@ class DataUtils {
         return userId
     }
 
+    static UUID createUser(DataSet dataSet, Sql sql,
+                           String login,
+                           String firstName,
+                           UUID groupId) {
+        def userId = dataSet.createUserUuid()
+        sql.dataSet('sample_rest_sec_user').add(
+                id: userId,
+                version: 1,
+                login: login,
+                login_lc: login.toLowerCase(),
+                first_name: firstName,
+                group_id: groupId
+        )
+        return userId
+    }
+
     static UUID createRole(DataSet dataSet, Sql sql, String name, String securityScope) {
         def roleId = dataSet.createRoleUuid()
         sql.dataSet('sample_rest_sec_role').add(

sample-rest/src/test/groovy/test_support/RestSpecsUtils.java

@@ -16,7 +16,6 @@
 
 package test_support;
 
-import test_support.RestTestUtils;
 import io.restassured.RestAssured;
 import io.restassured.specification.RequestSpecification;