@axinom/mosaic-service-common 0.36.0-rc.9 → 0.36.0

package/dist/common/errors/graphql-errors-customization.d.ts

@@ -29,6 +29,6 @@ export declare const customizeGraphQlErrorFields: (errorDataMapper?: MosaicError
     code?: string;
     extensions?: Dict<unknown>;
 };
-export declare const logGraphQlError: (writeLogMapper?: WriteLogMapper, logger?: Logger) => (error: GraphQLErrorExtended, graphQlOperations?: GraphQlOperation[]) => void;
+export declare const logGraphQlError: (writeLogMapper?: WriteLogMapper, logger?: Logger) => (error: GraphQLErrorExtended, originalError?: Error | null, graphQlOperations?: GraphQlOperation[]) => void;
 export {};
 //# sourceMappingURL=graphql-errors-customization.d.ts.map

package/dist/common/errors/graphql-errors-customization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-errors-customization.d.ts","sourceRoot":"","sources":["../../../src/common/errors/graphql-errors-customization.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGhF;;GAEG;AACH,UAAU,gBAAgB;IACxB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;IAClD;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AA6CD;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,qBACpB,iBAAiB,aAE5B,YAAY,kBACH,KAAK,GAAG,IAAI,KACzB;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;CAqB5B,CAAC;AAEF,eAAO,MAAM,eAAe,oBACT,cAAc,WACvB,MAAM,aAEN,oBAAoB,sBAAsB,gBAAgB,EAAE,KAAG,IA2BxE,CAAC"}
+{"version":3,"file":"graphql-errors-customization.d.ts","sourceRoot":"","sources":["../../../src/common/errors/graphql-errors-customization.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGhF;;GAEG;AACH,UAAU,gBAAgB;IACxB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;IAClD;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AA6CD;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,qBACpB,iBAAiB,aAE5B,YAAY,kBACH,KAAK,GAAG,IAAI,KACzB;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;CAqB5B,CAAC;AAEF,eAAO,MAAM,eAAe,oBACT,cAAc,WACvB,MAAM,aAGL,oBAAoB,kBACX,KAAK,GAAG,IAAI,sBACR,gBAAgB,EAAE,KACrC,IA4BJ,CAAC"}

package/dist/common/errors/graphql-errors-customization.js

@@ -66,9 +66,8 @@ const customizeGraphQlErrorFields = (errorDataMapper) => {
 };
 exports.customizeGraphQlErrorFields = customizeGraphQlErrorFields;
 const logGraphQlError = (writeLogMapper, logger = new logging_1.Logger({ context: 'GraphQLErrorHandler' })) => {
-    return (error, graphQlOperations) => {
-        var _a, _b;
-        const { message } = error, _c = error.extensions, { timestamp: logtime, exception: { code } } = _c, rest = __rest(_c, ["timestamp", "exception"]);
+    return (error, originalError, graphQlOperations) => {
+        const { message } = error, _a = error.extensions, { timestamp: logtime, exception: { code } } = _a, rest = __rest(_a, ["timestamp", "exception"]);
         const log = {
             logtime,
             message,
@@ -76,8 +75,8 @@ const logGraphQlError = (writeLogMapper, logger = new logging_1.Logger({ context
                 graphQlOperations })),
         };
         writeLogMapper
-            ? writeLogMapper(log, (_a = error.originalError) !== null && _a !== void 0 ? _a : error, logger)
-            : logger.log((_b = error.originalError) !== null && _b !== void 0 ? _b : error, log);
+            ? writeLogMapper(log, originalError !== null && originalError !== void 0 ? originalError : error, logger)
+            : logger.log(originalError !== null && originalError !== void 0 ? originalError : error, log);
     };
 };
 exports.logGraphQlError = logGraphQlError;

package/dist/common/errors/graphql-errors-customization.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-errors-customization.js","sourceRoot":"","sources":["../../../src/common/errors/graphql-errors-customization.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql-errors-customization.js","sourceRoot":"","sources":["../../../src/common/errors/graphql-errors-customization.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-service-common",
-  "version": "0.36.0-rc.9",
+  "version": "0.36.0",
   "description": "Common helpers and PostgreSQL-related functionality",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "294d6a683845640ef70dc4ed5e9f057dfaacc388"
+  "gitHead": "cb1823de8e408b481091bfe0b0107815e8b49880"
 }

package/src/common/errors/graphql-errors-customization.spec.ts

@@ -40,6 +40,7 @@ describe('GraphQL errors customization', () => {
   let testLogger: Logger;
   let timestampBeforeTest: Date;
   let errorOverride: jest.SpyInstance;
+  let debugOverride: jest.SpyInstance;
 
   const defaultCustomizer = customizeGraphQlErrorFields(defaultPgErrorMapper);
 
@@ -50,9 +51,12 @@ describe('GraphQL errors customization', () => {
 
   beforeEach(async () => {
     timestampBeforeTest = createOffsetDate(-20);
-    errorOverride = await jest
+    errorOverride = jest
       .spyOn(console, 'error')
       .mockImplementation((obj) => JSON.parse(obj));
+    debugOverride = jest
+      .spyOn(console, 'debug')
+      .mockImplementation((obj) => JSON.parse(obj));
   });
 
   afterEach(async () => {
@@ -117,16 +121,16 @@ describe('GraphQL errors customization', () => {
       log: jest.fn(),
     };
     const mockWriteLogMapper = jest.fn();
+    const originalError = new Error('original');
     const error = createGraphQLError('Sample error message', {
       extensions: {
         timestamp: '2023-07-20T12:00:00',
         exception: { code: 'ERROR_CODE' },
       },
-      originalError: new Error('original'),
     });
 
     const logFunction = logGraphQlError(mockWriteLogMapper, mockLogger as any);
-    logFunction(error);
+    logFunction(error, originalError);
 
     expect(mockWriteLogMapper).toHaveBeenCalledTimes(1);
     expect(mockWriteLogMapper).toHaveBeenCalledWith(
@@ -137,26 +141,61 @@ describe('GraphQL errors customization', () => {
           code: 'ERROR_CODE',
         },
       }),
-      error.originalError ?? error,
+      originalError,
       expect.anything(),
     );
   });
 
-  it('minimal internal server error -> valid response', async () => {
+  it('minimal graphql error without originalError -> valid response', async () => {
     // Arrange
     const now = new Date().toISOString();
     const error = createGraphQLError('test', {
       extensions: {
         timestamp: now,
-        exception: { code: MosaicErrors.InternalServerError.code },
+        exception: { code: MosaicErrors.GraphQLValidationFailed.code },
       },
-      originalError: new Error('original'),
     });
 
     // Act
     const logger = logGraphQlError(defaultWriteLogMapper, testLogger);
     logger(error);
 
+    // Assert
+    const loggedObject = getFirstMockResult<any>(debugOverride);
+    toBeIso8601Strict(loggedObject.logtime);
+    dateToBeInRange(loggedObject.logtime, timestampBeforeTest);
+    expect(loggedObject.error?.stack).toStartWith('Error: test\n');
+    expect(loggedObject).toMatchObject({
+      loglevel: 'DEBUG',
+      message: 'test',
+      context: 'GraphQLErrorHandler',
+      component: 'navy-asset-service_test',
+      details: {
+        code: MosaicErrors.GraphQLValidationFailed.code,
+      },
+      error: {
+        name: 'Error',
+        message: 'test',
+        stack: loggedObject.error?.stack,
+      },
+    });
+  });
+
+  it('minimal internal server error with originalError -> valid response', async () => {
+    // Arrange
+    const now = new Date().toISOString();
+    const originalError = new Error('original');
+    const error = createGraphQLError('test', {
+      extensions: {
+        timestamp: now,
+        exception: { code: MosaicErrors.InternalServerError.code },
+      },
+    });
+
+    // Act
+    const logger = logGraphQlError(defaultWriteLogMapper, testLogger);
+    logger(error, originalError);
+
     // Assert
     const loggedObject = getFirstMockResult<any>(errorOverride);
     toBeIso8601Strict(loggedObject.logtime);

package/src/common/errors/graphql-errors-customization.ts

@@ -111,10 +111,15 @@ export const logGraphQlError = (
   writeLogMapper?: WriteLogMapper,
   logger: Logger = new Logger({ context: 'GraphQLErrorHandler' }),
 ): {
-  (error: GraphQLErrorExtended, graphQlOperations?: GraphQlOperation[]): void;
+  (
+    error: GraphQLErrorExtended,
+    originalError?: Error | null,
+    graphQlOperations?: GraphQlOperation[],
+  ): void;
 } => {
   return (
     error: GraphQLErrorExtended,
+    originalError?: Error | null,
     graphQlOperations?: GraphQlOperation[],
   ): void => {
     const {
@@ -135,7 +140,7 @@ export const logGraphQlError = (
       }),
     };
     writeLogMapper
-      ? writeLogMapper(log, error.originalError ?? error, logger)
-      : logger.log(error.originalError ?? error, log);
+      ? writeLogMapper(log, originalError ?? error, logger)
+      : logger.log(originalError ?? error, log);
   };
 };