feat: add redirect mapping

xima-media · Feb 15, 2024 · 2432a95 · 2432a95
1 parent f491f01
commit 2432a95
Show file tree

Hide file tree

Showing 6 changed files with 251 additions and 113 deletions.
diff --git a/Classes/Command/CreateMappingsCommand.php b/Classes/Command/CreateMappingsCommand.php
@@ -38,11 +38,18 @@ public function execute(InputInterface $input, OutputInterface $output): int
     {
         $qb = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
         $qb->getRestrictions()->removeAll();
-        $result = $qb->select('uid', 'slug')
+        $result = $qb->select('uid', 'slug', 'sys_language_uid')
             ->from('pages')
             ->execute();
-
         $pages = $result->fetchAllAssociative();
+
+        $qb = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_redirect');
+        $qb->getRestrictions()->removeAll();
+        $result = $qb->select('uid', 'source_path', 'is_regexp')
+            ->from('sys_redirect')
+            ->execute();
+        $redirects = $result->fetchAllAssociative();
+
         $mappingPaths = $this->mappingRepository->getAllNonRegexPaths();
         $paths = $this->dataProviderService->readJsonData();
 
@@ -56,20 +63,48 @@ public function execute(InputInterface $input, OutputInterface $output): int
                 continue;
             }
 
-            foreach ($pages as $page) {
+            foreach ($pages as $key2 => $page) {
                 // no match
                 if ($page['slug'] !== $pathData->data) {
                     continue;
                 }
 
                 // create mapping
-                $data['tx_xmgoaccess_domain_model_mapping']['NEW' . $key] = [
+                $data['tx_xmgoaccess_domain_model_mapping']['NEW' . $key . $key2] = [
                     'pid' => 0,
                     'path' => $page['slug'],
                     'record_type' => 0,
                     'page' => $page['uid'],
                 ];
             }
+
+            foreach ($redirects as $key2 => $redirect) {
+                if (!$redirect['source_path'] || !is_string($redirect['source_path'])) {
+                    continue;
+                }
+
+                // check regex
+                if ($redirect['is_regexp']) {
+                    $matchResult = preg_match($redirect['source_path'], $pathData->data, $matches);
+                    if ($matchResult === 0) {
+                        continue;
+                    }
+                }
+
+                // no match
+                if (!$redirect['is_regexp'] && $redirect['source_path'] !== $pathData->data) {
+                    continue;
+                }
+
+                // create mapping
+                $data['tx_xmgoaccess_domain_model_mapping']['NEW' . $key . $key2] = [
+                    'pid' => 0,
+                    'path' => $pathData->data,
+                    'record_type' => 3,
+                    'foreign_uid' => $redirect['uid'],
+                    'foreign_table' => 'sys_redirect',
+                ];
+            }
         }
 
         if (!count($data['tx_xmgoaccess_domain_model_mapping'])) {

diff --git a/Classes/Domain/Model/Dto/Demand.php b/Classes/Domain/Model/Dto/Demand.php
@@ -11,6 +11,7 @@ class Demand
     public bool $showPages = true;
 
     public bool $showActions = true;
+    public bool $showRedirects = false;
 
     public static function createFromRequest(Request $request): self
     {
@@ -31,6 +32,10 @@ public static function createFromRequest(Request $request): self
             $demand->showActions = false;
         }
 
+        if (isset($postData['showRedirects']) && (int)$postData['showRedirects']) {
+            $demand->showRedirects = true;
+        }
+
         return $demand;
     }
 }
diff --git a/Classes/Service/DataProviderService.php b/Classes/Service/DataProviderService.php
@@ -79,8 +79,6 @@ public function getRequestList(?Demand $demand = null)
     {
         $goaccessData = $this->readJsonData();
 
-        $this->mappings = $this->mappingRepository->findAll();
-
         $items = [];
 
         foreach ($goaccessData['requests']->data as $pathData) {
@@ -90,18 +88,26 @@ public function getRequestList(?Demand $demand = null)
                 'hits' => $pathData->hits->count,
                 'visitors' => $pathData->visitors->count,
                 'path' => $path,
-                'mapping' => $this->resolvePathMapping($path),
+                'mappings' => $this->resolvePathMapping($path),
             ];
 
-            if ($demand && $item['mapping']) {
-                if (!$demand->showPages && $item['mapping']->getRecordType() === 0) {
-                    continue;
+            if (!$demand || empty($item['mappings'])) {
+                $items[] = $item;
+                continue;
+            }
+
+            foreach ($item['mappings'] as $mapping) {
+                if (!$demand->showPages && $mapping->getRecordType() === 0) {
+                    continue 2;
                 }
-                if (!$demand->showActions && $item['mapping']->getRecordType() === 1) {
-                    continue;
+                if (!$demand->showActions && $mapping->getRecordType() === 1) {
+                    continue 2;
                 }
-                if (!$demand->showIgnored && $item['mapping']->getRecordType() === 2) {
-                    continue;
+                if (!$demand->showIgnored && $mapping->getRecordType() === 2) {
+                    continue 2;
+                }
+                if (!$demand->showRedirects && $mapping->getRecordType() === 3) {
+                    continue 2;
                 }
             }
 
@@ -136,27 +142,31 @@ public function readJsonData(): array
         return $content ? (array)json_decode($content) : [];
     }
 
-    private function resolvePathMapping(string $path): ?Mapping
+    /**
+     * @return Mapping[]
+     */
+    private function resolvePathMapping(string $path): array
     {
-        foreach ($this->mappings as $mapping) {
+        $mappings = [];
+        foreach ($this->mappingRepository->findAll() as $mapping) {
             if ($mapping->isRegex()) {
                 preg_match('/' . $mapping->getPath() . '/', $path, $matches);
                 if ($matches) {
                     $this->enrichMapping($mapping);
-                    return $mapping;
+                    $mappings[] = $mapping;
                 }
             }
 
             if (!$mapping->isRegex() && $path === $mapping->getPath()) {
                 $this->enrichMapping($mapping);
-                return $mapping;
+                $mappings[] = $mapping;
             }
         }
 
-        return null;
+        return $mappings;
     }
 
-    private function enrichMapping(Mapping &$mapping): void
+    private function enrichMapping(Mapping $mapping): void
     {
         if ($mapping->getRecordType() === 0 && $mapping->getPage()) {
             $pageRecord = BackendUtility::readPageAccess($mapping->getPage(), '1=1');

diff --git a/Configuration/TCA/tx_xmgoaccess_domain_model_mapping.php b/Configuration/TCA/tx_xmgoaccess_domain_model_mapping.php
@@ -22,6 +22,9 @@
         2 => [
             'showitem' => '--palette--;;pathSettings, record_type',
         ],
+        3 => [
+            'showitem' => '--palette--;;pathSettings, record_type, foreign_table, foreign_uid',
+        ],
     ],
     'palettes' => [
         'pathSettings' => [
@@ -98,5 +101,17 @@
                 'default' => 0,
             ],
         ],
+        'foreign_uid' => [
+            'label' => 'Foreign UID',
+            'config' => [
+                'type' => 'input',
+            ],
+        ],
+        'foreign_table' => [
+            'label' => 'Foreign table',
+            'config' => [
+                'type' => 'input',
+            ],
+        ],
     ],
 ];