Merge branch 'release/1.0-rc10'

art-institute-of-chicago · Feb 21, 2020 · c909225 · c909225
2 parents 9ff2c24 + 3836c1e
commit c909225
Show file tree

Hide file tree

Showing 135 changed files with 572 additions and 1,538 deletions.
diff --git a/app/Console/Commands/Import/ImportUlan.php b/app/Console/Commands/Import/ImportUlan.php
@@ -44,6 +44,14 @@ public function handle()
                     $result = $this->fetchUlan($agent, $agent->birth_date, $agent->death_date);
 
                     $gotit = $this->updateUlan($agent, $result, 'with birth and death year');
+
+                    // Now let's try only name
+                    if (!$gotit)
+                    {
+                        $result = $this->fetchUlan($agent, null, null);
+
+                        $gotit = $this->updateUlan($agent, $result, 'with no years');
+                    }
                 }
             }
 

diff --git a/app/Models/AbstractPivot.php b/app/Models/AbstractPivot.php
@@ -7,7 +7,7 @@
 abstract class AbstractPivot extends Pivot
 {
 
-    use Instancable, Transformable, Fakeable;
+    use Instancable, Transformable;
 
     // TODO: Abstract `getDate` logic from BaseModel into Trait, so that we can `use` it here?
 

diff --git a/app/Models/Archive/ArchiveImage.php b/app/Models/Archive/ArchiveImage.php
@@ -16,8 +16,6 @@ class ArchiveImage extends BaseModel
 
     protected $primaryKey = 'id';
 
-    protected $fakeIdsStartAt = 999000;
-
     protected $casts = [
         'subject_terms' => 'array',
         'source_created_at' => 'datetime',

diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
@@ -12,7 +12,7 @@
 class BaseModel extends AbstractModel
 {
 
-    use Transformable, Instancable, Fakeable, Documentable;
+    use Transformable, Instancable, Documentable;
 
     /**
      * The name of the field that the source API provides a last updated timestamp in.

diff --git a/app/Models/Collections/AgentRole.php b/app/Models/Collections/AgentRole.php
@@ -12,6 +12,4 @@ class AgentRole extends CollectionsModel
 
     protected $primaryKey = 'citi_id';
 
-    protected $fakeIdsStartAt = 9000;
-
 }
diff --git a/app/Models/Collections/AgentType.php b/app/Models/Collections/AgentType.php
@@ -12,6 +12,4 @@ class AgentType extends CollectionsModel
 
     protected $primaryKey = 'citi_id';
 
-    protected $fakeIdsStartAt = 99900;
-
 }
diff --git a/app/Models/Collections/ArtworkDateQualifier.php b/app/Models/Collections/ArtworkDateQualifier.php
@@ -12,6 +12,4 @@ class ArtworkDateQualifier extends CollectionsModel
 
     protected $primaryKey = 'citi_id';
 
-    protected $fakeIdsStartAt = 9900;
-
 }
diff --git a/app/Models/Collections/ArtworkPlaceQualifier.php b/app/Models/Collections/ArtworkPlaceQualifier.php
@@ -12,6 +12,4 @@ class ArtworkPlaceQualifier extends CollectionsModel
 
     protected $primaryKey = 'citi_id';
 
-    protected $fakeIdsStartAt = 9000;
-
 }
diff --git a/app/Models/Collections/ArtworkType.php b/app/Models/Collections/ArtworkType.php
@@ -12,6 +12,4 @@ class ArtworkType extends CollectionsModel
 
     protected $primaryKey = 'citi_id';
 
-    protected $fakeIdsStartAt = 99900;
-
 }
diff --git a/app/Models/CollectionsModel.php b/app/Models/CollectionsModel.php
@@ -7,8 +7,6 @@ class CollectionsModel extends BaseModel
 
     protected static $source = 'Collections';
 
-    protected $fakeIdsStartAt = 999000000;
-
     protected $isInCiti = true;
 
 }
diff --git a/app/Models/Dsc/Section.php b/app/Models/Dsc/Section.php
@@ -13,8 +13,6 @@ class Section extends DscModel
 
     use ElasticSearchable;
 
-    protected $fakeIdsStartAt = 90000000000;
-
     protected $touches = [
         'artwork',
     ];

diff --git a/app/Models/DscModel.php b/app/Models/DscModel.php
@@ -9,8 +9,6 @@ class DscModel extends BaseModel
 
     protected $primaryKey = 'dsc_id';
 
-    protected $fakeIdsStartAt = 9990000;
-
     protected $hasSourceDates = false;
 
 }
diff --git a/app/Models/Fakeable.php b/app/Models/Fakeable.php
diff --git a/app/Models/LibraryModel.php b/app/Models/LibraryModel.php
@@ -11,9 +11,6 @@ class LibraryModel extends BaseModel
 
     protected $primaryKey = 'id';
 
-    // TODO: Add seeders for these models
-    // protected $fakeIdsStartAt = 9990000;
-
     protected $hasSourceDates = false;
 
 }
diff --git a/app/Models/MembershipModel.php b/app/Models/MembershipModel.php
@@ -9,6 +9,4 @@ class MembershipModel extends BaseModel
 
     protected $primaryKey = 'membership_id';
 
-    protected $fakeIdsStartAt = 99900000;
-
 }
diff --git a/app/Models/MobileModel.php b/app/Models/MobileModel.php
@@ -11,6 +11,4 @@ class MobileModel extends BaseModel
 
     protected $hasSourceDates = false;
 
-    protected $fakeIdsStartAt = 9990000;
-
 }
diff --git a/app/Models/ShopModel.php b/app/Models/ShopModel.php
@@ -11,6 +11,4 @@ class ShopModel extends BaseModel
 
     protected $primaryKey = 'shop_id';
 
-    protected $fakeIdsStartAt = 999000;
-
 }
diff --git a/app/Models/StaticArchive/Site.php b/app/Models/StaticArchive/Site.php
@@ -15,8 +15,6 @@ class Site extends BaseModel
 
     protected $primaryKey = 'site_id';
 
-    protected $fakeIdsStartAt = 9990000;
-
     protected $hasSourceDates = false;
 
     protected $touches = [

diff --git a/app/Models/Web/Page.php b/app/Models/Web/Page.php
@@ -10,8 +10,6 @@
 class Page extends WebModel
 {
 
-    protected $hasSourceDates = false;
-
     protected $casts = [
         'publish_start_date' => 'datetime',
         'publish_end_date' => 'datetime',

diff --git a/app/Transformers/Outbound/Collections/ArtworkArtistPivot.php b/app/Transformers/Outbound/Collections/ArtworkArtistPivot.php
@@ -66,22 +66,6 @@ protected function getFields()
                 'doc' => 'Whether this is a preferred artist',
                 'type' => 'boolean',
             ],
-
-            // TODO: Refactor relationships:
-            'artwork_title' => [
-                'doc' => 'Name of the work this artist made',
-                'type' => 'string',
-                'value' => function ($item) {
-                    return $item->artwork->title ?? null;
-                },
-            ],
-            'artwork_id' => [
-                'doc' => 'Unique identifier of the work this artist made',
-                'type' => 'number',
-                'value' => function ($item) {
-                    return $item->artwork->citi_id ?? null;
-                },
-            ],
             'artist_title' => [
                 'doc' => 'Name of the artist',
                 'type' => 'string',

diff --git a/app/Transformers/Outbound/Collections/Asset.php b/app/Transformers/Outbound/Collections/Asset.php
@@ -44,11 +44,6 @@ protected function getFields()
                     'default' => true,
                 ],
             ],
-            'copyright_notice' => [
-                'doc' => 'Statement notifying how the asset is protected by copyright. Applies to the asset itself, not artwork it may be related to.',
-                'type' => 'string',
-                'elasticsearch' => 'text',
-            ],
             'is_multimedia_resource' => [
                 'doc' => 'Whether this resource is considered to be multimedia',
                 'type' => 'boolean',

diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "brianium/paratest": "^3.1",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
-        "itsgoingd/clockwork": "^3.1",
+        "itsgoingd/clockwork": "^4.0",
         "mockery/mockery": "0.9.*",
         "phpstan/phpstan": "^0.11.12",
         "phpunit/phpunit": "^8.5",

diff --git a/composer.lock b/composer.lock
diff --git a/config/aic.php b/config/aic.php
@@ -12,7 +12,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.0-rc9',
+    'version' => '1.0-rc10',
 
     /*
     |--------------------------------------------------------------------------