[FINNA-3637] Split merging of component parts to its own method (#178)

Author: LuomaJuha

src/RecordManager/Base/Solr/SolrUpdater.php

@@ -1982,16 +1982,12 @@ protected function createSolrArray(
         }
 
         if ($hasComponentParts && null !== $components) {
-            $changeDate = null;
-            $mergedComponents += $metadataRecord->mergeComponentParts(
+            $mergedComponents += $this->mergeComponentParts(
+                $metadataRecord,
+                $record,
                 $components,
-                $changeDate
+                $source
             );
-            // Use latest date as the host record date
-            // @phpstan-ignore-next-line
-            if (null !== $changeDate && $changeDate > $record['date']) {
-                $record['date'] = $changeDate;
-            }
         }
         if (isset($settings['solrTransformationXSLT'])) {
             $params = [
@@ -2164,6 +2160,34 @@ protected function createSolrArray(
         return $data;
     }
 
+    /**
+     * Merge component parts to record
+     *
+     * @param AbstractRecord $metadataRecord Record to merge component parts to
+     * @param array          $record         Database record
+     * @param \Traversable   $components     Component parts to merge
+     * @param string         $source         Source ID
+     *
+     * @return int Amount of merged component parts
+     */
+    protected function mergeComponentParts(
+        AbstractRecord $metadataRecord,
+        array &$record,
+        \Traversable $components,
+        string $source
+    ): int {
+        $changeDate = null;
+        $mergedComponents = $metadataRecord->mergeComponentParts(
+            $components,
+            $changeDate
+        );
+        // Use latest date as the host record date
+        if (null !== $changeDate && $changeDate > $record['date']) {
+            $record['date'] = $changeDate;
+        }
+        return $mergedComponents;
+    }
+
     /**
      * Add work identification keys
      *

tests/RecordManagerTest/Base/Solr/SolrUpdaterTest.php

@@ -29,6 +29,7 @@
 
 namespace RecordManagerTest\Base\Solr;
 
+use ArrayIterator;
 use RecordManager\Base\Database\DatabaseInterface;
 use RecordManager\Base\Database\MongoDatabase;
 use RecordManager\Base\Enrichment\PluginManager as EnrichmentPluginManager;
@@ -187,14 +188,14 @@ public function testMergedComponents(): void
             'suppressed' => ['$in' => [null, false]],
             'source_id' => 'test',
         ];
-        $records = [
+        $records = new ArrayIterator([
             [
                 '_id' => 'test.2',
             ],
             [
                 '_id' => 'test.3',
             ],
-        ];
+        ]);
         $recordMap = [
             [$params, [], $records[0]],
         ];