Merge pull request #11 from BitBagCommerce/bugfix/UC-18-adjustments-after-tests

Refactor user update flow & adjust name of product while creating deal

Author: DominikWolos

src/Api/AbstractClient.php

@@ -44,13 +44,23 @@ protected function request(
             );
 
             $status = $response->getStatusCode();
+
             if ($status === Response::HTTP_TOO_MANY_REQUESTS && !$retrial) {
                 sleep(1);
 
                 return $this->request($path, $method, $options, true);
             }
 
             if ($status >= Response::HTTP_OK && $status < Response::HTTP_MULTIPLE_CHOICES) {
+                $this->logger->debug(sprintf(
+                    sprintf('%s User.com API request', $status),
+                ), [
+                    'path' => $path,
+                    'method' => $method,
+                    'options' => $options,
+                    'response' => $response->getContent(false),
+                ]);
+
                 return $response->toArray();
             }
 

src/Handler/OrderStateUpdateHandler.php

@@ -19,6 +19,8 @@
 use BitBag\SyliusUserComPlugin\Trait\UserComApiAwareInterface;
 use Psr\Log\LoggerInterface;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Product\Model\ProductInterface;
+use Sylius\Component\Product\Model\ProductVariantInterface;
 use Webmozart\Assert\Assert;
 
 final class OrderStateUpdateHandler implements OrderStateUpdateHandlerInterface
@@ -107,7 +109,7 @@ private function createProductEvents(
                     $resource,
                     $variant->getId(),
                     $this->productEventPayloadBuilder->build($eventType, $variant, $email),
-                    sprintf('%s - %s', $product?->getName(), $variant->getName()),
+                    $this->getProductName($variant, $product),
                 );
             }
         } catch (\Throwable $exception) {
@@ -116,4 +118,22 @@ private function createProductEvents(
             ]);
         }
     }
+
+    public function getProductName(
+        ProductVariantInterface $variant,
+        ?ProductInterface $product,
+    ): string {
+        $productName = $product?->getName();
+        $variantName = $variant->getName();
+
+        if (null === $productName) {
+            return $variantName ?? 'Unknown product';
+        }
+
+        if (null === $variantName) {
+            return $productName;
+        }
+
+        return sprintf('%s - %s', $productName, $variantName);
+    }
 }

src/Updater/CustomerWithKeyUpdater.php

@@ -103,21 +103,14 @@ public function updateWithUserKey(
             );
 
             $this->userApi->mergeUsers($apiAwareResource, $userByEmailFromForm['id'], [$userFoundByKey['id']]);
-        }
 
-        if (!isset($user) || false === array_key_exists(AbstractClient::ERROR, $user)) {
-            $user = $this->userApi->createUser($apiAwareResource, $payload);
-        }
+            $this->changeCookieWithEvent($user, $apiAwareResource, $eventName);
 
-        if (false === is_array($user) ||
-            false === array_key_exists('id', $user) ||
-            false === array_key_exists('user_key', $user)
-        ) {
-            throw new \RuntimeException('User might not be created or updated properly.');
+            return $user;
         }
 
-        $this->cookieManager->setUserComCookie($user['user_key']);
-        $this->sendEvent($apiAwareResource, $user['email'], $eventName);
+        $user = $this->userApi->createUser($apiAwareResource, $payload);
+        $this->changeCookieWithEvent($user, $apiAwareResource, $eventName);
 
         return $user;
     }
@@ -136,22 +129,44 @@ private function updateForUserWithoutEmail(
             UserApiInterface::EMAIL_PROPERTY,
         );
 
-        $id = null !== $customerFoundByEmail ?
-            $customerFoundByEmail['id'] :
-            $userFromUserKey['id'];
+        $customerFoundByEmailId = null !== $customerFoundByEmail && isset($customerFoundByEmail['id'])
+            ? $customerFoundByEmail['id']
+            : null
+        ;
+
+        $id = $customerFoundByEmailId ?? $userFromUserKey['id'];
 
         $user = $this->userApi->updateUser(
             $apiAwareResource,
             $id,
             $this->buildPayload($email, $customer, $address),
         );
 
-        if (null !== $customerFoundByEmail) {
-            $this->userApi->mergeUsers($apiAwareResource, $id, [$userFromUserKey]);
+        if (is_array($customerFoundByEmail) &&
+            array_key_exists('id', $customerFoundByEmail) &&
+            array_key_exists('id', $userFromUserKey)
+        ) {
+            $this->userApi->mergeUsers($apiAwareResource, $customerFoundByEmail['id'], [$userFromUserKey['id']]);
         }
 
         $this->sendEvent($apiAwareResource, $email, $eventName);
 
         return $user;
     }
+
+    public function changeCookieWithEvent(
+        ?array $user,
+        UserComApiAwareInterface $apiAwareResource,
+        string $eventName,
+    ): void {
+        if (false === is_array($user) ||
+            false === array_key_exists('id', $user) ||
+            false === array_key_exists('user_key', $user)
+        ) {
+            throw new \RuntimeException('User might not be created or updated properly.');
+        }
+
+        $this->cookieManager->setUserComCookie($user['user_key']);
+        $this->sendEvent($apiAwareResource, $user['email'], $eventName);
+    }
 }

src/Updater/CustomerWithoutKeyUpdater.php

@@ -39,7 +39,7 @@ public function updateWithoutUserKey(
     ): array|null {
         $userApiAwareResource = $this->userComApiAwareResourceProvider->getApiAwareResource();
         if (null === $userApiAwareResource) {
-            return null;
+            throw new \RuntimeException('User.com API resource could not be found.');
         }
 
         $email = $this->getEmail($customer, $email);