AUM - Error Handling and rejection - Batched Promises

arjunumenon · arjunumenon · commit 18c5824a7152 · 2021-01-19T09:02:32.000+05:30
diff --git a/src/m365/tenant/commands/auditlog/auditlog-report.spec.ts b/src/m365/tenant/commands/auditlog/auditlog-report.spec.ts
@@ -10,7 +10,7 @@ import Utils from '../../../../Utils';
 import commands from '../../commands';
 const command: Command = require('./auditlog-report');
 
-describe.only(commands.TENANT_AUDITLOG_REPORT, () => {
+describe(commands.TENANT_AUDITLOG_REPORT, () => {
   let log: string[];
   let logger: Logger;
   let loggerLogSpy: sinon.SinonSpy;
@@ -622,9 +622,16 @@ describe.only(commands.TENANT_AUDITLOG_REPORT, () => {
     });
   });
 
-  it('Handles Error - For a particular Content Audit Content URL', (done) => {
+  it('command correctly handles error for a particular Content Audit Content URL of a Batched Promise', (done) => {
     const err = 'Invalid request';
     sinon.stub(request, 'get').callsFake((opts) => {
+      if ((opts.url as string).indexOf('activity/feed/subscriptions/list') > -1) {
+        return Promise.resolve(JSONActiveSubscription);
+      }
+
+      if ((opts.url as string).indexOf('activity/feed/subscriptions/content') > -1) {
+        return Promise.resolve(JSONListAuditContent);
+      }
 
       if ((opts.url as string).indexOf('/activity/feed/audit/') > -1) {
         return Promise.reject(err);
diff --git a/src/m365/tenant/commands/auditlog/auditlog-report.ts b/src/m365/tenant/commands/auditlog/auditlog-report.ts
@@ -93,10 +93,11 @@ class TenantAuditlogReportCommand extends Command {
     return this.startContentSubscriptionIfNotActive(args, logger)
       .then((): Promise<AuditContentList[]> => this.getAuditContentList(args, logger))
       .then((auditContentLists: AuditContentList[]): Promise<any> => this.getBatchedPromises(auditContentLists, 10))
-      .then((batchedPromise : Promise<any>[]): Promise<void> => {
-        return new Promise<void>((resolve: () => void): void => { 
-          if (batchedPromise.length > 0) this.getBatchedAuditlogData(logger,batchedPromise, 0, resolve);
-          else resolve(); })
+      .then((batchedPromise: Promise<any>[]): Promise<void> => {
+        return new Promise<void>((resolve: () => void, reject: (err: any) => void): void => {
+          if (batchedPromise.length > 0) this.getBatchedAuditlogData(logger, batchedPromise, 0, resolve, reject);
+          else resolve();
+        })
       })
       .then((): AuditlogReport[] => { return this.completeAuditReports.flat(2) });
   }
@@ -178,7 +179,7 @@ class TenantAuditlogReportCommand extends Command {
     return Promise.resolve(batchedPromises);
   }
 
-  private getBatchedAuditlogData(logger: Logger,batchedPromiseList : any, batchNumber: number, resolve: () => void): void {
+  private getBatchedAuditlogData(logger: Logger, batchedPromiseList: any, batchNumber: number, resolve: () => void, reject: (err: any) => void): void {
     if (this.verbose) {
       logger.logToStderr(`Starting Batch : ${batchNumber}`);
     }
@@ -188,11 +189,13 @@ class TenantAuditlogReportCommand extends Command {
       .then((data: any) => {
         this.completeAuditReports.push(data);
         if (batchNumber < batchedPromiseList.length - 1) {
-          this.getBatchedAuditlogData(logger,batchedPromiseList, ++batchNumber, resolve)
+          this.getBatchedAuditlogData(logger, batchedPromiseList, ++batchNumber, resolve, reject)
         }
         else {
           resolve();
         }
+      }, (err: any): void => {
+        reject(err);
       });
   }
 
