EZP-31039: Skip requirement of sort params when updating Location via…

… REST (#57) Co-authored-by: Bartek Wajda <bartlomiej.wajda@ibexa.co>
ezsystems · Oct 27, 2020 · 479ab9e · 479ab9e
1 parent 64a7a59
commit 479ab9e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 19 deletions.
diff --git a/src/lib/Server/Input/Parser/LocationUpdate.php b/src/lib/Server/Input/Parser/LocationUpdate.php
@@ -9,7 +9,6 @@
 use EzSystems\EzPlatformRest\Input\BaseParser;
 use EzSystems\EzPlatformRest\Input\ParsingDispatcher;
 use EzSystems\EzPlatformRest\Input\ParserTools;
-use EzSystems\EzPlatformRest\Exceptions;
 use eZ\Publish\API\Repository\LocationService;
 use EzSystems\EzPlatformRest\Server\Values\RestLocationUpdateStruct;
 
@@ -69,18 +68,14 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
             $hidden = $this->parserTools->parseBooleanValue($data['hidden']);
         }
 
-        if (!array_key_exists('sortField', $data)) {
-            throw new Exceptions\Parser("Missing 'sortField' element for LocationUpdate.");
+        if (array_key_exists('sortField', $data)) {
+            $locationUpdateStruct->sortField = $this->parserTools->parseDefaultSortField($data['sortField']);
         }
 
-        $locationUpdateStruct->sortField = $this->parserTools->parseDefaultSortField($data['sortField']);
-
-        if (!array_key_exists('sortOrder', $data)) {
-            throw new Exceptions\Parser("Missing 'sortOrder' element for LocationUpdate.");
+        if (array_key_exists('sortOrder', $data)) {
+            $locationUpdateStruct->sortOrder = $this->parserTools->parseDefaultSortOrder($data['sortOrder']);
         }
 
-        $locationUpdateStruct->sortOrder = $this->parserTools->parseDefaultSortOrder($data['sortOrder']);
-
         return new RestLocationUpdateStruct($locationUpdateStruct, $hidden);
     }
 }
diff --git a/tests/lib/Server/Input/Parser/LocationUpdateTest.php b/tests/lib/Server/Input/Parser/LocationUpdateTest.php
@@ -74,37 +74,61 @@ public function testParse()
     }
 
     /**
-     * Test LocationUpdate parser throwing exception on missing sort field.
+     * Test LocationUpdate parser with missing sort field.
      */
-    public function testParseExceptionOnMissingSortField()
+    public function testParseWithMissingSortField()
     {
-        $this->expectException('EzSystems\EzPlatformRest\Exceptions\Parser');
-        $this->expectExceptionMessage('Missing \'sortField\' element for LocationUpdate.');
         $inputArray = [
             'priority' => 0,
             'remoteId' => 'remote-id',
             'sortOrder' => 'ASC',
         ];
 
         $locationUpdate = $this->getParser();
-        $locationUpdate->parse($inputArray, $this->getParsingDispatcherMock());
+        $result = $locationUpdate->parse($inputArray, $this->getParsingDispatcherMock());
+
+        $this->assertInstanceOf(
+            RestLocationUpdateStruct::class,
+            $result
+        );
+
+        $this->assertInstanceOf(
+            LocationUpdateStruct::class,
+            $result->locationUpdateStruct
+        );
+
+        $this->assertNull(
+            $result->locationUpdateStruct->sortField
+        );
     }
 
     /**
-     * Test LocationUpdate parser throwing exception on missing sort order.
+     * Test LocationUpdate parser with missing sort order.
      */
-    public function testParseExceptionOnMissingSortOrder()
+    public function testParseWithMissingSortOrder()
     {
-        $this->expectException(Parser::class);
-        $this->expectExceptionMessage('Missing \'sortOrder\' element for LocationUpdate.');
         $inputArray = [
             'priority' => 0,
             'remoteId' => 'remote-id',
             'sortField' => 'PATH',
         ];
 
         $locationUpdate = $this->getParser();
-        $locationUpdate->parse($inputArray, $this->getParsingDispatcherMock());
+        $result = $locationUpdate->parse($inputArray, $this->getParsingDispatcherMock());
+
+        $this->assertInstanceOf(
+            RestLocationUpdateStruct::class,
+            $result
+        );
+
+        $this->assertInstanceOf(
+            LocationUpdateStruct::class,
+            $result->locationUpdateStruct
+        );
+
+        $this->assertNull(
+            $result->locationUpdateStruct->sortOrder
+        );
     }
 
     /**