@memberjunction/server 1.8.1 → 2.1.1

package/src/generic/RunViewResolver.ts

@@ -1,6 +1,7 @@
 import { Arg, Ctx, Field, InputType, Int, ObjectType, PubSubEngine, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types';
 import { ResolverBase } from './ResolverBase';
+import { LogError, LogStatus } from '@memberjunction/core';
 
 /********************************************************************************
  * The PURPOSE of this resolver is to provide a generic way to run a view and return the results.
@@ -14,8 +15,8 @@ import { ResolverBase } from './ResolverBase';
 //****************************************************************************
 @InputType()
 export class RunViewByIDInput {
-  @Field(() => Int)
-  ViewID: number;
+  @Field(() => String)
+  ViewID: string;
 
   @Field(() => String, {
     nullable: true,
@@ -41,8 +42,8 @@ export class RunViewByIDInput {
   @Field(() => String, { nullable: true })
   UserSearchString: string;
 
-  @Field(() => Int, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
-  ExcludeUserViewRunID?: number;
+  @Field(() => String, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
+  ExcludeUserViewRunID?: string;
 
   @Field(() => String, {
     nullable: true,
@@ -98,7 +99,14 @@ export class RunViewByIDInput {
     description:
       'Optional, pass in entity_object, simple, or count_only as options to specify the type of result you want back. Defaults to simple if not provided',
   })
-  ResultType?: string;
+  ResultType?: string; 
+
+  @Field(() => Int, {
+    nullable: true,
+    description:
+      'If a value > 0 is provided, this value will be used to offset the rows returned.',
+  })
+  StartRow?: number
 }
 
 @InputType()
@@ -130,8 +138,8 @@ export class RunViewByNameInput {
   @Field(() => String, { nullable: true })
   UserSearchString: string;
 
-  @Field(() => Int, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
-  ExcludeUserViewRunID?: number;
+  @Field(() => String, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
+  ExcludeUserViewRunID?: string;
 
   @Field(() => String, {
     nullable: true,
@@ -188,7 +196,15 @@ export class RunViewByNameInput {
       'Optional, pass in entity_object, simple, or count_only as options to specify the type of result you want back. Defaults to simple if not provided',
   })
   ResultType?: string;
+
+  @Field(() => Int, {
+    nullable: true,
+    description:
+      'If a value > 0 is provided, this value will be used to offset the rows returned.',
+  })
+  StartRow?: number
 }
+
 @InputType()
 export class RunDynamicViewInput {
   @Field(() => String)
@@ -218,8 +234,8 @@ export class RunDynamicViewInput {
   @Field(() => String, { nullable: true })
   UserSearchString: string;
 
-  @Field(() => Int, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
-  ExcludeUserViewRunID?: number;
+  @Field(() => String, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
+  ExcludeUserViewRunID?: string;
 
   @Field(() => String, {
     nullable: true,
@@ -262,6 +278,109 @@ export class RunDynamicViewInput {
       'Optional, pass in entity_object, simple, or count_only as options to specify the type of result you want back. Defaults to simple if not provided',
   })
   ResultType?: string;
+
+  @Field(() => Int, {
+    nullable: true,
+    description:
+      'If a value > 0 is provided, this value will be used to offset the rows returned.',
+  })
+  StartRow?: number
+}
+
+@InputType()
+export class RunViewGenericInput {
+  @Field(() => String)
+  EntityName: string;
+
+  @Field(() => String, {
+    nullable: true,
+    description:
+      'Optional, pass in a valid condition to use as the view WHERE clause. For example, UpdatedAt >= Some Date - if not provided, no filter is applied',
+  })
+  ExtraFilter: string;
+
+  @Field(() => String, {
+    nullable: true,
+    description:
+      'Optional, pass in a valid order by clause sort the results on the server. For example, CreatedAt DESC to order by row creation date in reverse order. Any Valid SQL Order By clause is okay - if not provided, no server-side sorting is applied',
+  })
+  OrderBy: string;
+
+  @Field(() => [String], {
+    nullable: true,
+    description:
+      'Optional, array of entity field names, if not provided, all columns are returned. If provided, only the fields in the array are returned.',
+  })
+  Fields?: string[];
+
+  @Field(() => String, { nullable: true })
+  UserSearchString: string;
+
+  @Field(() => String, { nullable: true, description: 'Pass in a UserViewRun ID value to exclude all records from that run from results' })
+  ExcludeUserViewRunID?: string;
+
+  @Field(() => String, {
+    nullable: true,
+    description:
+      'Pass in a valid condition to append to the view WHERE clause to override the Exclude List. For example, UpdatedAt >= Some Date',
+  })
+  OverrideExcludeFilter?: string;
+
+  @Field(() => Boolean, {
+    nullable: true,
+    description:
+      'If set to True, the results of this view are saved into a new UserViewRun record and the UserViewRun.ID is passed back in the results.',
+  })
+  SaveViewResults?: boolean;
+
+  @Field(() => Boolean, {
+    nullable: true,
+    description:
+      'if set to true, the resulting data will filter out ANY records that were ever returned by this view, when the SaveViewResults property was set to true. This is useful if you want to run a particular view over time and make sure the results returned each time are new to the view.',
+  })
+  ExcludeDataFromAllPriorViewRuns?: boolean;
+
+  @Field(() => Boolean, {
+    nullable: true,
+    description:
+      'if set to true, if there IS any UserViewMaxRows property set for the entity in question, it will be IGNORED. This is useful in scenarios where you want to programmatically run a view and get ALL the data back, regardless of the MaxRows setting on the entity.',
+  })
+  IgnoreMaxRows?: boolean;
+
+  @Field(() => Int, {
+    nullable: true,
+    description:
+      'if a value > 0 is provided, and IgnoreMaxRows is set to false, this value is used for the max rows to be returned by the view.',  
+  })
+  MaxRows?: number
+
+  @Field(() => Boolean, {
+    nullable: true,
+    description:
+      'If set to true, an Audit Log record will be created for the view run, regardless of the property settings in the entity for auditing view runs',
+  })
+  ForceAuditLog?: boolean;
+
+  @Field(() => String, {
+    nullable: true,
+    description:
+      "if provided and either ForceAuditLog is set, or the entity's property settings for logging view runs are set to true, this will be used as the Audit Log Description.",
+  })
+  AuditLogDescription?: string;
+
+  @Field(() => String, {
+    nullable: true,
+    description:
+      'Optional, pass in entity_object, simple, or count_only as options to specify the type of result you want back. Defaults to simple if not provided',
+  })
+  ResultType?: string;
+
+  @Field(() => Int, {
+    nullable: true,
+    description:
+      'If a value > 0 is provided, this value will be used to offset the rows returned.',
+  })
+  StartRow?: number
 }
 
 @ObjectType()
@@ -269,8 +388,20 @@ export class RunViewResultRow {
   @Field(() => Int)
   ID: number;
 
-  @Field(() => Int)
-  EntityID: number;
+  @Field(() => String)
+  EntityID: string;
+
+  @Field(() => String)
+  Data: string;
+}
+
+@ObjectType()
+export class RunViewGenericResultRow {
+  @Field(() => String)
+  ID: string;
+
+  @Field(() => String)
+  EntityID: string;
 
   @Field(() => String)
   Data: string;
@@ -281,8 +412,32 @@ export class RunViewResult {
   @Field(() => [RunViewResultRow])
   Results: RunViewResultRow[];
 
+  @Field(() => String, { nullable: true })
+  UserViewRunID?: string;
+
   @Field(() => Int, { nullable: true })
-  UserViewRunID?: number;
+  RowCount: number;
+
+  @Field(() => Int, { nullable: true })
+  TotalRowCount: number;
+
+  @Field(() => Int, { nullable: true })
+  ExecutionTime: number;
+
+  @Field(() => String, { nullable: true })
+  ErrorMessage?: string;
+
+  @Field(() => Boolean, { nullable: false })
+  Success: boolean;
+}
+
+@ObjectType()
+export class RunViewGenericResult {
+  @Field(() => [RunViewGenericResultRow])
+  Results: RunViewGenericResultRow[];
+
+  @Field(() => String, { nullable: true })
+  UserViewRunID?: string;
 
   @Field(() => Int, { nullable: true })
   RowCount: number;
@@ -377,12 +532,47 @@ export class RunViewResolver extends ResolverBase {
     }
   }
 
-  protected processRawData(rawData: any[], entityId: number): RunViewResultRow[] {
+  @Query(() => [RunViewGenericResult])
+  async RunViews(
+    @Arg('input', () => [RunViewGenericInput]) input: (RunViewByNameInput & RunViewByIDInput & RunDynamicViewInput)[],
+    @Ctx() { dataSource, userPayload }: AppContext,
+    pubSub: PubSubEngine
+  ) {
+    try {
+      const rawData: RunViewGenericResult[] = await super.RunViewsGeneric(input, dataSource, userPayload, pubSub);
+      if (!rawData) {
+        return null;
+      }
+
+      let results: RunViewGenericResult[] = [];
+      for(const [index, data] of rawData.entries()){
+        const entityId = await dataSource.query(`SELECT TOP 1 ID from [${this.MJCoreSchema}].vwEntities WHERE Name='${input[index].EntityName}'`);
+        const returnData: any[] = this.processRawData(data.Results, entityId[0].ID);
+
+        results.push({
+          Results: returnData,
+          UserViewRunID: data?.UserViewRunID,
+          RowCount: data?.RowCount,
+          TotalRowCount: data?.TotalRowCount,
+          ExecutionTime: data?.ExecutionTime,
+          Success: data?.Success,
+        });
+      }
+
+      return results;
+    } 
+    catch (err) {
+      LogError(err);
+      return null;
+    }
+  }
+
+  protected processRawData(rawData: any[], entityId: string): RunViewResultRow[] {
     const returnResult = [];
     for (let i = 0; i < rawData.length; i++) {
       const row = rawData[i];
       returnResult.push({
-        ID: row.ID,
+        ID: row.ID.toString(),
         EntityID: entityId,
         Data: JSON.stringify(row),
       });

package/src/index.ts

@@ -6,12 +6,13 @@ import { expressMiddleware } from '@apollo/server/express4';
 import { mergeSchemas } from '@graphql-tools/schema';
 import { Metadata } from '@memberjunction/core';
 import { setupSQLServerClient, SQLServerProviderConfigData, UserCache } from '@memberjunction/sqlserver-dataprovider';
-import { json } from 'body-parser';
+import { default as BodyParser } from 'body-parser';
 import cors from 'cors';
 import express from 'express';
-import { globSync } from 'fast-glob';
+import { default as fg } from 'fast-glob';
 import { useServer } from 'graphql-ws/lib/use/ws';
 import { createServer } from 'node:http';
+import { fileURLToPath } from 'node:url';
 import { sep } from 'node:path';
 import 'reflect-metadata';
 import { ReplaySubject } from 'rxjs';
@@ -42,7 +43,6 @@ export * from './directives';
 export * from './entitySubclasses/userViewEntity.server';
 export * from './entitySubclasses/entityPermissions.server';
 export * from './entitySubclasses/DuplicateRunEntity.server';
-export * from './entitySubclasses/EntityBehavior.server';
 export * from './types';
 export { TokenExpiredError } from './auth';
 
@@ -50,7 +50,7 @@ export * from './generic/PushStatusResolver';
 export * from './generic/ResolverBase';
 export * from './generic/RunViewResolver';
 export * from './generic/KeyValuePairInput';
-export * from './generic/KeyInputOutputTypes'
+export * from './generic/KeyInputOutputTypes';
 export * from './generic/DeleteOptionsInput';
 
 export * from './resolvers/AskSkipResolver';
@@ -60,23 +60,26 @@ export * from './resolvers/EntityRecordNameResolver';
 export * from './resolvers/MergeRecordsResolver';
 export * from './resolvers/ReportResolver';
 
-export * from './generated/generated'
+export * from './generated/generated';
 
 import { resolve } from 'node:path';
 
-const localPath = (p: string) => resolve(__dirname, p);
+const localPath = (p: string) => {
+  // Convert import.meta.url to a local directory path
+  const dirname = fileURLToPath(new URL('.', import.meta.url));
+  // Resolve the provided path relative to the derived directory path
+  const resolvedPath = resolve(dirname, p);
+  return resolvedPath;
+};
 
 export const serve = async (resolverPaths: Array<string>) => {
-  const localResolverPaths = [
-    'resolvers/**/*Resolver.{js,ts}',
-    'generic/*Resolver.{js,ts}',
-    'generated/generated.{js,ts}'
-  ].map(localPath);
+  const localResolverPaths = ['resolvers/**/*Resolver.{js,ts}', 'generic/*Resolver.{js,ts}', 'generated/generated.{js,ts}'].map(localPath);
 
   const combinedResolverPaths = [...resolverPaths, ...localResolverPaths];
 
-  const replaceBackslashes = sep === '\\';
-  const paths = combinedResolverPaths.flatMap((path) => globSync(replaceBackslashes ? path.replace(/\\/g, '/') : path));
+  const isWindows = sep === '\\';
+  const globs = combinedResolverPaths.flatMap((path) => (isWindows ? path.replace(/\\/g, '/') : path));
+  const paths = fg.globSync(globs);
   if (paths.length === 0) {
     console.warn(`No resolvers found in ${combinedResolverPaths.join(', ')}`);
     console.log({ combinedResolverPaths, paths, cwd: process.cwd() });
@@ -107,9 +110,7 @@ export const serve = async (resolverPaths: Array<string>) => {
   /******TEST HARNESS FOR CHANGE DETECTION */
   /******TEST HARNESS FOR CHANGE DETECTION */
 
-
-
-  const dynamicModules = await Promise.all(paths.map((modulePath) => import(modulePath.replace(/\.[jt]s$/, ''))));
+  const dynamicModules = await Promise.all(paths.map((modulePath) => import(isWindows ? `file://${modulePath}` : modulePath)));
   const resolvers = dynamicModules.flatMap((module) =>
     Object.values(module).filter((value) => typeof value === 'function')
   ) as BuildSchemaOptions['resolvers'];
@@ -149,7 +150,7 @@ export const serve = async (resolverPaths: Array<string>) => {
   app.use(
     graphqlRootPath,
     cors<cors.CorsRequest>(),
-    json({limit: '50mb'}),
+    BodyParser.json({ limit: '50mb' }),
     expressMiddleware(apolloServer, {
       context: contextFunction({ setupComplete$, dataSource }),
     })
@@ -158,5 +159,3 @@ export const serve = async (resolverPaths: Array<string>) => {
   await new Promise<void>((resolve) => httpServer.listen({ port: graphqlPort }, resolve));
   console.log(`🚀 Server ready at http://localhost:${graphqlPort}/`);
 };
-
-export default serve;

package/src/resolvers/AskSkipResolver.ts

@@ -48,13 +48,13 @@ export class AskSkipResultType {
   Result: string;
 
   @Field(() => Int)
-  ConversationId: number;
+  ConversationId: string;
 
   @Field(() => Int)
-  UserMessageConversationDetailId: number;
+  UserMessageConversationDetailId: string;
 
   @Field(() => Int)
-  AIMessageConversationDetailId: number;
+  AIMessageConversationDetailId: string;
 }
  
 
@@ -71,7 +71,7 @@ export class AskSkipResolver {
    */
   @Query(() => AskSkipResultType)
   async ExecuteAskSkipRecordChat(@Arg('UserQuestion', () => String) UserQuestion: string,
-                                 @Arg('ConversationId', () => Int) ConversationId: number,
+                                 @Arg('ConversationId', () => String) ConversationId: string,
                                  @Arg('EntityName', () => String) EntityName: string,
                                  @Arg('CompositeKey', () => CompositeKeyInputType) compositeKey: CompositeKeyInputType,
                                  @Ctx() { dataSource, userPayload }: AppContext,
@@ -91,7 +91,7 @@ export class AskSkipResolver {
           await this.HandleSkipInitialObjectLoading(dataSource, ConversationId, UserQuestion, user, userPayload, md, null);
 
     // if we have a new conversation, update the data context to have an item for this record
-    if (!ConversationId || ConversationId <= 0) {
+    if (!ConversationId || ConversationId.length === 0) {
       const dci = await md.GetEntityObject<DataContextItemEntity>('Data Context Items', user);
       dci.DataContextID = dataContext.ID;
       dci.Type = 'single_record';
@@ -126,7 +126,7 @@ export class AskSkipResolver {
     return this.handleSimpleSkipPostRequest(input, convoEntity.ID, convoDetailEntity.ID, true, user);
   }
 
-  protected async handleSimpleSkipPostRequest(input: SkipAPIRequest, conversationID: number = 0, UserMessageConversationDetailId: number = 0, createAIMessageConversationDetail: boolean = false, user: UserInfo = null): Promise<AskSkipResultType> {
+  protected async handleSimpleSkipPostRequest(input: SkipAPIRequest, conversationID: string = "", UserMessageConversationDetailId: string = "", createAIMessageConversationDetail: boolean = false, user: UserInfo = null): Promise<AskSkipResultType> {
     LogStatus(`   >>> HandleSimpleSkipPostRequest Sending request to Skip API: ${___skipAPIurl}`);
 
     const response = await sendPostRequest(___skipAPIurl, input, true, null);
@@ -134,7 +134,7 @@ export class AskSkipResolver {
     if (response && response.length > 0) {
       // the last object in the response array is the final response from the Skip API
       const apiResponse = <SkipAPIResponse>response[response.length - 1].value;
-      const AIMessageConversationDetailID = createAIMessageConversationDetail ? await this.CreateAIMessageConversationDetail(apiResponse, conversationID, user) : 0;
+      const AIMessageConversationDetailID = createAIMessageConversationDetail ? await this.CreateAIMessageConversationDetail(apiResponse, conversationID, user) : "";
 //      const apiResponse = <SkipAPIResponse>response.data;
       LogStatus(`  Skip API response: ${apiResponse.responsePhase}`)
       return {
@@ -155,12 +155,12 @@ export class AskSkipResolver {
         ResponsePhase: SkipResponsePhase.AnalysisComplete,
         ConversationId: conversationID,
         UserMessageConversationDetailId: UserMessageConversationDetailId,
-        AIMessageConversationDetailId: 0,
+        AIMessageConversationDetailId: "",
       };
     }
   }
 
-  protected async CreateAIMessageConversationDetail(apiResponse: SkipAPIResponse, conversationID: number, user: UserInfo): Promise<number> {
+  protected async CreateAIMessageConversationDetail(apiResponse: SkipAPIResponse, conversationID: string, user: UserInfo): Promise<string> {
     const md = new Metadata();
     const convoDetailEntityAI = <ConversationDetailEntity>await md.GetEntityObject('Conversation Details', user);
     convoDetailEntityAI.NewRecord();
@@ -175,11 +175,11 @@ export class AskSkipResolver {
     }
     else{
       LogError(`Error saving conversation detail entity for AI message: ${lastSystemMessage?.content}`, undefined, convoDetailEntityAI.LatestResult);
-      return 0;
+      return "";
     }
   }
 
-  protected buildSkipAPIRequest(messages: SkipMessage[], conversationId: number, dataContext: DataContext, requestPhase: SkipRequestPhase, includeEntities: boolean, includeQueries: boolean): SkipAPIRequest {
+  protected buildSkipAPIRequest(messages: SkipMessage[], conversationId: string, dataContext: DataContext, requestPhase: SkipRequestPhase, includeEntities: boolean, includeQueries: boolean): SkipAPIRequest {
     const entities = includeEntities ? this.BuildSkipEntities() : [];
     const queries = includeQueries ? this.BuildSkipQueries() : [];
     const input: SkipAPIRequest = { 
@@ -188,7 +188,7 @@ export class AskSkipResolver {
       messages: messages, 
       conversationID: conversationId.toString(), 
       dataContext: <DataContext>CopyScalarsAndArrays(dataContext), // we are casting this to DataContext as we're pushing this to the Skip API, and we don't want to send the real DataContext object, just a copy of the scalar and array properties
-      organizationID: !isNaN(parseInt(___skipAPIOrgId)) ? parseInt(___skipAPIOrgId) : 0,
+      organizationID: ___skipAPIOrgId,
       requestPhase: requestPhase,
       entities: entities,
       queries: queries
@@ -205,13 +205,13 @@ export class AskSkipResolver {
   @Query(() => AskSkipResultType)
   async ExecuteAskSkipRunScript(@Ctx() { dataSource, userPayload }: AppContext,
                                 @PubSub() pubSub: PubSubEngine,
-                                @Arg('DataContextId', () => Int) DataContextId: number,
+                                @Arg('DataContextId', () => String) DataContextId: string,
                                 @Arg('ScriptText', () => String) ScriptText: string) {
     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`);
                                   const dataContext: DataContext = new DataContext();
     await dataContext.Load(DataContextId, dataSource, true, false, 0, user);
-    const input = this.buildSkipAPIRequest([], 0, dataContext, 'run_existing_script', false, false);
+    const input = this.buildSkipAPIRequest([], "", dataContext, 'run_existing_script', false, false);
     return this.handleSimpleSkipPostRequest(input);
   }
 
@@ -243,10 +243,10 @@ export class AskSkipResolver {
   @Query(() => AskSkipResultType)
   async ExecuteAskSkipAnalysisQuery(
     @Arg('UserQuestion', () => String) UserQuestion: string,
-    @Arg('ConversationId', () => Int) ConversationId: number,
+    @Arg('ConversationId', () => String) ConversationId: string,
     @Ctx() { dataSource, userPayload }: AppContext,
     @PubSub() pubSub: PubSubEngine,
-    @Arg('DataContextId', () => Int, { nullable: true }) DataContextId?: number
+    @Arg('DataContextId', () => String, { nullable: true }) DataContextId?: string
   ) {
     const md = new Metadata();
     const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email.trim().toLowerCase());
@@ -370,19 +370,19 @@ export class AskSkipResolver {
   }
 
   protected async HandleSkipInitialObjectLoading(dataSource: DataSource, 
-                                                 ConversationId: number, 
+                                                 ConversationId: string, 
                                                  UserQuestion: string, 
                                                  user: UserInfo,
                                                  userPayload: UserPayload, 
                                                  md: Metadata,
-                                                 DataContextId: number): Promise<{convoEntity: ConversationEntity, 
+                                                 DataContextId: string): Promise<{convoEntity: ConversationEntity, 
                                                                          dataContextEntity: DataContextEntity, 
                                                                          convoDetailEntity: ConversationDetailEntity, 
                                                                          dataContext: DataContext}> {
     const convoEntity = <ConversationEntity>await md.GetEntityObject('Conversations', user);
     let dataContextEntity: DataContextEntity;
 
-    if (!ConversationId || ConversationId <= 0) {
+    if (!ConversationId || ConversationId.length === 0) {
       // create a new conversation id
       convoEntity.NewRecord();
       if (user) {
@@ -390,7 +390,7 @@ export class AskSkipResolver {
         convoEntity.Name = AskSkipResolver._defaultNewChatName;
 
         dataContextEntity = await md.GetEntityObject<DataContextEntity>('Data Contexts', user);
-        if (!DataContextId || DataContextId <= 0) {
+        if (!DataContextId || DataContextId.length === 0) {
           dataContextEntity.NewRecord();
           dataContextEntity.UserID = user.ID;
           dataContextEntity.Name = 'Data Context for Skip Conversation';
@@ -408,7 +408,7 @@ export class AskSkipResolver {
         convoEntity.DataContextID = dataContextEntity.ID;
         if (await convoEntity.Save()) {
           ConversationId = convoEntity.ID;
-          if (!DataContextId || dataContextEntity.ID <= 0) {
+          if (!DataContextId || dataContextEntity.ID.length === 0) {
             // only do this if we created a new data context for this conversation
             dataContextEntity.Name += ` ${ConversationId}`;
             const dciSaveResult: boolean = await dataContextEntity.Save();
@@ -430,7 +430,7 @@ export class AskSkipResolver {
       dataContextEntity = await md.GetEntityObject<DataContextEntity>('Data Contexts', user);
 
       // note - we ignore the parameter DataContextId if it is passed in, we will use the data context from the conversation that is saved. If a user wants to change the data context for a convo, they can do that elsewhere
-      if (DataContextId && DataContextId > 0 && DataContextId !== convoEntity.DataContextID) {
+      if (DataContextId && DataContextId.length > 0 && DataContextId !== convoEntity.DataContextID) {
         if (convoEntity.DataContextID === null) {
           convoEntity.DataContextID = DataContextId;
           const convoEntitySaveResult: boolean = await convoEntity.Save();
@@ -464,7 +464,7 @@ export class AskSkipResolver {
     return {dataContext, convoEntity, dataContextEntity, convoDetailEntity};
   }
 
-  protected async LoadConversationDetailsIntoSkipMessages(dataSource: DataSource, ConversationId: number, maxHistoricalMessages?: number): Promise<SkipMessage[]> {
+  protected async LoadConversationDetailsIntoSkipMessages(dataSource: DataSource, ConversationId: string, maxHistoricalMessages?: number): Promise<SkipMessage[]> {
     try {
       // load up all the conversation details from the database server
       const md = new Metadata();
@@ -474,7 +474,7 @@ export class AskSkipResolver {
                    FROM 
                       ${e.SchemaName}.${e.BaseView} 
                    WHERE 
-                      ConversationID = ${ConversationId} 
+                      ConversationID = '${ConversationId}' 
                    ORDER 
                       BY __mj_CreatedAt DESC`;
       const result = await dataSource.query(sql);
@@ -555,7 +555,7 @@ export class AskSkipResolver {
   }
 
   protected async HandleSkipRequest(input: SkipAPIRequest, UserQuestion: string, user: UserInfo, dataSource: DataSource, 
-                                    ConversationId: number, userPayload: UserPayload, pubSub: PubSubEngine, md: Metadata, 
+                                    ConversationId: string, userPayload: UserPayload, pubSub: PubSubEngine, md: Metadata, 
                                     convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity,
                                     dataContext: DataContext, dataContextEntity: DataContextEntity): Promise<AskSkipResultType> {
     LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${___skipAPIurl}`);
@@ -628,13 +628,13 @@ export class AskSkipResolver {
         Result: `User Question ${UserQuestion} didn't work!`,
         ResponsePhase: SkipResponsePhase.AnalysisComplete,
         ConversationId: ConversationId,
-        UserMessageConversationDetailId: 0,
-        AIMessageConversationDetailId: 0,
+        UserMessageConversationDetailId: "",
+        AIMessageConversationDetailId: "",
       };
     }
   }
 
-  protected async PublishApiResponseUserUpdateMessage(apiResponse: SkipAPIResponse, userPayload: UserPayload, conversationID: number, pubSub: PubSubEngine) {
+  protected async PublishApiResponseUserUpdateMessage(apiResponse: SkipAPIResponse, userPayload: UserPayload, conversationID: string, pubSub: PubSubEngine) {
     let sUserMessage: string = '';
     switch (apiResponse.responsePhase) {
       case 'data_request':
@@ -662,7 +662,7 @@ export class AskSkipResolver {
   }
 
   protected async HandleAnalysisComplete(apiRequest: SkipAPIRequest, apiResponse: SkipAPIAnalysisCompleteResponse, UserQuestion: string, user: UserInfo, dataSource: DataSource, 
-                                         ConversationId: number, userPayload: UserPayload, pubSub: PubSubEngine, convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity,
+                                         ConversationId: string, userPayload: UserPayload, pubSub: PubSubEngine, convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity,
                                          dataContext: DataContext, dataContextEntity: DataContextEntity): Promise<AskSkipResultType> {
     // analysis is complete
     // all done, wrap things up
@@ -681,7 +681,7 @@ export class AskSkipResolver {
   }
 
   protected async HandleClarifyingQuestionPhase(apiRequest: SkipAPIRequest, apiResponse: SkipAPIClarifyingQuestionResponse, UserQuestion: string, user: UserInfo, dataSource: DataSource, 
-                                                ConversationId: number, userPayload: UserPayload, pubSub: PubSubEngine, convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity): Promise<AskSkipResultType> {
+                                                ConversationId: string, userPayload: UserPayload, pubSub: PubSubEngine, convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity): Promise<AskSkipResultType> {
     // need to create a message here in the COnversation and then pass that id below
     const md = new Metadata();
     const convoDetailEntityAI = <ConversationDetailEntity>await md.GetEntityObject('Conversation Details', user);
@@ -716,7 +716,7 @@ export class AskSkipResolver {
   }
 
   protected async HandleDataRequestPhase(apiRequest: SkipAPIRequest, apiResponse: SkipAPIDataRequestResponse, UserQuestion: string, user: UserInfo, dataSource: DataSource, 
-                                         ConversationId: number, userPayload: UserPayload, pubSub: PubSubEngine, convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity,
+                                         ConversationId: string, userPayload: UserPayload, pubSub: PubSubEngine, convoEntity: ConversationEntity, convoDetailEntity: ConversationDetailEntity,
                                          dataContext: DataContext, dataContextEntity: DataContextEntity): Promise<AskSkipResultType> {
     // our job in this method is to go through each of the data requests from the Skip API, get the data, and then go back to the Skip API again and to the next phase
     try {  
@@ -728,7 +728,7 @@ export class AskSkipResolver {
           ResponsePhase: SkipResponsePhase.DataRequest,
           ConversationId: ConversationId,
           UserMessageConversationDetailId: convoDetailEntity.ID,
-          AIMessageConversationDetailId: 0,
+          AIMessageConversationDetailId: "",
           Result: JSON.stringify(apiResponse)
         };    
     }
@@ -806,7 +806,7 @@ export class AskSkipResolver {
             ResponsePhase: SkipResponsePhase.DataRequest,
             ConversationId: ConversationId,
             UserMessageConversationDetailId: convoDetailEntity.ID,
-            AIMessageConversationDetailId: 0,
+            AIMessageConversationDetailId: "",
             Result: JSON.stringify(apiResponse)
           };    
         }
@@ -846,7 +846,7 @@ export class AskSkipResolver {
    * @param userPayload 
    * @returns 
    */
-  protected async FinishConversationAndNotifyUser(apiResponse: SkipAPIAnalysisCompleteResponse, dataContext: DataContext, dataContextEntity: DataContextEntity, md: Metadata, user: UserInfo, convoEntity: ConversationEntity, pubSub: PubSubEngine, userPayload: UserPayload): Promise<{AIMessageConversationDetailID: number}> {
+  protected async FinishConversationAndNotifyUser(apiResponse: SkipAPIAnalysisCompleteResponse, dataContext: DataContext, dataContextEntity: DataContextEntity, md: Metadata, user: UserInfo, convoEntity: ConversationEntity, pubSub: PubSubEngine, userPayload: UserPayload): Promise<{AIMessageConversationDetailID: string}> {
     const sTitle = apiResponse.reportTitle; 
     const sResult = JSON.stringify(apiResponse);
 
@@ -913,7 +913,7 @@ export class AskSkipResolver {
     };
   }
 
-  protected async getViewData(ViewId: number, user: UserInfo): Promise<any> {
+  protected async getViewData(ViewId: string, user: UserInfo): Promise<any> {
     const rv = new RunView();
     const result = await rv.RunView({ViewID: ViewId, IgnoreMaxRows: true}, user);
     if (result && result.Success)