Skip to content

Commit 521a53b

Browse files
committed
Add a lot of logs
1 parent 2814efc commit 521a53b

26 files changed

+556
-29
lines changed

config/services/enqueuer.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
<argument type="service" id="webgriffe_sylius_active_campaign_plugin.command_bus"/>
88
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.contact"/>
99
<argument type="service" id="doctrine.orm.entity_manager"/>
10+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
1011
</service>
1112

1213
<service id="webgriffe.sylius_active_campaign_plugin.enqueuer.connection"
1314
class="Webgriffe\SyliusActiveCampaignPlugin\Enqueuer\ConnectionEnqueuer">
1415
<argument type="service" id="webgriffe_sylius_active_campaign_plugin.command_bus"/>
1516
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.connection"/>
1617
<argument type="service" id="doctrine.orm.entity_manager"/>
18+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
1719
</service>
1820

1921
<service id="webgriffe.sylius_active_campaign_plugin.enqueuer.ecommerce_customer"
@@ -22,20 +24,23 @@
2224
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_customer"/>
2325
<argument type="service" id="doctrine.orm.entity_manager"/>
2426
<argument type="service" id="webgriffe_sylius_active_campaign.factory.channel_customer"/>
27+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
2528
</service>
2629

2730
<service id="webgriffe.sylius_active_campaign_plugin.enqueuer.ecommerce_order"
2831
class="Webgriffe\SyliusActiveCampaignPlugin\Enqueuer\EcommerceOrderEnqueuer">
2932
<argument type="service" id="webgriffe_sylius_active_campaign_plugin.command_bus"/>
3033
<argument type="service" id="doctrine.orm.entity_manager"/>
3134
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_order"/>
35+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
3236
</service>
3337

3438
<service id="webgriffe.sylius_active_campaign_plugin.enqueuer.webhook"
3539
class="Webgriffe\SyliusActiveCampaignPlugin\Enqueuer\WebhookEnqueuer">
3640
<argument type="service" id="webgriffe_sylius_active_campaign_plugin.command_bus"/>
3741
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.webhook"/>
3842
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.generator.channel_hostname_url"/>
43+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
3944
</service>
4045
</services>
4146
</container>

config/services/message_handler.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.mapper.contact"/>
88
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.contact"/>
99
<argument type="service" id="sylius.repository.customer"/>
10+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
1011
<tag name="messenger.message_handler"/>
1112
</service>
1213

@@ -15,12 +16,14 @@
1516
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.mapper.contact"/>
1617
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.contact"/>
1718
<argument type="service" id="sylius.repository.customer"/>
19+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
1820
<tag name="messenger.message_handler"/>
1921
</service>
2022

2123
<service id="webgriffe.sylius_active_campaign_plugin.message_handler.contact.remove"
2224
class="Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Contact\ContactRemoveHandler">
2325
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.contact"/>
26+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
2427
<tag name="messenger.message_handler"/>
2528
</service>
2629

@@ -61,6 +64,7 @@
6164
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.mapper.connection"/>
6265
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.connection"/>
6366
<argument type="service" id="sylius.repository.channel"/>
67+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
6468
<tag name="messenger.message_handler"/>
6569
</service>
6670

@@ -69,12 +73,14 @@
6973
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.mapper.connection"/>
7074
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.connection"/>
7175
<argument type="service" id="sylius.repository.channel"/>
76+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
7277
<tag name="messenger.message_handler"/>
7378
</service>
7479

7580
<service id="webgriffe.sylius_active_campaign_plugin.message_handler.connection.remove"
7681
class="Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\Connection\ConnectionRemoveHandler">
7782
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.connection"/>
83+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
7884
<tag name="messenger.message_handler"/>
7985
</service>
8086

@@ -86,6 +92,7 @@
8692
<argument type="service" id="sylius.repository.channel"/>
8793
<argument type="service" id="webgriffe_sylius_active_campaign.factory.channel_customer"/>
8894
<argument type="service" id="doctrine.orm.entity_manager"/>
95+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
8996
<tag name="messenger.message_handler"/>
9097
</service>
9198

@@ -95,12 +102,14 @@
95102
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_customer"/>
96103
<argument type="service" id="sylius.repository.customer"/>
97104
<argument type="service" id="sylius.repository.channel"/>
105+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
98106
<tag name="messenger.message_handler"/>
99107
</service>
100108

101109
<service id="webgriffe.sylius_active_campaign_plugin.message_handler.ecommerce_customer.remove"
102110
class="Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\EcommerceCustomer\EcommerceCustomerRemoveHandler">
103111
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_customer"/>
112+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
104113
<tag name="messenger.message_handler"/>
105114
</service>
106115

@@ -109,6 +118,7 @@
109118
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.mapper.ecommerce_order"/>
110119
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_order"/>
111120
<argument type="service" id="sylius.repository.order"/>
121+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
112122
<tag name="messenger.message_handler"/>
113123
</service>
114124

@@ -117,12 +127,14 @@
117127
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.mapper.ecommerce_order"/>
118128
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_order"/>
119129
<argument type="service" id="sylius.repository.order"/>
130+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
120131
<tag name="messenger.message_handler"/>
121132
</service>
122133

123134
<service id="webgriffe.sylius_active_campaign_plugin.message_handler.ecommerce_order.remove"
124135
class="Webgriffe\SyliusActiveCampaignPlugin\MessageHandler\EcommerceOrder\EcommerceOrderRemoveHandler">
125136
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.ecommerce_order"/>
137+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
126138
<tag name="messenger.message_handler"/>
127139
</service>
128140

@@ -132,6 +144,7 @@
132144
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.client.active_campaign.webhook"/>
133145
<argument type="service" id="sylius.repository.channel"/>
134146
<argument type="service" id="webgriffe.sylius_active_campaign_plugin.generator.channel_hostname_url"/>
147+
<argument type="service" id="monolog.logger.webgriffe_sylius_active_campaign_plugin"/>
135148
<tag name="messenger.message_handler"/>
136149
</service>
137150
</services>

src/Enqueuer/ConnectionEnqueuer.php

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Webgriffe\SyliusActiveCampaignPlugin\Enqueuer;
66

77
use Doctrine\ORM\EntityManagerInterface;
8+
use Psr\Log\LoggerInterface;
89
use Symfony\Component\Messenger\MessageBusInterface;
910
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
1011
use Webgriffe\SyliusActiveCampaignPlugin\Message\Connection\ConnectionCreate;
@@ -18,16 +19,33 @@ public function __construct(
1819
private MessageBusInterface $messageBus,
1920
private ActiveCampaignResourceClientInterface $activeCampaignConnectionClient,
2021
private EntityManagerInterface $entityManager,
22+
private ?LoggerInterface $logger = null,
2123
) {
24+
if ($this->logger === null) {
25+
trigger_deprecation(
26+
'webgriffe/sylius-active-campaign-plugin',
27+
'v0.12.2',
28+
'The logger argument is mandatory.',
29+
);
30+
}
2231
}
2332

2433
public function enqueue($channel): void
2534
{
2635
/** @var string|int|null $channelId */
2736
$channelId = $channel->getId();
2837
Assert::notNull($channelId, 'The channel id should not be null');
38+
$this->logger?->debug(sprintf(
39+
'Starting enqueuing connection for channel "%s".',
40+
$channelId,
41+
));
2942
$activeCampaignConnectionId = $channel->getActiveCampaignId();
3043
if ($activeCampaignConnectionId !== null) {
44+
$this->logger?->debug(sprintf(
45+
'Channel "%s" has an already valued ActiveCampaign id "%s", so we have to update the connection.',
46+
$channelId,
47+
$activeCampaignConnectionId,
48+
));
3149
$this->messageBus->dispatch(new ConnectionUpdate($channelId, $activeCampaignConnectionId));
3250

3351
return;
@@ -44,11 +62,20 @@ public function enqueue($channel): void
4462
$activeCampaignConnectionId = $connection->getId();
4563
$channel->setActiveCampaignId($activeCampaignConnectionId);
4664
$this->entityManager->flush();
65+
$this->logger?->debug(sprintf(
66+
'Found an ActiveCampaign connection with id "%s" for given channel "%s", the id has been stored and we have to update the connection.',
67+
$activeCampaignConnectionId,
68+
$channelId,
69+
));
4770

4871
$this->messageBus->dispatch(new ConnectionUpdate($channelId, $activeCampaignConnectionId));
4972

5073
return;
5174
}
75+
$this->logger?->debug(sprintf(
76+
'No connection found for given channel "%s", we have to create the connection.',
77+
$channelId,
78+
));
5279

5380
$this->messageBus->dispatch(new ConnectionCreate($channelId));
5481
}

src/Enqueuer/ContactEnqueuer.php

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Webgriffe\SyliusActiveCampaignPlugin\Enqueuer;
66

77
use Doctrine\ORM\EntityManagerInterface;
8+
use Psr\Log\LoggerInterface;
89
use Symfony\Component\Messenger\MessageBusInterface;
910
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
1011
use Webgriffe\SyliusActiveCampaignPlugin\Message\Contact\ContactCreate;
@@ -18,16 +19,33 @@ public function __construct(
1819
private MessageBusInterface $messageBus,
1920
private ActiveCampaignResourceClientInterface $activeCampaignContactClient,
2021
private EntityManagerInterface $entityManager,
22+
private ?LoggerInterface $logger = null,
2123
) {
24+
if ($this->logger === null) {
25+
trigger_deprecation(
26+
'webgriffe/sylius-active-campaign-plugin',
27+
'v0.12.2',
28+
'The logger argument is mandatory.',
29+
);
30+
}
2231
}
2332

2433
public function enqueue($customer): void
2534
{
2635
/** @var string|int|null $customerId */
2736
$customerId = $customer->getId();
2837
Assert::notNull($customerId, 'The customer id should not be null');
38+
$this->logger?->debug(sprintf(
39+
'Starting enqueuing contact for customer "%s".',
40+
$customerId,
41+
));
2942
$activeCampaignContactId = $customer->getActiveCampaignId();
3043
if ($activeCampaignContactId !== null) {
44+
$this->logger?->debug(sprintf(
45+
'Customer "%s" has an already valued ActiveCampaign id "%s", so we have to update the contact.',
46+
$customerId,
47+
$activeCampaignContactId,
48+
));
3149
$this->messageBus->dispatch(new ContactUpdate($customerId, $activeCampaignContactId));
3250

3351
return;
@@ -41,11 +59,20 @@ public function enqueue($customer): void
4159
$activeCampaignContactId = $contact->getId();
4260
$customer->setActiveCampaignId($activeCampaignContactId);
4361
$this->entityManager->flush();
62+
$this->logger?->debug(sprintf(
63+
'Customer "%s" has an already valued ActiveCampaign id "%s", so we have to update the contact.',
64+
$customerId,
65+
$activeCampaignContactId,
66+
));
4467

4568
$this->messageBus->dispatch(new ContactUpdate($customerId, $activeCampaignContactId));
4669

4770
return;
4871
}
72+
$this->logger?->debug(sprintf(
73+
'No contact found for given customer "%s", we have to create the contact.',
74+
$customerId,
75+
));
4976

5077
$this->messageBus->dispatch(new ContactCreate($customerId));
5178
}

src/Enqueuer/EcommerceCustomerEnqueuer.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Webgriffe\SyliusActiveCampaignPlugin\Enqueuer;
66

77
use Doctrine\ORM\EntityManagerInterface;
8+
use Psr\Log\LoggerInterface;
89
use Sylius\Component\Resource\Factory\FactoryInterface;
910
use Symfony\Component\Messenger\MessageBusInterface;
1011
use Webgriffe\SyliusActiveCampaignPlugin\Client\ActiveCampaignResourceClientInterface;
@@ -24,7 +25,15 @@ public function __construct(
2425
private ActiveCampaignResourceClientInterface $activeCampaignEcommerceCustomerClient,
2526
private EntityManagerInterface $entityManager,
2627
private FactoryInterface $channelCustomerFactory,
28+
private ?LoggerInterface $logger = null,
2729
) {
30+
if ($this->logger === null) {
31+
trigger_deprecation(
32+
'webgriffe/sylius-active-campaign-plugin',
33+
'v0.12.2',
34+
'The logger argument is mandatory.',
35+
);
36+
}
2837
}
2938

3039
public function enqueue($customer, $channel): void
@@ -35,9 +44,20 @@ public function enqueue($customer, $channel): void
3544
/** @var string|int|null $channelId */
3645
$channelId = $channel->getId();
3746
Assert::notNull($channelId, 'The channel id should not be null');
47+
$this->logger?->debug(sprintf(
48+
'Starting enqueuing ecommerce customer for customer "%s" and channel "%s".',
49+
$customerId,
50+
$channelId,
51+
));
3852

3953
$channelCustomer = $customer->getChannelCustomerByChannel($channel);
4054
if ($channelCustomer !== null) {
55+
$this->logger?->debug(sprintf(
56+
'Customer "%s" has an already valued ActiveCampaign id "%s" for channel "%s", so we have to update the ecommerce customer.',
57+
$customerId,
58+
$channelCustomer->getActiveCampaignId(),
59+
$channelId,
60+
));
4161
$this->messageBus->dispatch(new EcommerceCustomerUpdate($customerId, $channelCustomer->getActiveCampaignId(), $channelId));
4262

4363
return;
@@ -63,11 +83,22 @@ public function enqueue($customer, $channel): void
6383
$this->entityManager->persist($channelCustomer);
6484
$customer->addChannelCustomer($channelCustomer);
6585
$this->entityManager->flush();
86+
$this->logger?->debug(sprintf(
87+
'Found an ActiveCampaign ecommerce customer with id "%s" for given customer "%s" and channel "%s", the id has been stored and we have to update the ecommerce customer.',
88+
$activeCampaignEcommerceCustomerId,
89+
$customerId,
90+
$channelId,
91+
));
6692

6793
$this->messageBus->dispatch(new EcommerceCustomerUpdate($customerId, $activeCampaignEcommerceCustomerId, $channelId));
6894

6995
return;
7096
}
97+
$this->logger?->debug(sprintf(
98+
'No ecommerce customer found for given customer "%s" and channel "%s", we have to create the ecommerce customer.',
99+
$customerId,
100+
$channelId,
101+
));
71102

72103
$this->messageBus->dispatch(new EcommerceCustomerCreate($customerId, $channelId));
73104
}

0 commit comments

Comments
 (0)