Ensure add/removeDocuments returns string for IDs

src/Service/EnterpriseSearch/EnterpriseSearchService.php

@@ -71,7 +71,7 @@ public function getExternalURL(): ?string
 
     public function getExternalURLDescription(): ?string
     {
-        return 'Elastic App Search Dashboard';
+        return 'Elastic Enterprise Search Dashboard';
     }
 
     public function getDocumentationURL(): ?string
@@ -107,10 +107,12 @@ public function addDocuments(array $documents): array
 
             $this->handleError($response);
 
-            $processedIds += array_column($response, 'id');
+            // Grab all the ID values, and also cast them to string
+            $processedIds += array_map('strval', array_column($response, 'id'));
         }
 
-        return $processedIds;
+        // One document could have existed in multiple indexes, we only care to track it once
+        return array_unique($processedIds);
     }
 
     /**
@@ -162,10 +164,12 @@ public function removeDocuments(array $items): array
 
             // Results here can be marked as deleted true or false. false would indicate that no document with that ID
             // exists in Elastic - which, is the same result, really
-            $processedIds += array_column($response, 'id');
+            // Grab all the ID values, and also cast them to string
+            $processedIds += array_map('strval', array_column($response, 'id'));
         }
 
-        return $processedIds;
+        // One document could have existed in multiple indexes, we only care to track it once
+        return array_unique($processedIds);
     }
 
     /**

tests/Service/EnterpriseSearch/EnterpriseSearchServiceTest.php

@@ -17,6 +17,7 @@
 use SilverStripe\SearchService\Service\EnterpriseSearch\EnterpriseSearchService;
 use SilverStripe\SearchService\Service\IndexConfiguration;
 use SilverStripe\SearchService\Tests\Fake\DataObjectFake;
+use SilverStripe\SearchService\Tests\Fake\DataObjectFakePrivate;
 use SilverStripe\SearchService\Tests\Fake\DataObjectFakeVersioned;
 use SilverStripe\SearchService\Tests\Fake\ImageFake;
 use SilverStripe\SearchService\Tests\Fake\TagFake;
@@ -34,6 +35,7 @@ class EnterpriseSearchServiceTest extends SearchServiceTest
      */
     protected static $extra_dataobjects = [
         DataObjectFake::class,
+        DataObjectFakePrivate::class,
         DataObjectFakeVersioned::class,
         TagFake::class,
         ImageFake::class,
@@ -1207,7 +1209,11 @@ public function testAddDocuments(): void
                 'errors' => [],
             ],
             [
-                'id' => 'doc-321',
+                'id' => 321, // We'll check that this is cast to string
+                'errors' => [],
+            ],
+            [
+                'id' => '321', // Should be removed as a duplicate of the above
                 'errors' => [],
             ],
         ]);
@@ -1217,7 +1223,7 @@ public function testAddDocuments(): void
 
         $expectedIds = [
             'doc-123',
-            'doc-321',
+            '321',
         ];
 
         $resultIds = $this->searchService->addDocuments($documents);
@@ -1353,6 +1359,10 @@ public function testRemoveDocuments(): void
                 'id' => sprintf('silverstripe_searchservice_tests_fake_dataobjectfake_%s', $documentThree->ID),
                 'deleted' => true,
             ],
+            [
+                'id' => 123, // Test that int is cast to string
+                'deleted' => true,
+            ],
         ]);
 
         // Append this mock response to our stack
@@ -1362,6 +1372,7 @@ public function testRemoveDocuments(): void
             sprintf('silverstripe_searchservice_tests_fake_dataobjectfake_%s', $documentOne->ID),
             sprintf('silverstripe_searchservice_tests_fake_dataobjectfake_%s', $documentTwo->ID),
             sprintf('silverstripe_searchservice_tests_fake_dataobjectfake_%s', $documentThree->ID),
+            '123',
         ];
 
         $resultIds = $this->searchService->addDocuments($documents);