Private Races export/import/api

owlchester · Jul 1, 2024 · e753b78 · e753b78
1 parent f234862
commit e753b78
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/Http/Resources/CharacterResource.php b/app/Http/Resources/CharacterResource.php
@@ -17,7 +17,8 @@ public function toArray($request)
         /** @var Character $model */
         $model = $this->resource;
 
-        $raceIDs = $model->characterRaces->pluck('race.id');
+        $raceIDs = $model->characterRaces->where('is_private', false)->pluck('race.id');
+        $privateRaceIDs = $model->characterRaces->where('is_private', true)->pluck('race.id');
         $familyIDs = $model->families->pluck('id');
 
         $character = [
@@ -26,6 +27,7 @@ public function toArray($request)
             'sex' => $model->sex,
             'pronouns' => $model->pronouns,
             'races' => $raceIDs,
+            'private_races' => $privateRaceIDs,
             'type' => $model->type,
 
             'families' => $familyIDs,

diff --git a/app/Services/Campaign/Import/Mappers/EntityMapper.php b/app/Services/Campaign/Import/Mappers/EntityMapper.php
@@ -357,7 +357,11 @@ protected function pivot(string $relation, string $model, string $field): self
                 continue;
             }
             $foreignID = ImportIdMapper::get($model, $pivot[$field]);
-            $this->model->{$model}()->attach($foreignID);
+            if (array_key_exists('is_private', $pivot)) {
+                $this->model->{$model}()->attach($foreignID, ['is_private' => $pivot['is_private']]);
+            } else {
+                $this->model->{$model}()->attach($foreignID);
+            }
         }
         return $this;
     }

diff --git a/resources/api-docs/1.0/characters.md b/resources/api-docs/1.0/characters.md
@@ -54,6 +54,7 @@ The list of returned entities can be filtered. The available filters are [availa
             "sex": "Male",
             "pronouns": null,
             "races": [3],
+            "private_races": [2, 5],
             "type": null,
             "families": [34],
             "is_dead": true,
@@ -111,6 +112,7 @@ To get the details of a single character, use the following endpoint.
         "sex": "Male",
         "pronouns": null,
         "races": [3],
+        "private_races": [2, 5],
         "type": null,
         "families": [34],
         "is_dead": true,