@memberjunction/server 1.7.1 → 1.8.1

package/src/generic/ResolverBase.ts

@@ -24,10 +24,16 @@ export class ResolverBase {
       const entityInfo = md.Entities.find((e) => e.Name === entityName);
       if (!entityInfo) 
         throw new Error(`Entity ${entityName} not found in metadata`);
-      const fields = entityInfo.Fields.filter((f) => f.Name !== f.CodeName);
+      const fields = entityInfo.Fields.filter((f) => f.Name !== f.CodeName || f.Name.startsWith('__mj_'));
       fields.forEach((f) => {
         if (dataObject.hasOwnProperty(f.Name)) {
-          dataObject[f.CodeName] = dataObject[f.Name];
+          if (f.CodeName.startsWith('__mj_')) { // GraphQL doesn't allow us to pass back fields with __ so we are mapping our special field cases that start with __mj_ to _mj__ for transport - they are converted back on the other side automatically
+            const newCodeName = `_mj__${f.CodeName.substring(5)}`;
+            dataObject[newCodeName] = dataObject[f.Name];
+          } 
+          else {
+            dataObject[f.CodeName] = dataObject[f.Name];
+          }
           delete dataObject[f.Name];
         }
       });  
@@ -205,14 +211,12 @@ export class ResolverBase {
         // figure out the result type from the input string (if provided)
         let rt: 'simple' | 'entity_object' | 'count_only' = 'simple';
         switch (resultType?.trim().toLowerCase()) {
-          case 'entity_object':
-            rt = 'entity_object';
-            break;
           case 'count_only':
             rt = 'count_only';
             break;
+          case 'entity_object':
           default:
-            rt = 'simple';
+            rt = 'simple'; // use simple as the default AND for entity_object becuase on teh server we don't really pass back a true entity_object anyway, just passing back the simple object anyway
             break;
         }
 
@@ -236,9 +240,25 @@ export class ResolverBase {
           },
           user
         );
+        // go through the result and convert all fields that start with __mj_*** to _mj__*** for GraphQL transport
+        if (result && result.Success) {
+          for (const r of result.Results) {
+            const keys = Object.keys(r);
+            keys.forEach((k) => {
+              if (k.trim().toLowerCase().startsWith('__mj_')) {
+                r[`_mj__${k.substring(5)}`] = r[k];
+                delete r[k];
+              }
+            });
+          
+          }
+        }
         return result;
-      } else return null;
-    } catch (err) {
+      } 
+      else 
+        return null;
+    } 
+    catch (err) {
       console.log(err);
       throw err;
     }
@@ -385,7 +405,7 @@ export class ResolverBase {
         if (await entityObject.Save()) {
             // save worked, fire the AfterCreate event and then return all the data
             await this.AfterCreate(dataSource, input); // fire event
-            return entityObject.GetAll();
+            return this.MapFieldNamesToCodeNames(entityName, entityObject.GetAll());
         }
         else 
             // save failed, return null
@@ -458,7 +478,7 @@ export class ResolverBase {
         if (await entityObject.Save()) {
           // save worked, fire afterevent and return all the data
           await this.AfterUpdate(dataSource, input); // fire event
-          return entityObject.GetAll();
+          return this.MapFieldNamesToCodeNames(entityName, entityObject.GetAll());
         }
         else {
           throw new GraphQLError(entityObject.LatestResult?.Message ?? 'Unknown error', {
@@ -499,6 +519,10 @@ export class ResolverBase {
             val = (val === null || val === undefined || val === 'false' || val === '0' || parseInt(val) === 0) ? false : true;
             break;
           case EntityFieldTSType.Date:
+            // first, if val is a string and it is actually a number (milliseconds since epoch), convert it to a number. 
+            if (val !== null && val !== undefined && val.toString().trim() !== '' && !isNaN(val)) 
+              val = parseInt(val);
+
             val = val !== null && val !== undefined ? new Date(val) : null;
             break;
           default:
@@ -516,7 +540,24 @@ export class ResolverBase {
     const dbDifferences = [];
     Object.keys(clientOldValues).forEach((key) => {
       const f = entityObject.EntityInfo.Fields.find((f) => f.CodeName === key);
-      if (clientOldValues[key] !== dbValues[key] && f && f.AllowUpdateAPI && !f.IsPrimaryKey ) {
+      let different = false;
+      switch (typeof clientOldValues[key]) {
+        case 'number':
+          different = clientOldValues[key] !== dbValues[key];
+          break;
+        case 'boolean':
+          different = clientOldValues[key] !== dbValues[key];
+          break;
+        case 'object':
+          if (clientOldValues[key] instanceof Date) {
+            different = clientOldValues[key].getTime() !== dbValues[key].getTime();
+          }
+          break;
+        default:
+          different = clientOldValues[key] !== dbValues[key];
+          break;
+      }
+      if (different && f && !f.ReadOnly ) {
         // only include updateable fields
         dbDifferences.push({
           FieldName: key,

package/src/index.ts

@@ -89,18 +89,25 @@ export const serve = async (resolverPaths: Array<string>) => {
   const config = new SQLServerProviderConfigData(dataSource, '', mj_core_schema, cacheRefreshInterval);
   await setupSQLServerClient(config); // datasource is already initialized, so we can setup the client right away
   const md = new Metadata();
-
+  console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);
+  setupComplete$.next(true);
 
   /******TEST HARNESS FOR CHANGE DETECTION */
-  const cd = ExternalChangeDetectorEngine.Instance;
-  await cd.Config(false, UserCache.Users[0]);
-
-  // don't wait for this, just run it and show in console whenever done.
-  cd.DetectChangesForAllEligibleEntities().then(result => console.log(result));
+  /******TEST HARNESS FOR CHANGE DETECTION */
+  // const cd = ExternalChangeDetectorEngine.Instance;
+  // await cd.Config(false, UserCache.Users[0]);
+
+  // // don't wait for this, just run it and show in console whenever done.
+  // cd.DetectChangesForAllEligibleEntities().then(result => {
+  //   console.log(result)
+  //   cd.ReplayChanges(result.Changes).then(replayResult => {
+  //     console.log(replayResult)
+  //   });
+  // });
+  /******TEST HARNESS FOR CHANGE DETECTION */
+  /******TEST HARNESS FOR CHANGE DETECTION */
 
-  console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);
 
-  setupComplete$.next(true);
 
   const dynamicModules = await Promise.all(paths.map((modulePath) => import(modulePath.replace(/\.[jt]s$/, ''))));
   const resolvers = dynamicModules.flatMap((module) =>

package/src/resolvers/AskSkipResolver.ts

@@ -275,8 +275,8 @@ export class AskSkipResolver {
         feedback: q.Feedback,
         status: q.Status,
         qualityRank: q.QualityRank,
-        createdAt: q.CreatedAt,
-        updatedAt: q.UpdatedAt,
+        createdAt: q.__mj_CreatedAt,
+        updatedAt: q.__mj_UpdatedAt,
         categoryID: q.CategoryID, 
         fields: q.Fields.map((f) => {
           return {
@@ -294,8 +294,8 @@ export class AskSkipResolver {
             computationDescription: f.ComputationDescription,
             isSummary: f.IsSummary,
             summaryDescription: f.SummaryDescription,
-            createdAt: f.CreatedAt,
-            updatedAt: f.UpdatedAt,
+            createdAt: f.__mj_CreatedAt,
+            updatedAt: f.__mj_UpdatedAt,
           }
         })
       }
@@ -470,23 +470,23 @@ export class AskSkipResolver {
       const md = new Metadata();
       const e = md.Entities.find((e) => e.Name === 'Conversation Details');
       const sql = `SELECT 
-                      ${maxHistoricalMessages ? 'TOP ' + maxHistoricalMessages : ''} ID, Message, Role, CreatedAt 
+                      ${maxHistoricalMessages ? 'TOP ' + maxHistoricalMessages : ''} ID, Message, Role, __mj_CreatedAt 
                    FROM 
                       ${e.SchemaName}.${e.BaseView} 
                    WHERE 
                       ConversationID = ${ConversationId} 
                    ORDER 
-                      BY CreatedAt DESC`;
+                      BY __mj_CreatedAt DESC`;
       const result = await dataSource.query(sql);
       if (!result) 
         throw new Error(`Error running SQL: ${sql}`);
       else  {
-        // first, let's sort the result array into a local variable called returnData and in that we will sort by CreatedAt in ASCENDING order so we have the right chronological order
+        // first, let's sort the result array into a local variable called returnData and in that we will sort by __mj_CreatedAt in ASCENDING order so we have the right chronological order
         // the reason we're doing a LOCAL sort here is because in the SQL query above, we're sorting in DESCENDING order so we can use the TOP clause to limit the number of records and get the 
         // N most recent records. We want to sort in ASCENDING order because we want to send the messages to the Skip API in the order they were created.
         const returnData = result.sort((a: any, b: any) => {
-          const aDate = new Date(a.CreatedAt);
-          const bDate = new Date(b.CreatedAt);
+          const aDate = new Date(a.__mj_CreatedAt);
+          const bDate = new Date(b.__mj_CreatedAt);
           return aDate.getTime() - bDate.getTime();
         });
 

package/src/resolvers/EntityCommunicationsResolver.ts

@@ -29,10 +29,10 @@ export class CommunicationProviderMessageType {
     AdditionalAttributes: string;
 
     @Field()
-    CreatedAt: Date;
+    _mj_CreatedAt: Date;
 
     @Field()
-    UpdatedAt: Date;
+    _mj_UpdatedAt: Date;
 
     @Field()
     CommunicationProvider?: string;
@@ -71,10 +71,10 @@ export class TemplateInputType {
     IsActive: boolean;
 
     @Field()
-    CreatedAt: Date;
+    _mj_CreatedAt: Date;
 
     @Field()
-    UpdatedAt: Date;
+    _mj_UpdatedAt: Date;
 
     @Field({ nullable: true})
     Category?: string;
@@ -169,7 +169,7 @@ export class ReportResolver {
                                         @Ctx() { userPayload }: AppContext): Promise<RunEntityCommunicationResultType> {
     try {
         await EntityCommunicationsEngine.Instance.Config(false, userPayload.userRecord);
-        const newMessage = new Message(<Message>message);
+        const newMessage = new Message(message as unknown as Message);
         await TemplateEngineServer.Instance.Config(false, userPayload.userRecord);
         // for the templates, replace the values from the input with the objects from the Template Engine we have here
         if (newMessage.BodyTemplate) {

package/src/resolvers/UserResolver.ts

@@ -10,12 +10,14 @@ export class UserResolver extends UserResolverBase {
 
   @Query(() => User_)
   async UserByID(@Arg('ID', () => Int) ID: number, @Ctx() { dataSource }: AppContext) {
-    return super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { ID }));
+    const retVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { ID }));
+    return this.MapFieldNamesToCodeNames('Users', retVal);
   }
 
   @Query(() => User_)
   async UserByEmployeeID(@Arg('EmployeeID', () => Int) EmployeeID: number, @Ctx() { dataSource }: AppContext) {
-    return super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { EmployeeID }));
+    const retVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { EmployeeID }));
+    return this.MapFieldNamesToCodeNames('Users', retVal);
   }
 
   @Query(() => User_)
@@ -23,7 +25,7 @@ export class UserResolver extends UserResolverBase {
     // const searchEmail = userEmailMap[Email] ?? Email;
     const searchEmail = Email;
     const returnVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { Email: searchEmail }));
-    return returnVal;
+    return this.MapFieldNamesToCodeNames('Users', returnVal);
   }
 }
 export default UserResolver;