Commit 4fa5046b authored by Zoltan Attila Horvath's avatar Zoltan Attila Horvath
Browse files

Revert "Issue #3281055: Media entity migrations shouldn't migrate file IDs to media IDs" 

This reverts commit 27aabc5f.
parent 27aabc5f

migrations/d7_file_entity.yml

+2 −19
Changes for migrations/d7_file_entity.yml: 2 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -10,27 +10,10 @@ idMap: 
source:

  plugin: d7_file_entity_item

process:

  track_changes_uuid:

    -

      plugin: migration_lookup

      source: fid

      migration: d7_file_entity

      no_stub: true

    -

      plugin: skip_on_empty

      method: process

    -

      plugin: migmag_get_entity_property

      entity_type_id: 'media'

      property: 'uuid'

  oracle_uuid:

  uuid:

    plugin: media_migrate_uuid

    source: fid

  uuid:

    plugin: null_coalesce

    source:

      - '@track_changes_uuid'

      - '@oracle_uuid'

  mid: fid

  uid:

    -

      plugin: migration_lookup

migrations/d7_file_plain.yml

+2 −19
Changes for migrations/d7_file_plain.yml: 2 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -10,27 +10,10 @@ idMap: 
source:

  plugin: d7_file_plain

process:

  track_changes_uuid:

    -

      plugin: migration_lookup

      source: fid

      migration: d7_file_plain

      no_stub: true

    -

      plugin: skip_on_empty

      method: process

    -

      plugin: migmag_get_entity_property

      entity_type_id: 'media'

      property: 'uuid'

  oracle_uuid:

  uuid:

    plugin: media_migrate_uuid

    source: fid

  uuid:

    plugin: null_coalesce

    source:

      - '@track_changes_uuid'

      - '@oracle_uuid'

  mid: fid

  uid:

    -

      plugin: migration_lookup

src/MediaMigrationUuidOracle.php

+12 −4
Changes for src/MediaMigrationUuidOracle.php: 12 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ final class MediaMigrationUuidOracle implements MediaMigrationUuidOracleInterfac 
   * {@inheritdoc}

   */

  public function getMediaUuid(int $source_id, bool $generate = TRUE): ?string {

    // If the media entity already exist, return its UUID.

    if ($media = $this->mediaStorage->load($source_id)) {

      return $media->uuid();

    }



    // If the media does not exist, try to get its UUID from our prophecy table.

    if (!($uuid_prophecy = $this->getMediaUuidProphecy($source_id)) && $generate) {

      $uuid_prophecy = $this->setMediaProphecy($source_id);

    }
@@ -72,12 +78,14 @@ final class MediaMigrationUuidOracle implements MediaMigrationUuidOracleInterfac 
   *   The UUID, or NULL if it does not exist at the moment.

   */

  private function getMediaUuidProphecy(int $source_id): ?string {

    $prophecy = $this->database->select(MediaMigration::MEDIA_UUID_PROPHECY_TABLE, 'mupt')

      ->fields('mupt', [MediaMigration::MEDIA_UUID_PROPHECY_UUID_COL])

    $results = $this->database->select(MediaMigration::MEDIA_UUID_PROPHECY_TABLE, 'mupt')

      ->fields('mupt')

      ->condition('mupt.' . MediaMigration::MEDIA_UUID_PROPHECY_SOURCEID_COL, $source_id)

      ->execute()->fetchField();

      ->execute()->fetchAll();



    return $prophecy ?: NULL;

    return isset($results[0]->{MediaMigration::MEDIA_UUID_PROPHECY_UUID_COL}) ?

      $results[0]->{MediaMigration::MEDIA_UUID_PROPHECY_UUID_COL} :

      NULL;

  }



  /**

src/Plugin/migrate/field/FileEntity.php

+1 −6
Changes for src/Plugin/migrate/field/FileEntity.php: 1 added line, 6 removed lines.
Original line number Diff line number Diff line
@@ -71,12 +71,7 @@ class FileEntity extends MediaMigrationFieldPluginBase { 
    $process[] = [

      'plugin' => 'sub_process',

      'process' => [

        'target_id' => [

          'plugin' => 'migration_lookup',

          'source' => 'fid',

          'migration' => ['d7_file_entity', 'd7_file_plain'],

          'no_stub' => TRUE,

        ],

        'target_id' => 'fid',

      ],

    ];

src/Plugin/migrate/field/MediaImage.php

+1 −6
Changes for src/Plugin/migrate/field/MediaImage.php: 1 added line, 6 removed lines.
Original line number Diff line number Diff line
@@ -65,12 +65,7 @@ class MediaImage extends MediaMigrationFieldPluginBase { 
    $process[] = [

      'plugin' => 'sub_process',

      'process' => [

        'target_id' => [

          'plugin' => 'migration_lookup',

          'source' => 'fid',

          'migration' => ['d7_file_entity', 'd7_file_plain'],

          'no_stub' => TRUE,

        ],

        'target_id' => 'fid',

      ],

    ];