Merge branch 'master' into III-6494/rdf-convert-blank-nodes-to-named-…

…hashes

app/Event/EventRdfServiceProvider.php

@@ -10,6 +10,7 @@
 use CultuurNet\UDB3\Error\LoggerName;
 use CultuurNet\UDB3\Event\ReadModel\RDF\EventJsonToTurtleConverter;
 use CultuurNet\UDB3\Model\Serializer\Event\EventDenormalizer;
+use CultuurNet\UDB3\Model\Serializer\ValueObject\MediaObject\ImageNormalizer;
 use CultuurNet\UDB3\RDF\RdfServiceProvider;
 
 final class EventRdfServiceProvider extends AbstractServiceProvider
@@ -33,6 +34,7 @@ public function register(): void
                 $this->container->get('event_jsonld_repository'),
                 (new EventDenormalizer())->handlesDummyOrganizers(),
                 $this->container->get(AddressParser::class),
+                $this->container->get(ImageNormalizer::class),
                 LoggerFactory::create($this->getContainer(), LoggerName::forService('rdf'))
             )
         );

app/Media/MediaServiceProvider.php

@@ -6,15 +6,15 @@
 
 use Broadway\EventHandling\EventBus;
 use Broadway\UuidGenerator\Rfc4122\Version4Generator;
+use CultuurNet\UDB3\AggregateType;
 use CultuurNet\UDB3\Container\AbstractServiceProvider;
+use CultuurNet\UDB3\Error\LoggerFactory;
+use CultuurNet\UDB3\Error\LoggerName;
 use CultuurNet\UDB3\Http\Media\GetMediaRequestHandler;
 use CultuurNet\UDB3\Http\Media\UploadMediaRequestHandler;
 use CultuurNet\UDB3\Iri\CallableIriGenerator;
 use CultuurNet\UDB3\Media\Serialization\MediaObjectSerializer;
-use CultuurNet\UDB3\AggregateType;
-use CultuurNet\UDB3\Error\LoggerFactory;
-use CultuurNet\UDB3\Error\LoggerName;
-use CultuurNet\UDB3\Model\ValueObject\MediaObject\ImagesToMediaObjectReferencesConvertor;
+use CultuurNet\UDB3\Model\Serializer\ValueObject\MediaObject\ImageNormalizer;
 
 final class MediaServiceProvider extends AbstractServiceProvider
 {
@@ -31,7 +31,7 @@ protected function getProvidedServiceNames(): array
             'media_url_mapping',
             GetMediaRequestHandler::class,
             UploadMediaRequestHandler::class,
-            ImagesToMediaObjectReferencesConvertor::class,
+            ImageNormalizer::class,
         ];
     }
 
@@ -150,10 +150,11 @@ function () use ($container) {
         );
 
         $container->addShared(
-            ImagesToMediaObjectReferencesConvertor::class,
+            ImageNormalizer::class,
             function () use ($container) {
-                return new ImagesToMediaObjectReferencesConvertor(
+                return new ImageNormalizer(
                     $container->get('media_object_repository'),
+                    $container->get('media_object_iri_generator')
                 );
             }
         );

app/Organizer/OrganizerJSONLDServiceProvider.php

@@ -52,10 +52,7 @@ function () use ($container) {
                     new JsonDocumentLanguageEnricher(
                         new OrganizerJsonDocumentLanguageAnalyzer()
                     ),
-                    new ImageNormalizer(
-                        $container->get('media_object_repository'),
-                        $container->get('media_object_iri_generator')
-                    ),
+                    $this->container->get(ImageNormalizer::class),
                     new CdbXMLImporter(
                         $container->get(CdbXMLToJsonLDLabelImporter::class),
                         new CultureFeedAddressFactory()

app/Organizer/OrganizerRdfServiceProvider.php

@@ -9,7 +9,7 @@
 use CultuurNet\UDB3\Error\LoggerFactory;
 use CultuurNet\UDB3\Error\LoggerName;
 use CultuurNet\UDB3\Model\Serializer\Organizer\OrganizerDenormalizer;
-use CultuurNet\UDB3\Model\ValueObject\MediaObject\ImagesToMediaObjectReferencesConvertor;
+use CultuurNet\UDB3\Model\Serializer\ValueObject\MediaObject\ImageNormalizer;
 use CultuurNet\UDB3\Organizer\ReadModel\RDF\OrganizerJsonToTurtleConverter;
 use CultuurNet\UDB3\RDF\RdfServiceProvider;
 
@@ -31,7 +31,7 @@ public function register(): void
                 $this->container->get('organizer_jsonld_repository'),
                 new OrganizerDenormalizer(),
                 $this->container->get(AddressParser::class),
-                $this->container->get(ImagesToMediaObjectReferencesConvertor::class),
+                $this->container->get(ImageNormalizer::class),
                 LoggerFactory::create($this->getContainer(), LoggerName::forService('rdf'))
             )
         );

app/Ownership/OwnershipRequestHandlerServiceProvider.php

@@ -65,15 +65,19 @@ public function register(): void
         $container->addShared(
             GetOwnershipRequestHandler::class,
             fn () => new GetOwnershipRequestHandler(
-                $container->get(OwnershipServiceProvider::OWNERSHIP_JSONLD_REPOSITORY)
+                $container->get(OwnershipServiceProvider::OWNERSHIP_JSONLD_REPOSITORY),
+                $container->get(CurrentUser::class),
+                $container->get(OwnershipStatusGuard::class)
             )
         );
 
         $container->addShared(
             SearchOwnershipRequestHandler::class,
             fn () => new SearchOwnershipRequestHandler(
                 $container->get(OwnershipSearchRepository::class),
-                $container->get(OwnershipServiceProvider::OWNERSHIP_JSONLD_REPOSITORY)
+                $container->get(OwnershipServiceProvider::OWNERSHIP_JSONLD_REPOSITORY),
+                $container->get(CurrentUser::class),
+                $container->get(OwnershipStatusGuard::class)
             )
         );
 

features/ownership/get.feature

@@ -0,0 +1,62 @@
+Feature: Test getting a single ownership by ID
+  Background:
+    Given I am using the UDB3 base URL
+    And I am using an UiTID v1 API key of consumer "uitdatabank"
+    And I am authorized as JWT provider v1 user "centraal_beheerder"
+    And I send and accept "application/json"
+
+  Scenario: Get the ownership as an admin
+    Given I create a minimal organizer and save the "id" as "organizerId"
+    And I request ownership for "auth0|64089494e980aedd96740212" on the organizer with organizerId "%{organizerId}" and save the "id" as "ownershipId"
+    When I send a GET request to '/ownerships/%{ownershipId}'
+    Then the response status should be 200
+    And the JSON response at id should be "%{ownershipId}"
+    And the JSON response at ownerId should be "auth0|64089494e980aedd96740212"
+    And the JSON response at itemId should be "%{organizerId}"
+    And the JSON response at state should be "requested"
+    And the JSON response at itemType should be "organizer"
+    And the JSON response at requesterId should be "7a583ed3-cbc1-481d-93b1-d80fff0174dd"
+    And the JSON response at ownerEmail should be "[email protected]"
+
+  Scenario: Get the ownership as owner
+    Given I create a minimal organizer and save the "id" as "organizerId"
+    And I request ownership for "auth0|64089494e980aedd96740212" on the organizer with organizerId "%{organizerId}" and save the "id" as "ownershipId"
+    When I am authorized as JWT provider v2 user "dev_e2e_test"
+    And I send a GET request to '/ownerships/%{ownershipId}'
+    Then the response status should be 200
+    And the JSON response at id should be "%{ownershipId}"
+    And the JSON response at ownerId should be "auth0|64089494e980aedd96740212"
+    And the JSON response at itemId should be "%{organizerId}"
+    And the JSON response at state should be "requested"
+    And the JSON response at itemType should be "organizer"
+    And the JSON response at requesterId should be "7a583ed3-cbc1-481d-93b1-d80fff0174dd"
+    And the JSON response at ownerEmail should be "[email protected]"
+
+  Scenario: Not allowed to get the ownership as an unrelated user
+    Given I create a minimal organizer and save the "id" as "organizerId"
+    And I request ownership for "auth0|64089494e980aedd96740212" on the organizer with organizerId "%{organizerId}" and save the "id" as "ownershipId"
+    When I am authorized as JWT provider v2 user "invoerder"
+    And I send a GET request to '/ownerships/%{ownershipId}'
+    Then the response status should be 403
+    And the JSON response should be:
+    """
+    {
+      "type": "https://api.publiq.be/probs/auth/forbidden",
+      "title": "Forbidden",
+      "status": 403,
+      "detail": "You are not allowed to get this ownership"
+    }
+    """
+
+  Scenario: Get an unexisting ownership
+    When I send a GET request to '/ownerships/a0a9f9c0-84b5-471b-869e-c2c692217cc0'
+    Then the response status should be 404
+    And the JSON response should be:
+    """
+    {
+      "type": "https://api.publiq.be/probs/url/not-found",
+      "title": "Not Found",
+      "status": 404,
+      "detail": "The Ownership with id \"a0a9f9c0-84b5-471b-869e-c2c692217cc0\" was not found."
+    }
+    """

features/ownership/search.feature

@@ -74,17 +74,54 @@ Feature: Test searching ownerships
     And I request ownership for "auth0|631748dba64ea78e3983b203" on the organizer with organizerId "%{organizerId}" and save the "id" as "ownershipId3"
     And I request ownership for "auth0|631748dba64ea78e3983b204" on the organizer with organizerId "%{organizerId}" and save the "id" as "ownershipId4"
     And I request ownership for "auth0|631748dba64ea78e3983b205" on the organizer with organizerId "%{organizerId}" and save the "id" as "ownershipId5"
-    When I send a GET request to '/ownerships/?itemId=%{organizerId}&limit=2&start=2'
+    And I approve the ownership with ownershipId "%{ownershipId1}"
+    And I approve the ownership with ownershipId "%{ownershipId2}"
+    When I send a GET request to '/ownerships/?state=requested&itemId=%{organizerId}&imit=2&start=1'
     Then the response status should be 200
     And the JSON response at "itemsPerPage" should be 2
-    And the JSON response at "totalItems" should be 5
-    And the JSON response at "member/0/id" should be "%{ownershipId3}"
-    And the JSON response at "member/0/ownerId" should be "auth0|631748dba64ea78e3983b203"
+    And the JSON response at "totalItems" should be 3
+    And the JSON response at "member/0/id" should be "%{ownershipId4}"
+    And the JSON response at "member/0/ownerId" should be "auth0|631748dba64ea78e3983b204"
     And the JSON response at "member/0/state" should be "requested"
-    And the JSON response at "member/1/id" should be "%{ownershipId4}"
-    And the JSON response at "member/1/ownerId" should be "auth0|631748dba64ea78e3983b204"
+    And the JSON response at "member/1/id" should be "%{ownershipId5}"
+    And the JSON response at "member/1/ownerId" should be "auth0|631748dba64ea78e3983b205"
     And the JSON response at "member/1/state" should be "requested"
 
+  Scenario: Searching ownership of an organizer takes into permission organisaties bewerken
+    Given I create a minimal organizer and save the "id" as "organizerId1"
+    And I request ownership for "auth0|631748dba64ea78e3983b201" on the organizer with organizerId "%{organizerId1}" and save the "id" as "ownershipId1"
+    Given I create a minimal organizer and save the "id" as "organizerId2"
+    And I request ownership for "auth0|631748dba64ea78e3983b202" on the organizer with organizerId "%{organizerId2}" and save the "id" as "ownershipId2"
+    And I request ownership for "d759fd36-fb28-4fe3-8ec6-b4aaf990371d" on the organizer with organizerId "%{organizerId2}" and save the "id" as "ownershipId3"
+    And I approve the ownership with ownershipId "%{ownershipId3}"
+    When I am authorized as JWT provider v2 user "invoerder"
+    When I send a GET request to '/ownerships/?itemId=%{organizerId2}'
+    Then the response status should be 200
+    And the JSON response at "itemsPerPage" should be 2
+    And the JSON response at "totalItems" should be 2
+    And the JSON response at "member/0/id" should be "%{ownershipId2}"
+    And the JSON response at "member/0/ownerId" should be "auth0|631748dba64ea78e3983b202"
+    And the JSON response at "member/0/state" should be "requested"
+    And the JSON response at "member/1/id" should be "%{ownershipId3}"
+    And the JSON response at "member/1/ownerId" should be "d759fd36-fb28-4fe3-8ec6-b4aaf990371d"
+    And the JSON response at "member/1/state" should be "approved"
+
+  Scenario: Searching ownership of an organizer takes into account current owner
+    Given I create a minimal organizer and save the "id" as "organizerId1"
+    And I request ownership for "auth0|631748dba64ea78e3983b201" on the organizer with organizerId "%{organizerId1}" and save the "id" as "ownershipId1"
+    Given I create a minimal organizer and save the "id" as "organizerId2"
+    And I request ownership for "auth0|631748dba64ea78e3983b202" on the organizer with organizerId "%{organizerId2}" and save the "id" as "ownershipId2"
+    And I request ownership for "d759fd36-fb28-4fe3-8ec6-b4aaf990371d" on the organizer with organizerId "%{organizerId2}" and save the "id" as "ownershipId3"
+    When I am authorized as JWT provider v2 user "invoerder"
+    When I send a GET request to '/ownerships/?itemId=%{organizerId2}'
+    And show me the unparsed response
+    Then the response status should be 200
+    And the JSON response at "itemsPerPage" should be 1
+    And the JSON response at "totalItems" should be 1
+    And the JSON response at "member/0/id" should be "%{ownershipId3}"
+    And the JSON response at "member/0/ownerId" should be "d759fd36-fb28-4fe3-8ec6-b4aaf990371d"
+    And the JSON response at "member/0/state" should be "requested"
+
   Scenario: No ownerships found
     Given I create a minimal organizer and save the "id" as "organizerId"
     When I send a GET request to '/ownerships/?itemId=%{organizerId}'

src/Event/ReadModel/RDF/EventJsonToTurtleConverter.php

@@ -37,7 +37,7 @@
 use CultuurNet\UDB3\RDF\Editor\ContactPointEditor;
 use CultuurNet\UDB3\RDF\Editor\GraphEditor;
 use CultuurNet\UDB3\RDF\Editor\LabelEditor;
-use CultuurNet\UDB3\RDF\Editor\MediaObjectEditor;
+use CultuurNet\UDB3\RDF\Editor\ImageEditor;
 use CultuurNet\UDB3\RDF\Editor\OpeningHoursEditor;
 use CultuurNet\UDB3\RDF\Editor\VideoEditor;
 use CultuurNet\UDB3\RDF\Editor\WorkflowStatusEditor;
@@ -50,6 +50,7 @@
 use EasyRdf\Serialiser\Turtle;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 final class EventJsonToTurtleConverter implements JsonToTurtleConverter
 {
@@ -61,6 +62,7 @@ final class EventJsonToTurtleConverter implements JsonToTurtleConverter
     private DenormalizerInterface $eventDenormalizer;
     private AddressParser $addressParser;
     private LoggerInterface $logger;
+    private NormalizerInterface $imageNormalizer;
 
     private const TYPE_ACTIVITEIT = 'cidoc:E7_Activity';
     private const TYPE_SPACE_TIME = 'cidoc:E92_Spacetime_Volume';
@@ -114,6 +116,7 @@ public function __construct(
         DocumentRepository $documentRepository,
         DenormalizerInterface $eventDenormalizer,
         AddressParser $addressParser,
+        NormalizerInterface $imageNormalizer,
         LoggerInterface $logger
     ) {
         $this->eventsIriGenerator = $eventsIriGenerator;
@@ -124,6 +127,7 @@ public function __construct(
         $this->eventDenormalizer = $eventDenormalizer;
         $this->addressParser = $addressParser;
         $this->logger = $logger;
+        $this->imageNormalizer = $imageNormalizer;
     }
 
     public function convert(string $id): string
@@ -227,7 +231,10 @@ public function convert(string $id): string
         }
 
         if (!$event->getMediaObjectReferences()->isEmpty()) {
-            (new MediaObjectEditor())->setImages($resource, $event->getMediaObjectReferences());
+            (new ImageEditor($this->imageNormalizer))->setImages(
+                $resource,
+                $event->getMediaObjectReferences()->toImages()
+            );
         }
 
         return trim((new Turtle())->serialise($graph, 'turtle'));

src/Http/Ownership/GetOwnershipRequestHandler.php

@@ -9,24 +9,34 @@
 use CultuurNet\UDB3\Http\Response\JsonLdResponse;
 use CultuurNet\UDB3\ReadModel\DocumentDoesNotExist;
 use CultuurNet\UDB3\ReadModel\DocumentRepository;
+use CultuurNet\UDB3\User\CurrentUser;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 final class GetOwnershipRequestHandler implements RequestHandlerInterface
 {
     private DocumentRepository $ownershipRepository;
+    private CurrentUser $currentUser;
+    private OwnershipStatusGuard $ownershipStatusGuard;
 
-    public function __construct(DocumentRepository $ownershipRepository)
-    {
+    public function __construct(
+        DocumentRepository $ownershipRepository,
+        CurrentUser $currentUser,
+        OwnershipStatusGuard $ownershipStatusGuard
+    ) {
         $this->ownershipRepository = $ownershipRepository;
+        $this->currentUser = $currentUser;
+        $this->ownershipStatusGuard = $ownershipStatusGuard;
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $routeParameters = new RouteParameters($request);
         $ownershipId = $routeParameters->getOwnershipId();
 
+        $this->ownershipStatusGuard->isAllowedToGet($ownershipId, $this->currentUser);
+
         try {
             return new JsonLdResponse(
                 $this->ownershipRepository->fetch($ownershipId)->getRawBody()

src/Http/Ownership/OwnershipStatusGuard.php

@@ -25,6 +25,34 @@ public function __construct(
         $this->permissionVoter = $permissionVoter;
     }
 
+    public function isAllowedToGet(string $ownershipId, CurrentUser $currentUser): void
+    {
+        try {
+            $ownership = $this->ownershipSearchRepository->getById($ownershipId);
+        } catch (OwnershipItemNotFound $exception) {
+            throw ApiProblem::ownershipNotFound($ownershipId);
+        }
+
+        if ($currentUser->isGodUser()) {
+            return;
+        }
+
+        $isOwner = $this->permissionVoter->isAllowed(
+            Permission::organisatiesBewerken(),
+            $ownership->getItemId(),
+            $currentUser->getId()
+        );
+        if ($isOwner) {
+            return;
+        }
+
+        if ($ownership->getOwnerId() === $currentUser->getId()) {
+            return;
+        }
+
+        throw ApiProblem::forbidden('You are not allowed to get this ownership');
+    }
+
     public function isAllowedToRequest(string $itemId, string $requesterId, CurrentUser $currentUser): void
     {
         $isOwner = $this->permissionVoter->isAllowed(
@@ -73,7 +101,7 @@ private function isAllowedToUpdateOwnership(OwnershipItem $ownership, CurrentUse
         }
 
         return $this->permissionVoter->isAllowed(
-            Permission::organisatiesBeheren(),
+            Permission::organisatiesBewerken(),
             $ownership->getItemId(),
             $currentUser->getId()
         );