Merge pull request #1264 from contentful/fix/import-more-than-100-locales-zend-5557

fix: import more than 100 locales [ZEND-5557]

Author: BobHemphill76

lib/tasks/get-destination-data.ts

@@ -63,7 +63,7 @@ async function batchedPageQuery ({ environment, type, requestQueue }: BatchedPag
     })
     totalFetched += response.items.length
     logEmitter.emit('info', `Fetched ${totalFetched} of ${response.total} ${entityTypeName}`)
-    
+
     return { items: response.items, total: response.total }
   })
 
@@ -188,11 +188,10 @@ export default async function getDestinationData ({
 
     if (!skipLocales) {
       const localeIds = sourceData.locales?.map((e) => e.sys.id)
-      if (localeIds) {
-        result.locales = batchedIdQuery({
+      if (localeIds && localeIds.length) {
+        result.locales = batchedPageQuery({
           environment,
           type: 'locales',
-          ids: localeIds,
           requestQueue
         })
       }

package-lock.json

@@ -130,4 +130,4 @@
       "@semantic-release/github"
     ]
   }
-}
+}

package.json

@@ -5,7 +5,7 @@ import getDestinationData from '../../../lib/tasks/get-destination-data'
 
 const sourceData = {
   contentTypes: times(150, (n) => ({ sys: { id: `ct-${n}` } })),
-  locales: times(5, (n) => ({ sys: { id: `ct-${n}` } })),
+  locales: times(105, (n) => ({ sys: { id: `ct-${n}` } })),
   entries: times(2000, (n) => ({ sys: { id: `e-${n}` } })),
   assets: times(1500, (n) => ({ sys: { id: `a-${n}` } })),
   tags: times(250, (n) => ({ sys: { id: `t-${n}` }, name: `t-${n}` }))
@@ -38,7 +38,7 @@ const mockEnvironment = {
   getContentTypes: jest.fn(batchQueryResolver),
   getEntries: jest.fn(batchQueryResolver),
   getAssets: jest.fn(batchQueryResolver),
-  getLocales: jest.fn(batchQueryResolver),
+  getLocales: jest.fn(batchPageResolver(sourceData.locales)),
   getTags: jest.fn(batchPageResolver(sourceData.tags)) // resolve 250 tags
 }
 
@@ -90,15 +90,14 @@ test('Gets destination content', () => {
     .then((response) => {
       expect(mockEnvironment.getContentTypes.mock.calls).toHaveLength(2)
       testQueryLength('getContentTypes')
-      expect(mockEnvironment.getLocales.mock.calls).toHaveLength(1)
-      testQueryLength('getLocales')
+      expect(mockEnvironment.getLocales.mock.calls).toHaveLength(2)
       expect(mockEnvironment.getEntries.mock.calls).toHaveLength(20)
       testQueryLength('getEntries')
       expect(mockEnvironment.getAssets.mock.calls).toHaveLength(15)
       testQueryLength('getAssets')
       expect(mockEnvironment.getTags.mock.calls).toHaveLength(3)
       expect(response.contentTypes).toHaveLength(150)
-      expect(response.locales).toHaveLength(5)
+      expect(response.locales).toHaveLength(105)
       expect(response.entries).toHaveLength(2000)
       expect(response.assets).toHaveLength(1500)
       expect(response.tags).toHaveLength(250)
@@ -171,13 +170,12 @@ test('Gets destination content with contentModelOnly', () => {
     .then((response) => {
       expect(mockEnvironment.getContentTypes.mock.calls).toHaveLength(2)
       testQueryLength('getContentTypes')
-      expect(mockEnvironment.getLocales.mock.calls).toHaveLength(1)
-      testQueryLength('getLocales')
+      expect(mockEnvironment.getLocales.mock.calls).toHaveLength(2)
       expect(mockEnvironment.getEntries.mock.calls).toHaveLength(0)
       expect(mockEnvironment.getAssets.mock.calls).toHaveLength(0)
       expect(mockEnvironment.getTags.mock.calls).toHaveLength(3)
       expect(response.contentTypes).toHaveLength(150)
-      expect(response.locales).toHaveLength(5)
+      expect(response.locales).toHaveLength(105)
       expect(response.entries).toHaveLength(0)
       expect(response.assets).toHaveLength(0)
       expect(response.tags).toHaveLength(250)