@memberjunction/server 4.4.0 → 5.0.0

package/src/generic/DeleteOptionsInput.ts

@@ -1,8 +1,18 @@
 import { Field, InputType } from "type-graphql";
 
 /**
- * GraphQL InputType for the DeleteOptions.
- * Must be kept in sync with EntityDeleteOptions in @memberjunction/core.
+ * GraphQL InputType for entity delete operations.
+ *
+ * SYNC REQUIREMENTS - Changes here require updates to:
+ * 1. @memberjunction/core - EntityDeleteOptions class in interfaces.ts
+ * 2. @memberjunction/graphql-dataprovider - Delete method default options in graphQLDataProvider.ts
+ * 3. @memberjunction/graphql-dataprovider - DeleteQueryOptionsInput interface in graphQLSystemUserClient.ts
+ *
+ * TESTING: Schema sync tests in GraphQLDataProvider will fail if these files drift out of sync.
+ * Run: cd packages/GraphQLDataProvider && npm run test
+ *
+ * @see packages/MJCore/src/generic/interfaces.ts - EntityDeleteOptions class
+ * @see packages/GraphQLDataProvider/src/__tests__/schema-sync.test.ts - Automated sync verification
  */
 @InputType()
 export class DeleteOptionsInput {

package/src/generic/ResolverBase.ts

@@ -17,7 +17,7 @@ import {
   RunViewResult,
   UserInfo,
 } from '@memberjunction/core';
-import { AuditLogEntity, ErrorLogEntity, UserViewEntityExtended } from '@memberjunction/core-entities';
+import { MJAuditLogEntity, MJErrorLogEntity, UserViewEntityExtended } from '@memberjunction/core-entities';
 import { SQLServerDataProvider, UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { PubSubEngine, AuthorizationError } from 'type-graphql';
 import { GraphQLError } from 'graphql';
@@ -275,7 +275,7 @@ export class ResolverBase {
 
       const rv = provider as any as IRunViewProvider;
       const result = await rv.RunView<UserViewEntityExtended>({
-        EntityName: 'User Views',
+        EntityName: 'MJ: User Views',
         ExtraFilter: "Name='" + viewInput.ViewName + "'",
       }, userPayload.userRecord);
       if (result && result.Success && result.Results.length > 0) {
@@ -319,7 +319,7 @@ export class ResolverBase {
       }
 
       const contextUser = this.GetUserFromPayload(userPayload);
-      const viewInfo = await provider.GetEntityObject<UserViewEntityExtended>('User Views', contextUser);
+      const viewInfo = await provider.GetEntityObject<UserViewEntityExtended>('MJ: User Views', contextUser);
       await viewInfo.Load(viewInput.ViewID);
       return this.RunViewGenericInternal(
         provider,
@@ -404,9 +404,9 @@ export class ResolverBase {
         let viewInfo: UserViewEntityExtended | null = null;
 
         if (viewInput.ViewName) {
-          viewInfo = this.safeFirstArrayElement(await this.findBy(provider, 'User Views', { Name: viewInput.ViewName }, userPayload.userRecord));
+          viewInfo = this.safeFirstArrayElement(await this.findBy(provider, 'MJ: User Views', { Name: viewInput.ViewName }, userPayload.userRecord));
         } else if (viewInput.ViewID) {
-          viewInfo = await provider.GetEntityObject<UserViewEntityExtended>('User Views', contextUser);
+          viewInfo = await provider.GetEntityObject<UserViewEntityExtended>('MJ: User Views', contextUser);
           await viewInfo.Load(viewInput.ViewID);
         } else if (viewInput.EntityName) {
           const entity = md.Entities.find((e) => e.Name === viewInput.EntityName);
@@ -879,7 +879,7 @@ export class ResolverBase {
       if (!userInfo) throw new Error(`User ${userPayload?.email} not found in metadata`);
       if (!auditLogType) throw new Error(`Audit Log Type ${auditLogTypeName} not found in metadata`);
 
-      const auditLog = await md.GetEntityObject<AuditLogEntity>('Audit Logs', userInfo); // must pass user context on back end as we're not authenticated the same way as the front end
+      const auditLog = await md.GetEntityObject<MJAuditLogEntity>('MJ: Audit Logs', userInfo); // must pass user context on back end as we're not authenticated the same way as the front end
       auditLog.NewRecord();
       auditLog.UserID = userInfo.ID;
       auditLog.AuditLogTypeID = auditLogType.ID;
@@ -1255,7 +1255,7 @@ export class ResolverBase {
         // Create ErrorLog record in the database
         try {
           const md = new Metadata();
-          const errorLogEntity = await md.GetEntityObject<ErrorLogEntity>('Error Logs', contextUser);
+          const errorLogEntity = await md.GetEntityObject<MJErrorLogEntity>('MJ: Error Logs', contextUser);
           errorLogEntity.Code = 'ENTITY_SAVE_INCONSISTENCY';
           errorLogEntity.Message = `Entity save inconsistency detected for ${entityObject.EntityInfo.Name}: ${JSON.stringify(msg)}`;
           errorLogEntity.Status = 'Warning';

package/src/generic/RunViewResolver.ts

@@ -652,7 +652,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) 
         return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { Name: input.ViewName }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "MJ: User Views", { Name: input.ViewName }, userPayload.userRecord));
       const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
@@ -683,7 +683,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) 
         return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "MJ: User Views", { ID: input.ViewID }, userPayload.userRecord));
       const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
@@ -837,7 +837,7 @@ export class RunViewResolver extends ResolverBase {
         };
       }
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "MJ: User Views", { ID: input.ViewID }, userPayload.userRecord));
       const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {

package/src/resolvers/APIKeyResolver.ts

@@ -1,7 +1,7 @@
 import { Resolver, Mutation, Arg, Ctx } from "type-graphql";
 import { Field, InputType, ObjectType } from "type-graphql";
 import { LogError, Metadata } from "@memberjunction/core";
-import { APIKeyScopeEntity } from "@memberjunction/core-entities";
+import { MJAPIKeyScopeEntity } from "@memberjunction/core-entities";
 import { GetAPIKeyEngine } from "@memberjunction/api-keys";
 import { AppContext } from "../types.js";
 import { ResolverBase } from "../generic/ResolverBase.js";
@@ -225,7 +225,7 @@ export class APIKeyResolver extends ResolverBase {
 
         for (const scopeId of scopeIds) {
             try {
-                const keyScope = await md.GetEntityObject<APIKeyScopeEntity>(
+                const keyScope = await md.GetEntityObject<MJAPIKeyScopeEntity>(
                     'MJ: API Key Scopes',
                     user
                 );

package/src/resolvers/ComponentRegistryResolver.ts

@@ -1,7 +1,7 @@
 import { Arg, Ctx, Field, InputType, ObjectType, Query, Mutation, Resolver } from 'type-graphql';
 import { UserInfo, Metadata, LogError, LogStatus } from '@memberjunction/core';
 import { UserCache } from '@memberjunction/sqlserver-dataprovider';
-import { ComponentEntity, ComponentRegistryEntity, ComponentMetadataEngine } from '@memberjunction/core-entities';
+import { MJComponentEntity, MJComponentRegistryEntity, ComponentMetadataEngine } from '@memberjunction/core-entities';
 import { ComponentSpec } from '@memberjunction/interactive-component-types';
 import {
     ComponentRegistryClient,
@@ -393,7 +393,7 @@ export class ComponentRegistryExtendedResolver {
     /**
      * Get registry entity from database by ID
      */
-    private async getRegistry(registryId: string, userInfo: UserInfo): Promise<ComponentRegistryEntity | null> {
+    private async getRegistry(registryId: string, userInfo: UserInfo): Promise<MJComponentRegistryEntity | null> {
         try {
             await this.componentEngine.Config(false, userInfo);
             
@@ -411,7 +411,7 @@ export class ComponentRegistryExtendedResolver {
     /**
      * Get registry entity from database by Name
      */
-    private async getRegistryByName(registryName: string, userInfo: UserInfo): Promise<ComponentRegistryEntity | null> {
+    private async getRegistryByName(registryName: string, userInfo: UserInfo): Promise<MJComponentRegistryEntity | null> {
         try {
             await this.componentEngine.Config(false, userInfo);
             
@@ -431,7 +431,7 @@ export class ComponentRegistryExtendedResolver {
      * Environment variable format: REGISTRY_URI_OVERRIDE_<REGISTRY_NAME>
      * Example: REGISTRY_URI_OVERRIDE_MJ_CENTRAL=http://localhost:8080
      */
-    private getRegistryUri(registry: ComponentRegistryEntity): string {
+    private getRegistryUri(registry: MJComponentRegistryEntity): string {
         if (!registry.Name) {
             return registry.URI || '';
         }
@@ -455,7 +455,7 @@ export class ComponentRegistryExtendedResolver {
      * Create a client for a registry on-demand
      * Checks configuration first, then falls back to default settings
      */
-    private createClientForRegistry(registry: ComponentRegistryEntity): ComponentRegistryClient {
+    private createClientForRegistry(registry: MJComponentRegistryEntity): ComponentRegistryClient {
         // Check if there's a configuration for this registry
         const config = configInfo.componentRegistries?.find(r => 
             r.id === registry.ID || r.name === registry.Name
@@ -490,7 +490,7 @@ export class ComponentRegistryExtendedResolver {
     /**
      * Check if component should be cached
      */
-    private shouldCache(registry: ComponentRegistryEntity): boolean {
+    private shouldCache(registry: MJComponentRegistryEntity): boolean {
         // Check config for caching settings
         const config = configInfo.componentRegistries?.find(r => 
             r.id === registry.ID || r.name === registry.Name
@@ -509,7 +509,7 @@ export class ComponentRegistryExtendedResolver {
         try {
             // Find or create component entity
             const md = new Metadata();
-            const componentEntity = await md.GetEntityObject<ComponentEntity>('MJ: Components', userInfo);
+            const componentEntity = await md.GetEntityObject<MJComponentEntity>('MJ: Components', userInfo);
             
             // Check if component already exists
             const existingComponent = this.componentEngine.Components?.find(
@@ -562,8 +562,8 @@ export class ComponentRegistryExtendedResolver {
     /**
      * Map component type string to entity enum
      */
-    private mapComponentType(type: string): ComponentEntity['Type'] {
-        const typeMap: Record<string, ComponentEntity['Type']> = {
+    private mapComponentType(type: string): MJComponentEntity['Type'] {
+        const typeMap: Record<string, MJComponentEntity['Type']> = {
             'report': 'Report',
             'dashboard': 'Dashboard',
             'form': 'Form',

package/src/resolvers/CreateQueryResolver.ts

@@ -2,7 +2,7 @@ import { Arg, Ctx, Field, InputType, Mutation, ObjectType, registerEnumType, Res
 import { AppContext } from '../types.js';
 import { LogError, RunView, UserInfo, CompositeKey, DatabaseProviderBase, LogStatus } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
-import { QueryCategoryEntity, QueryPermissionEntity } from '@memberjunction/core-entities';
+import { MJQueryCategoryEntity, MJQueryPermissionEntity } from '@memberjunction/core-entities';
 import { MJQueryResolver } from '../generated/generated.js';
 import { GetReadOnlyProvider, GetReadWriteProvider } from '../util.js';
 import { DeleteOptionsInput } from '../generic/DeleteOptionsInput.js';
@@ -222,7 +222,7 @@ export class QueryParameterType {
 }
 
 @ObjectType()
-export class QueryEntityType {
+export class MJQueryEntityType {
     @Field(() => String)
     ID!: string;
 
@@ -300,8 +300,8 @@ export class CreateQueryResultType {
     @Field(() => [QueryParameterType], { nullable: true })
     Parameters?: QueryParameterType[];
 
-    @Field(() => [QueryEntityType], { nullable: true })
-    Entities?: QueryEntityType[];
+    @Field(() => [MJQueryEntityType], { nullable: true })
+    Entities?: MJQueryEntityType[];
 
     @Field(() => [QueryPermissionType], { nullable: true })
     Permissions?: QueryPermissionType[];
@@ -356,8 +356,8 @@ export class UpdateQueryResultType {
     @Field(() => [QueryParameterType], { nullable: true })
     Parameters?: QueryParameterType[];
 
-    @Field(() => [QueryEntityType], { nullable: true })
-    Entities?: QueryEntityType[];
+    @Field(() => [MJQueryEntityType], { nullable: true })
+    Entities?: MJQueryEntityType[];
 
     @Field(() => [QueryPermissionType], { nullable: true })
     Permissions?: QueryPermissionType[];
@@ -426,7 +426,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
             }
 
             // Use QueryEntityExtended which handles AI processing
-            const record = await provider.GetEntityObject<QueryEntityExtended>("Queries", context.userPayload.userRecord);
+            const record = await provider.GetEntityObject<QueryEntityExtended>("MJ: Queries", context.userPayload.userRecord);
             
             // Set the fields from input, handling CategoryPath resolution
             const fieldsToSet = {
@@ -604,7 +604,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
         const createdPermissions: QueryPermissionType[] = [];
         if (permissions && permissions.length > 0) {
             for (const perm of permissions) {
-                const permissionEntity = await p.GetEntityObject<QueryPermissionEntity>('Query Permissions', contextUser);
+                const permissionEntity = await p.GetEntityObject<MJQueryPermissionEntity>('MJ: Query Permissions', contextUser);
                 if (permissionEntity) {
                     permissionEntity.QueryID = queryID;
                     permissionEntity.RoleID = perm.RoleID;
@@ -640,7 +640,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
         try {
             // Load the existing query using QueryEntityExtended
             const provider = GetReadWriteProvider(context.providers);
-            const queryEntity = await provider.GetEntityObject<QueryEntityExtended>('Queries', context.userPayload.userRecord);
+            const queryEntity = await provider.GetEntityObject<QueryEntityExtended>('MJ: Queries', context.userPayload.userRecord);
             if (!queryEntity || !await queryEntity.Load(input.ID)) {
                 return {
                     Success: false,
@@ -656,7 +656,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
 
             // now make sure there is NO existing query by the same name in the specified category
             const existingQueryResult = await provider.RunView({
-                EntityName: 'Queries',
+                EntityName: 'MJ: Queries',
                 ExtraFilter: `Name='${input.Name}' AND CategoryID='${finalCategoryID}'` 
             }, context.userPayload.userRecord);
             if (existingQueryResult.Success && existingQueryResult.Results?.length > 0) {
@@ -704,8 +704,8 @@ export class MJQueryResolverExtended extends MJQueryResolver {
             if (input.Permissions !== undefined) {
                 // Delete existing permissions
                 const rv = new RunView();
-                const existingPermissions = await rv.RunView<QueryPermissionEntity>({
-                    EntityName: 'Query Permissions',
+                const existingPermissions = await rv.RunView<MJQueryPermissionEntity>({
+                    EntityName: 'MJ: Query Permissions',
                     ExtraFilter: `QueryID='${queryID}'`,
                     ResultType: 'entity_object'
                 }, context.userPayload.userRecord);
@@ -822,7 +822,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
             };
             
             // Use inherited DeleteRecord method from ResolverBase
-            const deletedQuery = await this.DeleteRecord('Queries', key, deleteOptions, provider, context.userPayload, pubSub);
+            const deletedQuery = await this.DeleteRecord('MJ: Queries', key, deleteOptions, provider, context.userPayload, pubSub);
             
             if (deletedQuery) {
                 return {
@@ -883,7 +883,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
             } else {
                 try {
                     // Create new category
-                    const newCategory = await p.GetEntityObject<QueryCategoryEntity>("Query Categories", contextUser);
+                    const newCategory = await p.GetEntityObject<MJQueryCategoryEntity>("MJ: Query Categories", contextUser);
                     if (!newCategory) {
                         throw new Error(`Failed to create entity object for Query Categories`);
                     }
@@ -954,7 +954,7 @@ export class MJQueryResolverExtended extends MJQueryResolver {
             const nameFilter = `LOWER(Name) = LOWER('${queryName.replace(/'/g, "''")}')`;
 
             const result = await provider.RunView({
-                EntityName: 'Queries',
+                EntityName: 'MJ: Queries',
                 ExtraFilter: `${nameFilter} AND ${categoryFilter}`
             }, contextUser);
 
@@ -977,14 +977,14 @@ export class MJQueryResolverExtended extends MJQueryResolver {
      * @param contextUser - User context for database operations
      * @returns The matching category entity or null if not found
      */
-    private async findCategoryByNameAndParent(provider: DatabaseProviderBase, categoryName: string, parentID: string | null, contextUser: UserInfo): Promise<QueryCategoryEntity | null> {
+    private async findCategoryByNameAndParent(provider: DatabaseProviderBase, categoryName: string, parentID: string | null, contextUser: UserInfo): Promise<MJQueryCategoryEntity | null> {
         try {
             // Query database directly to avoid cache staleness issues
             const parentFilter = parentID ? `ParentID='${parentID}'` : 'ParentID IS NULL';
             const nameFilter = `LOWER(Name) = LOWER('${categoryName.replace(/'/g, "''")}')`; // Escape single quotes
 
-            const result = await provider.RunView<QueryCategoryEntity>({
-                EntityName: 'Query Categories',
+            const result = await provider.RunView<MJQueryCategoryEntity>({
+                EntityName: 'MJ: Query Categories',
                 ExtraFilter: `${nameFilter} AND ${parentFilter}`,
                 ResultType: 'entity_object'
             }, contextUser);

package/src/resolvers/EntityResolver.ts

@@ -34,7 +34,7 @@ export class EntityResolver extends MJEntityResolverBase {
     }
     const rv = provider as any as IRunViewProvider;
     const result = await rv.RunView({
-      EntityName: 'Entities',
+      EntityName: 'MJ: Entities',
       ExtraFilter: totalWhere,
     }, userPayload.userRecord);
     if (result && result.Success) {

package/src/resolvers/FileCategoryResolver.ts

@@ -1,5 +1,5 @@
 import { CompositeKey, EntityDeleteOptions, EntityPermissionType, EntitySaveOptions, Metadata, RunView } from '@memberjunction/core';
-import { FileCategoryEntity, FileEntity } from '@memberjunction/core-entities';
+import { MJFileCategoryEntity, MJFileEntity } from '@memberjunction/core-entities';
 import { AppContext, Arg, Ctx, DeleteOptionsInput, Int, Mutation } from '@memberjunction/server';
 import { mj_core_schema } from '../config.js';
 import { MJFileCategoryResolver as FileCategoryResolverBase, MJFileCategory_ } from '../generated/generated.js';
@@ -23,8 +23,8 @@ export class FileCategoryResolver extends FileCategoryResolverBase {
     }
 
     const user = this.GetUserFromPayload(userPayload);
-    const fileEntity = await p.GetEntityObject<FileEntity>('Files', user);
-    const fileCategoryEntity = await p.GetEntityObject<FileCategoryEntity>('File Categories', user);
+    const fileEntity = await p.GetEntityObject<MJFileEntity>('MJ: Files', user);
+    const fileCategoryEntity = await p.GetEntityObject<MJFileCategoryEntity>('MJ: File Categories', user);
 
     fileEntity.CheckPermissions(EntityPermissionType.Update, true);
     fileCategoryEntity.CheckPermissions(EntityPermissionType.Delete, true);
@@ -49,7 +49,7 @@ export class FileCategoryResolver extends FileCategoryResolverBase {
       const rv = new RunView();
       const filesResult = await rv.RunView(
         {
-          EntityName: 'Files',
+          EntityName: 'MJ: Files',
           ExtraFilter: `CategoryID='${fileCategoryEntity.ID}'`,
           ResultType: 'entity_object',
         },
@@ -59,7 +59,7 @@ export class FileCategoryResolver 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 p.GetEntityObject<FileEntity>('Files', user);
+          const fileEntity = await p.GetEntityObject<MJFileEntity>('MJ: Files', user);
           await fileEntity.Load(file.ID);
           fileEntity.CategoryID = fileCategoryEntity.ParentID;
           await fileEntity.Save();

package/src/resolvers/FileResolver.ts

@@ -1,5 +1,5 @@
 import { EntityPermissionType, Metadata, FieldValueCollection, EntitySaveOptions, RunView } from '@memberjunction/core';
-import { FileEntity, FileStorageProviderEntity, FileStorageAccountEntity } from '@memberjunction/core-entities';
+import { MJFileEntity, MJFileStorageProviderEntity, MJFileStorageAccountEntity } from '@memberjunction/core-entities';
 import {
   AppContext,
   Arg,
@@ -330,7 +330,7 @@ export class FileResolver extends FileResolverBase {
    * Builds ExtendedUserContextOptions that includes the account entity for enterprise model.
    * This is required for OAuth providers using the Credential Engine to decrypt credentials.
    */
-  private buildExtendedUserContext(context: AppContext, accountEntity: FileStorageAccountEntity): ExtendedUserContextOptions {
+  private buildExtendedUserContext(context: AppContext, accountEntity: MJFileStorageAccountEntity): ExtendedUserContextOptions {
     const user = this.GetUserFromPayload(context.userPayload);
     return {
       userID: user.ID,
@@ -349,19 +349,19 @@ export class FileResolver extends FileResolverBase {
   private async loadAccountAndProvider(
     accountId: string,
     context: AppContext,
-  ): Promise<{ account: FileStorageAccountEntity; provider: FileStorageProviderEntity }> {
+  ): Promise<{ account: MJFileStorageAccountEntity; provider: MJFileStorageProviderEntity }> {
     const md = GetReadOnlyProvider(context.providers, { allowFallbackToReadWrite: true });
     const user = this.GetUserFromPayload(context.userPayload);
 
     // Load the account entity
-    const account = await md.GetEntityObject<FileStorageAccountEntity>('MJ: File Storage Accounts', user);
+    const account = await md.GetEntityObject<MJFileStorageAccountEntity>('MJ: File Storage Accounts', user);
     const loaded = await account.Load(accountId);
     if (!loaded) {
       throw new Error(`Storage account with ID ${accountId} not found`);
     }
 
     // Load the provider entity from the account's ProviderID
-    const provider = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', user);
+    const provider = await md.GetEntityObject<MJFileStorageProviderEntity>('MJ: File Storage Providers', user);
     await provider.Load(account.ProviderID);
 
     return { account, provider };
@@ -372,11 +372,11 @@ export class FileResolver extends FileResolverBase {
     // 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 provider.GetEntityObject<FileEntity>('Files', user);
-    const providerEntity = await provider.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', user);
+    const fileEntity = await provider.GetEntityObject<MJFileEntity>('MJ: Files', user);
+    const providerEntity = await provider.GetEntityObject<MJFileStorageProviderEntity>('MJ: File Storage Providers', user);
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
-    const [sameName] = await this.findBy(provider, 'Files', { Name: input.Name, ProviderID: input.ProviderID }, context.userPayload.userRecord);
+    const [sameName] = await this.findBy(provider, 'MJ: Files', { Name: input.Name, ProviderID: input.ProviderID }, context.userPayload.userRecord);
     const NameExists = Boolean(sameName);
 
     const success = fileEntity.NewRecord(FieldValueCollection.FromObject({ ...input, Status: 'Pending' }));
@@ -403,10 +403,10 @@ export class FileResolver extends FileResolverBase {
   async DownloadUrl(@Root() file: MJFile_, @Ctx() context: AppContext) {
     const md = new Metadata();
     const user = this.GetUserFromPayload(context.userPayload);
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Read, true);
 
-    const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', user);
+    const providerEntity = await md.GetEntityObject<MJFileStorageProviderEntity>('MJ: File Storage Providers', user);
     await providerEntity.Load(file.ProviderID);
 
     const userContext = this.buildUserContext(context);
@@ -420,13 +420,13 @@ export class FileResolver extends FileResolverBase {
     // if the name is changing, rename the target object as well
     const md = GetReadOnlyProvider(context.providers, { allowFallbackToReadWrite: true });
     const user = this.GetUserFromPayload(context.userPayload);
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Update, true);
 
     await fileEntity.Load(input.ID);
 
     if (fileEntity.Name !== input.Name) {
-      const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', user);
+      const providerEntity = await md.GetEntityObject<MJFileStorageProviderEntity>('MJ: File Storage Providers', user);
       await providerEntity.Load(fileEntity.ProviderID);
 
       const userContext = this.buildUserContext(context);
@@ -450,7 +450,7 @@ export class FileResolver extends FileResolverBase {
     const md = GetReadOnlyProvider(context.providers, { allowFallbackToReadWrite: true });
     const userInfo = this.GetUserFromPayload(context.userPayload);
 
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', userInfo);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', userInfo);
     await fileEntity.Load(ID);
     if (!fileEntity) {
       return null;
@@ -459,7 +459,7 @@ export class FileResolver extends FileResolverBase {
 
     // Only delete the object from the provider if it's actually been uploaded
     if (fileEntity.Status === 'Uploaded') {
-      const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', userInfo);
+      const providerEntity = await md.GetEntityObject<MJFileStorageProviderEntity>('MJ: File Storage Providers', userInfo);
       await providerEntity.Load(fileEntity.ProviderID);
       const userContext = this.buildUserContext(context);
       await deleteObject(providerEntity, fileEntity.ProviderKey ?? fileEntity.Name, userContext);
@@ -489,7 +489,7 @@ export class FileResolver extends FileResolverBase {
     });
 
     // Check permissions - user must have read access to Files entity
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Read, true);
 
     // Call the storage provider to list objects with extended user context (includes account for credential lookup)
@@ -524,7 +524,7 @@ export class FileResolver extends FileResolverBase {
     const { account, provider: providerEntity } = await this.loadAccountAndProvider(input.AccountID, context);
 
     // Check permissions
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Read, true);
 
     // Create download URL with extended user context (includes account for credential lookup)
@@ -542,7 +542,7 @@ export class FileResolver extends FileResolverBase {
     const { account, provider: providerEntity } = await this.loadAccountAndProvider(input.AccountID, context);
 
     // Check permissions
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
     // Create upload URL with extended user context (includes account for credential lookup)
@@ -584,7 +584,7 @@ export class FileResolver extends FileResolverBase {
     });
 
     // Check permissions
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Delete, true);
 
     console.log('[FileResolver] Permissions checked, calling deleteObject...');
@@ -607,7 +607,7 @@ export class FileResolver extends FileResolverBase {
     const { account, provider: providerEntity } = await this.loadAccountAndProvider(input.AccountID, context);
 
     // Check permissions
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Update, true);
 
     // Move the object with extended user context (includes account for credential lookup)
@@ -625,7 +625,7 @@ export class FileResolver extends FileResolverBase {
     const { account, provider: providerEntity } = await this.loadAccountAndProvider(input.AccountID, context);
 
     // Check permissions - copying requires both read (source) and create (destination)
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Read, true);
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
@@ -644,7 +644,7 @@ export class FileResolver extends FileResolverBase {
     const { account: accountEntity, provider: providerEntity } = await this.loadAccountAndProvider(input.AccountID, context);
 
     // Check permissions
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
     // Initialize driver with account-based credentials from Credential Engine
@@ -674,7 +674,7 @@ export class FileResolver extends FileResolverBase {
     const user = this.GetUserFromPayload(context.userPayload);
 
     // Check permissions - copying requires both read (source) and create (destination)
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Read, true);
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
@@ -722,13 +722,13 @@ export class FileResolver extends FileResolverBase {
     const user = this.GetUserFromPayload(context.userPayload);
 
     // Check permissions - searching requires read access
-    const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
+    const fileEntity = await md.GetEntityObject<MJFileEntity>('MJ: Files', user);
     fileEntity.CheckPermissions(EntityPermissionType.Read, true);
 
     // Load all requested account entities in a single query
     const rv = new RunView();
     const quotedIDs = input.AccountIDs.map((id) => `'${id}'`).join(', ');
-    const accountResult = await rv.RunView<FileStorageAccountEntity>(
+    const accountResult = await rv.RunView<MJFileStorageAccountEntity>(
       {
         EntityName: 'MJ: File Storage Accounts',
         ExtraFilter: `ID IN (${quotedIDs})`,
@@ -756,9 +756,9 @@ export class FileResolver extends FileResolverBase {
     // Load providers for all accounts
     const providerIDs = [...new Set(accountEntities.map((a) => a.ProviderID))];
     const quotedProviderIDs = providerIDs.map((id) => `'${id}'`).join(', ');
-    const providerResult = await rv.RunView<FileStorageProviderEntity>(
+    const providerResult = await rv.RunView<MJFileStorageProviderEntity>(
       {
-        EntityName: 'File Storage Providers',
+        EntityName: 'MJ: File Storage Providers',
         ExtraFilter: `ID IN (${quotedProviderIDs})`,
         ResultType: 'entity_object',
       },
@@ -769,7 +769,7 @@ export class FileResolver extends FileResolverBase {
       throw new Error(`Failed to load storage providers: ${providerResult.ErrorMessage}`);
     }
 
-    const providerMap = new Map<string, FileStorageProviderEntity>();
+    const providerMap = new Map<string, MJFileStorageProviderEntity>();
     for (const provider of providerResult.Results) {
       providerMap.set(provider.ID, provider);
     }

package/src/resolvers/GetDataContextDataResolver.ts

@@ -3,7 +3,7 @@ import { AppContext } from "../types.js";
 import { DataContext } from "@memberjunction/data-context";
 import { GetReadOnlyDataSource, GetReadOnlyProvider } from "../util.js";
 import { Metadata } from "@memberjunction/core";
-import { DataContextItemEntity } from "@memberjunction/core-entities";
+import { MJDataContextItemEntity } from "@memberjunction/core-entities";
 import { ResolverBase } from "../generic/ResolverBase.js";
 
 @ObjectType()
@@ -59,7 +59,7 @@ export class GetDataContextDataResolver extends ResolverBase {
                 allowFallbackToReadWrite: true,
             })
             const md = GetReadOnlyProvider(appCtx.providers, {allowFallbackToReadWrite: true});
-            const dciData = await md.GetEntityObject<DataContextItemEntity>("Data Context Items", appCtx.userPayload.userRecord);
+            const dciData = await md.GetEntityObject<MJDataContextItemEntity>("MJ: 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
                 await dci.LoadMetadataFromEntityRecord(dciData, Metadata.Provider, appCtx.userPayload.userRecord);