Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions src/RecordManager/Base/Solr/SolrUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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
*
Expand Down
5 changes: 3 additions & 2 deletions tests/RecordManagerTest/Base/Solr/SolrUpdaterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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]],
];
Expand Down