code simplification

Author: sgiehl

plugins/Actions/RecordBuilders/ActionReports.php

@@ -180,19 +180,28 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
             [$this, 'flatRowToTitleHierarchyPath'],
             $archiveProcessor
         );
-        $this->removeFlatPathMetadataFromDataTable($tablesByType[Action::TYPE_PAGE_URL]);
-        $this->removeFlatPathMetadataFromDataTable($tablesByType[Action::TYPE_PAGE_TITLE]);
-
-        $prefix = $archiveProcessor->getParams()->getSite()->getMainUrl();
-        $prefix = rtrim($prefix, '/') . '/';
-        ArchivingHelper::setFolderPathMetadata($tablesByType[Action::TYPE_PAGE_URL], $isUrl = true, $prefix);
-
-        ArchivingHelper::setFolderPathMetadata($tablesByType[Action::TYPE_PAGE_TITLE], $isUrl = false);
+        $this->finalizeBuiltFromFlatHierarchyTable(
+            $archiveProcessor,
+            $tablesByType[Action::TYPE_PAGE_URL],
+            Archiver::PAGE_URLS_RECORD_NAME
+        );
+        $this->finalizeBuiltFromFlatHierarchyTable(
+            $archiveProcessor,
+            $tablesByType[Action::TYPE_PAGE_TITLE],
+            Archiver::PAGE_TITLES_RECORD_NAME
+        );
 
         $dataTable = $tablesByType[Action::TYPE_SITE_SEARCH];
         $this->deleteUnusedColumnsFromKeywordsDataTable($dataTable);
 
-        foreach ($tablesByType as $dataTable) {
+        foreach ($tablesByType as $actionType => $dataTable) {
+            if (
+                $actionType === Action::TYPE_PAGE_URL
+                || $actionType === Action::TYPE_PAGE_TITLE
+            ) {
+                continue;
+            }
+
             ArchivingHelper::deleteInvalidSummedColumnsFromDataTable($dataTable);
         }
         foreach ($flatPageTablesByType as $flatDataTable) {
@@ -257,17 +266,7 @@ protected function beforeInsertBuiltFromFlatHierarchyRecord(
             return;
         }
 
-        $hierarchicalTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, Metrics::getColumnsAggregationOperation());
-        if ($recordName === Archiver::PAGE_URLS_RECORD_NAME) {
-            $prefix = $archiveProcessor->getParams()->getSite()->getMainUrl();
-            $prefix = rtrim($prefix, '/') . '/';
-            ArchivingHelper::setFolderPathMetadata($hierarchicalTable, $isUrl = true, $prefix);
-        } else {
-            ArchivingHelper::setFolderPathMetadata($hierarchicalTable, $isUrl = false);
-        }
-
-        $this->removeFlatPathMetadataFromDataTable($hierarchicalTable);
-        ArchivingHelper::deleteInvalidSummedColumnsFromDataTable($hierarchicalTable);
+        $this->finalizeBuiltFromFlatHierarchyTable($archiveProcessor, $hierarchicalTable, $recordName);
     }
 
     private function flatRowToHierarchyPath(Row $flatRow, int $actionType): ?array
@@ -307,6 +306,25 @@ private function removeFlatPathMetadataFromDataTable(DataTable $dataTable): void
         }
     }
 
+    private function finalizeBuiltFromFlatHierarchyTable(
+        ArchiveProcessor $archiveProcessor,
+        DataTable $hierarchicalTable,
+        string $recordName
+    ): void {
+        $hierarchicalTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, Metrics::getColumnsAggregationOperation());
+
+        if ($recordName === Archiver::PAGE_URLS_RECORD_NAME) {
+            $prefix = $archiveProcessor->getParams()->getSite()->getMainUrl();
+            $prefix = rtrim($prefix, '/') . '/';
+            ArchivingHelper::setFolderPathMetadata($hierarchicalTable, $isUrl = true, $prefix);
+        } elseif ($recordName === Archiver::PAGE_TITLES_RECORD_NAME) {
+            ArchivingHelper::setFolderPathMetadata($hierarchicalTable, $isUrl = false);
+        }
+
+        $this->removeFlatPathMetadataFromDataTable($hierarchicalTable);
+        ArchivingHelper::deleteInvalidSummedColumnsFromDataTable($hierarchicalTable);
+    }
+
     private function appendLegacyHierarchyRowsToFlatTable(DataTable $sourceTable, array $path, DataTable $flatTable, int $actionType): void
     {
         foreach ($sourceTable->getRowsWithoutSummaryRow() as $row) {