diff --git a/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php b/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php
index 3cce276..9112278 100644
--- a/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php
+++ b/spec/MessageHandler/Contact/ContactCreateHandlerSpec.php
@@ -7,16 +7,11 @@
use App\Entity\Customer\CustomerInterface;
use InvalidArgumentException;
use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
use Sylius\Component\Core\Model\CustomerInterface as SyliusCustomerInterface;
use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\MessageBusInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Mapper\ContactMapperInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactCreate;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactListsSubscriber;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactTagsAdder;
use Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact\ContactCreateHandler;
use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaign\ContactInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaignAwareInterface;
@@ -30,8 +25,7 @@ public function let(
ContactInterface $contact,
CustomerInterface $customer,
ActiveCampaignResourceClientInterface $activeCampaignContactClient,
- CustomerRepositoryInterface $customerRepository,
- MessageBusInterface $messageBus
+ CustomerRepositoryInterface $customerRepository
): void {
$contactMapper->mapFromCustomer($customer)->willReturn($contact);
@@ -39,7 +33,7 @@ public function let(
$customerRepository->find(12)->willReturn($customer);
- $this->beConstructedWith($contactMapper, $activeCampaignContactClient, $customerRepository, $messageBus);
+ $this->beConstructedWith($contactMapper, $activeCampaignContactClient, $customerRepository);
}
public function it_is_initializable(): void
@@ -87,16 +81,13 @@ public function it_creates_contact_on_active_campaign(
CustomerInterface $customer,
CustomerRepositoryInterface $customerRepository,
CreateResourceResponseInterface $createContactResponse,
- ResourceResponseInterface $contactResponse,
- MessageBusInterface $messageBus
+ ResourceResponseInterface $contactResponse
): void {
$contactResponse->getId()->willReturn(3423);
$createContactResponse->getResourceResponse()->willReturn($contactResponse);
$activeCampaignContactClient->create($contact)->shouldBeCalledOnce()->willReturn($createContactResponse);
$customer->setActiveCampaignId(3423)->shouldBeCalledOnce();
$customerRepository->add($customer)->shouldBeCalledOnce();
- $messageBus->dispatch(Argument::type(ContactTagsAdder::class))->shouldBeCalledOnce()->willReturn(new Envelope(new ContactTagsAdder(12)));
- $messageBus->dispatch(Argument::type(ContactListsSubscriber::class))->shouldBeCalledOnce()->willReturn(new Envelope(new ContactListsSubscriber(12)));
$this->__invoke(new ContactCreate(12));
}
diff --git a/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php b/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php
index defb246..7b84b3b 100644
--- a/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php
+++ b/spec/MessageHandler/Contact/ContactUpdateHandlerSpec.php
@@ -7,15 +7,10 @@
use App\Entity\Customer\CustomerInterface;
use InvalidArgumentException;
use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
use Sylius\Component\Core\Model\CustomerInterface as SyliusCustomerInterface;
use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\MessageBusInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Mapper\ContactMapperInterface;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactListsSubscriber;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactTagsAdder;
use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactUpdate;
use Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact\ContactUpdateHandler;
use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaign\ContactInterface;
@@ -29,8 +24,7 @@ public function let(
ContactInterface $contact,
CustomerInterface $customer,
ActiveCampaignResourceClientInterface $activeCampaignContactClient,
- CustomerRepositoryInterface $customerRepository,
- MessageBusInterface $messageBus
+ CustomerRepositoryInterface $customerRepository
): void {
$contactMapper->mapFromCustomer($customer)->willReturn($contact);
@@ -38,7 +32,7 @@ public function let(
$customerRepository->find(12)->willReturn($customer);
- $this->beConstructedWith($contactMapper, $activeCampaignContactClient, $customerRepository, $messageBus);
+ $this->beConstructedWith($contactMapper, $activeCampaignContactClient, $customerRepository);
}
public function it_is_initializable(): void
@@ -94,12 +88,9 @@ public function it_throws_if_customer_has_a_different_id_on_active_campaign_than
public function it_updates_contact_on_active_campaign(
ContactInterface $contact,
ActiveCampaignResourceClientInterface $activeCampaignContactClient,
- UpdateResourceResponseInterface $updateContactResponse,
- MessageBusInterface $messageBus
+ UpdateResourceResponseInterface $updateContactResponse
): void {
$activeCampaignContactClient->update(1234, $contact)->shouldBeCalledOnce()->willReturn($updateContactResponse);
- $messageBus->dispatch(Argument::type(ContactTagsAdder::class))->shouldBeCalledOnce()->willReturn(new Envelope(new ContactTagsAdder(12)));
- $messageBus->dispatch(Argument::type(ContactListsSubscriber::class))->shouldBeCalledOnce()->willReturn(new Envelope(new ContactListsSubscriber(12)));
$this->__invoke(new ContactUpdate(12, 1234));
}
diff --git a/src/MessageHandler/Contact/ContactCreateHandler.php b/src/MessageHandler/Contact/ContactCreateHandler.php
index 57a40d2..32212ac 100644
--- a/src/MessageHandler/Contact/ContactCreateHandler.php
+++ b/src/MessageHandler/Contact/ContactCreateHandler.php
@@ -7,12 +7,9 @@
use InvalidArgumentException;
use Sylius\Component\Core\Model\CustomerInterface;
use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Mapper\ContactMapperInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactCreate;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactListsSubscriber;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactTagsAdder;
use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaignAwareInterface;
final class ContactCreateHandler
@@ -20,8 +17,7 @@ final class ContactCreateHandler
public function __construct(
private ContactMapperInterface $contactMapper,
private ActiveCampaignResourceClientInterface $activeCampaignContactClient,
- private CustomerRepositoryInterface $customerRepository,
- private MessageBusInterface $messageBus
+ private CustomerRepositoryInterface $customerRepository
) {
}
@@ -44,8 +40,5 @@ public function __invoke(ContactCreate $message): void
$createContactResponse = $this->activeCampaignContactClient->create($this->contactMapper->mapFromCustomer($customer));
$customer->setActiveCampaignId($createContactResponse->getResourceResponse()->getId());
$this->customerRepository->add($customer);
-
- $this->messageBus->dispatch(new ContactTagsAdder($customerId));
- $this->messageBus->dispatch(new ContactListsSubscriber($customerId));
}
}
diff --git a/src/MessageHandler/Contact/ContactUpdateHandler.php b/src/MessageHandler/Contact/ContactUpdateHandler.php
index e281db5..e6fea5c 100644
--- a/src/MessageHandler/Contact/ContactUpdateHandler.php
+++ b/src/MessageHandler/Contact/ContactUpdateHandler.php
@@ -7,11 +7,8 @@
use InvalidArgumentException;
use Sylius\Component\Core\Model\CustomerInterface;
use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
use Webgriffe\SyliusActiveCampaignPlugin\Mapper\ContactMapperInterface;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactListsSubscriber;
-use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactTagsAdder;
use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactUpdate;
use Webgriffe\SyliusActiveCampaignPlugin\Model\ActiveCampaignAwareInterface;
@@ -20,8 +17,7 @@ final class ContactUpdateHandler
public function __construct(
private ContactMapperInterface $contactMapper,
private ActiveCampaignResourceClientInterface $activeCampaignContactClient,
- private CustomerRepositoryInterface $customerRepository,
- private MessageBusInterface $messageBus
+ private CustomerRepositoryInterface $customerRepository
) {
}
@@ -42,8 +38,5 @@ public function __invoke(ContactUpdate $message): void
throw new InvalidArgumentException(sprintf('The Customer with id "%s" has an ActiveCampaign id that does not match. Expected "%s", given "%s".', $customerId, $message->getActiveCampaignId(), (string) $activeCampaignId));
}
$this->activeCampaignContactClient->update($message->getActiveCampaignId(), $this->contactMapper->mapFromCustomer($customer));
-
- $this->messageBus->dispatch(new ContactTagsAdder($customerId));
- $this->messageBus->dispatch(new ContactListsSubscriber($customerId));
}
}
diff --git a/src/Resources/config/services/message_handler.xml b/src/Resources/config/services/message_handler.xml
index 74bc273..67e79c0 100644
--- a/src/Resources/config/services/message_handler.xml
+++ b/src/Resources/config/services/message_handler.xml
@@ -7,7 +7,6 @@
-
@@ -16,7 +15,6 @@
-