@rsdk/graphql 5.7.0-next.6 → 6.0.0-next.1

package/dist/graphql.log-formatter.d.ts

@@ -0,0 +1,13 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { LogFormatter } from '@rsdk/core';
+export declare class GraphqlLogFormatter implements LogFormatter {
+    readonly protocol = "graphql";
+    shouldLog(context: ExecutionContext): boolean;
+    getPath(context: ExecutionContext): string;
+    /**
+     * TODO: Проверить, что не вызывается несколько раз, если несколько
+     * резолверов.
+     */
+    formatRequest(context: ExecutionContext, includeBody: boolean): Record<string, unknown>;
+    formatResponse(context: ExecutionContext, body: unknown | undefined): Record<string, unknown>;
+}

package/dist/graphql.log-formatter.js

@@ -0,0 +1,53 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphqlLogFormatter = void 0;
+const common_1 = require("@nestjs/common");
+const graphql_1 = require("@nestjs/graphql");
+let GraphqlLogFormatter = class GraphqlLogFormatter {
+    protocol = 'graphql';
+    shouldLog(context) {
+        const { prev } = graphql_1.GqlExecutionContext.create(context).getInfo().path;
+        /**
+         * No logging for nested resolvers
+         */
+        return !prev;
+    }
+    getPath(context) {
+        const { key, typename } = graphql_1.GqlExecutionContext.create(context).getInfo().path;
+        return `${typename.toLowerCase()} - ${key}`;
+    }
+    /**
+     * TODO: Проверить, что не вызывается несколько раз, если несколько
+     * резолверов.
+     */
+    formatRequest(context, includeBody) {
+        const { req } = graphql_1.GqlExecutionContext.create(context).getContext();
+        return {
+            ...(includeBody && { body: req.body }),
+            query: req.query,
+            params: req.params,
+            method: req.method,
+            url: req.url,
+            headers: req.headers,
+        };
+    }
+    formatResponse(context, body) {
+        const { req: { res }, } = graphql_1.GqlExecutionContext.create(context).getContext();
+        return {
+            headers: res.getHeaders(),
+            statusCode: res.statusCode,
+            body,
+        };
+    }
+};
+exports.GraphqlLogFormatter = GraphqlLogFormatter;
+exports.GraphqlLogFormatter = GraphqlLogFormatter = __decorate([
+    (0, common_1.Injectable)()
+], GraphqlLogFormatter);
+//# sourceMappingURL=graphql.log-formatter.js.map

package/dist/graphql.log-formatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql.log-formatter.js","sourceRoot":"","sources":["../src/graphql.log-formatter.ts"],"names":[],"mappings":";;;;;;;;;AACA,2CAA4C;AAC5C,6CAAsD;AAI/C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IACrB,QAAQ,GAAG,SAAS,CAAC;IAE9B,SAAS,CAAC,OAAyB;QACjC,MAAM,EAAE,IAAI,EAAE,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;QAEpE;;WAEG;QACH,OAAO,CAAC,IAAI,CAAC;IACf,CAAC;IAED,OAAO,CAAC,OAAyB;QAC/B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GACrB,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;QAErD,OAAO,GAAG,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACH,aAAa,CACX,OAAyB,EACzB,WAAoB;QAEpB,MAAM,EAAE,GAAG,EAAE,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAEjE,OAAO;YACL,GAAG,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;YACtC,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAC;IACJ,CAAC;IAED,cAAc,CACZ,OAAyB,EACzB,IAAyB;QAEzB,MAAM,EACJ,GAAG,EAAE,EAAE,GAAG,EAAE,GACb,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAErD,OAAO;YACL,OAAO,EAAE,GAAG,CAAC,UAAU,EAAE;YACzB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,IAAI;SACL,CAAC;IACJ,CAAC;CACF,CAAA;AArDY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;GACA,mBAAmB,CAqD/B"}

package/dist/graphql.plugin.d.ts

@@ -1,6 +1,6 @@
 import type { MiddlewareConsumer } from '@nestjs/common';
 import type { AutoSchemaFileValue } from '@nestjs/graphql';
-import type { IErrorsFormatter, IErrorsSender, NestModuleDefinitions, PlatformAppPlugin, WithGenericHeaders } from '@rsdk/core';
+import type { IErrorsFormatter, IErrorsSender, LogFormatter, NestModuleDefinitions, PlatformAppPlugin, WithGenericHeaders } from '@rsdk/core';
 export type Approach = 'schema-first' | 'code-first';
 export interface GraphQLPluginOptions<T extends Approach> {
     approach: T;
@@ -24,6 +24,7 @@ export declare class GraphQLPlugin implements PlatformAppPlugin {
         extractor: WithGenericHeaders;
     }[];
     forTransports(): Readonly<string[]>;
+    logFormatter(): LogFormatter;
     modules(): NestModuleDefinitions;
     configureMiddleware(consumer: MiddlewareConsumer): void;
     errorFormatter(): IErrorsFormatter;

package/dist/graphql.plugin.js

@@ -4,14 +4,13 @@ exports.GraphQLPlugin = exports.isCodeFirst = exports.isSchemaFirst = void 0;
 const inlineTrace_1 = require("@apollo/server/plugin/inlineTrace");
 const default_1 = require("@apollo/server/plugin/landingPage/default");
 const apollo_1 = require("@nestjs/apollo");
-const core_1 = require("@nestjs/core");
 const graphql_1 = require("@nestjs/graphql");
 const logging_1 = require("@rsdk/logging");
 const apollo_logger_adapter_1 = require("./apollo-logger.adapter");
 const config_1 = require("./config");
 const error_handling_1 = require("./error-handling");
 const gql_headers_1 = require("./gql.headers");
-const graphql_logger_interceptor_1 = require("./graphql-logger.interceptor");
+const graphql_log_formatter_1 = require("./graphql.log-formatter");
 const onConnect = (connectionParams) => {
     const out = connectionParams ?? {};
     const headers = out.headers ?? {};
@@ -49,17 +48,11 @@ class GraphQLPlugin {
     forTransports() {
         return ['http'];
     }
+    logFormatter() {
+        return new graphql_log_formatter_1.GraphqlLogFormatter();
+    }
     modules() {
         return [
-            {
-                module: GraphQLPlugin,
-                providers: [
-                    {
-                        provide: core_1.APP_INTERCEPTOR,
-                        useClass: graphql_logger_interceptor_1.GraphqlLoggerInterceptor,
-                    },
-                ],
-            },
             graphql_1.GraphQLModule.forRootAsync({
                 inject: [config_1.GraphqlConfig],
                 driver: apollo_1.ApolloDriver,

package/dist/graphql.plugin.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/graphql",
-  "version": "5.7.0-next.6",
+  "version": "6.0.0-next.1",
   "description": "Plugin for graphql",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -18,7 +18,7 @@
     "@nestjs/apollo": "^12.0.0",
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
-    "@nestjs/graphql": "^12.2.2",
+    "@nestjs/graphql": "^12.0.8",
     "@rsdk/common": "*",
     "@rsdk/core": "*",
     "@rsdk/http.server": "*",
@@ -27,7 +27,7 @@
     "graphql": "^16.6.0",
     "graphql-subscriptions": "^2.0.0",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0"
+    "rxjs": "^7.8.1"
   },
-  "gitHead": "287622c55e8717861544f0be502bb37a6b19bbfb"
+  "gitHead": "3114a76df17cf98d6f3cbb8a931599a883af6783"
 }

package/src/graphql.log-formatter.ts

@@ -0,0 +1,60 @@
+import type { ExecutionContext } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
+import { GqlExecutionContext } from '@nestjs/graphql';
+import type { LogFormatter } from '@rsdk/core';
+
+@Injectable()
+export class GraphqlLogFormatter implements LogFormatter {
+  readonly protocol = 'graphql';
+
+  shouldLog(context: ExecutionContext): boolean {
+    const { prev } = GqlExecutionContext.create(context).getInfo().path;
+
+    /**
+     * No logging for nested resolvers
+     */
+    return !prev;
+  }
+
+  getPath(context: ExecutionContext): string {
+    const { key, typename } =
+      GqlExecutionContext.create(context).getInfo().path;
+
+    return `${typename.toLowerCase()} - ${key}`;
+  }
+
+  /**
+   * TODO: Проверить, что не вызывается несколько раз, если несколько
+   * резолверов.
+   */
+  formatRequest(
+    context: ExecutionContext,
+    includeBody: boolean,
+  ): Record<string, unknown> {
+    const { req } = GqlExecutionContext.create(context).getContext();
+
+    return {
+      ...(includeBody && { body: req.body }),
+      query: req.query,
+      params: req.params,
+      method: req.method,
+      url: req.url,
+      headers: req.headers,
+    };
+  }
+
+  formatResponse(
+    context: ExecutionContext,
+    body: unknown | undefined,
+  ): Record<string, unknown> {
+    const {
+      req: { res },
+    } = GqlExecutionContext.create(context).getContext();
+
+    return {
+      headers: res.getHeaders(),
+      statusCode: res.statusCode,
+      body,
+    };
+  }
+}

package/src/graphql.plugin.ts

@@ -3,12 +3,12 @@ import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin
 import type { ApolloDriverConfig } from '@nestjs/apollo';
 import { ApolloDriver } from '@nestjs/apollo';
 import type { MiddlewareConsumer } from '@nestjs/common';
-import { APP_INTERCEPTOR } from '@nestjs/core';
 import type { AutoSchemaFileValue } from '@nestjs/graphql';
 import { GraphQLModule } from '@nestjs/graphql';
 import type {
   IErrorsFormatter,
   IErrorsSender,
+  LogFormatter,
   NestModuleDefinitions,
   PlatformAppPlugin,
   WithGenericHeaders,
@@ -19,7 +19,7 @@ import { ApolloLoggerAdapter } from './apollo-logger.adapter';
 import { GraphqlConfig, Playground } from './config';
 import { GraphQLErrorsFormatter, GraphQLErrorsSender } from './error-handling';
 import { GqlHeaders } from './gql.headers';
-import { GraphqlLoggerInterceptor } from './graphql-logger.interceptor';
+import { GraphqlLogFormatter } from './graphql.log-formatter';
 
 const onConnect = (connectionParams: any): any => {
   const out = connectionParams ?? {};
@@ -99,17 +99,12 @@ export class GraphQLPlugin implements PlatformAppPlugin {
     return ['http'];
   }
 
+  logFormatter(): LogFormatter {
+    return new GraphqlLogFormatter();
+  }
+
   modules(): NestModuleDefinitions {
     return [
-      {
-        module: GraphQLPlugin,
-        providers: [
-          {
-            provide: APP_INTERCEPTOR,
-            useClass: GraphqlLoggerInterceptor,
-          },
-        ],
-      },
       GraphQLModule.forRootAsync<ApolloDriverConfig>({
         inject: [GraphqlConfig],
         driver: ApolloDriver,

package/dist/graphql-logger.interceptor.d.ts

@@ -1,10 +0,0 @@
-import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
-import { ILogger } from '@rsdk/logging';
-import type { Observable } from 'rxjs/internal/Observable';
-import { GraphqlConfig } from './config';
-export declare class GraphqlLoggerInterceptor implements NestInterceptor {
-    private logger;
-    private graphQLConfig;
-    constructor(logger: ILogger, graphQLConfig: GraphqlConfig);
-    intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any> | Promise<Observable<any>>;
-}

package/dist/graphql-logger.interceptor.js

@@ -1,80 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphqlLoggerInterceptor = void 0;
-const common_1 = require("@nestjs/common");
-const graphql_1 = require("@nestjs/graphql");
-const core_1 = require("@rsdk/core");
-const throwError_1 = require("rxjs/internal/observable/throwError");
-const catchError_1 = require("rxjs/internal/operators/catchError");
-const tap_1 = require("rxjs/internal/operators/tap");
-const config_1 = require("./config");
-let GraphqlLoggerInterceptor = class GraphqlLoggerInterceptor {
-    logger;
-    graphQLConfig;
-    constructor(logger, graphQLConfig) {
-        this.logger = logger;
-        this.graphQLConfig = graphQLConfig;
-    }
-    intercept(context, next) {
-        if (!this.graphQLConfig.requestLogging) {
-            return next.handle();
-        }
-        const isGraphql = context.getType() === 'graphql';
-        if (!isGraphql) {
-            return next.handle();
-        }
-        const { req: request } = graphql_1.GqlExecutionContext.create(context).getContext();
-        const startDate = Date.now();
-        const requestForLog = {
-            body: request.body,
-            query: request.query,
-            params: request.params,
-            method: request.method,
-            url: request.url,
-            headers: request.headers,
-        };
-        this.logger.trace('received graphql request', {
-            request: requestForLog,
-            timestamp: startDate,
-        });
-        return next.handle().pipe((0, catchError_1.catchError)((error) => {
-            const endDate = Date.now();
-            this.logger.trace('handled graphql request with error', {
-                request: requestForLog,
-                startDate,
-                endDate,
-                duration: endDate - startDate,
-                error,
-            });
-            return (0, throwError_1.throwError)(() => error);
-        }), (0, tap_1.tap)((response) => {
-            const endDate = Date.now();
-            this.logger.trace('handled graphql request', {
-                request: requestForLog,
-                startDate,
-                endDate,
-                duration: endDate - startDate,
-                response,
-            });
-        }));
-    }
-};
-exports.GraphqlLoggerInterceptor = GraphqlLoggerInterceptor;
-exports.GraphqlLoggerInterceptor = GraphqlLoggerInterceptor = __decorate([
-    (0, common_1.Injectable)(),
-    __param(0, (0, core_1.InjectLogger)(GraphqlLoggerInterceptor)),
-    __metadata("design:paramtypes", [Object, config_1.GraphqlConfig])
-], GraphqlLoggerInterceptor);
-//# sourceMappingURL=graphql-logger.interceptor.js.map

package/dist/graphql-logger.interceptor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"graphql-logger.interceptor.js","sourceRoot":"","sources":["../src/graphql-logger.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAA4C;AAE5C,6CAAsD;AACtD,qCAA0C;AAG1C,oEAAiE;AACjE,mEAAgE;AAChE,qDAAkD;AAElD,qCAAyC;AAGlC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEe;IACxC;IAFV,YACkD,MAAe,EACvD,aAA4B;QADY,WAAM,GAAN,MAAM,CAAS;QACvD,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IAEJ,SAAS,CACP,OAAyB,EACzB,IAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAkB,KAAK,SAAS,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAE1E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YAC5C,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACvB,IAAA,uBAAU,EAAC,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;gBACtD,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,KAAK;aACN,CAAC,CAAC;YACH,OAAO,IAAA,uBAAU,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,EACF,IAAA,SAAG,EAAC,CAAC,QAAQ,EAAE,EAAE;YACf,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBAC3C,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA7DY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,mBAAY,EAAC,wBAAwB,CAAC,CAAA;6CAChB,sBAAa;GAH3B,wBAAwB,CA6DpC"}

package/src/graphql-logger.interceptor.ts

@@ -1,80 +0,0 @@
-import type {
-  CallHandler,
-  ExecutionContext,
-  NestInterceptor,
-} from '@nestjs/common';
-import { Injectable } from '@nestjs/common';
-import type { GqlContextType } from '@nestjs/graphql';
-import { GqlExecutionContext } from '@nestjs/graphql';
-import { InjectLogger } from '@rsdk/core';
-import { ILogger } from '@rsdk/logging';
-import type { Observable } from 'rxjs/internal/Observable';
-import { throwError } from 'rxjs/internal/observable/throwError';
-import { catchError } from 'rxjs/internal/operators/catchError';
-import { tap } from 'rxjs/internal/operators/tap';
-
-import { GraphqlConfig } from './config';
-
-@Injectable()
-export class GraphqlLoggerInterceptor implements NestInterceptor {
-  constructor(
-    @InjectLogger(GraphqlLoggerInterceptor) private logger: ILogger,
-    private graphQLConfig: GraphqlConfig,
-  ) {}
-
-  intercept(
-    context: ExecutionContext,
-    next: CallHandler<any>,
-  ): Observable<any> | Promise<Observable<any>> {
-    if (!this.graphQLConfig.requestLogging) {
-      return next.handle();
-    }
-    const isGraphql = context.getType<GqlContextType>() === 'graphql';
-    if (!isGraphql) {
-      return next.handle();
-    }
-
-    const { req: request } = GqlExecutionContext.create(context).getContext();
-
-    const startDate = Date.now();
-    const requestForLog = {
-      body: request.body,
-      query: request.query,
-      params: request.params,
-      method: request.method,
-      url: request.url,
-      headers: request.headers,
-    };
-
-    this.logger.trace('received graphql request', {
-      request: requestForLog,
-      timestamp: startDate,
-    });
-
-    return next.handle().pipe(
-      catchError((error) => {
-        const endDate = Date.now();
-
-        this.logger.trace('handled graphql request with error', {
-          request: requestForLog,
-          startDate,
-          endDate,
-          duration: endDate - startDate,
-          error,
-        });
-        return throwError(() => error);
-      }),
-      tap((response) => {
-        const endDate = Date.now();
-
-        this.logger.trace('handled graphql request', {
-          request: requestForLog,
-          startDate,
-          endDate,
-          duration: endDate - startDate,
-          response,
-        });
-      }),
-    );
-  }
-}