@memberjunction/server 2.80.1 → 2.82.0

package/src/generic/ResolverBase.ts

@@ -154,7 +154,8 @@ export class ResolverBase {
 
   async RunViewByIDGeneric(viewInput: RunViewByIDInput, provider: DatabaseProviderBase, userPayload: UserPayload, pubSub: PubSubEngine) {
     try {
-      const viewInfo = await provider.GetEntityObject<UserViewEntity>('User Views');
+      const contextUser = this.GetUserFromPayload(userPayload);
+      const viewInfo = await provider.GetEntityObject<UserViewEntity>('User Views', contextUser);
       await viewInfo.Load(viewInput.ViewID);
       return this.RunViewGenericInternal(
         provider,
@@ -223,6 +224,7 @@ export class ResolverBase {
     userPayload: UserPayload
   ) {
     const md = provider;
+    const contextUser = this.GetUserFromPayload(userPayload);
     let params: RunViewGenericParams[] = [];
     for (const viewInput of viewInputs) {
       try {
@@ -231,7 +233,7 @@ export class ResolverBase {
         if (viewInput.ViewName) {
           viewInfo = this.safeFirstArrayElement(await this.findBy(provider, 'User Views', { Name: viewInput.ViewName }, userPayload.userRecord));
         } else if (viewInput.ViewID) {
-          viewInfo = await provider.GetEntityObject<UserViewEntity>('User Views');
+          viewInfo = await provider.GetEntityObject<UserViewEntity>('User Views', contextUser);
           await viewInfo.Load(viewInput.ViewID);
         } else if (viewInput.EntityName) {
           const entity = md.Entities.find((e) => e.Name === viewInput.EntityName);

package/src/resolvers/CreateQueryResolver.ts

@@ -70,6 +70,18 @@ export class CreateQuerySystemUserInput {
     @Field(() => Boolean, { nullable: true })
     UsesTemplate?: boolean;
 
+    @Field(() => Boolean, { nullable: true })
+    AuditQueryRuns?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    CacheEnabled?: boolean;
+
+    @Field(() => Number, { nullable: true })
+    CacheTTLMinutes?: number;
+
+    @Field(() => Number, { nullable: true })
+    CacheMaxSize?: number;
+
     @Field(() => [QueryPermissionInputType], { nullable: true })
     Permissions?: QueryPermissionInputType[];
 }
@@ -118,6 +130,18 @@ export class UpdateQuerySystemUserInput {
     @Field(() => Boolean, { nullable: true })
     UsesTemplate?: boolean;
 
+    @Field(() => Boolean, { nullable: true })
+    AuditQueryRuns?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    CacheEnabled?: boolean;
+
+    @Field(() => Number, { nullable: true })
+    CacheTTLMinutes?: number;
+
+    @Field(() => Number, { nullable: true })
+    CacheMaxSize?: number;
+
     @Field(() => [QueryPermissionInputType], { nullable: true })
     Permissions?: QueryPermissionInputType[];
 }
@@ -305,7 +329,11 @@ export class QueryResolverExtended extends QueryResolver {
                 CategoryID: finalCategoryID || input.CategoryID,
                 Status: input.Status || 'Approved',
                 QualityRank: input.QualityRank || 0,
-                UsesTemplate: input.UsesTemplate || false
+                UsesTemplate: input.UsesTemplate || false,
+                AuditQueryRuns: input.AuditQueryRuns || false,
+                CacheEnabled: input.CacheEnabled || false,
+                CacheTTLMinutes: input.CacheTTLMinutes || null,
+                CacheMaxSize: input.CacheMaxSize || null
             };
             // Remove Permissions from the fields to set since we handle them separately
             delete (fieldsToSet as any).Permissions;
@@ -407,18 +435,26 @@ export class QueryResolverExtended extends QueryResolver {
             }
 
             // Update fields that were provided
-            if (input.Name !== undefined) queryEntity.Name = input.Name;
-            if (finalCategoryID !== undefined) queryEntity.CategoryID = finalCategoryID;
-            if (input.UserQuestion !== undefined) queryEntity.UserQuestion = input.UserQuestion;
-            if (input.Description !== undefined) queryEntity.Description = input.Description;
-            if (input.SQL !== undefined) queryEntity.SQL = input.SQL;
-            if (input.TechnicalDescription !== undefined) queryEntity.TechnicalDescription = input.TechnicalDescription;
-            if (input.OriginalSQL !== undefined) queryEntity.OriginalSQL = input.OriginalSQL;
-            if (input.Feedback !== undefined) queryEntity.Feedback = input.Feedback;
-            if (input.Status !== undefined) queryEntity.Status = input.Status;
-            if (input.QualityRank !== undefined) queryEntity.QualityRank = input.QualityRank;
-            if (input.ExecutionCostRank !== undefined) queryEntity.ExecutionCostRank = input.ExecutionCostRank;
-            if (input.UsesTemplate !== undefined) queryEntity.UsesTemplate = input.UsesTemplate;
+            const updateFields: Record<string, any> = {};
+            if (input.Name !== undefined) updateFields.Name = input.Name;
+            if (finalCategoryID !== undefined) updateFields.CategoryID = finalCategoryID;
+            if (input.UserQuestion !== undefined) updateFields.UserQuestion = input.UserQuestion;
+            if (input.Description !== undefined) updateFields.Description = input.Description;
+            if (input.SQL !== undefined) updateFields.SQL = input.SQL;
+            if (input.TechnicalDescription !== undefined) updateFields.TechnicalDescription = input.TechnicalDescription;
+            if (input.OriginalSQL !== undefined) updateFields.OriginalSQL = input.OriginalSQL;
+            if (input.Feedback !== undefined) updateFields.Feedback = input.Feedback;
+            if (input.Status !== undefined) updateFields.Status = input.Status;
+            if (input.QualityRank !== undefined) updateFields.QualityRank = input.QualityRank;
+            if (input.ExecutionCostRank !== undefined) updateFields.ExecutionCostRank = input.ExecutionCostRank;
+            if (input.UsesTemplate !== undefined) updateFields.UsesTemplate = input.UsesTemplate;
+            if (input.AuditQueryRuns !== undefined) updateFields.AuditQueryRuns = input.AuditQueryRuns;
+            if (input.CacheEnabled !== undefined) updateFields.CacheEnabled = input.CacheEnabled;
+            if (input.CacheTTLMinutes !== undefined) updateFields.CacheTTLMinutes = input.CacheTTLMinutes;
+            if (input.CacheMaxSize !== undefined) updateFields.CacheMaxSize = input.CacheMaxSize;
+
+            // Use SetMany to update all fields at once
+            queryEntity.SetMany(updateFields);
 
             // Save the updated query
             const saveResult = await queryEntity.Save();
@@ -465,7 +501,6 @@ export class QueryResolverExtended extends QueryResolver {
                 SQLBaseType: f.SQLBaseType || undefined,
                 SQLFullType: f.SQLFullType || undefined,
                 IsComputed: f.IsComputed,
-                ComputationEnabled: true, // Default to true as it's not in QueryFieldInfo
                 ComputationDescription: f.ComputationDescription || undefined
             }));
             

package/src/resolvers/QueryResolver.ts

@@ -3,7 +3,6 @@ import { RunQuery, QueryInfo } from '@memberjunction/core';
 import { AppContext } from '../types.js';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { GraphQLJSONObject } from 'graphql-type-json';
-import { QueryEntity } from '@memberjunction/core-entities';
 import { Metadata } from '@memberjunction/core';
 
 @ObjectType()
@@ -34,6 +33,12 @@ export class RunQueryResultType {
 
   @Field(() => String, { nullable: true })
   AppliedParameters?: string;
+
+  @Field(() => Boolean, { nullable: true })
+  CacheHit?: boolean;
+
+  @Field(() => Int, { nullable: true })
+  CacheTTLRemaining?: number;
 }
 
 @Resolver()
@@ -79,9 +84,11 @@ export class RunQueryResolver {
                      @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): Promise<RunQueryResultType> {
+                     @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                     @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                     @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
     const runQuery = new RunQuery();
-    console.log('GetQueryData called with:', { QueryID, Parameters, MaxRows, StartRow });
+    console.log('GetQueryData called with:', { QueryID, Parameters, MaxRows, StartRow, ForceAuditLog, AuditLogDescription });
     const result = await runQuery.RunQuery(
       { 
         QueryID: QueryID,
@@ -89,7 +96,9 @@ export class RunQueryResolver {
         CategoryPath: CategoryPath,
         Parameters: Parameters,
         MaxRows: MaxRows,
-        StartRow: StartRow
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
       }, 
       context.userPayload.userRecord);
     console.log('RunQuery result:', { 
@@ -120,7 +129,9 @@ export class RunQueryResolver {
       TotalRowCount: result.TotalRowCount ?? 0,
       ExecutionTime: result.ExecutionTime ?? 0,
       ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
     };
   }
 
@@ -131,7 +142,9 @@ export class RunQueryResolver {
                            @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): Promise<RunQueryResultType> {
+                           @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                           @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                           @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
     const runQuery = new RunQuery();
     const result = await runQuery.RunQuery(
       { 
@@ -140,7 +153,9 @@ export class RunQueryResolver {
         CategoryPath: CategoryPath,
         Parameters: Parameters,
         MaxRows: MaxRows,
-        StartRow: StartRow
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
       },
       context.userPayload.userRecord);
       
@@ -153,7 +168,9 @@ export class RunQueryResolver {
       TotalRowCount: result.TotalRowCount ?? 0,
       ExecutionTime: result.ExecutionTime ?? 0,
       ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
     };
   }
 
@@ -165,7 +182,9 @@ export class RunQueryResolver {
                                @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): Promise<RunQueryResultType> {
+                               @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                               @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                               @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
     const runQuery = new RunQuery();
     const result = await runQuery.RunQuery(
       { 
@@ -174,7 +193,9 @@ export class RunQueryResolver {
         CategoryPath: CategoryPath,
         Parameters: Parameters,
         MaxRows: MaxRows,
-        StartRow: StartRow
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
       }, 
       context.userPayload.userRecord);
     
@@ -200,7 +221,9 @@ export class RunQueryResolver {
       TotalRowCount: result.TotalRowCount ?? 0,
       ExecutionTime: result.ExecutionTime ?? 0,
       ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
     };
   }
 
@@ -212,7 +235,9 @@ export class RunQueryResolver {
                                      @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): Promise<RunQueryResultType> {
+                                     @Arg('StartRow', () => Int, {nullable: true}) StartRow?: number,
+                                     @Arg('ForceAuditLog', () => Boolean, {nullable: true}) ForceAuditLog?: boolean,
+                                     @Arg('AuditLogDescription', () => String, {nullable: true}) AuditLogDescription?: string): Promise<RunQueryResultType> {
     const runQuery = new RunQuery();
     const result = await runQuery.RunQuery(
       { 
@@ -221,7 +246,9 @@ export class RunQueryResolver {
         CategoryPath: CategoryPath,
         Parameters: Parameters,
         MaxRows: MaxRows,
-        StartRow: StartRow
+        StartRow: StartRow,
+        ForceAuditLog: ForceAuditLog,
+        AuditLogDescription: AuditLogDescription
       }, 
       context.userPayload.userRecord);
     
@@ -234,7 +261,9 @@ export class RunQueryResolver {
       TotalRowCount: result.TotalRowCount ?? 0,
       ExecutionTime: result.ExecutionTime ?? 0,
       ErrorMessage: result.ErrorMessage || '',
-      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined
+      AppliedParameters: result.AppliedParameters ? JSON.stringify(result.AppliedParameters) : undefined,
+      CacheHit: (result as any).CacheHit,
+      CacheTTLRemaining: (result as any).CacheTTLRemaining
     };
   }
 }