fix(mappingutils): use correct logger (#209)

* fix(mappingutils): use correct logger and remove log stuffing on unresolved references * refactor(mappingutils-log): add path to warning in denormalizeResolvedReferences
e-Spirit · May 3, 2024 · ff2253c · ff2253c
1 parent 2f2f897
commit ff2253c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/modules/FSXAProxyApi.ts b/src/modules/FSXAProxyApi.ts
@@ -149,7 +149,8 @@ export class FSXAProxyApi implements FSXAApi {
       mappedItems,
       referenceMap,
       resolvedReferences,
-      remoteProject
+      remoteProject,
+      this._logger
     )
 
     return mappedItems[0] as unknown as T
@@ -253,7 +254,8 @@ export class FSXAProxyApi implements FSXAApi {
       items as (CaasApi_Item | MappedCaasItem)[],
       referenceMap!,
       resolvedReferences!,
-      remoteProject
+      remoteProject,
+      this._logger
     )
 
     return { page, pagesize, totalPages, size, items } as FetchResponse
@@ -377,13 +379,17 @@ export class FSXAProxyApi implements FSXAApi {
     const denormalizedProjectPropertiesArray = denormalizeResolvedReferences(
       [data.projectProperties],
       data.projectPropertiesReferenceMap || {},
-      data.projectPropertiesResolvedReferences || {}
+      data.projectPropertiesResolvedReferences || {},
+      undefined,
+      this._logger
     )
 
     const resolveElements = denormalizeResolvedReferences(
       data.resolveItems,
       data.resolveReferenceMap || {},
-      data.resolveResolvedReferences || {}
+      data.resolveResolvedReferences || {},
+      undefined,
+      this._logger
     )
 
     const denormalizedProjectProperties =

diff --git a/src/modules/FSXARemoteApi.ts b/src/modules/FSXARemoteApi.ts
@@ -496,7 +496,8 @@ export class FSXARemoteApi implements FSXAApi {
           items as (MappedCaasItem | CaasApi_Item)[],
           referenceMap,
           resolvedReferences,
-          remoteProjectId
+          remoteProjectId,
+          this._logger
         )[0]
   }
 
@@ -669,7 +670,8 @@ export class FSXARemoteApi implements FSXAApi {
             mappedItems,
             referenceMap,
             resolvedReferences,
-            remoteProjectId
+            remoteProjectId,
+            this._logger
           ),
       ...(normalized && { referenceMap }),
       ...(normalized && { resolvedReferences }),

diff --git a/src/modules/MappingUtils.ts b/src/modules/MappingUtils.ts
@@ -1,6 +1,7 @@
 import { set, get } from 'lodash'
 import { CaasApi_Item, Image, MappedCaasItem, NestedPath } from '../types'
 import { ResolvedReferencesInfo, ReferencedItemsInfo } from './CaaSMapper'
+import { Logger } from './Logger'
 
 const IMAGE_MAP_PLACEHOLDER = 'IMAGEMAP'
 const IMAGE_MAP_RESOLUTION_SPLIT_DELIMITER = '___'
@@ -73,7 +74,8 @@ const denormalizeResolvedReferences = (
   mappedItems: (CaasApi_Item | MappedCaasItem)[],
   referenceMap: ReferencedItemsInfo,
   resolvedReferences: ResolvedReferencesInfo,
-  remoteProjectId?: string
+  remoteProjectId?: string,
+  logger?: Logger
 ) => {
   if (!referenceMap || Object.keys(referenceMap).length === 0)
     return mappedItems
@@ -93,10 +95,8 @@ const denormalizeResolvedReferences = (
           resolvedImage || resolvedReferences[referencedId]
         )
       } else {
-        console.warn(
-          `[denormalizeResolvedReferences] Unable to find object [${referencedId}] during denormalization. resolvedReferencesKeys: {[${Object.keys(
-            resolvedReferences
-          ).join('],[')}]}`
+        logger?.warn(
+          `[denormalizeResolvedReferences] Unable to find object [${referencedId}] during denormalization for path [${path}].`
         )
       }
     })