Display for media with same id but various trees fixed

UksusoFF · Jun 22, 2020 · 4c2ccb3 · 4c2ccb3
1 parent 1951afe
commit 4c2ccb3
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 9 deletions.
diff --git a/src/Helpers/DatabaseHelper.php b/src/Helpers/DatabaseHelper.php
@@ -28,26 +28,37 @@ public function getIndividualsDataByTreeAndPids(string $tree, array $pids): Coll
             ->get();
     }
 
-    public function getMediaMap(string $media, int $order): ?string
-    {
+    public function getMediaMap(
+        int $tree,
+        string $media,
+        int $order
+    ): ?string {
         return DB::table('media_faces')
             ->where('f_m_id', '=', $media)
             ->where('f_m_order', '=', $order)
+            ->where('f_m_tree', '=', $tree)
             ->value('f_coordinates');
     }
 
-    public function setMediaMap(string $media, int $order, ?string $filename = null, ?string $map = null): ?int
-    {
+    public function setMediaMap(
+        int $tree,
+        string $media,
+        int $order,
+        ?string $filename = null,
+        ?string $map = null
+    ): ?int {
         if ($map === null) {
             return DB::table('media_faces')
                 ->where('f_m_id', '=', $media)
                 ->where('f_m_order', '=', $order)
+                ->where('f_m_tree', '=', $tree)
                 ->delete();
         }
 
         DB::table('media_faces')->updateOrInsert([
             'f_m_id' => $media,
             'f_m_order' => $order,
+            'f_m_tree' => $tree,
         ], [
             'f_coordinates' => $map,
             'f_m_filename' => $filename,
@@ -74,7 +85,11 @@ public function getMediaList(?string $media, ?string $person, ?string $search, i
 
         return [
             $query
-                ->leftJoin('media', 'f_m_id', '=', 'm_id')
+                ->leftJoin('media', function (JoinClause $join) {
+                    $join
+                        ->on('f_m_id', '=', 'm_id')
+                        ->on('f_m_tree', '=', 'm_file');
+                })
                 ->skip($start)
                 ->take($length)
                 ->get([
@@ -93,7 +108,11 @@ public function missedNotesRepair(): int
         $count = 0;
 
         DB::table('media_faces')
-            ->leftJoin('media', 'f_m_id', '=', 'm_id')
+            ->leftJoin('media', function (JoinClause $join) {
+                $join
+                    ->on('f_m_id', '=', 'm_id')
+                    ->on('f_m_tree', '=', 'm_file');
+            })
             ->whereNull('media.m_id')
             ->chunkById(20, function($chunks) use (&$count) {
                 foreach ($chunks as $chunk) {
@@ -117,7 +136,11 @@ public function missedNotesRepair(): int
     public function missedNotesDestroy(): int
     {
         return DB::table('media_faces')
-            ->leftJoin('media', 'f_m_id', '=', 'm_id')
+            ->leftJoin('media', function (JoinClause $join) {
+                $join
+                    ->on('f_m_id', '=', 'm_id')
+                    ->on('f_m_tree', '=', 'm_file');
+            })
             ->whereNull('media.m_id')
             ->delete();
     }

diff --git a/src/Http/Controllers/DataController.php b/src/Http/Controllers/DataController.php
@@ -254,7 +254,11 @@ private function getMediaMap(Media $media, string $fact): array
             throw new HttpNotFoundException();
         }
 
-        if (($map = $this->module->query->getMediaMap($media->xref(), $order)) !== null) {
+        if (($map = $this->module->query->getMediaMap(
+                $media->tree()->id(),
+                $media->xref(),
+                $order
+            )) !== null) {
             return json_decode($map, true);
         }
 
@@ -276,6 +280,7 @@ private function setMediaMap(Media $media, string $fact, array $map = []): void
         }
 
         $this->module->query->setMediaMap(
+            $media->tree()->id(),
             $media->xref(),
             $order,
             $file->filename(),

diff --git a/src/Migrations/Migration5.php b/src/Migrations/Migration5.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace UksusoFF\WebtreesModules\Faces\Migrations;
+
+use Fisharebest\Webtrees\Schema\MigrationInterface;
+use Illuminate\Database\Capsule\Manager as DB;
+use Illuminate\Database\Schema\Blueprint;
+
+/**
+ * Migrate data from oldest versions.
+ */
+class Migration5 implements MigrationInterface
+{
+    public function upgrade(): void
+    {
+        DB::schema()->table('media_faces', static function(Blueprint $table): void {
+            $table->unsignedInteger('f_m_tree')->nullable();
+        });
+
+        DB::table('media_faces')
+            ->leftJoin('media', 'f_m_id', '=', 'm_id')
+            ->update([
+                'f_m_tree' => DB::raw('m_file'),
+            ]);
+
+        DB::schema()->table('media_faces', static function(Blueprint $table): void {
+            $table->unsignedInteger('f_m_tree')->nullable(false)->change();
+        });
+    }
+}
diff --git a/src/Modules/FacesModule.php b/src/Modules/FacesModule.php
@@ -29,7 +29,7 @@ class FacesModule extends AbstractModule implements ModuleCustomInterface, Modul
     use ModuleGlobalTrait;
     use ModuleConfigTrait;
 
-    public const SCHEMA_VERSION = '5';
+    public const SCHEMA_VERSION = '6';
 
     public const CUSTOM_VERSION = '2.6.4';