feat: content item command improvements

src/commands/content-item/archive.ts

@@ -4,12 +4,13 @@ import dynamicContentClientFactory from '../../services/dynamic-content-client-f
 import { ArchiveLog } from '../../common/archive/archive-log';
 import { confirmAllContent } from '../../common/content-item/confirm-all-content';
 import ArchiveOptions from '../../common/archive/archive-options';
-import { ContentItem, DynamicContent, Status } from 'dc-management-sdk-js';
+import { ContentItem, Status } from 'dc-management-sdk-js';
 import { getDefaultLogPath, createLog } from '../../common/log-helpers';
 import { FileLog } from '../../common/file-log';
 import { withOldFilters } from '../../common/filter/facet';
 import { getContent } from '../../common/filter/fetch-content';
 import { progressBar } from '../../common/progress-bar/progress-bar';
+import { getContentByIds } from '../../common/content-item/get-content-items-by-ids';
 
 export const command = 'archive [id]';
 
@@ -86,108 +87,20 @@ export const builder = (yargs: Argv): void => {
     });
 };
 
-export const getContentItems = async ({
-  client,
-  id,
-  hubId,
-  repoId,
-  folderId,
-  revertLog,
-  facet
-}: {
-  client: DynamicContent;
-  id?: string | string[];
-  hubId: string;
-  repoId?: string | string[];
-  folderId?: string | string[];
-  revertLog?: string;
-  facet?: string;
-}): Promise<{ contentItems: ContentItem[]; missingContent: boolean }> => {
-  try {
-    let contentItems: ContentItem[] = [];
-
-    if (revertLog != null) {
-      const log = await new ArchiveLog().loadFromFile(revertLog);
-      id = log.getData('UNARCHIVE');
-    }
-
-    if (id != null) {
-      const itemIds = Array.isArray(id) ? id : [id];
-      const items: ContentItem[] = [];
-
-      for (const id of itemIds) {
-        try {
-          items.push(await client.contentItems.get(id));
-        } catch {
-          // Missing item.
-        }
-      }
-
-      contentItems.push(...items.filter(item => item.status === Status.ACTIVE));
-
-      return {
-        contentItems,
-        missingContent: contentItems.length != itemIds.length
-      };
-    }
-
-    const hub = await client.hubs.get(hubId);
-
-    contentItems = await getContent(client, hub, facet, { repoId, folderId, status: Status.ACTIVE, enrichItems: true });
-
-    return { contentItems, missingContent: false };
-  } catch (err) {
-    console.log(err);
-
-    return {
-      contentItems: [],
-      missingContent: false
-    };
-  }
-};
-
-export const processItems = async ({
+const processItems = async ({
   contentItems,
-  force,
-  silent,
-  logFile,
-  allContent,
-  missingContent,
+  log,
   ignoreError,
   ignoreSchemaValidation
 }: {
   contentItems: ContentItem[];
-  force?: boolean;
-  silent?: boolean;
-  logFile: FileLog;
-  allContent: boolean;
-  missingContent: boolean;
+  log: FileLog;
   ignoreError?: boolean;
   ignoreSchemaValidation?: boolean;
-}): Promise<void> => {
-  if (contentItems.length == 0) {
-    console.log('Nothing found to archive, aborting.');
-    return;
-  }
-
-  console.log('The following content items will be archived:');
-  contentItems.forEach((contentItem: ContentItem) => {
-    console.log(` ${contentItem.label} (${contentItem.id})`);
-  });
-  console.log(`Total: ${contentItems.length}`);
-
-  if (!force) {
-    const yes = await confirmAllContent('archive', 'content item', allContent, missingContent);
-    if (!yes) {
-      return;
-    }
-  }
-
-  const log = logFile.open();
-
+}): Promise<{ failedArchives: ContentItem[] }> => {
   const progress = progressBar(contentItems.length, 0, { title: 'Archiving content items' });
+  const failedArchives = [];
 
-  let successCount = 0;
   for (let i = 0; i < contentItems.length; i++) {
     try {
       const deliveryKey = contentItems[i].body._meta.deliveryKey;
@@ -206,74 +119,96 @@ export const processItems = async ({
       await contentItems[i].related.archive();
       progress.increment();
       log.addAction('ARCHIVE', `${args}`);
-      successCount++;
     } catch (e) {
+      failedArchives.push(contentItems[i]);
       progress.increment();
       log.addComment(`ARCHIVE FAILED: ${contentItems[i].id}`);
       log.addComment(e.toString());
 
       if (ignoreError) {
-        log.warn(`Failed to archive ${contentItems[i].label} (${contentItems[i].id}), continuing.`, e);
+        log.warn(`\nFailed to archive ${contentItems[i].label} (${contentItems[i].id}), continuing.`, e);
       } else {
         progress.stop();
-        log.error(`Failed to archive ${contentItems[i].label} (${contentItems[i].id}), aborting.`, e);
+        log.error(`\nFailed to archive ${contentItems[i].label} (${contentItems[i].id}), aborting.`, e);
         break;
       }
     }
   }
 
   progress.stop();
 
-  await log.close(!silent);
-
-  console.log(`Archived ${successCount} content items.`);
+  return { failedArchives };
 };
 
 export const handler = async (argv: Arguments<ArchiveOptions & ConfigurationParameters>): Promise<void> => {
   const { id, logFile, force, silent, ignoreError, hubId, revertLog, repoId, folderId, ignoreSchemaValidation } = argv;
+  const log = logFile.open();
   const client = dynamicContentClientFactory(argv);
-
   const facet = withOldFilters(argv.facet, argv);
-
   const allContent = !id && !facet && !revertLog && !folderId && !repoId;
 
   if (repoId && id) {
-    console.log('ID of content item is specified, ignoring repository ID');
+    log.appendLine('ID of content item is specified, ignoring repository ID');
   }
 
   if (id && facet) {
-    console.log('Please specify either a facet or an ID - not both.');
+    log.appendLine('Please specify either a facet or an ID - not both.');
     return;
   }
 
   if (repoId && folderId) {
-    console.log('Folder is specified, ignoring repository ID');
+    log.appendLine('Folder is specified, ignoring repository ID');
   }
 
   if (allContent) {
-    console.log('No filter was given, archiving all content');
+    log.appendLine('No filter was given, archiving all content');
   }
 
-  const { contentItems, missingContent } = await getContentItems({
-    client,
-    id,
-    hubId,
-    repoId,
-    folderId,
-    revertLog,
-    facet
-  });
+  let ids: string[] = [];
+
+  if (id) {
+    ids = Array.isArray(id) ? id : [id];
+  }
 
-  await processItems({
+  if (revertLog) {
+    const log = await new ArchiveLog().loadFromFile(revertLog);
+    ids = log.getData('UNARCHIVE');
+  }
+
+  const hub = await client.hubs.get(hubId);
+  const contentItems = ids.length
+    ? (await getContentByIds(client, ids)).filter(item => item.status === Status.ACTIVE)
+    : await getContent(client, hub, facet, { repoId, folderId, status: Status.ACTIVE, enrichItems: true });
+
+  if (!contentItems.length) {
+    log.appendLine('Nothing found to archive, aborting');
+    return;
+  }
+
+  const missingContentItems = ids.length > 0 ? Boolean(ids.length !== contentItems.length) : false;
+  log.appendLine(`Found ${contentItems.length} content items to archive`);
+
+  if (!force) {
+    const yes = await confirmAllContent('archive', 'content item', allContent, missingContentItems);
+    if (!yes) {
+      return;
+    }
+  }
+
+  const { failedArchives } = await processItems({
     contentItems,
-    force,
-    silent,
-    logFile,
-    allContent,
-    missingContent,
+    log,
     ignoreError,
     ignoreSchemaValidation
   });
+
+  const failedArchiveMsg = failedArchives.length
+    ? `with ${failedArchives.length} failed archives - check logs for details`
+    : ``;
+
+  log.appendLine(`Archived content items ${failedArchiveMsg}`);
+
+  await log.close(!silent);
 };
 
 // log format: