Merge pull request #267 from art-institute-of-chicago/fix/gallery-lat…

…-longs Get gallery lat-long info from API model [MA-156]
art-institute-of-chicago · Mar 5, 2024 · 6c68b43 · 6c68b43
2 parents 6c8831b + fa96413
commit 6c68b43
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/app/Models/Transformers/GalleryTransformer.php b/app/Models/Transformers/GalleryTransformer.php
@@ -13,14 +13,14 @@ public function transform(TwillModelContract $gallery)
             $gallery->id => [
                 'title' => $gallery->title,
                 'nid' => (string) $gallery->id, // Legacy from Drupal
-                'location' => $gallery->latlon,
-                'latitude' => $gallery->latitude,
-                'longitude' => $gallery->longitude,
+                'location' => $gallery->getApiModel()->latlon ?? $gallery->latlon,
+                'latitude' => $gallery->getApiModel()->latitude ?? $gallery->latitude,
+                'longitude' => $gallery->getApiModel()->longitude ?? $gallery->longitude,
                 'gallery_id' => (string) $gallery->id,
                 'tgn_id' => null,// Legacy from Drupal
-                'closed' => $gallery->is_closed,
-                'number' => $gallery->number,
-                'floor' => $gallery->floor,
+                'closed' => $gallery->getApiModel()->is_closed ?? $gallery->is_closed,
+                'number' => $gallery->getApiModel()->number ?? $gallery->number,
+                'floor' => $gallery->getApiModel()->floor ?? $gallery->floor,
                 'source_updated_at' => $gallery->source_updated_at,
                 'updated_at' => $gallery->updated_at,
             ]

diff --git a/tests/Feature/GallerySerializerTest.php b/tests/Feature/GallerySerializerTest.php
@@ -3,13 +3,24 @@
 namespace Tests\Feature;
 
 use App\Models\Gallery;
+use App\Models\Api\Gallery as ApiGallery;
 use App\Repositories\Serializers\GallerySerializer;
 use Tests\TestCase;
+use Tests\MockApi;
 
 class GallerySerializerTest extends TestCase
 {
+    use MockApi;
+
     public function test_serialize(): void
     {
+        $mockGalleryResponses = ApiGallery::factory()
+            ->count(3)
+            ->make()
+            ->map(fn ($gallery) => $this->mockApiModelReponse($gallery));
+        $responses = collect($mockGalleryResponses)->toArray();
+        $this->addMockApiResponses($responses);
+
         $serializer = new GallerySerializer();
         $galleries = Gallery::factory()->count(3)->make();
         $serialized = $serializer->serialize($galleries);