Start contact payload parsing

composer-require-checker.json

@@ -0,0 +1,5 @@
+{
+    "symbol-whitelist": [
+        "toNullableDateTime"
+    ]
+}

composer.json

@@ -21,23 +21,27 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.34",
+        "infection/infection": "^0.27.4",
+        "maglnet/composer-require-checker": "^4.7",
+        "mockery/mockery": "^1.6",
+        "phpmd/phpmd": "^2.14",
+        "phpro/grumphp": "^2.1",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "^10.4",
-        "symfony/var-dumper": "^6.3",
-        "phpro/grumphp": "^2.1",
-        "phpmd/phpmd": "^2.14",
-        "maglnet/composer-require-checker": "^4.7",
-        "infection/infection": "^0.27.4",
-        "roave/security-advisories": "dev-latest"
+        "roave/security-advisories": "dev-latest",
+        "symfony/var-dumper": "^6.3"
     },
     "autoload": {
         "psr-4": {
             "JeckelLab\\MauticWebhookParser\\": "src"
-        }
+        },
+        "files": [
+            "src/functions.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

grumphp.yml

@@ -37,7 +37,7 @@ grumphp:
       use_grumphp_paths: true
     composer_require_checker:
       composer_file: 'composer.json'
-      config_file: ~
+      config_file: 'composer-require-checker.json'
       ignore_parse_errors: false
       triggered_by: [ 'composer.json', 'composer.lock', 'src/*.php' ]
     git_branch_name:

src/ContactParser.php

@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @author: Julien Mercier-Rojas <julien@jeckel-lab.fr>
+ * Created at: 13/10/2023
+ */
+
+declare(strict_types=1);
+
+namespace JeckelLab\MauticWebhookParser;
+
+use DateTimeImmutable;
+use Exception;
+use JeckelLab\MauticWebhookParser\Exception\LogicException;
+use JeckelLab\MauticWebhookParser\Model\Contact;
+
+class ContactParser
+{
+    /**
+     * @param array<string, mixed> $payload
+     * @return Contact
+     * @throws Exception|LogicException
+     */
+    public function parse(array $payload): Contact
+    {
+        return new Contact(
+            dateAdded: is_string($payload['dateAdded']) ? new DateTimeImmutable($payload['dateAdded']) : throw new LogicException('Missing dateAdded'),
+            dateIdentified: is_string($payload['dateIdentified']) ? new DateTimeImmutable($payload['dateIdentified']) : throw new LogicException('Missing dateIdentified'),
+            dateModified: toNullableDateTime($payload['dateModified'] ?? null),
+            id: is_int($payload['id']) ? $payload['id'] : throw new LogicException('Missing id'),
+            isPublished: (bool) $payload['isPublished'],
+        );
+    }
+}

src/Model/Contact.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @author: Julien Mercier-Rojas <julien@jeckel-lab.fr>
+ * Created at: 13/10/2023
+ */
+
+declare(strict_types=1);
+
+namespace JeckelLab\MauticWebhookParser\Model;
+
+use DateTimeImmutable;
+
+readonly class Contact
+{
+    public function __construct(
+        public DateTimeImmutable $dateAdded,
+        public DateTimeImmutable $dateIdentified,
+        public ?DateTimeImmutable $dateModified,
+        public int $id,
+        public bool $isPublished,
+    ) {}
+}

src/Model/MauticEvent.php

@@ -16,7 +16,7 @@
 {
     public function __construct(
         public MauticEventType $eventType,
-        public Client $client,
+        public Contact $client,
         public Lead $lead,
         public DateTimeImmutable $timestamp
     ) {}

src/PayloadParser.php

@@ -12,13 +12,16 @@
 use DateTimeImmutable;
 use Exception;
 use JeckelLab\MauticWebhookParser\Exception\LogicException;
-use JeckelLab\MauticWebhookParser\Model\Client;
 use JeckelLab\MauticWebhookParser\Model\Lead;
 use JeckelLab\MauticWebhookParser\Model\MauticEvent;
 use JeckelLab\MauticWebhookParser\ValueObject\MauticEventType;
 
 class PayloadParser
 {
+    public function __construct(
+        private readonly ContactParser $clientParser,
+    ) {}
+
     /**
      * @param array<string, array<array<string, mixed>>> $payload
      * @return iterable<MauticEvent>
@@ -27,6 +30,9 @@ class PayloadParser
     public function parse(array $payload): iterable
     {
         foreach ($payload as $eventName => $events) {
+            if ($eventName === 'timestamp') {
+                continue;
+            }
             $event = MauticEventType::from($eventName);
             foreach ($events as $eventPayload) {
                 yield $this->parseEvent($eventPayload, $event);
@@ -43,9 +49,14 @@ public function parseEvent(array $eventPayload, MauticEventType $event): MauticE
         if (! is_string($eventPayload['timestamp'])) {
             throw new LogicException('Missing timestamp');
         }
+        if (! is_array($eventPayload['contact'])) {
+            throw new LogicException('Missing contact');
+        }
+        /** @var array<string, mixed> $contactPayload */
+        $contactPayload = $eventPayload['contact'];
         return new MauticEvent(
             eventType: $event,
-            client: new Client(),
+            client: $this->clientParser->parse($contactPayload),
             lead: new Lead(),
             timestamp: new DateTimeImmutable($eventPayload['timestamp'])
         );

src/functions.php

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @author: Julien Mercier-Rojas <julien@jeckel-lab.fr>
+ * Created at: 13/10/2023
+ */
+
+declare(strict_types=1);
+
+namespace JeckelLab\MauticWebhookParser;
+
+use DateTimeImmutable;
+use Exception;
+
+function toNullableDateTime(mixed $date): ?DateTimeImmutable
+{
+    try {
+        return is_string($date) ? new DateTimeImmutable($date) : null;
+    } catch (Exception) {
+        return null;
+    }
+}

tests/PayloadParserTest.php

@@ -8,6 +8,7 @@
 declare(strict_types=1);
 
 
+use JeckelLab\MauticWebhookParser\ContactParser;
 use JeckelLab\MauticWebhookParser\PayloadParser;
 use JeckelLab\MauticWebhookParser\ValueObject\MauticEventType;
 use PHPUnit\Framework\TestCase;
@@ -16,14 +17,12 @@ class PayloadParserTest extends TestCase
 {
     public function testItExtractCorrectEvents(): void
     {
-        $parser = new PayloadParser();
-        $payload = [
-            "mautic.lead_post_save_new" => [
-                [
-                    "timestamp" => "2017-06-19T09:31:18+00:00",
-                ],
-            ],
-        ];
+        $parser = new PayloadParser(new ContactParser());
+        /** @var string $payloadString */
+        $payloadString = file_get_contents(__DIR__ . '/fixtures/contact-identified.json');
+
+        /** @var array<string, array<array<string, mixed>>> $payload */
+        $payload = json_decode($payloadString, true);
         $events = [];
         foreach($parser->parse($payload) as $event) {
             $events[] = $event;