Merge pull request #816 from devmes/bugfix/809

fix: pregenerate the slug entries incl. the counter
lochmueller · Oct 29, 2024 · 3e3d311 · 3e3d311
2 parents 3a5215f + 577076d
commit 3e3d311
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Classes/Service/IndexerService.php b/Classes/Service/IndexerService.php
@@ -227,14 +227,16 @@ protected function insertAndUpdateNeededItems(
      */
     protected function generateSlugAndInsert(array $neededItems, int $workspace = 0): void
     {
+        $i = 0;
         foreach ($neededItems as $item) {
             if ($workspace) {
                 $item['t3ver_oid'] = 0;
             }
 
-            $item['slug'] = $this->slugService->makeSlugUnique($item);
+            $item['slug'] = $this->slugService->makeSlugUnique($item, $i);
             // We need to insert after each index, so subsequent indices do not get the same slug
             $this->rawIndexRepository->insert($item);
+            $i++;
         }
     }
 

diff --git a/Classes/Service/Url/SlugService.php b/Classes/Service/Url/SlugService.php
@@ -135,10 +135,10 @@ protected function generateSlugSuffix(string $uniqueRegisterKey, string $base, a
      * Process the record and make the slug unique in the table, e.g. adds a suffix on duplicate.
      *
      * @param array $recordData
-     *
+     * @param int|null $counter
      * @return string
      */
-    public function makeSlugUnique(array $recordData): string
+    public function makeSlugUnique(array $recordData, ?int $counter = null): string
     {
         // Create RecordState and generate slug
         $state = $this->stateFactory->fromArray(
@@ -149,7 +149,7 @@ public function makeSlugUnique(array $recordData): string
 
         /* @noinspection PhpUnhandledExceptionInspection */
         return $this->getSlugHelper($recordData['t3ver_wsid'] ?? 0)
-            ->buildSlugForUniqueInTable($recordData['slug'], $state);
+            ->buildSlugForUniqueInTable($recordData['slug'] . ($counter ? '-' . $counter : ''), $state);
     }
 
     protected function getSlugHelper(int $workspaceId = 0): SlugHelper