refactor: address feedback, part 1

Author: rs-amp

src/commands/content-item/import-revert.ts

@@ -4,7 +4,7 @@ import { Arguments } from 'yargs';
 import { FileLog } from '../../common/file-log';
 import dynamicContentClientFactory from '../../services/dynamic-content-client-factory';
 import { ContentItem } from 'dc-management-sdk-js';
-import { asyncQuestion } from '../../common/log-helpers';
+import { asyncQuestion } from '../../common/question-helpers';
 
 export const revert = async (argv: Arguments<ImportItemBuilderOptions & ConfigurationParameters>): Promise<boolean> => {
   let log: FileLog;

src/commands/content-item/import.ts

@@ -28,7 +28,8 @@ import {
 } from '../../common/content-item/content-dependancy-tree';
 
 import { AmplienceSchemaValidator, defaultSchemaLookup } from '../../common/content-item/amplience-schema-validator';
-import { getDefaultLogPath, asyncQuestion } from '../../common/log-helpers';
+import { getDefaultLogPath } from '../../common/log-helpers';
+import { asyncQuestion } from '../../common/question-helpers';
 import { PublishQueue } from '../../common/import/publish-queue';
 import { MediaRewriter } from '../../common/media/media-rewriter';
 

src/commands/event/archive.spec.ts

@@ -339,6 +339,24 @@ describe('event archive command', () => {
       expect(archiveMock).toBeCalledTimes(2);
     });
 
+    it('should archive events when multiple ids provided', async () => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (readline as any).setResponses(['y']);
+
+      const { mockGet, mockEditionsList, archiveMock } = mockValues({ status: 'PUBLISHED' });
+
+      const argv = {
+        ...yargArgs,
+        ...config,
+        id: ['1', '2']
+      };
+      await handler(argv);
+
+      expect(mockGet).toHaveBeenCalledTimes(4);
+      expect(mockEditionsList).toHaveBeenCalledTimes(2);
+      expect(archiveMock).toBeCalledTimes(4);
+    });
+
     it('should delete event with scheduled edition', async () => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (readline as any).setResponses(['y']);

src/commands/event/archive.ts

@@ -77,7 +77,7 @@ export const getEvents = async ({
   hubId,
   name
 }: {
-  id?: string;
+  id?: string | string[];
   hubId: string;
   name?: string | string[];
   client: DynamicContent;
@@ -93,19 +93,23 @@ export const getEvents = async ({
 > => {
   try {
     if (id != null) {
-      const event = await client.events.get(id);
-      const editions = await paginator(event.related.editions.list);
-
-      return [
-        {
-          event,
-          editions,
-          command: 'ARCHIVE',
-          unscheduleEditions: [],
-          deleteEditions: [],
-          archiveEditions: []
-        }
-      ];
+      const ids = Array.isArray(id) ? id : [id];
+
+      return await Promise.all(
+        ids.map(async id => {
+          const event = await client.events.get(id);
+          const editions = await paginator(event.related.editions.list);
+
+          return {
+            event,
+            editions,
+            command: 'ARCHIVE',
+            unscheduleEditions: [],
+            deleteEditions: [],
+            archiveEditions: []
+          };
+        })
+      );
     }
 
     const hub = await client.hubs.get(hubId);

src/commands/hub/steps/schema-clone-step.ts

@@ -51,19 +51,19 @@ export class SchemaCloneStep implements CloneHubStep {
     const toArchive = revertLog.getData('CREATE', this.getName());
     const toUpdate = revertLog.getData('UPDATE', this.getName());
 
-    for (let i = 0; i < toArchive.length; i++) {
+    for (const id of toArchive) {
       try {
-        const schema = await client.contentTypeSchemas.get(toArchive[i]);
+        const schema = await client.contentTypeSchemas.get(id);
         if ((schema as ResourceStatus).status == Status.ACTIVE) {
           await schema.related.archive();
         }
       } catch (e) {
-        state.logFile.appendLine(`Could not archive ${toArchive[i]}. Continuing...`);
+        state.logFile.appendLine(`Could not archive ${id}. Continuing...`);
       }
     }
 
-    for (let i = 0; i < toUpdate.length; i++) {
-      const updateArgs = toUpdate[i].split(' ');
+    for (const id of toUpdate) {
+      const updateArgs = id.split(' ');
 
       try {
         const schema = await client.contentTypeSchemas.getByVersion(updateArgs[0], Number(updateArgs[1]));
@@ -74,7 +74,7 @@ export class SchemaCloneStep implements CloneHubStep {
           typeToSync.related.contentTypeSchema.update();
         }
       } catch (e) {
-        state.logFile.appendLine(`Error while updating ${toUpdate[i]}. Continuing...`);
+        state.logFile.appendLine(`Error while updating ${id}. Continuing...`);
       }
     }
 

src/commands/settings/import.ts

@@ -5,7 +5,8 @@ import dynamicContentClientFactory from '../../services/dynamic-content-client-f
 import { ImportSettingsBuilderOptions } from '../../interfaces/import-settings-builder-options.interface';
 import { WorkflowStatesMapping } from '../../common/workflowStates/workflowStates-mapping';
 import { FileLog } from '../../common/file-log';
-import { getDefaultLogPath, asyncQuestion } from '../../common/log-helpers';
+import { getDefaultLogPath } from '../../common/log-helpers';
+import { asyncQuestion } from '../../common/question-helpers';
 import { join } from 'path';
 import { readFile } from 'fs';
 import { promisify } from 'util';

src/common/archive/archive-helpers.ts

@@ -1,4 +1,4 @@
-import { asyncQuestion } from '../log-helpers';
+import { asyncQuestion } from '../question-helpers';
 
 export async function confirmArchive(
   action: string,

src/common/log-helpers.ts

@@ -1,6 +1,4 @@
 import { join } from 'path';
-import readline, { ReadLine } from 'readline';
-import { FileLog } from './file-log';
 
 export function getDefaultLogPath(type: string, action: string, platform: string = process.platform): string {
   return join(
@@ -9,25 +7,3 @@ export function getDefaultLogPath(type: string, action: string, platform: string
     `logs/${type}-${action}-<DATE>.log`
   );
 }
-
-function asyncQuestionInternal(rl: ReadLine, question: string): Promise<string> {
-  return new Promise((resolve): void => {
-    rl.question(question, resolve);
-  });
-}
-
-export async function asyncQuestion(question: string, log?: FileLog): Promise<boolean> {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: false
-  });
-
-  const answer = await asyncQuestionInternal(rl, question);
-  rl.close();
-
-  if (log != null) {
-    log.appendLine(question + answer, true);
-  }
-  return answer.length > 0 && answer[0].toLowerCase() === 'y';
-}

src/common/question-helpers.ts

@@ -0,0 +1,24 @@
+import readline, { ReadLine } from 'readline';
+import { FileLog } from './file-log';
+
+function asyncQuestionInternal(rl: ReadLine, question: string): Promise<string> {
+  return new Promise((resolve): void => {
+    rl.question(question, resolve);
+  });
+}
+
+export async function asyncQuestion(question: string, log?: FileLog): Promise<boolean> {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: false
+  });
+
+  const answer = await asyncQuestionInternal(rl, question);
+  rl.close();
+
+  if (log != null) {
+    log.appendLine(question + answer, true);
+  }
+  return answer.length > 0 && answer[0].toLowerCase() === 'y';
+}

src/services/export.service.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import * as path from 'path';
 import { URL } from 'url';
 import DataPresenter from '../view/data-presenter';
-import { asyncQuestion } from '../common/log-helpers';
+import { asyncQuestion } from '../common/question-helpers';
 import { FileLog } from '../common/file-log';
 
 export type ExportResult = 'CREATED' | 'UPDATED' | 'UP-TO-DATE';