Merge pull request #68 from adam-vessey/move-base

Move base migration
discoverygarden · Jun 7, 2021 · ab42d9d · ab42d9d
2 parents a2dc99b + 1a304e1
commit ab42d9d
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 19 deletions.
diff --git a/islandora_spreadsheet_ingest.info.yml b/islandora_spreadsheet_ingest.info.yml
@@ -4,11 +4,11 @@ type: module
 package: DGI
 core: 8.x
 dependencies:
-  - migrate
-  - node
-  - media
-  - islandora
-  - migrate_plus
-  - migrate_tools
-  - dgi_migrate
-  - migrate_spreadsheet
+  # We implement a plugin making use of their base class.
+  - drupal:migrate
+  # We generate migrate_plus migration/migration_group entities.
+  - migrate_plus:migrate_plus
+  # We generate links to endpoints migrate_tools defines.
+  - migrate_plus:migrate_tools
+  # We generate migrations using migrate_spreadsheet.
+  - migrate_spreadsheet:migrate_spreadsheet
diff --git a/...stall/migrate_plus.migration.isi_file.yml → ...stall/migrate_plus.migration.isi_file.yml b/...stall/migrate_plus.migration.isi_file.yml → ...stall/migrate_plus.migration.isi_file.yml
@@ -65,4 +65,4 @@ destination:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/...igrate_plus.migration.isi_media_audio.yml → ...igrate_plus.migration.isi_media_audio.yml b/...igrate_plus.migration.isi_media_audio.yml → ...igrate_plus.migration.isi_media_audio.yml
@@ -66,4 +66,4 @@ migration_dependencies:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/.../migrate_plus.migration.isi_media_doc.yml → .../migrate_plus.migration.isi_media_doc.yml b/.../migrate_plus.migration.isi_media_doc.yml → .../migrate_plus.migration.isi_media_doc.yml
@@ -66,4 +66,4 @@ migration_dependencies:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/...migrate_plus.migration.isi_media_file.yml → ...migrate_plus.migration.isi_media_file.yml b/...migrate_plus.migration.isi_media_file.yml → ...migrate_plus.migration.isi_media_file.yml
@@ -64,4 +64,4 @@ migration_dependencies:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/...igrate_plus.migration.isi_media_image.yml → ...igrate_plus.migration.isi_media_image.yml b/...igrate_plus.migration.isi_media_image.yml → ...igrate_plus.migration.isi_media_image.yml
@@ -68,4 +68,4 @@ migration_dependencies:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/...igrate_plus.migration.isi_media_video.yml → ...igrate_plus.migration.isi_media_video.yml b/...igrate_plus.migration.isi_media_video.yml → ...igrate_plus.migration.isi_media_video.yml
@@ -65,4 +65,4 @@ migration_dependencies:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/...stall/migrate_plus.migration.isi_node.yml → ...stall/migrate_plus.migration.isi_node.yml b/...stall/migrate_plus.migration.isi_node.yml → ...stall/migrate_plus.migration.isi_node.yml
@@ -97,4 +97,4 @@ destination:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/...tall/migrate_plus.migration_group.isi.yml → ...tall/migrate_plus.migration_group.isi.yml b/...tall/migrate_plus.migration_group.isi.yml → ...tall/migrate_plus.migration_group.isi.yml
@@ -8,7 +8,7 @@ shared_configuration:
     # Worksheet nonsensical but required.
     worksheet: nada
     track_changes: true
-    file: 'modules/contrib/islandora_spreadsheet_ingest/fixtures/migration_example.csv'
+    file: 'modules/contrib/islandora_spreadsheet_ingest/modules/islandora_spreadsheet_ingest_example/fixtures/migration_example.csv'
     header_row: 1
     keys:
       'ID':
@@ -18,4 +18,4 @@ shared_configuration:
 dependencies:
   enforced:
     module:
-      - islandora_spreadsheet_ingest
+      - islandora_spreadsheet_ingest_example
diff --git a/fixtures/audio/tailtoddle_lo.mp3 → ..._example/fixtures/audio/tailtoddle_lo.mp3 b/fixtures/audio/tailtoddle_lo.mp3 → ..._example/fixtures/audio/tailtoddle_lo.mp3
diff --git a/fixtures/binary/bin.bin → ...et_ingest_example/fixtures/binary/bin.bin b/fixtures/binary/bin.bin → ...et_ingest_example/fixtures/binary/bin.bin
diff --git a/fixtures/copy_fixtures.sh → ..._ingest_example/fixtures/copy_fixtures.sh b/fixtures/copy_fixtures.sh → ..._ingest_example/fixtures/copy_fixtures.sh
diff --git a/fixtures/dev_example.sh → ...et_ingest_example/fixtures/dev_example.sh b/fixtures/dev_example.sh → ...et_ingest_example/fixtures/dev_example.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT=$0
-MODULE=islandora_spreadsheet_ingest
+MODULE=islandora_spreadsheet_ingest_example
 MG=isi
 MIGRATIONS=($(drush migrate:status --group=$MG --field=id))
 APACHE_USER=www-data

diff --git a/fixtures/docs/embeded_text.pdf → ...st_example/fixtures/docs/embeded_text.pdf b/fixtures/docs/embeded_text.pdf → ...st_example/fixtures/docs/embeded_text.pdf
diff --git a/fixtures/images/dg1.png → ...et_ingest_example/fixtures/images/dg1.png b/fixtures/images/dg1.png → ...et_ingest_example/fixtures/images/dg1.png
diff --git a/fixtures/images/dg2.png → ...et_ingest_example/fixtures/images/dg2.png b/fixtures/images/dg2.png → ...et_ingest_example/fixtures/images/dg2.png
diff --git a/fixtures/images/dg3.png → ...et_ingest_example/fixtures/images/dg3.png b/fixtures/images/dg3.png → ...et_ingest_example/fixtures/images/dg3.png
diff --git a/fixtures/migration_example.csv → ...st_example/fixtures/migration_example.csv b/fixtures/migration_example.csv → ...st_example/fixtures/migration_example.csv
diff --git a/fixtures/video/video_countdown.mp4 → ...xample/fixtures/video/video_countdown.mp4 b/fixtures/video/video_countdown.mp4 → ...xample/fixtures/video/video_countdown.mp4
diff --git a/modules/islandora_spreadsheet_ingest_example/islandora_spreadsheet_ingest_example.info.yml b/modules/islandora_spreadsheet_ingest_example/islandora_spreadsheet_ingest_example.info.yml
@@ -0,0 +1,11 @@
+name: 'Islandora Spreadsheet Ingest Example'
+description: "Example CSV import of Islandora content."
+type: module
+package: DGI
+core_version_requirement: ^8 || ^9
+dependencies:
+  - dgi_migrate:dgi_migrate
+  - drupal:media
+  - drupal:node
+  - islandora_spreadsheet_ingest:islandora_spreadsheet_ingest
+  - migrate_plus:migrate_plus
diff --git a/src/Entity/Request.php b/src/Entity/Request.php
@@ -152,4 +152,29 @@ public function getOwner() {
     return $this->owner;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    parent::calculateDependencies();
+
+    foreach (array_column($this->getMappings(), 'original_migration_id') as $original_migration_id) {
+      $this->addDependency('config', "migrate_plus.migration.{$original_migration_id}");
+    }
+    list($type, $id) = explode(':', $this->getOriginalMapping());
+    switch ($type) {
+      case 'migration_group':
+        $this->addDependency('config', "migrate_plus.migration_group.{$id}");
+        break;
+
+      default:
+        throw new Exception(strtr('Unknown type of original mapping: "!type"', [
+          '!type' => $type,
+        ]));
+
+    }
+
+    return $this;
+  }
+
 }
diff --git a/src/MigrationGroupDeriver.php b/src/MigrationGroupDeriver.php
@@ -123,8 +123,11 @@ public function create(RequestInterface $request) {
         'nada'),
       'file' => $this->fileStorage->load(reset($request->getSheet()['file']))->getFileUri(),
     ];
+
     // Grab the original values.
-    $source += $config['source'];
+    if (isset($config['source'])) {
+      $source += $config['source'];
+    }
 
     // Add on the rest of the defaults that may be missing.
     $source += [