Bunch of small fixes

owlchester · Apr 18, 2024 · fb93442 · fb93442
1 parent ef364d7
commit fb93442
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 56 deletions.
diff --git a/app/Http/Requests/StoreCreature.php b/app/Http/Requests/StoreCreature.php
@@ -36,6 +36,8 @@ public function rules()
             'image' => 'mimes:jpeg,png,jpg,gif,webp|max:' . Limit::upload(),
             'image_url' => 'nullable|url|active_url',
             'template_id' => 'nullable',
+            'locations' => 'array',
+            'locations.*' => 'distinct|exists:locations,id',
         ];
 
         /** @var Creature $self */

diff --git a/app/Http/Requests/StoreOrganisation.php b/app/Http/Requests/StoreOrganisation.php
@@ -36,6 +36,8 @@ public function rules()
             'organisation_id' => 'nullable|exists:organisations,id',
             'image_url' => 'nullable|url|active_url',
             'template_id' => 'nullable',
+            'locations' => 'array',
+            'locations.*' => 'distinct|exists:locations,id',
         ];
 
         /** @var Organisation $self */

diff --git a/app/Http/Requests/StoreRace.php b/app/Http/Requests/StoreRace.php
@@ -36,6 +36,8 @@ public function rules()
             'image' => 'mimes:jpeg,png,jpg,gif,webp|max:' . Limit::upload(),
             'image_url' => 'nullable|url|active_url',
             'template_id' => 'nullable',
+            'locations' => 'array',
+            'locations.*' => 'distinct|exists:locations,id',
         ];
 
         /** @var Race $self */

diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
@@ -25,7 +25,7 @@
  * @property Collection|OrganisationMember[] $members
  * @property Collection|Organisation[] $descendants
  * @property Collection|Organisation[] $organisations
- *  * @property Collection|Location[] $locations
+ * @property Collection|Location[] $locations
  * @property bool $is_defunct
  */
 class Organisation extends MiscModel
@@ -66,7 +66,6 @@ class Organisation extends MiscModel
      * Fields that can be sorted on
      */
     protected array $sortableColumns = [
-        'location.name',
         'is_defunct',
     ];
 
@@ -80,7 +79,6 @@ class Organisation extends MiscModel
 
     protected array $exportFields = [
         'base',
-        'location_id',
         'is_defunct',
     ];
 
@@ -91,7 +89,6 @@ class Organisation extends MiscModel
      * @var string[]
      */
     public array $nullableForeignKeys = [
-        'location_id',
         'organisation_id'
     ];
 
@@ -106,8 +103,6 @@ public function scopePreparedWith(Builder $query): Builder
             ->with([
                 'entity',
                 'entity.image',
-                'location',
-                'location.entity',
                 'locations' => function ($sub) {
                     $sub->select('id', 'name');
                 },

diff --git a/app/Services/Campaign/Import/Mappers/EntityMapper.php b/app/Services/Campaign/Import/Mappers/EntityMapper.php
@@ -348,6 +348,7 @@ protected function foreign(string $model, string $field): self
 
     protected function pivot(string $relation, string $model, string $field): self
     {
+        //Check if import has old location_id and migrate it to new locations pivot table system, currently only happens with organisations
         if ($relation == 'pivotLocations' && isset($this->data['location_id']) && !in_array(['location_id' => $this->data['location_id']], $this->data[$relation])) {
             $this->data[$relation][] = ['location_id' => $this->data['location_id']];
         }

diff --git a/app/Services/Entity/ConnectionService.php b/app/Services/Entity/ConnectionService.php
@@ -118,15 +118,15 @@ protected function initRace()
     {
         $this
             ->loadChildRaces()
-            ->loadRaceLocations()
+            ->loadLocations()
         ;
     }
 
     protected function initOrganisation()
     {
         $this
             ->loadMapMarkers()
-            ->loadRaceLocations()
+            ->loadLocations()
             ->loadTimelines()
             ->loadQuests()
             ->loadAuthoredJournals()
@@ -319,7 +319,7 @@ protected function loadChildRaces(): self
         return $this;
     }
 
-    protected function loadRaceLocations(): self
+    protected function loadLocations(): self
     {
         /** @var Location $parent */
         $parent = $this->entity->child;

diff --git a/resources/views/entities/components/profile/_locations.blade.php b/resources/views/entities/components/profile/_locations.blade.php
@@ -0,0 +1,15 @@
+@if ($campaign->enabled('locations') && !$model->locations->isEmpty())
+    <div class="element profile-location">
+        <div class="title text-uppercase text-xs">
+            {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!}
+        </div>
+        @php $existingLocations = []; @endphp
+        @foreach ($model->locations()->with('entity')->get() as $location)
+            @if(!empty($existingLocations[$location->id]))
+                @continue
+            @endif
+            @php $existingLocations[$location->id] = true; @endphp
+            {!! $location->tooltipedLink() !!}
+        @endforeach
+    </div>
+@endif
diff --git a/resources/views/entities/components/profile/creatures.blade.php b/resources/views/entities/components/profile/creatures.blade.php
@@ -5,21 +5,6 @@
 @endif
 
 <x-sidebar.profile>
-    @if ($campaign->enabled('locations') && !$model->locations->isEmpty())
-        <div class="element profile-location">
-            <div class="title text-uppercase text-xs">
-                {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!}
-            </div>
-            @php $existingLocations = []; @endphp
-            @foreach ($model->locations as $location)
-                @if(!empty($existingLocations[$location->id]))
-                    @continue
-                @endif
-                @php $existingLocations[$location->id] = true; @endphp
-                {!! $location->tooltipedLink() !!}
-            @endforeach
-        </div>
-    @endif
-
+    @include('entities.components.profile._locations')
     @include('entities.components.profile._type')
 </x-sidebar.profile>
diff --git a/resources/views/entities/components/profile/organisations.blade.php b/resources/views/entities/components/profile/organisations.blade.php
@@ -5,21 +5,7 @@
 @endif
 
 <x-sidebar.profile>
-    @if ($campaign->enabled('locations') && !$model->locations->isEmpty())
-        <div class="element profile-location">
-            <div class="title text-uppercase text-xs">
-                {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!}
-            </div>
-            @php $existingRaces = []; @endphp
-            @foreach ($model->locations()->with('entity')->get() as $location)
-                @if(!empty($existingLocations[$location->id]))
-                    @continue
-                @endif
-                @php $existingLocations[$location->id] = true; @endphp
-                {!! $location->tooltipedLink() !!}
-            @endforeach
-        </div>
-    @endif
+    @include('entities.components.profile._locations')
     @include('entities.components.profile._type')
     @include('entities.components.profile._events')
 </x-sidebar.profile>
diff --git a/resources/views/entities/components/profile/races.blade.php b/resources/views/entities/components/profile/races.blade.php
@@ -5,21 +5,6 @@
 @endif
 
 <x-sidebar.profile>
-    @if ($campaign->enabled('locations') && !$model->locations->isEmpty())
-        <div class="element profile-location">
-            <div class="title text-uppercase text-xs">
-                {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!}
-            </div>
-            @php $existingRaces = []; @endphp
-            @foreach ($model->locations()->with('entity')->get() as $location)
-                @if(!empty($existingLocations[$location->id]))
-                    @continue
-                @endif
-                @php $existingLocations[$location->id] = true; @endphp
-                {!! $location->tooltipedLink() !!}
-            @endforeach
-        </div>
-    @endif
-
+    @include('entities.components.profile._locations')
     @include('entities.components.profile._type')
 </x-sidebar.profile>