wip

app/Concerns/HasTemporaryTable.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use Illuminate\Support\Facades\DB;
+
+trait HasTemporaryTable
+{
+    public function getTemporaryTable(): string
+    {
+        return '_temp_' . $this->getTable();
+    }
+
+    public static function saveToTemporaryTable(array $values): void
+    {
+        DB::table((new static())->getTemporaryTable())->insert($values);
+    }
+}

app/Contracts/TemporaryTable.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Contracts;
+
+interface TemporaryTable
+{
+    public function getTemporaryTable(): string;
+
+    public function getTemporaryTableUniqueColumns(): array;
+
+    public static function saveToTemporaryTable(array $values): void;
+}

app/Exceptions/CountryCodeNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+use Exception;
+
+class CountryCodeNotFoundException extends Exception
+{
+    public function __construct(string $name)
+    {
+        parent::__construct("Could not find country code for: {$name}");
+    }
+}

app/Jobs/DeleteTemporaryTableData.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Jobs;
+
+use App\Contracts\TemporaryTable;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Facades\DB;
+
+class DeleteTemporaryTableData implements ShouldQueue
+{
+    use Queueable;
+
+    public string $model;
+
+    public int $electionId;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(string $model, int $electionId)
+    {
+        $this->model = $model;
+        $this->electionId = $electionId;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $model = new $this->model;
+
+        if (! $model instanceof TemporaryTable) {
+            throw new Exception('Model must implement TemporaryTable contract');
+        }
+
+        DB::table($model->getTemporaryTable())
+            ->where('election_id', $this->electionId)
+            ->delete();
+    }
+}

app/Jobs/Europarl240609/Turnout/FetchTurnoutDataJob.php

@@ -4,8 +4,11 @@
 
 namespace App\Jobs\Europarl240609\Turnout;
 
+use App\Jobs\DeleteTemporaryTableData;
+use App\Jobs\PersistTemporaryTableData;
 use App\Jobs\SchedulableJob;
 use App\Models\County;
+use App\Models\Turnout;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Storage;
@@ -55,20 +58,25 @@ public function execute(): void
         $counties = County::all();
 
         $electionName = $this->scheduledJob->election->getFilamentName();
+        $electionId = $this->scheduledJob->election_id;
 
         $time = now()->toDateTimeString();
 
-        Bus::chain([
-            Bus::batch(
-                $counties
-                    ->map(fn (County $county) => new ImportCountyTurnoutJob($this->scheduledJob, $county))
-            )->name("$electionName / Prezență / $time"),
-
-            Bus::batch(
-                $counties
-                    ->map(fn (County $county) => new ImportCountyStatisticsJob($this->scheduledJob, $county))
-            )->name("$electionName / Statistici / $time"),
-        ])->onQueue('sequential')->dispatch();
+        $jobs = $counties
+            ->map(fn (County $county) => new ImportCountyTurnoutJob($this->scheduledJob, $county))
+            ->push(new ImportAbroadTurnoutJob($this->scheduledJob));
+
+        $persistAndClean = fn () => Bus::chain([
+            new PersistTemporaryTableData(Turnout::class, $electionId),
+            new DeleteTemporaryTableData(Turnout::class, $electionId),
+        ])->dispatch();
+
+        Bus::batch($jobs)
+            ->catch($persistAndClean)
+            ->then($persistAndClean)
+            ->name("$electionName / Prezență / $time")
+            ->allowFailures()
+            ->dispatch();
     }
 
     /**

app/Jobs/Europarl240609/Turnout/ImportCountyTurnoutJob.php

@@ -13,7 +13,6 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 use Illuminate\Queue\SerializesModels;
 use League\Csv\Reader;
 
@@ -49,6 +48,8 @@ public function handle(): void
 
         $values = collect();
 
+        $segments = Turnout::segmentsMap();
+
         $records = $reader->getRecords();
         foreach ($records as $record) {
             $values->push([
@@ -63,19 +64,14 @@ public function handle(): void
                 'complement' => $record['LC'],
                 'supplement' => $record['LS'],
                 'mobile' => $record['UM'],
+
+                'area' => $record['Mediu'],
+
+                ...$segments->map(fn (string $segment) => $record[$segment]),
             ]);
         }
 
-        Turnout::upsert(
-            $values->all(),
-            ['election_id', 'county_id', 'section'],
-            ['initial_permanent', 'initial_complement', 'permanent', 'complement', 'supplement', 'mobile']
-        );
-    }
-
-    public function middleware(): array
-    {
-        return [new SkipIfBatchCancelled];
+        Turnout::saveToTemporaryTable($values->all());
     }
 
     /**

app/Jobs/PersistTemporaryTableData.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Jobs;
+
+use App\Contracts\TemporaryTable;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Facades\DB;
+
+class PersistTemporaryTableData implements ShouldQueue
+{
+    use Queueable;
+
+    public string $model;
+
+    public int $electionId;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(string $model, int $electionId)
+    {
+        $this->model = $model;
+        $this->electionId = $electionId;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $model = new $this->model;
+
+        if (! $model instanceof TemporaryTable) {
+            throw new Exception('Model must implement TemporaryTable contract');
+        }
+
+        $columns = collect($model->getFillable())
+            ->sort();
+
+        $selectColumns = $columns
+            ->map(fn (string $column) => "`$column`")
+            ->implode(', ');
+
+        $updateColumns = $columns
+            ->reject(fn (string $column) => \in_array($column, $model->getTemporaryTableUniqueColumns()))
+            ->map(fn (string $column) => "`$column` = `{$model->getTemporaryTable()}`.`$column`")
+            ->implode(', ');
+
+        DB::unprepared(<<<"SQL"
+            INSERT INTO `{$model->getTable()}` ({$selectColumns})
+            SELECT {$selectColumns} FROM `{$model->getTemporaryTable()}` WHERE `election_id` = {$this->electionId}
+            ON DUPLICATE KEY UPDATE {$updateColumns};
+        SQL);
+    }
+}

app/Models/Country.php

@@ -69,7 +69,7 @@ public static function getTypesenseModelSettings(): array
                 ],
             ],
             'search-parameters' => [
-                'query_by' => 'name',
+                'query_by' => 'name,aliases',
             ],
         ];
     }