Ensure floor plan url uses https scheme [MA-154]

art-institute-of-chicago · Jan 31, 2024 · cfacf97 · cfacf97
1 parent 49f8841
commit cfacf97
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/app/Models/Transformers/FloorTransformer.php b/app/Models/Transformers/FloorTransformer.php
@@ -10,10 +10,11 @@ class FloorTransformer extends TransformerAbstract
 {
     public function transform(TwillModelContract $floor)
     {
+        $floorPlan = $floor->fileObject('floor_plan');
         return [
             "map_floor$floor->level" => [
                 'label' => $floor->level,
-                'floor_plan' => $floor->file('floor_plan'),
+                'floor_plan' => $floorPlan ? secure_url('storage/uploads/' . $floorPlan?->uuid) : null,
                 'anchor_pixel_1' => Floor::ANCHOR_PIXELS[0],
                 'anchor_pixel_2' => Floor::ANCHOR_PIXELS[1],
                 'anchor_location_1' => FLOOR::ANCHOR_LOCATIONS[0],

diff --git a/database/factories/FloorFactory.php b/database/factories/FloorFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use A17\Twill\Models\File;
 use App\Models\Floor;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -18,4 +19,19 @@ public function definition(): array
             },
         ];
     }
+
+    public function withFloorPlan(): Factory
+    {
+        return $this->state(fn () => [])
+            ->afterCreating(function (Floor $floor) {
+                $filename = 'test.pdf';
+                $file = File::create([
+                    'filename' => $filename,
+                    'uuid' => fake()->uuid() . '/' . $filename,
+                    'size' => fake()->randomNumber(),
+                ]);
+                $floor->files()->attach($file, ['locale' => 'en', 'role' => 'floor_plan']);
+                $floor->save();
+            });
+    }
 }
diff --git a/tests/Feature/FloorSerializerTest.php b/tests/Feature/FloorSerializerTest.php
@@ -4,10 +4,13 @@
 
 use App\Models\Floor;
 use App\Repositories\Serializers\FloorSerializer;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class FloorSerializerTest extends TestCase
 {
+    use RefreshDatabase;
+
     public function test_serialize(): void
     {
         $floors = Floor::factory()->count(count(Floor::LEVELS))->make();
@@ -27,4 +30,13 @@ public function test_serialize(): void
             $this->assertArrayHasKey('tile_images', $floor);
         }
     }
+
+    public function test_floor_plan_url(): void
+    {
+        $floor = Floor::factory()->withFloorPlan()->create();
+        $serializer = new FloorSerializer();
+        $serialized = $serializer->serialize([$floor]);
+        $floorPlanUrl = $serialized['map_floors']['map_floor' . $floor->level]['floor_plan'];
+        $this->assertStringStartsWith('https://', $floorPlanUrl, 'The floor plan url uses the https scheme');
+    }
 }