feat(meilisearch-connector): update getContentTypesWithSameIndex

to handle multiple indexes

Author: L-Weisz

server/__tests__/meilisearch.test.js

@@ -358,7 +358,7 @@ describe('Tests content types', () => {
     })
 
     expect(
-      customStrapi.plugin().service().actionInBatches
+      customStrapi.plugin().service().actionInBatches,
     ).toHaveBeenCalledWith({
       contentType: 'restaurant',
       callback: expect.anything(),
@@ -373,7 +373,7 @@ describe('Tests content types', () => {
     })
     expect(customStrapi.log.info).toHaveBeenCalledTimes(1)
     expect(customStrapi.log.info).toHaveBeenCalledWith(
-      'A task to update the settings to the Meilisearch index "customIndex" has been enqueued (Task uid: undefined).'
+      'A task to update the settings to the Meilisearch index "customIndex" has been enqueued (Task uid: undefined).',
     )
   })
 
@@ -401,7 +401,7 @@ describe('Tests content types', () => {
     })
 
     expect(
-      customStrapi.plugin().service().actionInBatches
+      customStrapi.plugin().service().actionInBatches,
     ).toHaveBeenCalledWith({
       contentType: 'restaurant',
       callback: expect.anything(),
@@ -416,10 +416,10 @@ describe('Tests content types', () => {
     })
     expect(customStrapi.log.info).toHaveBeenCalledTimes(2)
     expect(customStrapi.log.info).toHaveBeenCalledWith(
-      'A task to update the settings to the Meilisearch index "customIndex" has been enqueued (Task uid: undefined).'
+      'A task to update the settings to the Meilisearch index "customIndex" has been enqueued (Task uid: undefined).',
     )
     expect(customStrapi.log.info).toHaveBeenCalledWith(
-      'A task to update the settings to the Meilisearch index "anotherIndex" has been enqueued (Task uid: undefined).'
+      'A task to update the settings to the Meilisearch index "anotherIndex" has been enqueued (Task uid: undefined).',
     )
   })
 
@@ -587,4 +587,25 @@ describe('Tests content types', () => {
 
     expect(result).toEqual(['api::restaurant.restaurant'])
   })
+
+  test('Test to get content types with same index, edge case with multiple indexes', async () => {
+    const customStrapi = createStrapiMock({
+      restaurantConfig: {
+        indexName: ['customIndex'],
+      },
+      aboutConfig: {
+        indexName: ['customIndex', 'anotherIndex'],
+      },
+    })
+
+    const meilisearchService = createMeilisearchService({
+      strapi: customStrapi,
+    })
+
+    const result = await meilisearchService.getContentTypesWithSameIndex({
+      contentType: 'restaurant',
+    })
+
+    expect(result).toEqual(['api::restaurant.restaurant', 'api::about.about'])
+  })
 })

server/services/meilisearch/connector.js

@@ -364,17 +364,30 @@ module.exports = ({ strapi, adapter, config }) => {
      * @returns {Promise<string[]>} - ContentTypes names.
      */
     getContentTypesWithSameIndex: async function ({ contentType }) {
-      const indexUid = config.getIndexNameOfContentType({ contentType })
+      const indexUids = config.getIndexNamesOfContentType({ contentType })
+
+      // Initialize an empty array to hold contentTypes with the same index names
+      let contentTypesWithSameIndex = []
+
+      // Iterate over each indexUid to fetch and accumulate contentTypes that have the same indexName
+      for (const indexUid of indexUids) {
+        const contentTypesForCurrentIndex = await config
+          .listContentTypesWithCustomIndexName({ indexName: indexUid })
+          .map(contentTypeName => `api::${contentTypeName}.${contentTypeName}`)
+
+        contentTypesWithSameIndex = [
+          ...contentTypesWithSameIndex,
+          ...contentTypesForCurrentIndex,
+        ]
+      }
 
-      // Fetch contentTypes that has the same indexName as the provided contentType
-      const contentTypesWithSameIndex = await config
-        .listContentTypesWithCustomIndexName({ indexName: indexUid })
-        .map(contentTypeName => `api::${contentTypeName}.${contentTypeName}`)
+      // Remove duplicates
+      contentTypesWithSameIndex = [...new Set(contentTypesWithSameIndex)]
 
-      // get all contentTypes (not indexes) indexed in Meilisearch.
+      // Get all contentTypes (not indexes) indexed in Meilisearch.
       const indexedContentTypes = await store.getIndexedContentTypes()
 
-      // Take intersection of both array
+      // Take intersection of both arrays
       const indexedContentTypesWithSameIndex = indexedContentTypes.filter(
         contentType => contentTypesWithSameIndex.includes(contentType),
       )