IBX-1507: Provided additional arguments for Location Visitor (#86)

* IBX-1507: Provided additional arguments for Location Visitor

* IBX-1507: Updated service definition

* IBX-1507: Provided functional test

* IBX-1507: CS remarks

* IBX-1507: Rollback stdClass usage

Author: barw4

src/bundle/Resources/config/value_object_visitors.yml

@@ -598,7 +598,9 @@ services:
         class: "%ezpublish_rest.output.value_object_visitor.Location.class%"
         tags:
             - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Location }
-        arguments: ["@ezpublish.api.service.location"]
+        arguments:
+            $locationService: '@ezpublish.api.service.location'
+            $contentService: '@ezpublish.api.service.content'
 
     ezpublish_rest.output.value_object_visitor.LocationList:
         parent: ezpublish_rest.output.value_object_visitor.base

src/lib/Server/Output/ValueObjectVisitor/Location.php

@@ -6,7 +6,9 @@
  */
 namespace EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor;
 
+use eZ\Publish\API\Repository\Exceptions\UnauthorizedException;
 use eZ\Publish\API\Repository\LocationService;
+use eZ\Publish\API\Repository\ContentService;
 use EzSystems\EzPlatformRest\Output\ValueObjectVisitor;
 use EzSystems\EzPlatformRest\Output\Generator;
 use EzSystems\EzPlatformRest\Output\Visitor;
@@ -18,14 +20,16 @@
  */
 class Location extends ValueObjectVisitor
 {
-    /**
-     * @var \eZ\Publish\API\Repository\LocationService
-     */
+    /** @var \eZ\Publish\API\Repository\LocationService */
     private $locationService;
 
-    public function __construct(LocationService $locationService)
+    /** @var \eZ\Publish\API\Repository\ContentService */
+    private $contentService;
+
+    public function __construct(LocationService $locationService, ContentService $contentService)
     {
         $this->locationService = $locationService;
+        $this->contentService = $contentService;
     }
 
     /**
@@ -147,7 +151,27 @@ protected function visitLocationAttributes(Visitor $visitor, Generator $generato
             )
         );
         $generator->endAttribute('href');
-        $visitor->visitValueObject(new RestContentValue($location->contentInfo));
+
+        $content = $location->getContent();
+        $contentInfo = $location->contentInfo;
+
+        try {
+            $mainLocation = $contentInfo->mainLocationId === $location->id
+                ? $location
+                : $this->locationService->loadLocation($contentInfo->mainLocationId);
+        } catch (UnauthorizedException $e) {
+            $mainLocation = null;
+        }
+
+        $visitor->visitValueObject(new RestContentValue(
+                $contentInfo,
+                $mainLocation,
+                $content,
+                $content->getContentType(),
+                $this->contentService->loadRelations($content->getVersionInfo())
+            )
+        );
+
         $generator->endObjectElement('ContentInfo');
     }
 }

tests/bundle/Functional/SearchView/SearchViewTest.php

@@ -74,6 +74,40 @@ public function testSimpleXmlContentQuery(string $xmlQueryBody, int $expectedCou
         self::assertEquals($expectedCount, $this->getQueryResultsCount('xml', $body));
     }
 
+    public function testLocationsByIdQueryContainsCurrentVersionObject(): void
+    {
+        $body = <<<JSON
+        {
+            "ViewInput": {
+                "identifier": "locations-by-id",
+                "public": "false",
+                "LocationQuery": {
+                    "Filter": {
+                        "LocationIdCriterion": "2"
+                    },
+                    "limit": "10",
+                    "offset": "0"
+                }
+            }
+        }
+        JSON;
+
+        $request = $this->createHttpRequest(
+            'POST',
+            '/api/ezp/v2/views',
+            'ViewInput+json; version=1.1',
+            'View+json',
+            $body
+        );
+
+        $response = $this->sendHttpRequest($request);
+        $jsonResponse = json_decode($response->getBody()->getContents());
+
+        $content = $jsonResponse->View->Result->searchHits->searchHit[0]->value->Location->ContentInfo->Content;
+
+        self::assertIsObject($content->CurrentVersion->Version);
+    }
+
     /**
      * Covers POST with LocationQuery Logic on /api/ezp/v2/views using payload in the JSON format.
      *