@memberjunction/server 2.111.1 → 2.112.0

package/src/resolvers/QueryResolver.ts

@@ -1,9 +1,9 @@
 import { Arg, Ctx, ObjectType, Query, Resolver, Field, Int } from 'type-graphql';
-import { RunQuery, QueryInfo, IRunQueryProvider, IMetadataProvider } from '@memberjunction/core';
+import { RunQuery, QueryInfo, IRunQueryProvider, IMetadataProvider } from '@memberjunction/global';
 import { AppContext } from '../types.js';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { GraphQLJSONObject } from 'graphql-type-json';
-import { Metadata } from '@memberjunction/core';
+import { Metadata } from '@memberjunction/global';
 import { GetReadOnlyProvider } from '../util.js';
 
 @ObjectType()
@@ -44,9 +44,16 @@ export class RunQueryResultType {
 
 @Resolver()
 export class RunQueryResolver {
-  private async findQuery(md: IMetadataProvider, QueryID: string, QueryName?: string, CategoryID?: string, CategoryPath?: string, refreshMetadataIfNotFound: boolean = false): Promise<QueryInfo | null> {
+  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 => {
+    const queries = md.Queries.filter((q) => {
       if (QueryID) {
         return q.ID.trim().toLowerCase() === QueryID.trim().toLowerCase();
       } else if (QueryName) {
@@ -67,31 +74,31 @@ export class RunQueryResolver {
         // 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 {
+      } else {
         return null; // No query found and not refreshing metadata
       }
-    }
-    else {
+    } 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});
+  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,
@@ -99,15 +106,16 @@ export class RunQueryResolver {
         MaxRows: MaxRows,
         StartRow: StartRow,
         ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      }, 
-      context.userPayload.userRecord);
-    console.log('RunQuery result:', { 
-      Success: result.Success, 
+        AuditLogDescription: AuditLogDescription,
+      },
+      context.userPayload.userRecord
+    );
+    console.log('RunQuery result:', {
+      Success: result.Success,
       ErrorMessage: result.ErrorMessage,
-      AppliedParameters: result.AppliedParameters 
+      AppliedParameters: result.AppliedParameters,
     });
-    
+
     // If QueryName is not populated by the provider, use efficient lookup
     let queryName = result.QueryName;
     if (!queryName) {
@@ -120,7 +128,7 @@ export class RunQueryResolver {
         console.error('Error finding query to get name:', error);
       }
     }
-    
+
     return {
       QueryID: QueryID,
       QueryName: queryName || 'Unknown Query',
@@ -132,35 +140,38 @@ export class RunQueryResolver {
       ErrorMessage: result.ErrorMessage || '',
       AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
       CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
+      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});
+  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, 
+      {
+        QueryName: QueryName,
         CategoryID: CategoryID,
         CategoryPath: CategoryPath,
         Parameters: Parameters,
         MaxRows: MaxRows,
         StartRow: StartRow,
         ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
+        AuditLogDescription: AuditLogDescription,
       },
-      context.userPayload.userRecord);
-      
+      context.userPayload.userRecord
+    );
+
     return {
       QueryID: result.QueryID || '',
       QueryName: QueryName,
@@ -172,27 +183,29 @@ export class RunQueryResolver {
       ErrorMessage: result.ErrorMessage || '',
       AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
       CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
+      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});
+  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,
@@ -200,10 +213,11 @@ export class RunQueryResolver {
         MaxRows: MaxRows,
         StartRow: StartRow,
         ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      }, 
-      context.userPayload.userRecord);
-    
+        AuditLogDescription: AuditLogDescription,
+      },
+      context.userPayload.userRecord
+    );
+
     // If QueryName is not populated by the provider, use efficient lookup
     let queryName = result.QueryName;
     if (!queryName) {
@@ -216,7 +230,7 @@ export class RunQueryResolver {
         console.error('Error finding query to get name:', error);
       }
     }
-    
+
     return {
       QueryID: QueryID,
       QueryName: queryName || 'Unknown Query',
@@ -228,26 +242,28 @@ export class RunQueryResolver {
       ErrorMessage: result.ErrorMessage || '',
       AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
       CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
+      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});
+  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,
@@ -255,10 +271,11 @@ export class RunQueryResolver {
         MaxRows: MaxRows,
         StartRow: StartRow,
         ForceAuditLog: ForceAuditLog,
-        AuditLogDescription: AuditLogDescription
-      }, 
-      context.userPayload.userRecord);
-    
+        AuditLogDescription: AuditLogDescription,
+      },
+      context.userPayload.userRecord
+    );
+
     return {
       QueryID: result.QueryID || '',
       QueryName: QueryName,
@@ -270,7 +287,7 @@ export class RunQueryResolver {
       ErrorMessage: result.ErrorMessage || '',
       AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
       CacheHit: (result as any).CacheHit,
-      CacheTTLRemaining: (result as any).CacheTTLRemaining
+      CacheTTLRemaining: (result as any).CacheTTLRemaining,
     };
   }
-}
+}

package/src/resolvers/ReportResolver.ts

@@ -1,4 +1,4 @@
-import { EntitySaveOptions, IRunReportProvider, Metadata, RunReport } from '@memberjunction/core';
+import { EntitySaveOptions, IRunReportProvider, Metadata, RunReport } from '@memberjunction/global';
 import { Arg, Ctx, Field, Int, Mutation, ObjectType, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types.js';
 import { ConversationDetailEntity, ReportEntity } from '@memberjunction/core-entities';
@@ -49,7 +49,7 @@ export class CreateReportResultType {
 export class ReportResolverExtended {
   @Query(() => RunReportResultType)
   async GetReportData(@Arg('ReportID', () => String) ReportID: string, @Ctx() context: AppContext): Promise<RunReportResultType> {
-    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true});
+    const provider = GetReadOnlyProvider(context.providers, { allowFallbackToReadWrite: true });
     const rp = new RunReport(provider as unknown as IRunReportProvider);
 
     const result = await rp.RunReport({ ReportID: ReportID });