1667 personal data eraser timeout with sorting (#1668)

Author: daern91

packages/personal-data-erasure/src/main.js

@@ -19,6 +19,7 @@ import type {
   Client,
   ClientRequest,
   ClientResponse,
+  SuccessResult,
   ServiceBuilderInstance,
   MethodType,
   ClientResult,
@@ -161,7 +162,7 @@ export default class PersonalDataErasure {
     )
   }
 
-  deleteAll(customerId: string): Promise<Array<AllData>> {
+  async deleteAll(customerId: string): Promise<void> {
     if (!customerId) throw Error('missing `customerId` argument')
     this.logger.info('Starting deletion')
 
@@ -194,45 +195,38 @@ export default class PersonalDataErasure {
         .build(),
       builder: requestBuilder.reviews,
     }
-
     const resourcesToDelete = [
-      customersResource,
+      reviewsResource,
+      shoppingListsResource,
       ordersResource,
       paymentsResource,
-      shoppingListsResource,
-      reviewsResource,
+      customersResource,
     ]
-
-    return Promise.all(
-      resourcesToDelete.map(
-        (resource: {
-          uri: string,
-          builder: ServiceBuilderInstance,
-        }): Promise<AllData> => {
-          const request = PersonalDataErasure.buildRequest(resource.uri, 'GET')
-
-          return this.client.process(
-            request,
-            (response: ClientResponse): Promise<void> => {
-              if (response.statusCode !== 200 && response.statusCode !== 404)
-                return Promise.reject(
-                  Error(`Request returned status code ${response.statusCode}`)
-                )
-              if (response.statusCode === 200)
-                this._deleteOne(response, resource.builder)
-              return Promise.resolve()
-            },
-            { accumulate: true }
+    for (let i = 0; i < resourcesToDelete.length; i += 1) {
+      const resource = resourcesToDelete[i]
+      let continueProcessing = true
+      while (continueProcessing) {
+        const request = PersonalDataErasure.buildRequest(resource.uri, 'GET')
+        /* eslint-disable no-await-in-loop */
+        const response = await this.client.execute(request)
+        if (response.statusCode !== 200 && response.statusCode !== 404)
+          return Promise.reject(
+            Error(`Request returned status code ${response.statusCode}`)
           )
-        }
-      )
-    )
+        if (response.body && response.body.results.length < 20)
+          continueProcessing = false
+        if (response.statusCode === 200)
+          await this._deleteOne(response, resource.builder)
+        /* eslint-enable no-await-in-loop */
+      }
+    }
+    return Promise.resolve()
   }
 
-  _deleteOne(response: ClientResponse, builder: ServiceBuilderInstance) {
+  async _deleteOne(response: SuccessResult, builder: ServiceBuilderInstance) {
     const results = response.body ? response.body.results : []
     if (results.length > 0) {
-      Promise.all(
+      await Promise.all(
         results.map((result: AllData): Promise<ClientResult> => {
           const deleteRequest = PersonalDataErasure.buildDeleteRequest(
             result,

packages/personal-data-erasure/test/main.spec.js

@@ -154,10 +154,8 @@ describe('PersonalDataErasure', () => {
             results: [],
           },
         }
-        personalDataErasure.client.process = jest.fn(
-          async (request, callback) => {
-            await callback(payload)
-          }
+        personalDataErasure.client.execute = jest.fn(() =>
+          Promise.resolve(payload)
         )
       })
 
@@ -167,9 +165,9 @@ describe('PersonalDataErasure', () => {
         ).rejects.toThrowErrorMatchingSnapshot())
     })
     test('should throw error if no customerID is passed', () => {
-      expect(() =>
+      return expect(
         personalDataErasure.deleteAll()
-      ).toThrowErrorMatchingSnapshot()
+      ).rejects.toThrowErrorMatchingSnapshot()
     })
   })
 
@@ -239,7 +237,9 @@ describe('PersonalDataErasure', () => {
           results: [],
         },
       }
-      expect(personalDataErasure._deleteOne(payload)).toBeFalsy()
+      return expect(
+        personalDataErasure._deleteOne(payload)
+      ).resolves.toBeFalsy()
     })
   })
 })