Merge pull request #1847 from cultuurnet/III-6370-expose-email-in-own…

…ership

III-6370 Expose email in ownership

app/Ownership/OwnershipServiceProvider.php

@@ -13,6 +13,7 @@
 use CultuurNet\UDB3\Ownership\Readmodels\OwnershipSearchProjector;
 use CultuurNet\UDB3\Ownership\Repositories\Search\DBALOwnershipSearchRepository;
 use CultuurNet\UDB3\Ownership\Repositories\Search\OwnershipSearchRepository;
+use CultuurNet\UDB3\User\UserIdentityResolver;
 use Ramsey\Uuid\UuidFactory;
 
 final class OwnershipServiceProvider extends AbstractServiceProvider
@@ -56,7 +57,8 @@ public function register(): void
         $container->addShared(
             OwnershipLDProjector::class,
             fn () => new OwnershipLDProjector(
-                $container->get(OwnershipServiceProvider::OWNERSHIP_JSONLD_REPOSITORY)
+                $container->get(OwnershipServiceProvider::OWNERSHIP_JSONLD_REPOSITORY),
+                $container->get(UserIdentityResolver::class)
             )
         );
 

features/ownership/approve.feature

@@ -16,6 +16,7 @@ Feature: Test approving ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "approved"
 
@@ -29,6 +30,7 @@ Feature: Test approving ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "approved"
 

features/ownership/delete.feature

@@ -16,6 +16,7 @@ Feature: Test deleting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "deleted"
 
@@ -31,6 +32,7 @@ Feature: Test deleting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "deleted"
 
@@ -46,6 +48,7 @@ Feature: Test deleting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "deleted"
 
@@ -59,6 +62,7 @@ Feature: Test deleting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "deleted"
 
@@ -73,6 +77,7 @@ Feature: Test deleting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "deleted"
 
@@ -87,6 +92,7 @@ Feature: Test deleting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "deleted"
 

features/ownership/reject.feature

@@ -16,6 +16,7 @@ Feature: Test rejecting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "rejected"
 
@@ -29,6 +30,7 @@ Feature: Test rejecting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "auth0|64089494e980aedd96740212"
     And the JSON response at "state" should be "rejected"
 

features/ownership/request.feature

@@ -13,6 +13,7 @@ Feature: Test requesting ownership
     And the JSON response at "itemId" should be "%{organizerId}"
     And the JSON response at "itemType" should be "organizer"
     And the JSON response at "ownerId" should be "auth0|64089494e980aedd96740212"
+    And the JSON response at "ownerEmail" should be "[email protected]"
     And the JSON response at "requesterId" should be "7a583ed3-cbc1-481d-93b1-d80fff0174dd"
     And the JSON response at "state" should be "requested"
 

src/Ownership/Readmodels/OwnershipLDProjector.php

@@ -17,6 +17,7 @@
 use CultuurNet\UDB3\ReadModel\DocumentRepository;
 use CultuurNet\UDB3\ReadModel\JsonDocument;
 use CultuurNet\UDB3\RecordedOn;
+use CultuurNet\UDB3\User\UserIdentityResolver;
 
 final class OwnershipLDProjector implements EventListener
 {
@@ -25,10 +26,14 @@ final class OwnershipLDProjector implements EventListener
     }
 
     private DocumentRepository $repository;
+    private UserIdentityResolver $userIdentityResolver;
 
-    public function __construct(DocumentRepository $repository)
-    {
+    public function __construct(
+        DocumentRepository $repository,
+        UserIdentityResolver $userIdentityResolver
+    ) {
         $this->repository = $repository;
+        $this->userIdentityResolver = $userIdentityResolver;
     }
 
     public function handle(DomainMessage $domainMessage): void
@@ -50,6 +55,8 @@ public function handle(DomainMessage $domainMessage): void
 
     public function applyOwnershipRequested(OwnershipRequested $ownershipRequested, DomainMessage $domainMessage): JsonDocument
     {
+        $ownerDetails = $this->userIdentityResolver->getUserById($ownershipRequested->getOwnerId());
+
         $jsonDocument = new JsonDocument($ownershipRequested->getId());
 
         $body = $jsonDocument->getBody();
@@ -58,6 +65,7 @@ public function applyOwnershipRequested(OwnershipRequested $ownershipRequested,
         $body->itemId = $ownershipRequested->getItemId();
         $body->itemType = $ownershipRequested->getItemType();
         $body->ownerId = $ownershipRequested->getOwnerId();
+        $body->ownerEmail = $ownerDetails !== null ? $ownerDetails->getEmailAddress() : null;
         $body->requesterId = $ownershipRequested->getRequesterId();
         $body->state = OwnershipState::requested()->toString();
 

tests/Ownership/Readmodels/OwnershipLDProjectorTest.php

@@ -15,6 +15,8 @@
 use CultuurNet\UDB3\ReadModel\InMemoryDocumentRepository;
 use CultuurNet\UDB3\ReadModel\JsonDocument;
 use CultuurNet\UDB3\RecordedOn;
+use CultuurNet\UDB3\User\UserIdentityDetails;
+use CultuurNet\UDB3\User\UserIdentityResolver;
 use PHPUnit\Framework\TestCase;
 
 class OwnershipLDProjectorTest extends TestCase
@@ -29,7 +31,19 @@ protected function setUp(): void
 
         $this->ownershipRepository = new InMemoryDocumentRepository();
 
-        $this->ownershipLDProjector = new OwnershipLDProjector($this->ownershipRepository);
+        $userIdentityResolver = $this->createMock(UserIdentityResolver::class);
+        $userIdentityResolver->expects($this->any())
+            ->method('getUserById')
+            ->willReturn(new UserIdentityDetails(
+                'auth0|63e22626e39a8ca1264bd29b',
+                'dev+e2e',
+                '[email protected]'
+            ));
+
+        $this->ownershipLDProjector = new OwnershipLDProjector(
+            $this->ownershipRepository,
+            $userIdentityResolver
+        );
     }
 
     /**
@@ -200,6 +214,7 @@ private function createOwnershipJsonDocument(
         $jsonLD->{'itemId'} = '9e68dafc-01d8-4c1c-9612-599c918b981d';
         $jsonLD->{'itemType'} = 'organizer';
         $jsonLD->{'ownerId'} = 'auth0|63e22626e39a8ca1264bd29b';
+        $jsonLD->{'ownerEmail'} = '[email protected]';
         $jsonLD->{'requesterId'} = 'google-oauth2|102486314601596809843';
         $jsonLD->{'state'} = $state->toString();
         $jsonLD->{'created'} = $recordedOn->toString();