@memberjunction/server 2.95.0 → 2.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "2.95.0",
+  "version": "2.97.0",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -22,44 +22,44 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/actions": "2.95.0",
-    "@memberjunction/ai": "2.95.0",
-    "@memberjunction/ai-core-plus": "2.95.0",
-    "@memberjunction/ai-agents": "2.95.0",
-    "@memberjunction/aiengine": "2.95.0",
-    "@memberjunction/ai-prompts": "2.95.0",
-    "@memberjunction/ai-agent-manager-actions": "2.95.0",
-    "@memberjunction/ai-mistral": "2.95.0",
-    "@memberjunction/ai-openai": "2.95.0",
-    "@memberjunction/ai-anthropic": "2.95.0",
-    "@memberjunction/ai-groq": "2.95.0",
-    "@memberjunction/ai-cerebras": "2.95.0",
-    "@memberjunction/ai-lmstudio": "2.95.0",
-    "@memberjunction/ai-openrouter": "2.95.0",
-    "@memberjunction/ai-ollama": "2.95.0",
-    "@memberjunction/ai-vectors-pinecone": "2.95.0",
-    "@memberjunction/ai-local-embeddings": "2.95.0",
-    "@memberjunction/core": "2.95.0",
-    "@memberjunction/core-actions": "2.95.0",
-    "@memberjunction/actions-apollo": "2.95.0",
-    "@memberjunction/actions-bizapps-accounting": "2.95.0",
-    "@memberjunction/actions-bizapps-crm": "2.95.0",
-    "@memberjunction/actions-bizapps-lms": "2.95.0",
-    "@memberjunction/actions-bizapps-social": "2.95.0",
-    "@memberjunction/core-entities": "2.95.0",
-    "@memberjunction/core-entities-server": "2.95.0",
-    "@memberjunction/data-context": "2.95.0",
-    "@memberjunction/data-context-server": "2.95.0",
-    "@memberjunction/doc-utils": "2.95.0",
-    "@memberjunction/entity-communications-server": "2.95.0",
-    "@memberjunction/external-change-detection": "2.95.0",
-    "@memberjunction/global": "2.95.0",
-    "@memberjunction/graphql-dataprovider": "2.95.0",
-    "@memberjunction/queue": "2.95.0",
-    "@memberjunction/skip-types": "2.95.0",
-    "@memberjunction/sqlserver-dataprovider": "2.95.0",
-    "@memberjunction/storage": "2.95.0",
-    "@memberjunction/templates": "2.95.0",
+    "@memberjunction/actions": "2.97.0",
+    "@memberjunction/ai": "2.97.0",
+    "@memberjunction/ai-core-plus": "2.97.0",
+    "@memberjunction/ai-agents": "2.97.0",
+    "@memberjunction/aiengine": "2.97.0",
+    "@memberjunction/ai-prompts": "2.97.0",
+    "@memberjunction/ai-agent-manager-actions": "2.97.0",
+    "@memberjunction/ai-mistral": "2.97.0",
+    "@memberjunction/ai-openai": "2.97.0",
+    "@memberjunction/ai-anthropic": "2.97.0",
+    "@memberjunction/ai-groq": "2.97.0",
+    "@memberjunction/ai-cerebras": "2.97.0",
+    "@memberjunction/ai-lmstudio": "2.97.0",
+    "@memberjunction/ai-openrouter": "2.97.0",
+    "@memberjunction/ai-ollama": "2.97.0",
+    "@memberjunction/ai-vectors-pinecone": "2.97.0",
+    "@memberjunction/ai-local-embeddings": "2.97.0",
+    "@memberjunction/core": "2.97.0",
+    "@memberjunction/core-actions": "2.97.0",
+    "@memberjunction/actions-apollo": "2.97.0",
+    "@memberjunction/actions-bizapps-accounting": "2.97.0",
+    "@memberjunction/actions-bizapps-crm": "2.97.0",
+    "@memberjunction/actions-bizapps-lms": "2.97.0",
+    "@memberjunction/actions-bizapps-social": "2.97.0",
+    "@memberjunction/core-entities": "2.97.0",
+    "@memberjunction/core-entities-server": "2.97.0",
+    "@memberjunction/data-context": "2.97.0",
+    "@memberjunction/data-context-server": "2.97.0",
+    "@memberjunction/doc-utils": "2.97.0",
+    "@memberjunction/entity-communications-server": "2.97.0",
+    "@memberjunction/external-change-detection": "2.97.0",
+    "@memberjunction/global": "2.97.0",
+    "@memberjunction/graphql-dataprovider": "2.97.0",
+    "@memberjunction/queue": "2.97.0",
+    "@memberjunction/skip-types": "2.97.0",
+    "@memberjunction/sqlserver-dataprovider": "2.97.0",
+    "@memberjunction/storage": "2.97.0",
+    "@memberjunction/templates": "2.97.0",
     "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "9.0.6",

package/src/context.ts

@@ -15,6 +15,7 @@ import e from 'express';
 import { DatabaseProviderBase } from '@memberjunction/core';
 import { SQLServerDataProvider, SQLServerProviderConfigData } from '@memberjunction/sqlserver-dataprovider';
 import { AuthProviderFactory } from './auth/AuthProviderFactory.js';
+import { Metadata } from '@memberjunction/core';
 
 const verifyAsync = async (issuer: string, token: string): Promise<jwt.JwtPayload> =>
   new Promise((resolve, reject) => {
@@ -157,6 +158,10 @@ export const contextFunction =
       apiKey 
     );
 
+    if (Metadata.Provider.Entities.length === 0 ) {
+      console.warn('WARNING: No entities found in global/shared metadata, this can often be due to the use of **global** Metadata/RunView/DB Providers in a multi-user environment. Check your code to make sure you are using the providers passed to you in AppContext by MJServer and not calling new Metadata() new RunView() new RunQuery() and similar patterns as those are unstable at times in multi-user server environments!!!');
+    }
+
     // now create a new instance of SQLServerDataProvider for each request
     const config = new SQLServerProviderConfigData(dataSource, mj_core_schema, 0, undefined, undefined, false);
     const p = new SQLServerDataProvider();

package/src/resolvers/ActionResolver.ts

@@ -5,8 +5,9 @@ import { Metadata, UserInfo, BaseEntity, CompositeKey, KeyValuePair, LogError }
 import { ActionParam, ActionResult } from "@memberjunction/actions-base";
 import { Field, InputType, ObjectType } from "type-graphql";
 import { KeyValuePairInput } from "../generic/KeyValuePairInput.js";
-import { AppContext } from "../types.js";
+import { AppContext, ProviderInfo } from "../types.js";
 import { CopyScalarsAndArrays } from "@memberjunction/global";
+import { GetReadOnlyProvider } from "../util.js";
 
 /**
  * Input type for action parameters
@@ -341,7 +342,7 @@ export class ActionResolver {
 
       // Add entity object if we have entity information and primary key
       if ((input.EntityID || input.EntityName) && input.PrimaryKey && input.PrimaryKey.KeyValuePairs.length > 0) {
-        await this.addEntityObject(params, input, user);
+        await this.addEntityObject(ctx.providers, params, input, user);
       }
 
       // Add other parameters
@@ -400,8 +401,8 @@ export class ActionResolver {
    * @param user The authenticated user
    * @private
    */
-  private async addEntityObject(params: any, input: EntityActionInput, user: UserInfo): Promise<void> {
-    const md = new Metadata();
+  private async addEntityObject(providers: Array<ProviderInfo>, params: any, input: EntityActionInput, user: UserInfo): Promise<void> {
+    const md = GetReadOnlyProvider(providers);
     
     // Find the entity by ID or name
     let entity;

package/src/resolvers/AskSkipResolver.ts

@@ -1,5 +1,5 @@
 import { Arg, Ctx, Field, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
-import { LogError, LogStatus, Metadata, RunView, UserInfo, CompositeKey, EntityFieldInfo, EntityInfo, EntityRelationshipInfo, EntitySaveOptions, EntityDeleteOptions } from '@memberjunction/core';
+import { LogError, LogStatus, Metadata, RunView, UserInfo, CompositeKey, EntityFieldInfo, EntityInfo, EntityRelationshipInfo, EntitySaveOptions, EntityDeleteOptions, IMetadataProvider } from '@memberjunction/core';
 import { AppContext, UserPayload, MJ_SERVER_EVENT_CODE } from '../types.js';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -59,7 +59,7 @@ import mssql from 'mssql';
 
 import { registerEnumType } from 'type-graphql';
 import { MJGlobal, CopyScalarsAndArrays } from '@memberjunction/global';
-import { sendPostRequest } from '../util.js';
+import { GetReadWriteProvider, sendPostRequest } from '../util.js';
 import { GetAIAPIKey } from '@memberjunction/ai';
 import { CompositeKeyInputType } from '../generic/KeyInputOutputTypes.js';
 import { AIEngine } from '@memberjunction/aiengine';
@@ -479,7 +479,7 @@ export class AskSkipResolver {
     @Arg('ConversationId', () => String) ConversationId: string,
     @Arg('EntityName', () => String) EntityName: string,
     @Arg('CompositeKey', () => CompositeKeyInputType) compositeKey: CompositeKeyInputType,
-    @Ctx() { dataSource, userPayload }: AppContext,
+    @Ctx() { dataSource, userPayload, providers }: AppContext,
     @PubSub() pubSub: PubSubEngine
   ) {
     // In this function we're simply going to call the Skip API and pass along the message from the user
@@ -498,14 +498,14 @@ export class AskSkipResolver {
       );  
     }
 
-    const md = new Metadata();
+    const md = GetReadWriteProvider(providers);
     const { convoEntity, dataContextEntity, convoDetailEntity, dataContext } = await this.HandleSkipChatInitialObjectLoading(
       dataSource,
       ConversationId,
       UserQuestion,
       user,
       userPayload,
-      md,
+      md as unknown as Metadata,
       null
     );
 
@@ -558,7 +558,7 @@ export class AskSkipResolver {
    */
   @Mutation(() => AskSkipResultType)
   async ExecuteAskSkipLearningCycle(
-    @Ctx() { dataSource, userPayload }: AppContext,
+    @Ctx() { dataSource, userPayload, providers }: AppContext,
     @Arg('ForceEntityRefresh', () => Boolean, { nullable: true }) ForceEntityRefresh?: boolean
   ) {
       const skipConfigInfo = configInfo.askSkip;
@@ -612,7 +612,7 @@ export class AskSkipResolver {
       }
 
       // Get the Skip agent ID
-      const md = new Metadata();
+      const md = GetReadWriteProvider(providers);
       const skipAgent = AIEngine.Instance.GetAgentByName('Skip');
       if (!skipAgent) {
         throw new Error("Skip agent not found in AIEngine");
@@ -1467,11 +1467,11 @@ cycle.`);
   @Query(() => ReattachConversationResponse)
   async ReattachToProcessingConversation(
     @Arg('ConversationId', () => String) ConversationId: string,
-    @Ctx() { userPayload }: AppContext,
+    @Ctx() { userPayload, providers }: AppContext,
     @PubSub() pubSub: PubSubEngine
   ): Promise<ReattachConversationResponse | null> {
     try {
-      const md = new Metadata();
+      const md = GetReadWriteProvider(providers);
       const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email.trim().toLowerCase());
       if (!user) {
         LogError(`User ${userPayload.email} not found in UserCache`);
@@ -1581,13 +1581,13 @@ cycle.`);
   async ExecuteAskSkipAnalysisQuery(
     @Arg('UserQuestion', () => String) UserQuestion: string,
     @Arg('ConversationId', () => String) ConversationId: string,
-    @Ctx() { dataSource, userPayload }: AppContext,
+    @Ctx() { dataSource, userPayload, providers }: AppContext,
     @PubSub() pubSub: PubSubEngine,
     @Arg('DataContextId', () => String, { nullable: true }) DataContextId?: string,
     @Arg('ForceEntityRefresh', () => Boolean, { nullable: true }) ForceEntityRefresh?: boolean,
     @Arg('StartTime', () => Date, { nullable: true }) StartTime?: Date
   ) {
-    const md = new Metadata();
+    const md = GetReadWriteProvider(providers);
     const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email.trim().toLowerCase());
     if (!user) throw new Error(`User ${userPayload.email} not found in UserCache`);
 
@@ -1600,7 +1600,7 @@ cycle.`);
       UserQuestion,
       user,
       userPayload,
-      md,
+      md as unknown as Metadata,
       DataContextId
     );
 
@@ -1625,7 +1625,7 @@ cycle.`);
       ConversationId,
       userPayload,
       pubSub,
-      md,
+      md as unknown as Metadata,
       convoEntity,
       convoDetailEntity,
       dataContext,

package/src/resolvers/CreateQueryResolver.ts

@@ -1,10 +1,10 @@
 import { Arg, Ctx, Field, InputType, Mutation, ObjectType, registerEnumType, Resolver, PubSub, PubSubEngine } from 'type-graphql';
 import { AppContext } from '../types.js';
-import { LogError, Metadata, RunView, UserInfo, CompositeKey } from '@memberjunction/core';
+import { LogError, Metadata, RunView, UserInfo, CompositeKey, DatabaseProviderBase } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { QueryCategoryEntity, QueryPermissionEntity } from '@memberjunction/core-entities';
 import { QueryResolver } from '../generated/generated.js';
-import { GetReadWriteProvider } from '../util.js';
+import { GetReadOnlyProvider, GetReadWriteProvider } from '../util.js';
 import { DeleteOptionsInput } from '../generic/DeleteOptionsInput.js';
 import { QueryEntityExtended } from '@memberjunction/core-entities-server';
 
@@ -311,13 +311,12 @@ export class QueryResolverExtended extends QueryResolver {
         try {
             // Handle CategoryPath if provided
             let finalCategoryID = input.CategoryID;
+            const provider = GetReadWriteProvider(context.providers); 
             if (input.CategoryPath) {
-                const md = new Metadata();
-                finalCategoryID = await this.findOrCreateCategoryPath(input.CategoryPath, md, context.userPayload.userRecord);
+                finalCategoryID = await this.findOrCreateCategoryPath(input.CategoryPath, provider, context.userPayload.userRecord);
             }
             
             // Use QueryEntityExtended which handles AI processing
-            const provider = GetReadWriteProvider(context.providers); 
             const record = await provider.GetEntityObject<QueryEntityExtended>("Queries", context.userPayload.userRecord);
             
             // Set the fields from input, handling CategoryPath resolution
@@ -345,7 +344,7 @@ export class QueryResolverExtended extends QueryResolver {
                 const queryID = record.ID;
                 
                 if (input.Permissions && input.Permissions.length > 0) {
-                    await this.createPermissions(input.Permissions, queryID, context.userPayload.userRecord);
+                    await this.createPermissions(provider, input.Permissions, queryID, context.userPayload.userRecord);
                     await record.RefreshRelatedMetadata(true); // force DB update since we just created new permissions
                 }                
 
@@ -354,7 +353,12 @@ export class QueryResolverExtended extends QueryResolver {
                     QueryData: JSON.stringify(record.GetAll()),
                     Fields: record.QueryFields,
                     Parameters: record.QueryParameters,
-                    Entities: record.QueryEntities,
+                    Entities: record.QueryEntities.map(e => {
+                        return {
+                            ...e,
+                            EntityName: e.Entity // alias this to fix variable name mismatch
+                        }
+                    }),
                     Permissions: record.QueryPermissions
                 };
             } 
@@ -374,13 +378,12 @@ export class QueryResolverExtended extends QueryResolver {
         }
     }
 
-    protected async createPermissions(permissions: QueryPermissionInputType[], queryID: string, contextUser: UserInfo): Promise<QueryPermissionType[]> {
+    protected async createPermissions(p: DatabaseProviderBase, permissions: QueryPermissionInputType[], queryID: string, contextUser: UserInfo): Promise<QueryPermissionType[]> {
         // Create permissions if provided
         const createdPermissions: QueryPermissionType[] = [];
         if (permissions && permissions.length > 0) {
-            const md = new Metadata();
             for (const perm of permissions) {
-                const permissionEntity = await md.GetEntityObject<QueryPermissionEntity>('Query Permissions', contextUser);
+                const permissionEntity = await p.GetEntityObject<QueryPermissionEntity>('Query Permissions', contextUser);
                 if (permissionEntity) {
                     permissionEntity.QueryID = queryID;
                     permissionEntity.RoleID = perm.RoleID;
@@ -427,8 +430,20 @@ export class QueryResolverExtended extends QueryResolver {
             // Handle CategoryPath if provided
             let finalCategoryID = input.CategoryID;
             if (input.CategoryPath) {
-                const md = new Metadata();
-                finalCategoryID = await this.findOrCreateCategoryPath(input.CategoryPath, md, context.userPayload.userRecord);
+                finalCategoryID = await this.findOrCreateCategoryPath(input.CategoryPath, provider, context.userPayload.userRecord);
+            }
+
+            // now make sure there is NO existing query by the same name in the specified category
+            const existingQueryResult = await provider.RunView({
+                EntityName: 'Queries',
+                ExtraFilter: `Name='${input.Name}' AND CategoryID='${finalCategoryID}'` 
+            }, context.userPayload.userRecord);
+            if (existingQueryResult.Success && existingQueryResult.Results?.length > 0) {
+                // we have a match! Let's return an error
+                return {
+                    Success: false,
+                    ErrorMessage: `Query with name '${input.Name}' already exists in the specified ${input.CategoryID ? 'category' : 'categoryPath'}`
+                };
             }
 
             // Update fields that were provided
@@ -481,7 +496,7 @@ export class QueryResolverExtended extends QueryResolver {
                 }
 
                 // Create new permissions
-                await this.createPermissions(input.Permissions, queryID, context.userPayload.userRecord);
+                await this.createPermissions(provider, input.Permissions, queryID, context.userPayload.userRecord);
                 
                 // Refresh the metadata to get updated permissions
                 await queryEntity.RefreshRelatedMetadata(true);
@@ -608,7 +623,7 @@ export class QueryResolverExtended extends QueryResolver {
      * @param contextUser - User context for operations
      * @returns The ID of the final category in the path
      */
-    private async findOrCreateCategoryPath(categoryPath: string, md: Metadata, contextUser: UserInfo): Promise<string> {
+    private async findOrCreateCategoryPath(categoryPath: string, p: DatabaseProviderBase, contextUser: UserInfo): Promise<string> {
         if (!categoryPath || categoryPath.trim() === '') {
             throw new Error('CategoryPath cannot be empty');
         }
@@ -625,7 +640,7 @@ export class QueryResolverExtended extends QueryResolver {
             const categoryName = pathParts[i];
             
             // Look for existing category at this level
-            const existingCategory = await this.findCategoryByNameAndParent(categoryName, currentParentID, contextUser);
+            const existingCategory = await this.findCategoryByNameAndParent(p, categoryName, currentParentID, contextUser);
             
             if (existingCategory) {
                 currentCategoryID = existingCategory.ID;
@@ -633,7 +648,7 @@ export class QueryResolverExtended extends QueryResolver {
             } else {
                 try {
                     // Create new category
-                    const newCategory = await md.GetEntityObject<QueryCategoryEntity>("Query Categories", contextUser);
+                    const newCategory = await p.GetEntityObject<QueryCategoryEntity>("Query Categories", contextUser);
                     if (!newCategory) {
                         throw new Error(`Failed to create entity object for Query Categories`);
                     }
@@ -652,7 +667,7 @@ export class QueryResolverExtended extends QueryResolver {
                     currentParentID = newCategory.ID;
 
                     // Refresh metadata after each category creation to ensure it's available for subsequent lookups
-                    await md.Refresh();
+                    await p.Refresh();
                 } catch (error) {
                     throw new Error(`Failed to create category '${categoryName}': ${error instanceof Error ? error.message : String(error)}`);
                 }
@@ -673,9 +688,9 @@ export class QueryResolverExtended extends QueryResolver {
      * @param contextUser - User context for database operations
      * @returns The matching category entity or null if not found
      */
-    private async findCategoryByNameAndParent(categoryName: string, parentID: string | null, contextUser: UserInfo): Promise<QueryCategoryEntity | null> {
+    private async findCategoryByNameAndParent(provider: DatabaseProviderBase, categoryName: string, parentID: string | null, contextUser: UserInfo): Promise<QueryCategoryEntity | null> {
         try {
-            const rv = new RunView();
+            const rv = provider;
             const parentFilter = parentID ? `ParentID='${parentID}'` : 'ParentID IS NULL';
             const nameFilter = `LOWER(Name) = LOWER('${categoryName.replace(/'/g, "''")}')`; // Escape single quotes
             

package/src/resolvers/DatasetResolver.ts

@@ -1,6 +1,7 @@
 import { Arg, Ctx, Field, InputType, Int, ObjectType, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types.js';
 import { LogError, Metadata } from '@memberjunction/core';
+import { GetReadOnlyProvider } from '../util.js';
 
 @ObjectType()
 export class DatasetResultType {
@@ -38,11 +39,11 @@ export class DatasetResolverExtended {
   @Query(() => DatasetResultType)
   async GetDatasetByName(
     @Arg('DatasetName', () => String) DatasetName: string,
-    @Ctx() {}: AppContext,
+    @Ctx() {providers}: AppContext,
     @Arg('ItemFilters', () => [DatasetItemFilterTypeGQL], { nullable: 'itemsAndList' }) ItemFilters?: DatasetItemFilterTypeGQL[]
   ) {
     try {
-      const md = new Metadata();
+      const md = GetReadOnlyProvider(providers, {allowFallbackToReadWrite: true});
       const result = await md.GetDatasetByName(DatasetName, ItemFilters);
       if (result) {
         return {
@@ -89,11 +90,11 @@ export class DatasetStatusResolver {
   @Query(() => DatasetStatusResultType)
   async GetDatasetStatusByName(
     @Arg('DatasetName', () => String) DatasetName: string,
-    @Ctx() {}: AppContext,
+    @Ctx() {providers}: AppContext,
     @Arg('ItemFilters', () => [DatasetItemFilterTypeGQL], { nullable: 'itemsAndList' }) ItemFilters?: DatasetItemFilterTypeGQL[]
   ) {
     try {
-      const md = new Metadata();
+      const md = GetReadOnlyProvider(providers, {allowFallbackToReadWrite: true});
       const result = await md.GetDatasetStatusByName(DatasetName, ItemFilters);
       if (result) {
         return {

package/src/resolvers/EntityRecordNameResolver.ts

@@ -1,7 +1,8 @@
-import { Metadata, CompositeKey } from '@memberjunction/core';
+import { Metadata, CompositeKey, DatabaseProviderBase } from '@memberjunction/core';
 import { Arg, Ctx, Field, InputType, ObjectType, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types.js';
 import { CompositeKeyInputType, CompositeKeyOutputType } from '../generic/KeyInputOutputTypes.js';
+import { GetReadOnlyProvider } from '../util.js';
 
 @InputType()
 export class EntityRecordNameInput {
@@ -36,26 +37,27 @@ export class EntityRecordNameResolver {
   async GetEntityRecordName(
     @Arg('EntityName', () => String) EntityName: string,
     @Arg('CompositeKey', () => CompositeKeyInputType) primaryKey: CompositeKey,
-    @Ctx() { userPayload }: AppContext
+    @Ctx() { providers, userPayload }: AppContext
   ): Promise<EntityRecordNameResult> {
-    const md = new Metadata();
+    const md = GetReadOnlyProvider(providers, {allowFallbackToReadWrite: true});
+
     return await this.InnerGetEntityRecordName(md, EntityName, primaryKey);
   }
 
   @Query(() => [EntityRecordNameResult])
   async GetEntityRecordNames(
     @Arg('info', () => [EntityRecordNameInput]) info: EntityRecordNameInput[],
-    @Ctx() {}: AppContext
+    @Ctx() {providers}: AppContext
   ): Promise<EntityRecordNameResult[]> {
     const result: EntityRecordNameResult[] = [];
-    const md = new Metadata();
+    const md = GetReadOnlyProvider(providers, {allowFallbackToReadWrite: true});
     for (const i of info) {
       result.push(await this.InnerGetEntityRecordName(md, i.EntityName, i.CompositeKey));
     }
     return result;
   }
 
-  async InnerGetEntityRecordName(md: Metadata, EntityName: string, primaryKey: CompositeKeyInputType): Promise<EntityRecordNameResult> {
+  async InnerGetEntityRecordName(md: DatabaseProviderBase, EntityName: string, primaryKey: CompositeKeyInputType): Promise<EntityRecordNameResult> {
     const pk = new CompositeKey(primaryKey.KeyValuePairs);
     const e = md.Entities.find((e) => e.Name === EntityName);
     if (e) {

package/src/resolvers/FileCategoryResolver.ts

@@ -16,16 +16,15 @@ export class FileResolver extends FileCategoryResolverBase {
   ) {
     const key = new CompositeKey();
     key.LoadFromSingleKeyValuePair('ID', ID);
-    const provider = GetReadWriteProvider(providers);    
+    const p = GetReadWriteProvider(providers);    
 
-    if (!(await this.BeforeDelete(provider, key))) {
+    if (!(await this.BeforeDelete(p, key))) {
       return null;
     }
 
-    const md = new Metadata();
     const user = this.GetUserFromPayload(userPayload);
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
-    const fileCategoryEntity = await md.GetEntityObject<FileCategoryEntity>('File Categories', user);
+    const fileEntity = await p.GetEntityObject<FileEntity>('Files', user);
+    const fileCategoryEntity = await p.GetEntityObject<FileCategoryEntity>('File Categories', user);
 
     fileEntity.CheckPermissions(EntityPermissionType.Update, true);
     fileCategoryEntity.CheckPermissions(EntityPermissionType.Delete, true);
@@ -34,7 +33,7 @@ export class FileResolver extends FileCategoryResolverBase {
     const returnValue = fileCategoryEntity.GetAll();
 
     // Any files using the deleted category fall back to its parent
-    await provider.BeginTransaction();
+    await p.BeginTransaction();
     try {
       // SHOULD USE BaseEntity for each of these records to ensure object model
       // is used everywhere - new code below. The below is SLOWER than a single
@@ -60,20 +59,20 @@ export class FileResolver extends FileCategoryResolverBase {
         // iterate through each of the files in filesResult.Results
         // and update the CategoryID to fileCategoryEntity.ParentID
         for (const file of filesResult.Results) {
-          const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+          const fileEntity = await p.GetEntityObject<FileEntity>('Files', user);
           await fileEntity.Load(file.ID);
           fileEntity.CategoryID = fileCategoryEntity.ParentID;
           await fileEntity.Save();
         }
       }
       await fileCategoryEntity.Delete(options);
-      await provider.CommitTransaction();
+      await p.CommitTransaction();
     } catch (error) {
-      await provider.RollbackTransaction();
+      await p.RollbackTransaction();
       throw error;
     }
 
-    await this.AfterDelete(provider, key); // fire event
+    await this.AfterDelete(p, key); // fire event
     return returnValue;
   }
 }

package/src/resolvers/FileResolver.ts

@@ -51,14 +51,13 @@ export class FileResolver extends FileResolverBase {
     @Ctx() context: AppContext,
     @PubSub() pubSub: PubSubEngine
   ) {
-    const md = new Metadata();
+    // Check to see if there's already an object with that name
+    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true})    
     const user = this.GetUserFromPayload(context.userPayload);
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
-    const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', user);
+    const fileEntity = await provider.GetEntityObject<FileEntity>('Files', user);
+    const providerEntity = await provider.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', user);
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
-    // Check to see if there's already an object with that name
-    const provider = GetReadOnlyProvider(context.providers, {allowFallbackToReadWrite: true})    
     const [sameName] = await this.findBy(
       provider,
       'Files',
@@ -108,7 +107,7 @@ export class FileResolver extends FileResolverBase {
     @PubSub() pubSub: PubSubEngine
   ) {
     // if the name is changing, rename the target object as well
-    const md = new Metadata();
+    const md = GetReadOnlyProvider(context.providers);
     const user = this.GetUserFromPayload(context.userPayload);
     const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Update, true);
@@ -136,7 +135,7 @@ export class FileResolver extends FileResolverBase {
     @Ctx() context: AppContext,
     @PubSub() pubSub: PubSubEngine
   ) {
-    const md = new Metadata();
+    const md = GetReadOnlyProvider(context.providers);
     const userInfo = this.GetUserFromPayload(context.userPayload);
 
     const fileEntity = await md.GetEntityObject<FileEntity>('Files', userInfo);

package/src/resolvers/GetDataContextDataResolver.ts

@@ -1,7 +1,7 @@
 import { Arg, Ctx, Field, ObjectType, Query } from "type-graphql";
 import { AppContext } from "../types.js";
 import { DataContext } from "@memberjunction/data-context";
-import { GetReadOnlyDataSource } from "../util.js";
+import { GetReadOnlyDataSource, GetReadOnlyProvider } from "../util.js";
 import { Metadata } from "@memberjunction/core";
 import { DataContextItemEntity } from "@memberjunction/core-entities";
 
@@ -53,7 +53,7 @@ export class GetDataContextDataResolver {
             const ds = GetReadOnlyDataSource(appCtx.dataSources, {
                 allowFallbackToReadWrite: true,
             })
-            const md = new Metadata();
+            const md = GetReadOnlyProvider(appCtx.providers, {allowFallbackToReadWrite: true});
             const dciData = await md.GetEntityObject<DataContextItemEntity>("Data Context Items", appCtx.userPayload.userRecord);
             if (await dciData.Load(DataContextItemID)) {
                 const dci = DataContext.CreateDataContextItem(); // use class factory to get whatever lowest level sub-class is registered

package/src/resolvers/GetDataResolver.ts

@@ -3,7 +3,7 @@ import { AppContext } from '../types.js';
 import { LogError, LogStatus, Metadata } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { v4 as uuidv4 } from 'uuid';
-import { GetReadOnlyDataSource } from '../util.js';
+import { GetReadOnlyDataSource, GetReadOnlyProvider } from '../util.js';
 import sql from 'mssql';
  
 @InputType() 
@@ -169,7 +169,7 @@ export class GetDataResolver {
     @Ctx() context: AppContext
     ): Promise<SimpleEntityResultType> {
         try { 
-            const md = new Metadata();
+            const md = GetReadOnlyProvider(context.providers);
             const result = md.Entities.map((e) => {
                 return { 
                     ID: e.ID, 

package/src/resolvers/InfoResolver.ts

@@ -30,7 +30,7 @@ export class Info {
 }
 
 @Resolver(Info)
-export class InfoResolver {
+export class InfoResolver { 
   @Public()
   @Query(() => Info)
   Info(@Ctx() context: AppContext): Info {