Merge branch 'develop'

app/Console/Commands/Report/ReportOsci.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Console\Commands\Report;
+
+use League\Csv\Writer;
+use Illuminate\Support\Facades\Storage;
+
+use Aic\Hub\Foundation\AbstractCommand as BaseCommand;
+
+class ReportOsci extends BaseCommand
+{
+
+    protected $signature = 'report:osci';
+
+    protected $description = 'Export OSCI mapping';
+
+    public function handle()
+    {
+        $csv = Writer::createFromString('');
+
+        $csv->insertOne([
+            'artwork_citi_id',
+            'publication_title',
+            'section_title',
+            'web_url',
+        ]);
+
+        $sections = \App\Models\Dsc\Section::whereNotNull('artwork_citi_id');
+
+        foreach ($sections->cursor() as $section) {
+            $row = [
+                'artwork_citi_id' => $section->artwork_citi_id,
+                'publication_title' => $section->publication->title,
+                'section_title' => $section->title,
+                'web_url' => $section->web_url,
+            ];
+
+            $this->info(json_encode(array_values($row)));
+            $csv->insertOne($row);
+        }
+
+        Storage::put('artwork-sections.csv', $csv->getContent());
+    }
+
+}

app/Console/Commands/Report/ReportUlan.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands\Report;
+
+use League\Csv\Writer;
+use Illuminate\Support\Facades\Storage;
+
+use Aic\Hub\Foundation\AbstractCommand as BaseCommand;
+
+class ReportUlan extends BaseCommand
+{
+
+    protected $signature = 'report:ulan';
+
+    protected $description = 'Export ULAN mapping';
+
+    public function handle()
+    {
+        $csv = Writer::createFromString('');
+
+        $csv->insertOne([
+            'id',
+            'ulan_uri',
+            'title',
+            'birth_date',
+            'death_date',
+        ]);
+
+        $artists = \App\Models\Collections\Agent::whereNotNull('ulan_uri');
+
+        foreach ($artists->cursor() as $artist) {
+            $row = [
+                'id' => $artist->citi_id,
+                'ulan_uri' => $artist->ulan_uri,
+                'title' => $artist->title,
+                'birth_date' => $artist->birth_date,
+                'death_date' => $artist->death_date,
+            ];
+
+            $this->info(json_encode(array_values($row)));
+            $csv->insertOne($row);
+        }
+
+        Storage::put('agents-ulan.csv', $csv->getContent());
+    }
+
+}

app/Models/Collections/Artwork.php

@@ -153,6 +153,10 @@ public function themes()
         return $this->categories()->themes();
     }
 
+    public function dateQualifier() {
+        return $this->belongsTo('App\Models\Collections\ArtworkDateQualifier', 'artwork_date_qualifier_citi_id');
+    }
+
     public function dates()
     {
         return $this->hasMany('App\Models\Collections\ArtworkDate');

app/Transformers/Inbound/Collections/Artwork.php

@@ -41,6 +41,7 @@ protected function getExtraFields(Datum $datum)
             'copyright_notice' => $copyright_notice,
             'gallery_citi_id' => $datum->gallery_id,
             'internal_department_id' => $datum->department_id,
+            'artwork_date_qualifier_citi_id' => $datum->date_qualifier_id,
             // TODO: ArtworkTypes may need to be attached via string comparison
             //'artwork_type_citi_id' => , // Redmine #2431
         ];

app/Transformers/Outbound/Collections/Artwork.php

@@ -177,6 +177,22 @@ protected function getFields()
                     'type' => 'text',
                 ],
             ],
+            'date_qualifier_title' => [
+                'doc' => 'Readable, text qualifer to the dates provided for this record.',
+                'type' => 'string',
+                'elasticsearch' => 'keyword',
+                'value' => function ($item) {
+                    return $item->dateQualifier->title ?? '';
+                },
+            ],
+            'date_qualifier_id' => [
+                'doc' => 'Unique identifier of the qualifer to the dates provided for this record.',
+                'type' => 'integer',
+                'elasticsearch' => 'integer',
+                'value' => function ($item) {
+                    return $item->artwork_date_qualifier_citi_id;
+                },
+            ],
             'artist_display' => [
                 'doc' => 'Readable description of the creator of this work. Includes artist names, nationality and lifespan dates',
                 'type' => 'string',

config/aic.php

@@ -12,7 +12,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.0-rc8',
+    'version' => '1.0-rc9',
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2020_01_14_145706_add_artwork_date_qualifier_citi_id_to_artworks_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddArtworkDateQualifierCitiIdToArtworksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('artworks', function (Blueprint $table) {
+            $table->integer('artwork_date_qualifier_citi_id')->default(null)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('artworks', function (Blueprint $table) {
+            $table->dropColumn(['artwork_date_qualifier_citi_id']);
+        });
+    }
+}