Merge branch 'develop'

.env.testing.example

@@ -3,12 +3,11 @@ APP_KEY=
 APP_DEBUG=true
 APP_URL='http://api.test'
 
-# Also defined in phpunit.xml?
-APP_ENV='testing'
-
-DB_CONNECTION='testing'
-
-# WEB-1801: Uncomment for paratest
-# DB_DATABASE=':memory:'
+DB_CONNECTION='mysql'
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE='testing'
+DB_USERNAME='homestead'
+DB_PASSWORD='secret'
 
 SCOUT_DRIVER=null

VERSION

@@ -1 +1 @@
-1.6
+1.8

app/Models/Collections/Artwork.php

@@ -18,6 +18,7 @@ class Artwork extends CollectionsModel
 
     protected $casts = [
         'alt_titles' => 'array',
+        'dimensions_detail' => 'array',
         'is_public_domain' => 'boolean',
         'is_zoomable' => 'boolean',
         'is_on_view' => 'boolean',

app/Transformers/Outbound/Collections/Artwork.php

@@ -213,6 +213,22 @@ protected function getFields()
                 'type' => 'string',
                 'elasticsearch' => 'keyword',
             ],
+            'dimensions_detail' => [
+                'doc' => 'The height, width, depth, and/or diameter of each section of the work in centimeters',
+                'type' => 'object',
+                'elasticsearch' => [
+                    'mapping' => [
+                        'type' => 'object',
+                        'properties' => [
+                            'clarification' => ['type' => 'text'],
+                            'depth' => ['type' => 'float'],
+                            'diameter' => ['type' => 'float'],
+                            'height' => ['type' => 'float'],
+                            'width' => ['type' => 'float'],
+                        ],
+                    ],
+                ],
+            ],
             'medium_display' => [
                 'doc' => 'The substances or materials used in the creation of a work',
                 'type' => 'string',
@@ -255,6 +271,10 @@ protected function getFields()
                     return $item->provenance;
                 },
             ],
+            'edition' => [
+                'doc' => 'Edition number if the work is one of many',
+                'type' => 'text',
+            ],
 
             /**
              * Publishing fields:

composer.json

@@ -28,6 +28,7 @@
         "aic/data-hub-foundation": "dev-laravel-8-support",
         "aic/laravel-scout-elastic": "dev-master",
         "cviebrock/laravel-elasticsearch": "^9.0",
+        "doctrine/dbal": "^2.13",
         "fruitcake/laravel-cors": "^2.0",
         "intervention/image": "^2.7",
         "jsq/amazon-es-php": "dev-master",

config/database.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Database\DBAL\TimestampType;
 use Illuminate\Support\Str;
 
 $config = [
@@ -113,6 +114,20 @@
 
     'migrations' => 'migrations',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Column Types
+    |--------------------------------------------------------------------------
+    | This allows for modifying `timestamp` columns in migrations.
+    | See https://laravel.com/docs/8.x/migrations#prerequisites.
+    */
+
+    'dbal' => [
+        'types' => [
+            'timestamp' => TimestampType::class,
+        ],
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Redis Databases

database/factories/Collections/ArtworkFactory.php

@@ -25,6 +25,7 @@ public function definition()
                 'description' => $this->faker->paragraph(5),
                 'artist_display' => $artist->title_raw . "\n" . $this->faker->country . ', ' . $this->faker->year . '–' . $this->faker->year,
                 'dimensions' => $this->faker->randomFloat(1, 0, 200) . ' x ' . $this->faker->randomFloat(1, 0, 200) . ' (' . $this->faker->randomNumber(2) . $this->faker->randomElement(['', ' 1/8', ' 1/4', ' 3/8', ' 1/2', ' 5/8', ' 3/4', ' 7/8']) . ' x ' . $this->faker->randomNumber(2) . $this->faker->randomElement(['', ' 1/8', ' 1/4', ' 3/8', ' 1/2', ' 5/8', ' 3/4', ' 7/8']) . ' in.)',
+                'dimensions_detail' => $this->fakeDimensionsDetail(3),
                 'medium_display' => ucfirst($this->faker->word) . ' on ' . $this->faker->word,
                 'credit_line' => $this->faker->randomElement(['', 'Friends of ', 'Gift of ', 'Bequest of ']) . $this->faker->words(3, true),
                 'inscriptions' => $this->faker->words(4, true),
@@ -36,8 +37,24 @@ public function definition()
                 'copyright_notice' => '© ' . $this->faker->year . ' ' . ucfirst($this->faker->words(3, true)),
                 'artwork_type_id' => $this->faker->randomElement(ArtworkType::query()->pluck('id')->all()),
                 'gallery_id' => $this->faker->randomElement(Place::query()->pluck('id')->all()),
+                'edition' => $this->faker->randomNumber(1) . ' of ' . $this->faker->randomNumber(2, true),
             ],
             $this->dates(true)
         );
     }
+
+    protected function fakeDimensionsDetail(int $count = 1): array
+    {
+        $dimensions = array();
+        for ($i = 0; $i < $count; $i++) {
+            $dimensions[] = [
+                'clarification' => ucfirst($this->faker->word()),
+                'diameter' => $this->faker->randomFloat(),
+                'depth' => $this->faker->randomFloat(),
+                'height' => $this->faker->randomFloat(),
+                'width' => $this->faker->randomFloat(),
+            ];
+        }
+        return $dimensions;
+    }
 }

database/migrations/2023_03_07_121605_add_edition_column_to_artworks_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddEditionColumnToArtworksTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('artworks', function (Blueprint $table) {
+            $table->text('edition')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('artworks', function (Blueprint $table) {
+            $table->dropColumn('edition');
+        });
+    }
+}

database/migrations/2023_03_14_160826_add_dimensions_detail_column_to_artworks_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDimensionsDetailColumnToArtworksTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('artworks', function (Blueprint $table) {
+            $table->json('dimensions_detail')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('artworks', function (Blueprint $table) {
+            $table->dropColumn('dimensions_detail');
+        });
+    }
+}