fix: exposing the deleted-members differences

oat-sa · Nov 21, 2022 · b3ac9ff · b3ac9ff
1 parent ffdeabf
commit b3ac9ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Nrps/MembershipService.php b/src/Nrps/MembershipService.php
@@ -74,7 +74,8 @@ public function updateMembership(MembershipInterface $membership, array $rawMemb
 
             if (!$memberCollection->has($memberId)) {
                 $this->setUpdatedAtToMember($existingMember, $now);
-                $existingMember->setStatus(MemberInterface::STATUS_DELETED);
+                $existingMember->setStatus(MemberInterface::STATUS_DELETED)
+                    ->getProperties()->add(['status' => MemberInterface::STATUS_DELETED]);
 
                 $memberCollection->add($existingMember);
             } else {

diff --git a/src/Nrps/MembershipServiceServerBuilder.php b/src/Nrps/MembershipServiceServerBuilder.php
@@ -35,19 +35,19 @@ class MembershipServiceServerBuilder implements MembershipServiceServerBuilderIn
     /** @var RequestStack */
     private $requestStack;
 
-    /** @var MembershipRepository */
-    private $repository;
+    /** @var MembershipService */
+    private $service;
 
     /** @var DefaultMembershipFactory */
     private $factory;
 
     public function __construct(
         RequestStack $requestStack,
-        MembershipRepository $repository,
+        MembershipService $service,
         DefaultMembershipFactory $factory
     ) {
         $this->requestStack = $requestStack;
-        $this->repository = $repository;
+        $this->service = $service;
         $this->factory = $factory;
     }
 
@@ -86,7 +86,7 @@ private function build(string $role = null, int $limit = null, int $offset = nul
         if ($membershipIdentifier === 'default') {
             $membership = $this->factory->create();
         } else {
-            $membership = $this->repository->find($membershipIdentifier);
+            $membership = $this->service->findMembership($membershipIdentifier);
         }
 
         if (null === $membership || $membership->getContext()->getIdentifier() !== $contextIdentifier) {
@@ -102,7 +102,8 @@ static function (MemberInterface $member) use ($role, $since) {
                        && (
                            $since === null
                            || $member->getProperties()->get(MembershipService::UPDATED_AT_FIELD, 0) > $since
-                       );
+                       )
+                       && ($since !== null || $member->getStatus() !== MemberInterface::STATUS_DELETED);
             }
         );