@tmdb-graphql-api/resolvers 0.1.2-unstable.5 → 0.1.2-unstable.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmdb-graphql-api/resolvers",
   "description": "The TMDB GraphQL resolvers module.",
-  "version": "0.1.2-unstable.5",
+  "version": "0.1.2-unstable.7",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/themoviedb-graphql-api",

package/src/helpers/buildArgsResolver.ts

@@ -25,8 +25,8 @@ export const buildArgsResolver =
 
     const childLogger = logger.child(newCtx.data);
 
-    childLogger.info(`Resolving ${fieldName}`);
-    const { data, errors, headers, source = 'api' } = await callback(args, newCtx, info);
+    childLogger.info(`Resolving ${fieldName} ${JSON.stringify(args)}`);
+    const { data, errors, headers } = await callback(args, newCtx, info);
 
     if (errors?.length) {
       const message = `Failed to resolve ${fieldName}`;
@@ -34,7 +34,6 @@ export const buildArgsResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    childLogger.info(`Successfully resolved ${fieldName} from ${source}`);
     setCacheMetadata(fieldName, headers);
     return data;
   };

package/src/helpers/buildNoObjArgsResolver.ts

@@ -32,7 +32,6 @@ export const buildNoObjArgsResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    childLogger.info(`Successfully resolved ${fieldPath} from api`);
     setCacheMetadata(fieldPath, headers);
     return data;
   };

package/src/helpers/buildObjArgsResolver.ts

@@ -26,17 +26,30 @@ export const buildObjArgsResolver =
     };
 
     const childLogger = logger.child(newCtx.data);
-    childLogger.info(`Resolving ${fieldPath}`);
-    const { data, errors, headers, source = 'api' } = await callback(obj, args, newCtx, info);
+    const loggingEnabled = !obj || fieldName === 'id';
+    const id = obj && 'id' in obj && obj.id ? obj.id : 'id' in args ? args.id : undefined;
+
+    const enrichLogMessage = (message: string) => {
+      const enrichedMessage = `${message} ${fieldPath}`;
+      return id ? `${enrichedMessage} ${String(id)}` : enrichedMessage;
+    };
+
+    if (loggingEnabled) {
+      childLogger.info(enrichLogMessage('Resolving'));
+    }
+
+    const { data, errors, headers } = await callback(obj, args, newCtx, info);
 
     if (errors?.length) {
-      const message = `Failed to resolve ${fieldPath}`;
-      childLogger.error(message, { errors });
+      const message = enrichLogMessage('Failed to resolve');
+
+      if (loggingEnabled) {
+        childLogger.error(message, { errors });
+      }
+
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    childLogger.info(`Successfully resolved ${fieldPath} from ${source}`);
-
     if (headers) {
       setCacheMetadata(fieldPath, headers);
     }

package/src/helpers/buildObjResolver.ts

@@ -33,7 +33,7 @@ export const buildObjResolver =
     }
 
     childLogger.info(`Resolving ${fieldPath}`);
-    const { data, errors, headers, source = 'api' } = await callback(obj, newCtx, info);
+    const { data, errors, headers } = await callback(obj, newCtx, info);
 
     if (errors?.length) {
       const message = `Failed to resolve ${fieldPath}`;
@@ -41,8 +41,6 @@ export const buildObjResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    childLogger.info(`Successfully resolved ${fieldPath} from ${source}`);
-
     if (headers) {
       setCacheMetadata(fieldPath, headers);
     }