@memberjunction/server 2.52.0 → 2.54.0

package/src/resolvers/FileResolver.ts

@@ -72,7 +72,7 @@ export class FileResolver extends FileResolverBase {
 
     // Save the file record with the updated input
     const mapper = new FieldMapper();
-    fileEntity.LoadFromData(mapper.ReverseMapFields({ ...input }));
+    await fileEntity.LoadFromData(mapper.ReverseMapFields({ ...input }));
     fileEntity.SetMany(mapper.ReverseMapFields({ ...updatedInput }));
     await fileEntity.Save();
     const File = mapper.MapFields({ ...fileEntity.GetAll() });

package/src/resolvers/QueryResolver.ts

@@ -1,81 +1,134 @@
-// Queries are MemberJunction primitive operations that are used to retrieve data from the server from any stored query
-import { RunQuery } from '@memberjunction/core';
-import { Arg, Ctx, Field, Int, ObjectType, Query, Resolver } from 'type-graphql';
-import { AppContext } from '../types.js';
-
-@ObjectType()
-export class RunQueryResultType {
-  @Field()
-  QueryID: string;
-
-  @Field()
-  QueryName: string;
-
-  @Field()
-  Success: boolean;
-
-  @Field()
-  Results: string;
-
-  @Field()
-  RowCount: number;
-
-  @Field()
-  ExecutionTime: number;
-
-  @Field()
-  ErrorMessage: string;
-}
-
-@Resolver(RunQueryResultType)
-export class ReportResolver {
-  @Query(() => RunQueryResultType)
-  async GetQueryData(@Arg('QueryID', () => String) QueryID: string, 
-                     @Ctx() context: AppContext,
-                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
-                     @Arg('CategoryName', () => String, {nullable: true}) CategoryName?: string): Promise<RunQueryResultType> {
-    const runQuery = new RunQuery();
-    const result = await runQuery.RunQuery(
-      { 
-        QueryID: QueryID,
-        CategoryID: CategoryID,
-        CategoryName: CategoryName 
-      }, 
-      context.userPayload.userRecord);
-    
-    return {
-      QueryID: QueryID,
-      QueryName: result.QueryName,
-      Success: result.Success,
-      Results: JSON.stringify(result.Results),
-      RowCount: result.RowCount,
-      ExecutionTime: result.ExecutionTime,
-      ErrorMessage: result.ErrorMessage,
-    };
-  }
-
-  @Query(() => RunQueryResultType)
-  async GetQueryDataByName(@Arg('QueryName', () => String) QueryName: string, 
-                           @Ctx() context: AppContext,
-                           @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
-                           @Arg('CategoryName', () => String, {nullable: true}) CategoryName?: string): Promise<RunQueryResultType> {
-    const runQuery = new RunQuery();
-    const result = await runQuery.RunQuery(
-      { 
-        QueryName: QueryName, 
-        CategoryID: CategoryID,
-        CategoryName: CategoryName
-      },
-      context.userPayload.userRecord);
-      
-    return {
-      QueryID: result.QueryID,
-      QueryName: QueryName,
-      Success: result.Success,
-      Results: JSON.stringify(result.Results),
-      RowCount: result.RowCount,
-      ExecutionTime: result.ExecutionTime,
-      ErrorMessage: result.ErrorMessage,
-    };
-  }
-}
+// Queries are MemberJunction primitive operations that are used to retrieve data from the server from any stored query
+import { RunQuery } from '@memberjunction/core';
+import { Arg, Ctx, Field, Int, ObjectType, Query, Resolver } from 'type-graphql';
+import { AppContext } from '../types.js';
+import { RequireSystemUser } from '../directives/RequireSystemUser.js';
+
+@ObjectType()
+export class RunQueryResultType {
+  @Field()
+  QueryID: string;
+
+  @Field()
+  QueryName: string;
+
+  @Field()
+  Success: boolean;
+
+  @Field()
+  Results: string;
+
+  @Field()
+  RowCount: number;
+
+  @Field()
+  ExecutionTime: number;
+
+  @Field()
+  ErrorMessage: string;
+}
+
+@Resolver(RunQueryResultType)
+export class ReportResolver {
+  @Query(() => RunQueryResultType)
+  async GetQueryData(@Arg('QueryID', () => String) QueryID: string, 
+                     @Ctx() context: AppContext,
+                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                     @Arg('CategoryName', () => String, {nullable: true}) CategoryName?: string): Promise<RunQueryResultType> {
+    const runQuery = new RunQuery();
+    const result = await runQuery.RunQuery(
+      { 
+        QueryID: QueryID,
+        CategoryID: CategoryID,
+        CategoryName: CategoryName 
+      }, 
+      context.userPayload.userRecord);
+    
+    return {
+      QueryID: QueryID,
+      QueryName: result.QueryName,
+      Success: result.Success,
+      Results: JSON.stringify(result.Results),
+      RowCount: result.RowCount,
+      ExecutionTime: result.ExecutionTime,
+      ErrorMessage: result.ErrorMessage,
+    };
+  }
+
+  @Query(() => RunQueryResultType)
+  async GetQueryDataByName(@Arg('QueryName', () => String) QueryName: string, 
+                           @Ctx() context: AppContext,
+                           @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                           @Arg('CategoryName', () => String, {nullable: true}) CategoryName?: string): Promise<RunQueryResultType> {
+    const runQuery = new RunQuery();
+    const result = await runQuery.RunQuery(
+      { 
+        QueryName: QueryName, 
+        CategoryID: CategoryID,
+        CategoryName: CategoryName
+      },
+      context.userPayload.userRecord);
+      
+    return {
+      QueryID: result.QueryID,
+      QueryName: QueryName,
+      Success: result.Success,
+      Results: JSON.stringify(result.Results),
+      RowCount: result.RowCount,
+      ExecutionTime: result.ExecutionTime,
+      ErrorMessage: result.ErrorMessage,
+    };
+  }
+
+  @RequireSystemUser()
+  @Query(() => RunQueryResultType)
+  async GetQueryDataSystemUser(@Arg('QueryID', () => String) QueryID: string, 
+                               @Ctx() context: AppContext,
+                               @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                               @Arg('CategoryName', () => String, {nullable: true}) CategoryName?: string): Promise<RunQueryResultType> {
+    const runQuery = new RunQuery();
+    const result = await runQuery.RunQuery(
+      { 
+        QueryID: QueryID,
+        CategoryID: CategoryID,
+        CategoryName: CategoryName 
+      }, 
+      context.userPayload.userRecord);
+    
+    return {
+      QueryID: QueryID,
+      QueryName: result.QueryName,
+      Success: result.Success,
+      Results: JSON.stringify(result.Results),
+      RowCount: result.RowCount,
+      ExecutionTime: result.ExecutionTime,
+      ErrorMessage: result.ErrorMessage,
+    };
+  }
+
+  @RequireSystemUser()
+  @Query(() => RunQueryResultType)
+  async GetQueryDataByNameSystemUser(@Arg('QueryName', () => String) QueryName: string, 
+                                     @Ctx() context: AppContext,
+                                     @Arg('CategoryID', () => String, {nullable: true}) CategoryID?: string,
+                                     @Arg('CategoryName', () => String, {nullable: true}) CategoryName?: string): Promise<RunQueryResultType> {
+    const runQuery = new RunQuery();
+    const result = await runQuery.RunQuery(
+      { 
+        QueryName: QueryName, 
+        CategoryID: CategoryID,
+        CategoryName: CategoryName
+      },
+      context.userPayload.userRecord);
+      
+    return {
+      QueryID: result.QueryID,
+      QueryName: QueryName,
+      Success: result.Success,
+      Results: JSON.stringify(result.Results),
+      RowCount: result.RowCount,
+      ExecutionTime: result.ExecutionTime,
+      ErrorMessage: result.ErrorMessage,
+    };
+  }
+}

package/src/resolvers/RunAIPromptResolver.ts

@@ -33,6 +33,9 @@ export class AIPromptRunResult {
 
     @Field({ nullable: true })
     validationResult?: string;
+
+    @Field({ nullable: true })
+    chatResult?: string;
 }
 
 @Resolver()
@@ -194,7 +197,8 @@ export class RunAIPromptResolver extends ResolverBase {
                     executionTimeMs: executionTime,
                     tokensUsed: result.tokensUsed,
                     promptRunId: result.promptRun?.ID,
-                    validationResult: result.validationResult ? JSON.stringify(result.validationResult) : undefined
+                    validationResult: result.validationResult ? JSON.stringify(result.validationResult) : undefined,
+                    chatResult: result.chatResult ? JSON.stringify(result.chatResult) : undefined
                 };
             } else {
                 LogError(`AI Prompt run failed for ${promptEntity.Name}: ${result.errorMessage}`);
@@ -202,7 +206,8 @@ export class RunAIPromptResolver extends ResolverBase {
                     success: false,
                     error: result.errorMessage,
                     executionTimeMs: executionTime,
-                    promptRunId: result.promptRun?.ID
+                    promptRunId: result.promptRun?.ID,
+                    chatResult: result.chatResult ? JSON.stringify(result.chatResult) : undefined
                 };
             }