@memberjunction/server 2.121.0 → 2.122.0

package/src/resolvers/QueryResolver.ts

@@ -1,276 +1,276 @@
-import { Arg, Ctx, ObjectType, Query, Resolver, Field, Int } from 'type-graphql';
-import { RunQuery, QueryInfo, IRunQueryProvider, IMetadataProvider } from '@memberjunction/core';
-import { AppContext } from '../types.js';
-import { RequireSystemUser } from '../directives/RequireSystemUser.js';
-import { GraphQLJSONObject } from 'graphql-type-json';
-import { Metadata } from '@memberjunction/core';
-import { GetReadOnlyProvider } from '../util.js';
-
-@ObjectType()
-export class RunQueryResultType {
-  @Field()
-  QueryID: string;
-
-  @Field()
-  QueryName: string;
-
-  @Field()
-  Success: boolean;
-
-  @Field()
-  Results: string;
-
-  @Field()
-  RowCount: number;
-
-  @Field()
-  TotalRowCount: number;
-
-  @Field()
-  ExecutionTime: number;
-
-  @Field()
-  ErrorMessage: string;
-
-  @Field(() => String, { nullable: true })
-  AppliedParameters?: string;
-
-  @Field(() => Boolean, { nullable: true })
-  CacheHit?: boolean;
-
-  @Field(() => Int, { nullable: true })
-  CacheTTLRemaining?: number;
-}
-
-@Resolver()
-export class RunQueryResolver {
-  private async findQuery(md: IMetadataProvider, QueryID: string, QueryName?: string, CategoryID?: string, CategoryPath?: string, refreshMetadataIfNotFound: boolean = false): Promise<QueryInfo | null> {
-    // Filter queries based on provided criteria
-    const queries = md.Queries.filter(q => {
-      if (QueryID) {
-        return q.ID.trim().toLowerCase() === QueryID.trim().toLowerCase();
-      } else if (QueryName) {
-        let matches = q.Name.trim().toLowerCase() === QueryName.trim().toLowerCase();
-        if (CategoryID) {
-          matches = matches && q.CategoryID?.trim().toLowerCase() === CategoryID.trim().toLowerCase();
-        }
-        if (CategoryPath) {
-          matches = matches && q.Category?.trim().toLowerCase() === CategoryPath.trim().toLowerCase();
-        }
-        return matches;
-      }
-      return false;
-    });
-
-    if (queries.length === 0) {
-      if (refreshMetadataIfNotFound) {
-        // If we didn't find the query, refresh metadata and try again
-        await md.Refresh();
-        return this.findQuery(md, QueryID, QueryName, CategoryID, CategoryPath, false); // change the refresh flag to false so we don't loop infinitely
-      } 
-      else {
-        return null; // No query found and not refreshing metadata
-      }
-    }
-    else {
-      return queries[0];
-    }
-  }
-  @Query(() => RunQueryResultType)
-  async GetQueryData(@Arg('QueryID', () => String) QueryID: string, 
-                     @Ctx() context: AppContext,
-                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
-                     @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
-                     @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
-                     @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
-                     @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
-                     @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
-                     @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
-    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
-    const md = provider as unknown as IMetadataProvider;
-    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
-    console.log('GetQueryData called with:', { QueryID, Parameters, MaxRows, StartRow, ForceAuditLog, AuditLogDescription });
-    const result = await rq.RunQuery(
-      { 
-        QueryID: QueryID,
-        CategoryID: CategoryID,
-        CategoryPath: CategoryPath,
-        Parameters: Parameters,
-        MaxRows: MaxRows,
-        StartRow: StartRow,
-        ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      }, 
-      context.userPayload.userRecord);
-    console.log('RunQuery result:', { 
-      Success: result.Success, 
-      ErrorMessage: result.ErrorMessage,
-      AppliedParameters: result.AppliedParameters 
-    });
-    
-    // If QueryName is not populated by the provider, use efficient lookup
-    let queryName = result.QueryName;
-    if (!queryName) {
-      try {
-        const queryInfo = await this.findQuery(md, QueryID, undefined, CategoryID, CategoryPath, true);
-        if (queryInfo) {
-          queryName = queryInfo.Name;
-        }
-      } catch (error) {
-        console.error('Error finding query to get name:', error);
-      }
-    }
-    
-    return {
-      QueryID: QueryID,
-      QueryName: queryName || 'Unknown Query',
-      Success: result.Success ?? false,
-      Results: JSON.stringify(result.Results ?? null),
-      RowCount: result.RowCount ?? 0,
-      TotalRowCount: result.TotalRowCount ?? 0,
-      ExecutionTime: result.ExecutionTime ?? 0,
-      ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
-      CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
-    };
-  }
-
-  @Query(() => RunQueryResultType)
-  async GetQueryDataByName(@Arg('QueryName', () => String) QueryName: string, 
-                           @Ctx() context: AppContext,
-                           @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
-                           @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
-                           @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
-                           @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
-                           @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
-                           @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
-                           @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
-    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
-    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
-    const result = await rq.RunQuery(
-      { 
-        QueryName: QueryName, 
-        CategoryID: CategoryID,
-        CategoryPath: CategoryPath,
-        Parameters: Parameters,
-        MaxRows: MaxRows,
-        StartRow: StartRow,
-        ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      },
-      context.userPayload.userRecord);
-      
-    return {
-      QueryID: result.QueryID || '',
-      QueryName: QueryName,
-      Success: result.Success ?? false,
-      Results: JSON.stringify(result.Results ?? null),
-      RowCount: result.RowCount ?? 0,
-      TotalRowCount: result.TotalRowCount ?? 0,
-      ExecutionTime: result.ExecutionTime ?? 0,
-      ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
-      CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
-    };
-  }
-
-  @RequireSystemUser()
-  @Query(() => RunQueryResultType)
-  async GetQueryDataSystemUser(@Arg('QueryID', () => String) QueryID: string, 
-                               @Ctx() context: AppContext,
-                               @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
-                               @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
-                               @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
-                               @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
-                               @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
-                               @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
-                               @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
-    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
-    const md = provider as unknown as IMetadataProvider;
-    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
-
-    const result = await rq.RunQuery(
-      { 
-        QueryID: QueryID,
-        CategoryID: CategoryID,
-        CategoryPath: CategoryPath,
-        Parameters: Parameters,
-        MaxRows: MaxRows,
-        StartRow: StartRow,
-        ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      }, 
-      context.userPayload.userRecord);
-    
-    // If QueryName is not populated by the provider, use efficient lookup
-    let queryName = result.QueryName;
-    if (!queryName) {
-      try {
-        const queryInfo = await this.findQuery(md, QueryID, undefined, CategoryID, CategoryPath, true);
-        if (queryInfo) {
-          queryName = queryInfo.Name;
-        }
-      } catch (error) {
-        console.error('Error finding query to get name:', error);
-      }
-    }
-    
-    return {
-      QueryID: QueryID,
-      QueryName: queryName || 'Unknown Query',
-      Success: result.Success ?? false,
-      Results: JSON.stringify(result.Results ?? null),
-      RowCount: result.RowCount ?? 0,
-      TotalRowCount: result.TotalRowCount ?? 0,
-      ExecutionTime: result.ExecutionTime ?? 0,
-      ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
-      CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
-    };
-  }
-
-  @RequireSystemUser()
-  @Query(() => RunQueryResultType)
-  async GetQueryDataByNameSystemUser(@Arg('QueryName', () => String) QueryName: string, 
-                                     @Ctx() context: AppContext,
-                                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
-                                     @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
-                                     @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
-                                     @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
-                                     @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
-                                     @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
-                                     @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
-    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
-    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
-
-    const result = await rq.RunQuery(
-      { 
-        QueryName: QueryName,
-        CategoryID: CategoryID,
-        CategoryPath: CategoryPath,
-        Parameters: Parameters,
-        MaxRows: MaxRows,
-        StartRow: StartRow,
-        ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      }, 
-      context.userPayload.userRecord);
-    
-    return {
-      QueryID: result.QueryID || '',
-      QueryName: QueryName,
-      Success: result.Success ?? false,
-      Results: JSON.stringify(result.Results ?? null),
-      RowCount: result.RowCount ?? 0,
-      TotalRowCount: result.TotalRowCount ?? 0,
-      ExecutionTime: result.ExecutionTime ?? 0,
-      ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
-      CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
-    };
-  }
+import { Arg, Ctx, ObjectType, Query, Resolver, Field, Int } from 'type-graphql';
+import { RunQuery, QueryInfo, IRunQueryProvider, IMetadataProvider } from '@memberjunction/core';
+import { AppContext } from '../types.js';
+import { RequireSystemUser } from '../directives/RequireSystemUser.js';
+import { GraphQLJSONObject } from 'graphql-type-json';
+import { Metadata } from '@memberjunction/core';
+import { GetReadOnlyProvider } from '../util.js';
+
+@ObjectType()
+export class RunQueryResultType {
+  @Field()
+  QueryID: string;
+
+  @Field()
+  QueryName: string;
+
+  @Field()
+  Success: boolean;
+
+  @Field()
+  Results: string;
+
+  @Field()
+  RowCount: number;
+
+  @Field()
+  TotalRowCount: number;
+
+  @Field()
+  ExecutionTime: number;
+
+  @Field()
+  ErrorMessage: string;
+
+  @Field(() => String, { nullable: true })
+  AppliedParameters?: string;
+
+  @Field(() => Boolean, { nullable: true })
+  CacheHit?: boolean;
+
+  @Field(() => Int, { nullable: true })
+  CacheTTLRemaining?: number;
+}
+
+@Resolver()
+export class RunQueryResolver {
+  private async findQuery(md: IMetadataProvider, QueryID: string, QueryName?: string, CategoryID?: string, CategoryPath?: string, refreshMetadataIfNotFound: boolean = false): Promise<QueryInfo | null> {
+    // Filter queries based on provided criteria
+    const queries = md.Queries.filter(q => {
+      if (QueryID) {
+        return q.ID.trim().toLowerCase() === QueryID.trim().toLowerCase();
+      } else if (QueryName) {
+        let matches = q.Name.trim().toLowerCase() === QueryName.trim().toLowerCase();
+        if (CategoryID) {
+          matches = matches && q.CategoryID?.trim().toLowerCase() === CategoryID.trim().toLowerCase();
+        }
+        if (CategoryPath) {
+          matches = matches && q.Category?.trim().toLowerCase() === CategoryPath.trim().toLowerCase();
+        }
+        return matches;
+      }
+      return false;
+    });
+
+    if (queries.length === 0) {
+      if (refreshMetadataIfNotFound) {
+        // If we didn't find the query, refresh metadata and try again
+        await md.Refresh();
+        return this.findQuery(md, QueryID, QueryName, CategoryID, CategoryPath, false); // change the refresh flag to false so we don't loop infinitely
+      } 
+      else {
+        return null; // No query found and not refreshing metadata
+      }
+    }
+    else {
+      return queries[0];
+    }
+  }
+  @Query(() => RunQueryResultType)
+  async GetQueryData(@Arg('QueryID', () => String) QueryID: string, 
+                     @Ctx() context: AppContext,
+                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                     @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
+                     @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
+                     @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
+                     @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                     @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                     @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
+    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
+    const md = provider as unknown as IMetadataProvider;
+    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
+    console.log('GetQueryData called with:', { QueryID, Parameters, MaxRows, StartRow, ForceAuditLog, AuditLogDescription });
+    const result = await rq.RunQuery(
+      { 
+        QueryID: QueryID,
+        CategoryID: CategoryID,
+        CategoryPath: CategoryPath,
+        Parameters: Parameters,
+        MaxRows: MaxRows,
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
+      }, 
+      context.userPayload.userRecord);
+    console.log('RunQuery result:', { 
+      Success: result.Success, 
+      ErrorMessage: result.ErrorMessage,
+      AppliedParameters: result.AppliedParameters 
+    });
+    
+    // If QueryName is not populated by the provider, use efficient lookup
+    let queryName = result.QueryName;
+    if (!queryName) {
+      try {
+        const queryInfo = await this.findQuery(md, QueryID, undefined, CategoryID, CategoryPath, true);
+        if (queryInfo) {
+          queryName = queryInfo.Name;
+        }
+      } catch (error) {
+        console.error('Error finding query to get name:', error);
+      }
+    }
+    
+    return {
+      QueryID: QueryID,
+      QueryName: queryName || 'Unknown Query',
+      Success: result.Success ?? false,
+      Results: JSON.stringify(result.Results ?? null),
+      RowCount: result.RowCount ?? 0,
+      TotalRowCount: result.TotalRowCount ?? 0,
+      ExecutionTime: result.ExecutionTime ?? 0,
+      ErrorMessage: result.ErrorMessage || '',
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
+    };
+  }
+
+  @Query(() => RunQueryResultType)
+  async GetQueryDataByName(@Arg('QueryName', () => String) QueryName: string, 
+                           @Ctx() context: AppContext,
+                           @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                           @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
+                           @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
+                           @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
+                           @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                           @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                           @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
+    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
+    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
+    const result = await rq.RunQuery(
+      { 
+        QueryName: QueryName, 
+        CategoryID: CategoryID,
+        CategoryPath: CategoryPath,
+        Parameters: Parameters,
+        MaxRows: MaxRows,
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
+      },
+      context.userPayload.userRecord);
+      
+    return {
+      QueryID: result.QueryID || '',
+      QueryName: QueryName,
+      Success: result.Success ?? false,
+      Results: JSON.stringify(result.Results ?? null),
+      RowCount: result.RowCount ?? 0,
+      TotalRowCount: result.TotalRowCount ?? 0,
+      ExecutionTime: result.ExecutionTime ?? 0,
+      ErrorMessage: result.ErrorMessage || '',
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
+    };
+  }
+
+  @RequireSystemUser()
+  @Query(() => RunQueryResultType)
+  async GetQueryDataSystemUser(@Arg('QueryID', () => String) QueryID: string, 
+                               @Ctx() context: AppContext,
+                               @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                               @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
+                               @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
+                               @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
+                               @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                               @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                               @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
+    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
+    const md = provider as unknown as IMetadataProvider;
+    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
+
+    const result = await rq.RunQuery(
+      { 
+        QueryID: QueryID,
+        CategoryID: CategoryID,
+        CategoryPath: CategoryPath,
+        Parameters: Parameters,
+        MaxRows: MaxRows,
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
+      }, 
+      context.userPayload.userRecord);
+    
+    // If QueryName is not populated by the provider, use efficient lookup
+    let queryName = result.QueryName;
+    if (!queryName) {
+      try {
+        const queryInfo = await this.findQuery(md, QueryID, undefined, CategoryID, CategoryPath, true);
+        if (queryInfo) {
+          queryName = queryInfo.Name;
+        }
+      } catch (error) {
+        console.error('Error finding query to get name:', error);
+      }
+    }
+    
+    return {
+      QueryID: QueryID,
+      QueryName: queryName || 'Unknown Query',
+      Success: result.Success ?? false,
+      Results: JSON.stringify(result.Results ?? null),
+      RowCount: result.RowCount ?? 0,
+      TotalRowCount: result.TotalRowCount ?? 0,
+      ExecutionTime: result.ExecutionTime ?? 0,
+      ErrorMessage: result.ErrorMessage || '',
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
+    };
+  }
+
+  @RequireSystemUser()
+  @Query(() => RunQueryResultType)
+  async GetQueryDataByNameSystemUser(@Arg('QueryName', () => String) QueryName: string, 
+                                     @Ctx() context: AppContext,
+                                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                                     @Arg('CategoryPath', () => String, {nullable: true}) CategoryPath?: string,
+                                     @Arg('Parameters', () => GraphQLJSONObject, {nullable: true}) Parameters?: Record<string, any>,
+                                     @Arg('MaxRows', () => Int, {nullable: true}) MaxRows?: number,
+                                     @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                                     @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                                     @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
+    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
+    const rq = new RunQuery(provider as unknown as IRunQueryProvider);
+
+    const result = await rq.RunQuery(
+      { 
+        QueryName: QueryName,
+        CategoryID: CategoryID,
+        CategoryPath: CategoryPath,
+        Parameters: Parameters,
+        MaxRows: MaxRows,
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
+      }, 
+      context.userPayload.userRecord);
+    
+    return {
+      QueryID: result.QueryID || '',
+      QueryName: QueryName,
+      Success: result.Success ?? false,
+      Results: JSON.stringify(result.Results ?? null),
+      RowCount: result.RowCount ?? 0,
+      TotalRowCount: result.TotalRowCount ?? 0,
+      ExecutionTime: result.ExecutionTime ?? 0,
+      ErrorMessage: result.ErrorMessage || '',
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
+    };
+  }
 }