Merge pull request #602 from JoshKisb/main

update tenancy

app/Jobs/ImportGedcom.php

@@ -49,7 +49,7 @@ public function handle(): int
         ]);
         $parser = new GedcomParser();
 
-        $parser->parse($job->getConnectionName(), $this->filePath, $slug, true);
+        $parser->parse($job->getConnectionName(), $this->filePath, $slug, false);
         // with(new GedcomParser())->parse($tenant->connectionName(), $this->filePath, $slug, true);
 
         File::delete($this->filePath);

app/Models/Addr.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Addr extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     protected $fillable = [
         'adr1',
@@ -24,9 +25,5 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
+
 }

app/Models/Author.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Author extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     protected $fillable = ['description', 'is_active', 'name'];
 
@@ -22,8 +23,4 @@ public function user(): BelongsTo
     }
 
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/BatchData.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Filament\Facades\Filament;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class BatchData extends \FamilyTree365\LaravelGedcom\Utils\BatchData 
+{
+    public static function upsert($modelClass, $conn, array $values, array $uniqueBy, array $update = [])
+    {
+        // error_log("modi upsert");
+        $teamId = auth()->check() ? Filament::getTenant()->id : null;
+
+        // Add team_id to each data item
+        foreach ($values as &$value) {
+            $value['team_id'] = $teamId;
+        }
+
+        return parent::upsert($modelClass, $conn, $values, $uniqueBy, $update);
+    }
+}

app/Models/Chan.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Chan extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
 
 
@@ -31,8 +32,4 @@ public function user(): BelongsTo
         }
 
 
-        public function team()
-        {
-            return $this->belongsTo(Team::class);
-        }
 }

app/Models/Citation.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Citation extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     protected $fillable = ['name', 'description', 'repository_id', 'volume', 'page', 'is_active', 'confidence', 'source_id'];
 
@@ -28,8 +29,4 @@ public function user(): BelongsTo
     }
 
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/Dna.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Dna extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
 
     protected $fillable = [
@@ -23,11 +24,4 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
-
-
 }

app/Models/DnaMatching.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class DnaMatching extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     protected $fillable = [
         'file1',
@@ -25,8 +26,4 @@ public function user(): BelongsTo
     }
 
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/Family.php

@@ -2,20 +2,17 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Family extends \FamilyTree365\LaravelGedcom\Models\Family
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/FamilyEvent.php

@@ -2,21 +2,18 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class FamilyEvent extends \FamilyTree365\LaravelGedcom\Models\FamilyEvent
 {
 //
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/FamilySlgs.php

@@ -2,22 +2,18 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class FamilySlgs extends \FamilyTree365\LaravelGedcom\Models\FamilySlgs
 {
 //
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/MediaObject.php

@@ -2,14 +2,11 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class MediaObject extends \FamilyTree365\LaravelGedcom\Models\MediaObject
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/Note.php

@@ -2,14 +2,10 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Note extends \FamilyTree365\LaravelGedcom\Models\Note
 {
-    use HasFactory;
-
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
+    use HasFactory, BelongsToTenant;
 }

app/Models/Person.php

@@ -4,6 +4,7 @@
 
 //use App\Traits\ConnectionTrait;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -12,7 +13,7 @@
 
 class Person extends Model
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
     protected $fillable = [
         'gid',
@@ -179,8 +180,4 @@ public function death()
         return $this->events->where('title', '=', 'DEAT')->first();
     }
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/PersonAlia.php

@@ -2,14 +2,11 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class PersonAlia extends \FamilyTree365\LaravelGedcom\Models\PersonAlia
 {
-    use HasFactory;
+    use HasFactory, BelongsToTenant;
 
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
 }

app/Models/PersonAnci.php

@@ -2,35 +2,12 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class PersonAnci extends Model
+class PersonAnci extends \FamilyTree365\LaravelGedcom\Models\PersonAnci
 {
-    use HasFactory;
-
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'person_anci';
-
-    /**
-     * The "type" of the auto-incrementing ID.
-     *
-     * @var string
-     */
-    protected $keyType = 'integer';
-
-    /**
-     * @var array
-     */
-    protected $fillable = ['group', 'gid', 'anci', 'created_at', 'updated_at'];
-
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
+    use HasFactory, BelongsToTenant;
 
 }

app/Models/PersonAsso.php

@@ -2,14 +2,10 @@
 
 namespace App\Models;
 
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class PersonAsso extends \FamilyTree365\LaravelGedcom\Models\PersonAsso
 {
-    use HasFactory;
-
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
+    use HasFactory, BelongsToTenant;
 }