Merge branch 'release/1.5'

art-institute-of-chicago · Sep 8, 2022 · 43096a5 · 43096a5
2 parents 88caa08 + dde5548
commit 43096a5
Show file tree

Hide file tree

Showing 292 changed files with 3,680 additions and 5,754 deletions.
diff --git a/.env.example b/.env.example
@@ -52,8 +52,6 @@ ELASTICSEARCH_SHARDS_REPLICA=0 # Set to number of nodes - 1
 # Open-source data services:
 COLLECTIONS_DATA_SERVICE_URL='http://data-service-collections.test/api/v1'
 ASSETS_DATA_SERVICE_URL='http://data-service-assets.test/api/v1'
-LIBRARY_DATA_SERVICE_URL='http://data-service-library.test/api/v1'
-ARCHIVES_DATA_SERVICE_URL='http://data-service-archive.test/api/v1'
 DSC_DATA_SERVICE_URL='http://data-service-catalogues.test/api/v1'
 SHOP_DATA_SERVICE_URL='http://data-service-shop.test/api/v1'
 ANALYTICS_DATA_SERVICE_URL='http://data-service-analytics.test/api/v1'
@@ -74,7 +72,6 @@ DIGITAL_LABELS_JSON_ROOT=
 DIGITAL_LABELS_IMAGE_ROOT=
 
 STATIC_ARCHIVE_JSON='https://raw.githubusercontent.com/art-institute-of-chicago/static-archive/master/archive.json'
-PRIMO_API_SOURCE=
 
 SHOP_IMGIX_URL='https://shop-images.imgix.net/'
 SHOP_PRODUCT_URL='https://shop.artic.edu/products/'

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ https://api.artic.edu/api/v1/artworks
 
 ...and here's a query that shows identifiers, titles, and last modified dates for all artworks that have been updated in our collections system in the past seven days from this moment, sorted in reverse chronological order:
 
-https://api.artic.edu/api/v1/artworks/search?fields=id,title,last_updated_source&query[range][last_updated_source][gte]=now-7d&sort[last_updated_source][order]=desc
+https://api.artic.edu/api/v1/artworks/search?fields=id,title,source_updated_at&query[range][source_updated_at][gte]=now-7d&sort[source_updated_at][order]=desc
 
 Our API is a wrapper around [Elasticsearch's Query DSL](https://www.elastic.co/guide/en/elasticsearch/reference/6.0/query-dsl.html). Depending on your needs, these queries can get quite complex.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4
+1.5
diff --git a/app/BelongsToManyOrOne.php b/app/BelongsToManyOrOne.php
@@ -56,7 +56,7 @@ public function expectMany()
      */
     public function isPreferred()
     {
-        return $this->wherePivot('preferred', '=', true)->expectOne();
+        return $this->wherePivot('is_preferred', '=', true)->expectOne();
     }
 
     /**
@@ -66,6 +66,6 @@ public function isPreferred()
      */
     public function isAlternative()
     {
-        return $this->wherePivot('preferred', '=', false)->expectMany();
+        return $this->wherePivot('is_preferred', '=', false)->expectMany();
     }
 }
diff --git a/app/Console/Commands/BaseCommand.php b/app/Console/Commands/BaseCommand.php
@@ -25,8 +25,6 @@ protected function getCategories()
             'Mobile' => 'Mobile',
             'Dsc' => 'Digital Scholarly Catalogs',
             'StaticArchive' => 'Static Archive',
-            //'Archive' => 'Archive',
-            //'Library' => 'Library',
             'Web' => 'Website',
         ];
     }

diff --git a/app/Console/Commands/Bulk/BulkAll.php b/app/Console/Commands/Bulk/BulkAll.php
diff --git a/app/Console/Commands/CleanSeed.php b/app/Console/Commands/CleanSeed.php
diff --git a/app/Console/Commands/Delete/DeleteAssets.php b/app/Console/Commands/Delete/DeleteAssets.php
@@ -7,7 +7,6 @@
 
 class DeleteAssets extends AbstractImportCommand
 {
-
     protected $signature = 'delete:assets
                             {--since= : How far back to scan for records}';
 
@@ -66,10 +65,10 @@ private function shallow()
 
                 // Loop through all model types
                 foreach ($this->modelClasses as $modelClass) {
-                    // Check if a resource with a matching lake_guid exists
-                    if ($model = $modelClass::where('lake_guid', '=', $datum->asset_id)->first()) {
+                    // Check if a resource with a matching id exists
+                    if ($model = $modelClass::where('id', '=', $datum->asset_id)->first()) {
                         // Check that the resource was modified at or before the delete
-                        if ($model->source_modified_at->lte($sourceDeletedAt)) {
+                        if ($model->source_updated_at->lte($sourceDeletedAt)) {
                             $this->warn('Deleting ' . $modelClass . ' ' . $datum->asset_id);
                             $model->delete();
                             break;

diff --git a/app/Console/Commands/Delete/DeleteCollections.php b/app/Console/Commands/Delete/DeleteCollections.php
@@ -59,7 +59,7 @@ private function deleteByEndpoint()
                 }
 
                 // Ignore the change the if the record has been modified after the delete
-                if ($entity->source_modified_at->gt($deletedAt)) {
+                if ($entity->source_updated_at->gt($deletedAt)) {
                     continue;
                 }
 

diff --git a/app/Console/Commands/Dump/DumpExportGettingStarted.php b/app/Console/Commands/Dump/DumpExportGettingStarted.php
@@ -51,7 +51,7 @@ public function handle()
         $json = fopen(Storage::disk('dumps')->path('local/getting-started/allArtworks.jsonl'), 'a');
 
         $artworks = $model::query()
-            ->select('citi_id', 'title', 'main_id', 'department_id')
+            ->select('id', 'title', 'main_id', 'department_id')
             ->setEagerLoads([
                 'artistPivots',
                 'categories',
@@ -61,7 +61,7 @@ public function handle()
         foreach ($model::cursor() as $item) {
             // JSON
             fwrite($json, json_encode([
-                'id' => $item->citi_id,
+                'id' => $item->id,
                 'title' => $item->title,
                 'main_reference_number' => $item->main_id,
                 'department_title' => ($item->departments->first()->title ?? null),
@@ -71,7 +71,7 @@ public function handle()
             // CSV
             if ($item->isBoosted()) {
                 $csv->insertOne([
-                    'id' => $item->citi_id,
+                    'id' => $item->id,
                     'title' => $item->title,
                     'main_reference_number' => $item->main_id,
                     'department_title' => ($item->departments->first()->title ?? null),

diff --git a/app/Console/Commands/Import/ImportAllCommand.php b/app/Console/Commands/Import/ImportAllCommand.php
@@ -21,8 +21,6 @@ public function handle()
         $this->call('import:events-ticketed-full', ['--yes' => 'default']);
         $this->call('import:dsc', ['--yes' => 'default', '-v' => 'default']);
         $this->call('import:mobile');
-        $this->call('import:library', ['--yes' => 'default']);
-        $this->call('import:archive', ['--yes' => 'default']);
         $this->call('import:sites', ['--yes' => 'default']);
         $this->call('import:products-full', ['--yes' => 'default']);
         $this->call('import:analytics');

diff --git a/app/Console/Commands/Import/ImportArchive.php b/app/Console/Commands/Import/ImportArchive.php
diff --git a/app/Console/Commands/Import/ImportCollectionsFull.php b/app/Console/Commands/Import/ImportCollectionsFull.php
@@ -38,7 +38,6 @@ protected function importEndpoints()
         $this->importEndpoint('artwork-place-qualifiers');
         $this->importEndpoint('object-types');
         $this->importEndpoint('agent-types');
-        $this->importEndpoint('catalogues');
         $this->importEndpoint('categories');
         $this->importEndpoint('terms');
 

diff --git a/app/Console/Commands/Import/ImportLibrary.php b/app/Console/Commands/Import/ImportLibrary.php
diff --git a/app/Console/Commands/Import/ImportMobile.php b/app/Console/Commands/Import/ImportMobile.php
@@ -47,10 +47,10 @@ private function importArtworks($results)
             $id = (int) $datum->nid;
             $artwork = MobileArtwork::findOrNew($id);
 
-            $artwork->mobile_id = $id;
+            $artwork->id = $id;
             $artwork->title = $datum->title;
 
-            $artwork->artwork_citi_id = $datum->id ?? $datum->object_id ?? null;
+            $artwork->artwork_id = $datum->id ?? $datum->object_id ?? null;
 
             $location = explode(', ', $datum->location);
             $artwork->latitude = (float) $location[0];
@@ -74,7 +74,7 @@ private function importSounds($results)
             $id = (int) $datum->nid;
             $sound = Sound::findOrNew($id);
 
-            $sound->mobile_id = $id;
+            $sound->id = $id;
             $sound->title = $datum->title;
 
             $sound->web_url = env('MOBILE_AUDIO_CDN_URL') . array_slice(explode('/', $datum->audio_file_url), -1)[0];
@@ -98,7 +98,7 @@ private function importTours($results)
             $id = (int) $datum->nid;
             $tour = Tour::findOrNew($id);
 
-            $tour->mobile_id = $id;
+            $tour->id = $id;
             $tour->title = $datum->title;
 
             $tour->image = $datum->image_url;
@@ -115,14 +115,14 @@ private function importTours($results)
 
     private function importTourStops($data, $tour)
     {
-        $this->info("Flushing tour stops for tour #{$tour->mobile_id}...");
+        $this->info("Flushing tour stops for tour #{$tour->id}...");
 
-        TourStop::where('tour_mobile_id', $tour->mobile_id)->delete();
+        TourStop::where('tour_id', $tour->id)->delete();
 
-        $this->info("Importing tour stops for tour #{$tour->mobile_id}...");
+        $this->info("Importing tour stops for tour #{$tour->id}...");
 
         foreach ($data as $datum) {
-            $this->info("Importing tour stop [ {$tour->mobile_id} / {$datum->object} / {$datum->audio_id} ]");
+            $this->info("Importing tour stop [ {$tour->id} / {$datum->object} / {$datum->audio_id} ]");
 
             $id = cantorTuple($datum->object, $datum->audio_id);
 
@@ -131,7 +131,7 @@ private function importTourStops($data, $tour)
             $stop->id = $id;
             $stop->weight = $datum->sort;
 
-            $stop->tour()->associate($tour->mobile_id);
+            $stop->tour()->associate($tour->id);
             $stop->artwork()->associate($datum->object);
             $stop->sound()->associate($datum->audio_id);
 

diff --git a/app/Console/Commands/Import/ImportScheduleMonthly.php b/app/Console/Commands/Import/ImportScheduleMonthly.php
@@ -15,8 +15,6 @@ public function handle()
     {
         $this->call('import:analytics');
 
-        $this->call('import:library', ['--yes' => 'default']);
-        $this->call('import:archive', ['--yes' => 'default']);
         $this->call('import:sites', ['--yes' => 'default']);
         $this->call('import:dsc', ['--yes' => 'default']);
     }