feat: improves logging

kontent-ai-bot · Jan 16, 2020 · cb37f7a · cb37f7a
1 parent 9bf80ad
commit cb37f7a
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 29 deletions.
diff --git a/src/cli/app.ts b/src/cli/app.ts
@@ -68,6 +68,7 @@ const restore = async (config: ICliFileConfig) => {
         },
         projectId: config.projectId,
         apiKey: config.apiKey,
+        enableLog: config.enableLog,
         workflowIdForImportedItems: '00000000-0000-0000-0000-000000000000',
         process: {
             language: item => config.importLanguages,

diff --git a/src/import/import.helper.ts b/src/import/import.helper.ts
@@ -1,11 +1,17 @@
 import { codenameTranslateHelper } from '../core';
-import { IExportData } from '../export';
-import { IImportData, IPreparedImportItem, IImportSource } from './import.models';
+import { IImportData, IImportSource, IPreparedImportItem } from './import.models';
 
 export class ImportHelper {
     public prepareImportData(sourceData: IImportSource): IImportData {
         // translate internal ids to codenames
-        codenameTranslateHelper.replaceIdReferencesWithCodenames(sourceData.importData, sourceData.importData);
+        codenameTranslateHelper.replaceIdReferencesWithCodenames(
+            sourceData.importData.contentTypes,
+            sourceData.importData
+        );
+        codenameTranslateHelper.replaceIdReferencesWithCodenames(
+            sourceData.importData.contentTypeSnippets,
+            sourceData.importData
+        );
 
         // flatten data
         const items = this.flattenSourceData(sourceData);
@@ -39,10 +45,7 @@ export class ImportHelper {
         return sortedItems;
     }
 
-    private getDependenciesOfItem(
-        item: IPreparedImportItem,
-        allItems: IPreparedImportItem[]
-    ): string[] {
+    private getDependenciesOfItem(item: IPreparedImportItem, allItems: IPreparedImportItem[]): string[] {
         const deps: string[] = [];
 
         // get referenced codenames in item
@@ -57,55 +60,59 @@ export class ImportHelper {
     private flattenSourceData(sourceData: IImportSource): IPreparedImportItem[] {
         return [
             ...sourceData.importData.taxonomies.map(m => {
-                return <IPreparedImportItem> {
+                return <IPreparedImportItem>{
                     codename: m.codename,
                     deps: [],
                     item: m,
                     type: 'taxonomy'
                 };
             }),
-            ...this.orderItemsByDeps(sourceData.importData.contentTypeSnippets.map(m => {
-                return <IPreparedImportItem> {
-                    codename: m.codename,
-                    deps: [],
-                    item: m,
-                    type: 'contentTypeSnippet'
-                };
-            })),
-            ...this.orderItemsByDeps(sourceData.importData.contentTypes.map(m => {
-                return <IPreparedImportItem> {
-                    codename: m.codename,
-                    deps: [],
-                    item: m,
-                    type: 'contentType'
-                };
-            })),
+            ...this.orderItemsByDeps(
+                sourceData.importData.contentTypeSnippets.map(m => {
+                    return <IPreparedImportItem>{
+                        codename: m.codename,
+                        deps: [],
+                        item: m,
+                        type: 'contentTypeSnippet'
+                    };
+                })
+            ),
+            ...this.orderItemsByDeps(
+                sourceData.importData.contentTypes.map(m => {
+                    return <IPreparedImportItem>{
+                        codename: m.codename,
+                        deps: [],
+                        item: m,
+                        type: 'contentType'
+                    };
+                })
+            ),
             ...sourceData.importData.languages.map(m => {
-                return <IPreparedImportItem> {
+                return <IPreparedImportItem>{
                     codename: m.id,
                     deps: [],
                     item: m,
                     type: 'language'
                 };
             }),
             ...sourceData.importData.assets.map(m => {
-                return <IPreparedImportItem> {
+                return <IPreparedImportItem>{
                     codename: m.id,
                     deps: [],
                     item: m,
                     type: 'asset'
                 };
             }),
             ...sourceData.importData.contentItems.map(m => {
-                return <IPreparedImportItem> {
+                return <IPreparedImportItem>{
                     codename: m.codename,
                     deps: [],
                     item: m,
                     type: 'contentItem'
                 };
             }),
             ...sourceData.importData.languageVariants.map(m => {
-                return <IPreparedImportItem> {
+                return <IPreparedImportItem>{
                     codename: m.item.codename,
                     deps: [m.item.codename],
                     item: m,

diff --git a/src/import/import.models.ts b/src/import/import.models.ts
@@ -15,6 +15,7 @@ export interface IImportConfig {
     workflowIdForImportedItems: string;
     projectId: string;
     apiKey: string;
+    enableLog: boolean;
     onImport?: (item: IProcessedItem) => void;
     process?: {
         taxonomy?: (

diff --git a/src/import/import.service.ts b/src/import/import.service.ts
@@ -38,7 +38,16 @@ export class ImportService {
     public async importFromSourceAsync(
         sourceData: IImportSource
     ): Promise<IImportItemResult<ValidImportContract, ValidImportModel>[]> {
+
+        if (this.config.enableLog) {
+            console.log(`Preparing data for import`);
+        }
         const importData = importHelper.prepareImportData(sourceData);
+
+        if (this.config.enableLog) {
+            console.log(`Importing data`);
+        }
+
         return await this.importAsync(importData);
     }
 

diff --git a/src/zip/zip.service.ts b/src/zip/zip.service.ts
@@ -44,7 +44,7 @@ export class ZipService {
         }
         const assets = await this.readAndParseJsonFile(unzippedFile, this.assetsName);
 
-        return {
+        const result = {
             importData: {
                 assets,
                 contentTypes: await this.readAndParseJsonFile(unzippedFile, this.contentTypesName),
@@ -57,6 +57,12 @@ export class ZipService {
             assetFolders: await this.readAndParseJsonFile(unzippedFile, this.assetFoldersName),
             binaryFiles: await this.extractBinaryFilesAsync(unzippedFile, assets)
         };
+
+        if (this.config.enableLog) {
+            console.log(`Pasing zip completed`);
+        }
+
+        return result;
     }
 
     public async createZipAsync(exportData: IExportData, metadata: IExportMetadata): Promise<void> {