fixup! fixup! Fix checking of user ids when building requests

lmc-eu · Jan 8, 2018 · 01035d6 · 01035d6
1 parent 05af7a2
commit 01035d6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -26,7 +26,7 @@ public static function forInconsistentUserId(UserAwareInterface $mainCommand, Us
     public static function forInconsistentUserMergeAndInteractionCommand($userMergeId, $interactionUserId)
     {
         $message = sprintf(
-            'Source user id in UserMerge command ("%s") must be the same as user id in interaction command ("%s")',
+            'Source user in UserMerge command ("%s") must be the same as user in Interaction command ("%s")',
             $userMergeId,
             $interactionUserId
         );

diff --git a/src/RequestBuilder/RecommendationRequestBuilder.php b/src/RequestBuilder/RecommendationRequestBuilder.php
@@ -70,16 +70,18 @@ private function assertInteractionUserId(): void
             return;
         }
 
+        $interactionUserId = $this->interactionCommand->getUserId();
+
         // (A, null, A)
-        if ($this->userMergeCommand === null && $this->interactionCommand->getUserId() !== $this->userRecommendationCommand->getUserId()) {
+        if ($this->userMergeCommand === null && $interactionUserId !== $this->userRecommendationCommand->getUserId()) {
             throw LogicException::forInconsistentUserId($this->userRecommendationCommand, $this->interactionCommand);
         }
 
         // (A, A -> ?, ?)
-        if ($this->userMergeCommand !== null && $this->interactionCommand->getUserId() !== $this->userMergeCommand->getSourceUserId()) {
+        if ($this->userMergeCommand !== null && $interactionUserId !== $this->userMergeCommand->getSourceUserId()) {
             throw LogicException::forInconsistentUserMergeAndInteractionCommand(
                 $this->userMergeCommand->getSourceUserId(),
-                $this->interactionCommand->getUserId()
+                $interactionUserId
             );
         }
     }
@@ -90,7 +92,8 @@ private function assertInteractionUserId(): void
      */
     private function assertUserMergeUserId(): void
     {
-        if ($this->userMergeCommand !== null && $this->userMergeCommand->getUserId() !== $this->userRecommendationCommand->getUserId()) {
+        if ($this->userMergeCommand !== null
+            && $this->userMergeCommand->getUserId() !== $this->userRecommendationCommand->getUserId()) {
             throw LogicException::forInconsistentUserId($this->userRecommendationCommand, $this->userMergeCommand);
         }
     }

diff --git a/src/RequestBuilder/SortingRequestBuilder.php b/src/RequestBuilder/SortingRequestBuilder.php
@@ -71,16 +71,18 @@ private function assertInteractionUserId(): void
             return;
         }
 
+        $interactionUserId = $this->interactionCommand->getUserId();
+
         // (A, null, A)
-        if ($this->userMergeCommand === null && $this->interactionCommand->getUserId() !== $this->sortingCommand->getUserId()) {
+        if ($this->userMergeCommand === null && $interactionUserId !== $this->sortingCommand->getUserId()) {
             throw LogicException::forInconsistentUserId($this->sortingCommand, $this->interactionCommand);
         }
 
         // (A, A -> ?, ?)
-        if ($this->userMergeCommand !== null && $this->interactionCommand->getUserId() !== $this->userMergeCommand->getSourceUserId()) {
+        if ($this->userMergeCommand !== null && $interactionUserId !== $this->userMergeCommand->getSourceUserId()) {
             throw LogicException::forInconsistentUserMergeAndInteractionCommand(
                 $this->userMergeCommand->getSourceUserId(),
-                $this->interactionCommand->getUserId()
+                $interactionUserId
             );
         }
     }
@@ -91,7 +93,8 @@ private function assertInteractionUserId(): void
      */
     private function assertUserMergeUserId(): void
     {
-        if ($this->userMergeCommand !== null && $this->userMergeCommand->getUserId() !== $this->sortingCommand->getUserId()) {
+        if ($this->userMergeCommand !== null
+            && $this->userMergeCommand->getUserId() !== $this->sortingCommand->getUserId()) {
             throw LogicException::forInconsistentUserId($this->sortingCommand, $this->userMergeCommand);
         }
     }

diff --git a/tests/unit/RequestBuilder/RecommendationRequestBuilderTest.php b/tests/unit/RequestBuilder/RecommendationRequestBuilderTest.php
@@ -137,7 +137,7 @@ public function shouldFailOnIncorrectSequenceOfUsersWhenMerging(): void
 
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage(
-            'Source user id in UserMerge command ("test-user-b") must be the same as user id in interaction command ("test-user-a")'
+            'Source user in UserMerge command ("test-user-b") must be the same as user in Interaction command ("test-user-a")'
         );
 
         $builder = new RecommendationRequestBuilder($recommendationsCommand);

diff --git a/tests/unit/RequestBuilder/SortingRequestBuilderTest.php b/tests/unit/RequestBuilder/SortingRequestBuilderTest.php
@@ -130,7 +130,7 @@ public function shouldFailOnIncorrectSequenceOfUsersWhenMerging(): void
 
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage(
-            'Source user id in UserMerge command ("test-user-b") must be the same as user id in interaction command ("test-user-a")'
+            'Source user in UserMerge command ("test-user-b") must be the same as user in Interaction command ("test-user-a")'
         );
 
         $builder = new SortingRequestBuilder($sortingCommand);