fixed pagination tests

Author: cs-raj

packages/contentstack-export-to-csv/src/utils/api-client.ts

@@ -169,15 +169,18 @@ async function getUsers(
   try {
     const users = await managementAPIClient.organization(organization.uid).getInvitations(params) as unknown as OrgUsersResponse;
 
-    if (!users.items || (users.items && !users.items.length)) {
+    if (!users.items || users.items.length < params.limit) {
+      if (users.items?.length) {
+        result = result.concat(users.items);
+      }
       return result;
-    } else {
-      result = result.concat(users.items);
-      params.skip = params.page * params.limit;
-      params.page++;
-      await wait(200);
-      return getUsers(managementAPIClient, organization, params, result);
     }
+
+    result = result.concat(users.items);
+    params.skip = params.page * params.limit;
+    params.page++;
+    await wait(200);
+    return getUsers(managementAPIClient, organization, params, result);
   } catch {
     return result;
   }

packages/contentstack-export-to-csv/test/unit/utils/api-client.functional.test.ts

@@ -131,7 +131,8 @@ describe('api-client functional', () => {
         }),
       } as any;
       const res = await getOrgUsers(client, 'org-1');
-      expect(res).to.equal(invitations);
+      expect(res.items).to.have.lengthOf(1);
+      expect(res.items[0].email).to.equal('a@b.com');
     });
 
     it('getOrgUsers rejects when org uid missing', async () => {
@@ -148,8 +149,8 @@ describe('api-client functional', () => {
 
     it('getOrgUsers resolves paginated invitations for non-owner admin org', async () => {
       const getInvitations = sandbox.stub();
-      getInvitations.onFirstCall().resolves({ items: [{ email: 'a@b.com' }] });
-      getInvitations.onSecondCall().resolves({ items: [] });
+      getInvitations.onFirstCall().resolves({ items: Array.from({ length: 100 }, (_, i) => ({ email: `u${i}@b.com` })) });
+      getInvitations.onSecondCall().resolves({ items: [{ email: 'a@b.com' }] });
       const client = {
         getUser: () =>
           Promise.resolve({
@@ -160,7 +161,7 @@ describe('api-client functional', () => {
         }),
       } as any;
       const res = await getOrgUsers(client, 'org-1');
-      expect(res.items).to.have.lengthOf(1);
+      expect(res.items).to.have.lengthOf(101);
       expect(getInvitations.calledTwice).to.equal(true);
     });
 

packages/contentstack-export-to-csv/test/unit/utils/api-client.test.ts

@@ -108,19 +108,19 @@ describe('api-client', () => {
 
   describe('getOrgUsers', () => {
     it('should paginate getInvitations for organization owners', async () => {
-      const page1 = Array.from({ length: 10 }, (_, i) => makeUser(i));
-      const page2 = Array.from({ length: 10 }, (_, i) => makeUser(i + 10));
-      const page3 = Array.from({ length: 5 }, (_, i) => makeUser(i + 20));
+      const page1 = Array.from({ length: config.limit }, (_, i) => makeUser(i));
+      const page2 = Array.from({ length: config.limit }, (_, i) => makeUser(i + config.limit));
+      const page3 = Array.from({ length: 25 }, (_, i) => makeUser(i + config.limit * 2));
 
       const { client, getInvitations, invitationParams } = createPaginatedMockClient(
         { is_owner: true },
-        [page1, page2, page3, []],
+        [page1, page2, page3],
       );
 
       const result = await getOrgUsers(client, ORG_UID);
 
-      expect(result.items).to.have.lengthOf(25);
-      expect(getInvitations.callCount).to.equal(4);
+      expect(result.items).to.have.lengthOf(225);
+      expect(getInvitations.callCount).to.equal(3);
       expect(invitationParams[0]).to.deep.equal({ skip: 0, page: 1, limit: config.limit });
       expect(invitationParams[1]).to.deep.equal({ skip: config.limit, page: 2, limit: config.limit });
       expect(invitationParams[2]).to.deep.equal({
@@ -131,19 +131,19 @@ describe('api-client', () => {
     });
 
     it('should paginate getInvitations for organization admins', async () => {
-      const page1 = Array.from({ length: 10 }, (_, i) => makeUser(i));
-      const page2 = Array.from({ length: 10 }, (_, i) => makeUser(i + 10));
-      const page3 = Array.from({ length: 5 }, (_, i) => makeUser(i + 20));
+      const page1 = Array.from({ length: config.limit }, (_, i) => makeUser(i));
+      const page2 = Array.from({ length: config.limit }, (_, i) => makeUser(i + config.limit));
+      const page3 = Array.from({ length: 25 }, (_, i) => makeUser(i + config.limit * 2));
 
       const { client, getInvitations, invitationParams } = createPaginatedMockClient(
         { is_owner: false, org_roles: [{ admin: true }] },
-        [page1, page2, page3, []],
+        [page1, page2, page3],
       );
 
       const result = await getOrgUsers(client, ORG_UID);
 
-      expect(result.items).to.have.lengthOf(25);
-      expect(getInvitations.callCount).to.equal(4);
+      expect(result.items).to.have.lengthOf(225);
+      expect(getInvitations.callCount).to.equal(3);
       expect(invitationParams[0]).to.deep.equal({ skip: 0, page: 1, limit: config.limit });
     });