1. Может быть кейс, что нужно подставить свой Upserter записей. Делаю его через DI.

2. Также условие `on conflict` для partial unique тоже пишется как `on conflict(id) where created_at is null` например. Что бы не переписывать весь Upserter и т.д., вынес резолвинг conflict condition'a в DI также.

Author: kvatra

src/Integration/Laravel/Receive/Receiver.php

@@ -4,8 +4,10 @@
 
 namespace Umbrellio\TableSync\Integration\Laravel\Receive;
 
+use Illuminate\Support\Facades\App;
 use Umbrellio\TableSync\Integration\Laravel\Exceptions\UnknownMessageEvent;
 use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageDataRetriever;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\Upserter;
 use Umbrellio\TableSync\Messages\ReceivedMessage;
 
 class Receiver
@@ -24,7 +26,7 @@ public function receive(ReceivedMessage $message): void
 
         switch ($event) {
             case 'update':
-                $upserter = new Upserter();
+                $upserter = App::make(Upserter::class);
                 $upserter->upsert($data, $message->getVersion());
                 break;
             case 'destroy':

src/Integration/Laravel/Receive/Upserter/ByTargetKeysResolver.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Umbrellio\TableSync\Integration\Laravel\Receive\Upserter;
+
+use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageData;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\ConflictConditionResolverContract;
+
+class ByTargetKeysResolver implements ConflictConditionResolverContract
+{
+    public function resolve(MessageData $messageData): string
+    {
+        return '(' . implode(',', $messageData->getTargetKeys()) . ')';
+    }
+}

src/Integration/Laravel/Receive/Upserter/ConflictConditionResolverContract.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Umbrellio\TableSync\Integration\Laravel\Receive\Upserter;
+
+use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageData;
+
+interface ConflictConditionResolverContract
+{
+    public function resolve(MessageData $messageData): string;
+}

src/Integration/Laravel/Receive/Upserter.php renamed to src/Integration/Laravel/Receive/Upserter/Upserter.php

@@ -2,14 +2,22 @@
 
 declare(strict_types=1);
 
-namespace Umbrellio\TableSync\Integration\Laravel\Receive;
+namespace Umbrellio\TableSync\Integration\Laravel\Receive\Upserter;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageData;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\ConflictConditionResolverContract;
 
 class Upserter
 {
+    private $conflictConditionResolver;
+
+    public function __construct(ConflictConditionResolverContract $conflictConditionResolver)
+    {
+        $this->conflictConditionResolver = $conflictConditionResolver;
+    }
+
     // todo via modern expressive not existing query builder
     public function upsert(MessageData $messageData, float $version): void
     {
@@ -25,7 +33,7 @@ public function upsert(MessageData $messageData, float $version): void
         }, $columns));
 
         $values = $this->convertInsertValues($data);
-        $target = implode(',', $messageData->getTargetKeys());
+        $target = $this->conflictConditionResolver->resolve($messageData);
 
         $valueBindings = Arr::flatten($data);
 
@@ -34,7 +42,7 @@ public function upsert(MessageData $messageData, float $version): void
 
         $sql = <<<CODE_SAMPLE
         INSERT INTO {$messageData->getTable()} ({$columnString}) VALUES {$values}
-        ON CONFLICT ({$target}) 
+        ON CONFLICT {$target} 
         DO UPDATE 
           SET {$updateSpecString}
           WHERE {$messageData->getTable()}.version < ?

src/Integration/Laravel/TableSyncServiceProvider.php

@@ -11,7 +11,9 @@
 use Psr\Log\LoggerInterface;
 use Umbrellio\TableSync\Integration\Laravel\Console\PidManager;
 use Umbrellio\TableSync\Integration\Laravel\Publishers\QueuePublisher;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\ByTargetKeysResolver;
 use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageDataRetriever;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\ConflictConditionResolverContract;
 use Umbrellio\TableSync\Integration\Laravel\ReceivedMessageHandlers\QueueReceivedMessageHandler;
 use Umbrellio\TableSync\Publisher;
 use Umbrellio\TableSync\Rabbit\ChannelContainer;
@@ -23,6 +25,7 @@
 class TableSyncServiceProvider extends ServiceProvider
 {
     protected $defer = true;
+    public $bindings = [ConflictConditionResolverContract::class => ByTargetKeysResolver::class];
 
     public function boot()
     {

tests/functional/Laravel/Integration/Receive/Upserter/ByTargetKeysResolverTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Umbrellio\TableSync\Tests\functional\Laravel\Integration\Receive\Upserter;
+
+use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageData;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\ByTargetKeysResolver;
+use Umbrellio\TableSync\Tests\functional\Laravel\LaravelTestCase;
+
+class ByTargetKeysResolverTest extends LaravelTestCase
+{
+    /** @test */
+    public function correctConditionResolved(): void
+    {
+        $resolver = new ByTargetKeysResolver();
+        $messageData = new MessageData('test_models', ['id', 'name'], [
+            [
+                'id' => 1,
+                'name' => 'new_name',
+            ],
+        ]);
+
+        $expectedCondition = '(id,name)';
+        $this->assertSame($expectedCondition, $resolver->resolve($messageData));
+    }
+}

tests/functional/Laravel/Integration/Receive/UpserterTest.php renamed to tests/functional/Laravel/Integration/Receive/Upserter/UpserterTest.php

@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Umbrellio\TableSync\Tests\functional\Laravel\Integration\Receive;
+namespace Umbrellio\TableSync\Tests\functional\Laravel\Integration\Receive\Upserter;
 
 use Umbrellio\TableSync\Integration\Laravel\Receive\MessageData\MessageData;
-use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\ByTargetKeysResolver;
+use Umbrellio\TableSync\Integration\Laravel\Receive\Upserter\Upserter;
 use Umbrellio\TableSync\Tests\functional\Laravel\LaravelTestCase;
 use Umbrellio\TableSync\Tests\functional\Laravel\Traits\StubPublisher;
 
@@ -22,7 +23,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->upserter = new Upserter();
+        $conflictResolver = new ByTargetKeysResolver();
+        $this->upserter = new Upserter($conflictResolver);
 
         $this->stubPublisher();
     }