From 1f1b0edb6f63f85f1415729261be17a030a633ad Mon Sep 17 00:00:00 2001
From: Igor Karpilenko <karpylenko.ihor@gmail.com>
Date: Mon, 24 Aug 2020 13:39:59 +0300
Subject: [PATCH 1/8] [Shared content] PR review comments fix

---
 .../openy_gc_shared_content.info.yml            |  1 +
 .../src/Form/SharedContentSourceServerForm.php  | 17 +++++++++++++++--
 .../src/Plugin/Action/ShareToVirtualYBase.php   |  4 +++-
 .../Plugin/Action/UnshareFromVirtualYBase.php   |  4 +++-
 .../SharedContentSourceType/VirtualYVideo.php   |  2 +-
 .../src/SharedContentSourceTypeBase.php         |  6 ++++++
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/modules/openy_gc_shared_content/openy_gc_shared_content.info.yml b/modules/openy_gc_shared_content/openy_gc_shared_content.info.yml
index a5342d74d..07d8c4c1b 100644
--- a/modules/openy_gc_shared_content/openy_gc_shared_content.info.yml
+++ b/modules/openy_gc_shared_content/openy_gc_shared_content.info.yml
@@ -2,6 +2,7 @@ name: 'Virtual Y Shared Content'
 type: module
 description: 'Virtual Y Shared Content'
 package: Open Y Virtual YMCA
+version: 0.1
 core: 8.x
 core_version_requirement: ^8 || ^9
 dependencies:
diff --git a/modules/openy_gc_shared_content/src/Form/SharedContentSourceServerForm.php b/modules/openy_gc_shared_content/src/Form/SharedContentSourceServerForm.php
index d0ce77ef6..56c64415b 100644
--- a/modules/openy_gc_shared_content/src/Form/SharedContentSourceServerForm.php
+++ b/modules/openy_gc_shared_content/src/Form/SharedContentSourceServerForm.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -37,6 +38,13 @@ class SharedContentSourceServerForm extends EntityForm {
    */
   protected $config;
 
+  /**
+   * A logger instance.
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  protected $logger;
+
   /**
    * Constructs an SharedContentSource object.
    *
@@ -48,11 +56,14 @@ class SharedContentSourceServerForm extends EntityForm {
    *   The request stack.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config
    *   The configuration factory service.
+   * @param \Psr\Log\LoggerInterface $logger
+   *   A logger instance.
    */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, Client $client, RequestStack $request_stack, ConfigFactoryInterface $config) {
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, Client $client, RequestStack $request_stack, ConfigFactoryInterface $config, LoggerInterface $logger) {
     $this->entityTypeManager = $entityTypeManager;
     $this->client = $client;
     $this->config = $config;
+    $this->logger = $logger;
     $this->request = $request_stack->getCurrentRequest();
   }
 
@@ -64,7 +75,8 @@ public static function create(ContainerInterface $container) {
       $container->get('entity_type.manager'),
       $container->get('http_client'),
       $container->get('request_stack'),
-      $container->get('config.factory')
+      $container->get('config.factory'),
+      $container->get('logger.factory')->get('openy_gc_shared_content')
     );
   }
 
@@ -167,6 +179,7 @@ protected function requestToken($url) {
       }
     }
     catch (RequestException $e) {
+      $this->logger->notice($e->getMessage());
       return NULL;
     }
   }
diff --git a/modules/openy_gc_shared_content/src/Plugin/Action/ShareToVirtualYBase.php b/modules/openy_gc_shared_content/src/Plugin/Action/ShareToVirtualYBase.php
index 5449c974a..7480513a2 100644
--- a/modules/openy_gc_shared_content/src/Plugin/Action/ShareToVirtualYBase.php
+++ b/modules/openy_gc_shared_content/src/Plugin/Action/ShareToVirtualYBase.php
@@ -9,11 +9,13 @@
  */
 class ShareToVirtualYBase extends FieldUpdateActionBase {
 
+  const GC_SHARE_ENABLED = 1;
+
   /**
    * {@inheritdoc}
    */
   protected function getFieldsToUpdate() {
-    return ['field_gc_share' => 1];
+    return ['field_gc_share' => self::GC_SHARE_ENABLED];
   }
 
 }
diff --git a/modules/openy_gc_shared_content/src/Plugin/Action/UnshareFromVirtualYBase.php b/modules/openy_gc_shared_content/src/Plugin/Action/UnshareFromVirtualYBase.php
index 3b0124dc3..3268fdfec 100644
--- a/modules/openy_gc_shared_content/src/Plugin/Action/UnshareFromVirtualYBase.php
+++ b/modules/openy_gc_shared_content/src/Plugin/Action/UnshareFromVirtualYBase.php
@@ -9,11 +9,13 @@
  */
 class UnshareFromVirtualYBase extends FieldUpdateActionBase {
 
+  const GC_SHARE_DEFAULT_VALUE = 0;
+
   /**
    * {@inheritdoc}
    */
   protected function getFieldsToUpdate() {
-    return ['field_gc_share' => 0];
+    return ['field_gc_share' => self::GC_SHARE_DEFAULT_VALUE];
   }
 
 }
diff --git a/modules/openy_gc_shared_content/src/Plugin/SharedContentSourceType/VirtualYVideo.php b/modules/openy_gc_shared_content/src/Plugin/SharedContentSourceType/VirtualYVideo.php
index f25afd0f5..49cf6c6e8 100644
--- a/modules/openy_gc_shared_content/src/Plugin/SharedContentSourceType/VirtualYVideo.php
+++ b/modules/openy_gc_shared_content/src/Plugin/SharedContentSourceType/VirtualYVideo.php
@@ -128,7 +128,7 @@ public function formatItem($data, $teaser = TRUE) {
             }
             if ($item['type'] == 'media--video') {
               if ($item['attributes']['field_media_source'] == 'youtube') {
-                $url = 'http://www.youtube.com/embed/' . $item['attributes']['field_media_video_id'];
+                $url = 'https://www.youtube.com/embed/' . $item['attributes']['field_media_video_id'];
               }
               elseif ($item['attributes']['field_media_source'] == 'vimeo') {
                 $url = 'https://player.vimeo.com/video/' . $item['attributes']['field_media_video_id'];
diff --git a/modules/openy_gc_shared_content/src/SharedContentSourceTypeBase.php b/modules/openy_gc_shared_content/src/SharedContentSourceTypeBase.php
index f0679ce2b..d548417f7 100644
--- a/modules/openy_gc_shared_content/src/SharedContentSourceTypeBase.php
+++ b/modules/openy_gc_shared_content/src/SharedContentSourceTypeBase.php
@@ -325,7 +325,13 @@ public function saveMediaFromSource($parent_data, $data, $bundle, $url) {
         return [];
       }
       $file_temp = file_get_contents($url . $file_data['attributes']['uri']['url']);
+      if (!$file_temp) {
+        return [];
+      }
       $file = file_save_data($file_temp, $file_data['attributes']['uri']['value']);
+      if (!$file) {
+        return [];
+      }
     }
 
     unset($data['attributes']['drupal_internal__mid']);

From 04f3c860c52cd608dbf0b7e1a2b0e77077ae0245 Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Mon, 24 Aug 2020 22:20:15 +0300
Subject: [PATCH 2/8] Fixed bug with the items that are not available to share

---
 .../migrate_plus.migration.virtual_y_shared_node_blog.yml      | 3 +++
 .../migrate_plus.migration.virtual_y_shared_node_video.yml     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
index 0528b99aa..b4e4b2ac0 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
@@ -68,6 +68,9 @@ process:
     default_value: 1
   title: title
   field_gc_origin: constants/DOMAIN
+  field_gc_share:
+    plugin: default_value
+    default_value: 1
   field_vy_blog_description/value: field_vy_blog_description
   field_vy_blog_description/format:
     plugin: default_value
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
index dc7eac5d1..190e224b5 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
@@ -84,6 +84,9 @@ process:
     default_value: 1
   title: title
   field_gc_origin: constants/DOMAIN
+  field_gc_share:
+    plugin: default_value
+    default_value: 1
   field_gc_video_description/value: field_gc_video_description
   field_gc_video_description/format:
     plugin: default_value

From b0db57262856725be3e5dfc97a5a412ea93d9adb Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Tue, 25 Aug 2020 12:12:01 +0300
Subject: [PATCH 3/8] Fixed bug with the error in case of empty response

---
 ...s.migration.virtual_y_shared_file_blog.yml |  2 +-
 ....migration.virtual_y_shared_file_video.yml |  2 +-
 ...migration.virtual_y_shared_gc_category.yml |  2 +-
 ...igration.virtual_y_shared_gc_equipment.yml |  2 +-
 ...us.migration.virtual_y_shared_gc_level.yml |  2 +-
 ...tion.virtual_y_shared_media_blog_image.yml |  2 +-
 ...migration.virtual_y_shared_media_video.yml |  2 +-
 ...ion.virtual_y_shared_media_video_image.yml |  2 +-
 ...s.migration.virtual_y_shared_node_blog.yml |  2 +-
 ....migration.virtual_y_shared_node_video.yml |  2 +-
 .../migrate_plus/data_parser/VirtualYJson.php | 61 +++++++++++++++++++
 11 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100644 modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php

diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml
index 2cd145dbc..8d21c0a7a 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml
@@ -13,7 +13,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml
index f888dc49e..4ff43c72d 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml
@@ -13,7 +13,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml
index e551108de..a30acc735 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml
@@ -15,7 +15,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
index c1a5dbed1..9b7bc6022 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
@@ -17,7 +17,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml
index 7d24bf48b..69d3106cb 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml
@@ -17,7 +17,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
index a3e8abc3c..9671586fc 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
@@ -14,7 +14,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml
index 61c06dac1..2fde9ac75 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml
@@ -14,7 +14,7 @@ source:
   track_changes: true
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   headers:
     Accept: 'application/json; charset=utf-8'
     Content-Type: 'application/json'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml
index 20710e03f..ac47e478d 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml
@@ -14,7 +14,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
index b4e4b2ac0..853606f17 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
@@ -13,7 +13,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
index 190e224b5..0c8386574 100644
--- a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
+++ b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
@@ -13,7 +13,7 @@ source:
   plugin: url
   data_fetcher_plugin: http
   # Specifies the JSON parser plugin.
-  data_parser_plugin: json
+  data_parser_plugin: virtualy_json
   track_changes: true
   headers:
     Accept: 'application/json; charset=utf-8'
diff --git a/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php b/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php
new file mode 100644
index 000000000..09e0f34dc
--- /dev/null
+++ b/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\openy_gc_shared_content_server\Plugin\migrate_plus\data_parser;
+
+use Drupal\migrate_plus\Plugin\migrate_plus\data_parser\Json;
+
+/**
+ * Obtain JSON data for migration.
+ *
+ * @DataParser(
+ *   id = "virtualy_json",
+ *   title = @Translation("Virtual Y JSON")
+ * )
+ */
+class VirtualYJson extends Json {
+
+  /**
+   * Retrieves the JSON data and returns it as an array.
+   *
+   * @param string $url
+   *   URL of a JSON feed.
+   *
+   * @return array
+   *   The selected data to be iterated.
+   *
+   * @throws \GuzzleHttp\Exception\RequestException
+   */
+  protected function getSourceData($url) {
+    $response = $this->getDataFetcherPlugin()->getResponseContent($url);
+
+    // Convert objects to associative arrays.
+    $source_data = json_decode($response, TRUE);
+
+    // If json_decode() has returned NULL, it might be that the data isn't
+    // valid utf8 - see http://php.net/manual/en/function.json-decode.php#86997.
+    if (is_null($source_data)) {
+      $utf8response = utf8_encode($response);
+      $source_data = json_decode($utf8response, TRUE);
+    }
+
+    // Backwards-compatibility for depth selection.
+    if (is_int($this->itemSelector)) {
+      return $this->selectByDepth($source_data);
+    }
+
+    // Otherwise, we're using xpath-like selectors.
+    $selectors = explode('/', trim($this->itemSelector, '/'));
+    foreach ($selectors as $selector) {
+      if (!empty($selector)) {
+        if (!empty($source_data[$selector])) {
+          $source_data = $source_data[$selector];
+        } else {
+          $source_data = [];
+        }
+      }
+    }
+
+    return $source_data;
+  }
+
+}

From 2f0b4757af4f5c1702a5a55bfb21e30c8bb86eab Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Tue, 25 Aug 2020 12:45:16 +0300
Subject: [PATCH 4/8] Changed entity query to the entity storage (Drupal 9
 compatibility)

---
 .../src/SourceMigrationDeriver.php            | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php b/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php
index aa3d23d4d..72e50884d 100644
--- a/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php
+++ b/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Component\Plugin\Derivative\DeriverInterface;
+use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\Query\QueryFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\openy_gc_shared_content_server\Entity\SharedContentSource;
@@ -19,18 +20,20 @@ class SourceMigrationDeriver extends DeriverBase implements DeriverInterface, Co
   /**
    * EntityQuery service instance.
    *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
+   * @var \Drupal\Core\Entity\Query\QueryInterface
    */
-  protected $entityQuery;
+  protected $sharedContentStorage;
 
   /**
    * SourceMigrationDeriver constructor.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entityQuery
-   *   EntityQuery instance.
+   * @param \Drupal\Core\Entity\EntityTypeManager $entityQuery
+   *   EntityTypeManager instance.
    */
-  public function __construct(QueryFactory $entityQuery) {
-    $this->entityQuery = $entityQuery;
+  public function __construct(EntityTypeManager $entityTypeManager) {
+    $this->sharedContentStorage = $entityTypeManager
+      ->getStorage('shared_content_source')
+      ->getQuery();
   }
 
   /**
@@ -38,7 +41,7 @@ public function __construct(QueryFactory $entityQuery) {
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
     return new static(
-      $container->get('entity.query')
+      $container->get('entity_type.manager')
     );
   }
 
@@ -47,7 +50,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) {
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
 
-    $ids = $this->entityQuery->get('shared_content_source')->execute();
+    $ids = $this->sharedContentStorage->execute();
 
     if (empty($ids)) {
       return [];

From 3a217c8ea1da965148a78d3d907dfb8a1b78aab0 Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Tue, 25 Aug 2020 12:49:58 +0300
Subject: [PATCH 5/8] Moved migrations from the migrations folder to config

---
 .../migrate_plus.migration.virtual_y_shared_file_blog.yml         | 0
 .../migrate_plus.migration.virtual_y_shared_file_video.yml        | 0
 .../migrate_plus.migration.virtual_y_shared_gc_category.yml       | 0
 .../migrate_plus.migration.virtual_y_shared_gc_equipment.yml      | 0
 .../install}/migrate_plus.migration.virtual_y_shared_gc_level.yml | 0
 .../migrate_plus.migration.virtual_y_shared_media_blog_image.yml  | 0
 .../migrate_plus.migration.virtual_y_shared_media_video.yml       | 0
 .../migrate_plus.migration.virtual_y_shared_media_video_image.yml | 0
 .../migrate_plus.migration.virtual_y_shared_node_blog.yml         | 0
 .../migrate_plus.migration.virtual_y_shared_node_video.yml        | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_file_blog.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_file_video.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_gc_category.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_gc_equipment.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_gc_level.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_media_blog_image.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_media_video.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_media_video_image.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_node_blog.yml (100%)
 rename modules/openy_gc_shared_content_server/{migrations => config/install}/migrate_plus.migration.virtual_y_shared_node_video.yml (100%)

diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_blog.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_blog.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_video.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_video.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_category.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_category.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_level.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_level.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video_image.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video_image.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_blog.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_blog.yml
diff --git a/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml b/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_video.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
rename to modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_video.yml

From f4243a89c1564ed50a78f7746f195f3868f43dff Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Tue, 25 Aug 2020 13:00:42 +0300
Subject: [PATCH 6/8] Revert "Moved migrations from the migrations folder to
 config"

This reverts commit 3a217c8ea1da965148a78d3d907dfb8a1b78aab0.
---
 .../migrate_plus.migration.virtual_y_shared_file_blog.yml         | 0
 .../migrate_plus.migration.virtual_y_shared_file_video.yml        | 0
 .../migrate_plus.migration.virtual_y_shared_gc_category.yml       | 0
 .../migrate_plus.migration.virtual_y_shared_gc_equipment.yml      | 0
 .../migrate_plus.migration.virtual_y_shared_gc_level.yml          | 0
 .../migrate_plus.migration.virtual_y_shared_media_blog_image.yml  | 0
 .../migrate_plus.migration.virtual_y_shared_media_video.yml       | 0
 .../migrate_plus.migration.virtual_y_shared_media_video_image.yml | 0
 .../migrate_plus.migration.virtual_y_shared_node_blog.yml         | 0
 .../migrate_plus.migration.virtual_y_shared_node_video.yml        | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_file_blog.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_file_video.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_gc_category.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_gc_equipment.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_gc_level.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_media_blog_image.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_media_video.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_media_video_image.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_node_blog.yml (100%)
 rename modules/openy_gc_shared_content_server/{config/install => migrations}/migrate_plus.migration.virtual_y_shared_node_video.yml (100%)

diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_blog.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_blog.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_blog.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_file_video.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_file_video.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_category.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_category.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_category.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_equipment.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_equipment.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_level.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_gc_level.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_gc_level.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_blog_image.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_blog_image.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video_image.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_media_video_image.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_media_video_image.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_blog.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_blog.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_blog.yml
diff --git a/modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_video.yml b/modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml
similarity index 100%
rename from modules/openy_gc_shared_content_server/config/install/migrate_plus.migration.virtual_y_shared_node_video.yml
rename to modules/openy_gc_shared_content_server/migrations/migrate_plus.migration.virtual_y_shared_node_video.yml

From aa288fdffbd5865a251b69c190cb7f2f3f5a15f1 Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Tue, 25 Aug 2020 13:33:43 +0300
Subject: [PATCH 7/8] Replaced url of the default openy shared demo server.

---
 ...eny_gc_shared_content.shared_content_source_server.openy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openy_gc_shared_content/config/install/openy_gc_shared_content.shared_content_source_server.openy.yml b/modules/openy_gc_shared_content/config/install/openy_gc_shared_content.shared_content_source_server.openy.yml
index d43de6387..4ba95cc27 100644
--- a/modules/openy_gc_shared_content/config/install/openy_gc_shared_content.shared_content_source_server.openy.yml
+++ b/modules/openy_gc_shared_content/config/install/openy_gc_shared_content.shared_content_source_server.openy.yml
@@ -3,5 +3,5 @@ status: true
 dependencies: {  }
 id: openy
 label: 'Open Y'
-url: 'http://rose.demo.openy.ci.fivejars.com'
+url: 'https://shared.openy.org'
 token: ''

From 2f4882b6a17e1d4e13b526a3a859e40ab0a2f688 Mon Sep 17 00:00:00 2001
From: Anatoliy Polyakov <anpolimus@gmail.com>
Date: Tue, 25 Aug 2020 13:36:05 +0300
Subject: [PATCH 8/8] CS fix

---
 .../src/Plugin/migrate_plus/data_parser/VirtualYJson.php  | 3 ++-
 .../src/SourceMigrationDeriver.php                        | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php b/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php
index 09e0f34dc..810d8ab6c 100644
--- a/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php
+++ b/modules/openy_gc_shared_content_server/src/Plugin/migrate_plus/data_parser/VirtualYJson.php
@@ -49,7 +49,8 @@ protected function getSourceData($url) {
       if (!empty($selector)) {
         if (!empty($source_data[$selector])) {
           $source_data = $source_data[$selector];
-        } else {
+        }
+        else {
           $source_data = [];
         }
       }
diff --git a/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php b/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php
index 72e50884d..46a289012 100644
--- a/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php
+++ b/modules/openy_gc_shared_content_server/src/SourceMigrationDeriver.php
@@ -5,7 +5,6 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Component\Plugin\Derivative\DeriverInterface;
 use Drupal\Core\Entity\EntityTypeManager;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\openy_gc_shared_content_server\Entity\SharedContentSource;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
@@ -27,8 +26,11 @@ class SourceMigrationDeriver extends DeriverBase implements DeriverInterface, Co
   /**
    * SourceMigrationDeriver constructor.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManager $entityQuery
-   *   EntityTypeManager instance.
+   * @param \Drupal\Core\Entity\EntityTypeManager $entityTypeManager
+   *   EntityTypeManager service instance.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
+   * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
   public function __construct(EntityTypeManager $entityTypeManager) {
     $this->sharedContentStorage = $entityTypeManager