Do not retry to add other contact things if the contact has been deleted

Author: lruozzi9

src/MessageHandler/Contact/ContactListsSubscriberHandler.php

@@ -10,6 +10,7 @@
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Exception\ListSubscriptionStatusResolverExceptionInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Mapper\ContactListMapperInterface;
@@ -81,6 +82,15 @@ public function __invoke(ContactListsSubscriber $message): void
                     $activeCampaignContactId,
                     $listSubscriptionStatus,
                 ));
+            } catch (NotFoundHttpException) {
+                $this->logger->error(sprintf(
+                    'Contact with ActiveCampaign id "%s" (customer id "%s") was not found on ActiveCampaign while subscribing to list "%s". The contact may have been deleted on ActiveCampaign side.',
+                    $activeCampaignContactId,
+                    $customerId,
+                    $activeCampaignListId,
+                ));
+
+                return;
             } catch (HttpException $httpException) {
                 if ($httpException->getStatusCode() !== 200) {
                     throw $httpException;

src/MessageHandler/Contact/ContactTagsAdderHandler.php

@@ -63,7 +63,7 @@ public function __invoke(ContactTagsAdder $message): void
             try {
                 $this->activeCampaignContactTagClient->create($this->contactTagFactory->createNew($activeCampaignContactId, $activeCampaignTagId));
             } catch (NotFoundHttpException) {
-                $this->logger->warning(sprintf(
+                $this->logger->error(sprintf(
                     'Contact with ActiveCampaign id "%s" (customer id "%s") was not found on ActiveCampaign while adding tag "%s". The contact may have been deleted on ActiveCampaign side.',
                     $activeCampaignContactId,
                     $customerId,

src/MessageHandler/Contact/ContactUpdateHandler.php

@@ -9,6 +9,7 @@
 use Psr\Log\LoggerInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Mapper\ContactMapperInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactUpdate;
@@ -55,6 +56,12 @@ public function __invoke(ContactUpdate $message): void
 
         try {
             $this->activeCampaignContactClient->update($message->getActiveCampaignId(), $this->contactMapper->mapFromCustomer($customer));
+        } catch (NotFoundHttpException) {
+            $this->logger?->error(sprintf(
+                'Contact with ActiveCampaign id "%s" (customer id "%s") was not found on ActiveCampaign during update. The contact may have been deleted on ActiveCampaign side.',
+                $message->getActiveCampaignId(),
+                $customerId,
+            ));
         } catch (\Throwable $e) {
             $this->logger?->error($e->getMessage(), $e->getTrace());
 

src/MessageHandler/EcommerceCustomer/EcommerceCustomerUpdateHandler.php

@@ -11,6 +11,7 @@
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Mapper\EcommerceCustomerMapperInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Message\EcommerceCustomer\EcommerceCustomerUpdate;
@@ -73,6 +74,12 @@ public function __invoke(EcommerceCustomerUpdate $message): void
 
         try {
             $this->activeCampaignClient->update($message->getActiveCampaignId(), $this->ecommerceCustomerMapper->mapFromCustomerAndChannel($customer, $channel));
+        } catch (NotFoundHttpException) {
+            $this->logger?->error(sprintf(
+                'EcommerceCustomer with ActiveCampaign id "%s" (customer id "%s") was not found on ActiveCampaign during update. The resource may have been deleted on ActiveCampaign side.',
+                $message->getActiveCampaignId(),
+                $customerId,
+            ));
         } catch (\Throwable $e) {
             $this->logger?->error($e->getMessage(), $e->getTrace());
 

src/MessageHandler/EcommerceOrder/EcommerceOrderUpdateHandler.php

@@ -9,6 +9,7 @@
 use Psr\Log\LoggerInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Mapper\EcommerceOrderMapperInterface;
 use Webgriffe\SyliusActiveCampaignPlugin\Message\EcommerceOrder\EcommerceOrderUpdate;
@@ -55,6 +56,12 @@ public function __invoke(EcommerceOrderUpdate $message): void
 
         try {
             $this->activeCampaignEcommerceOrderClient->update($message->getActiveCampaignId(), $this->ecommerceOrderMapper->mapFromOrder($order, $message->isInRealTime()));
+        } catch (NotFoundHttpException) {
+            $this->logger?->error(sprintf(
+                'EcommerceOrder with ActiveCampaign id "%s" (order id "%s") was not found on ActiveCampaign during update. The resource may have been deleted on ActiveCampaign side.',
+                $message->getActiveCampaignId(),
+                $orderId,
+            ));
         } catch (\Throwable $e) {
             $this->logger?->error($e->getMessage(), $e->getTrace());