@memberjunction/server 2.112.0 → 2.113.1

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/global';
+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/global';
+import { Metadata } from '@memberjunction/core';
 import { GetReadOnlyProvider } from '../util.js';
 
 @ObjectType()
@@ -44,16 +44,9 @@ 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) {
@@ -74,31 +67,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,
@@ -106,16 +99,15 @@ 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) {
@@ -128,7 +120,7 @@ export class RunQueryResolver {
         console.error('Error finding query to get name:', error);
       }
     }
-
+    
     return {
       QueryID: QueryID,
       QueryName: queryName || 'Unknown Query',
@@ -140,38 +132,35 @@ 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,
@@ -183,29 +172,27 @@ 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,
@@ -213,11 +200,10 @@ 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) {
@@ -230,7 +216,7 @@ export class RunQueryResolver {
         console.error('Error finding query to get name:', error);
       }
     }
-
+    
     return {
       QueryID: QueryID,
       QueryName: queryName || 'Unknown Query',
@@ -242,28 +228,26 @@ 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,
@@ -271,11 +255,10 @@ 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,
@@ -287,7 +270,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/global';
+import { EntitySaveOptions, IRunReportProvider, Metadata, RunReport } from '@memberjunction/core';
 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 });