@memberjunction/server 1.3.3 → 1.4.1

package/src/resolvers/FileResolver.ts

@@ -4,6 +4,7 @@ import {
   AppContext,
   Arg,
   Ctx,
+  DeleteOptionsInput,
   Field,
   FieldResolver,
   InputType,
@@ -121,7 +122,7 @@ export class FileResolver extends FileResolverBase {
   }
 
   @Mutation(() => File_)
-  async DeleteFile(@Arg('ID', () => Int) ID: number, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+  async DeleteFile(@Arg('ID', () => Int) ID: number, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
     const md = new Metadata();
     const userInfo = this.GetUserFromPayload(userPayload);
 
@@ -139,6 +140,6 @@ export class FileResolver extends FileResolverBase {
       await deleteObject(providerEntity, fileEntity.ProviderKey ?? fileEntity.Name);
     }
 
-    return super.DeleteFile(ID, { dataSource, userPayload }, pubSub);
+    return super.DeleteFile(ID, options, { dataSource, userPayload }, pubSub);
   }
 }

package/src/resolvers/MergeRecordsResolver.ts

@@ -1,7 +1,7 @@
 import { LogError, Metadata, CompositeKey } from '@memberjunction/core';
 import { Arg, Ctx, Field, InputType, Int, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types';
-import { CompositeKeyInputType, CompositeKeyOutputType } from './PotentialDuplicateRecordResolver';
+import { CompositeKeyInputType, CompositeKeyOutputType } from '../generic/KeyInputOutputTypes';
 
 @ObjectType()
 export class EntityDependencyResult {
@@ -36,25 +36,6 @@ export class EntityDependencyResolver {
 }
 
 
-@InputType()
-export class KeyValuePairInputType {
-  @Field(() => String)
-  FieldName: string;
-
-  @Field(() => String)
-  Value: string;
-}
-
-@ObjectType()
-export class KeyValuePairOutputType {
-  @Field(() => String)
-  FieldName: string;
-
-  @Field(() => String)
-  Value: string;
-}
- 
-
 @ObjectType()
 export class RecordDependencyResult {
   @Field(() => String)

package/src/resolvers/PotentialDuplicateRecordResolver.ts

@@ -1,12 +1,12 @@
 import { Arg, Ctx, Field, Float, InputType, Int, ObjectType, Query, Resolver } from "type-graphql";
 import { PotentialDuplicateRequest, PotentialDuplicateResponse, PotentialDuplicate, Metadata, KeyValuePair, LogError, CompositeKey, PotentialDuplicateResult } from '@memberjunction/core';
-import {KeyValuePairInputType, KeyValuePairOutputType} from './MergeRecordsResolver'
 import { AppContext } from "../types";
 import { UserCache } from "@memberjunction/sqlserver-dataprovider";
 
 //load the default vectorDB and embedding model
 import {LoadMistralEmbedding} from '@memberjunction/ai-mistral';
 import {LoadPineconeVectorDB} from '@memberjunction/ai-vectors-pinecone';
+import { CompositeKeyInputType, CompositeKeyOutputType, KeyValuePairOutputType } from "../generic/KeyInputOutputTypes";
 LoadMistralEmbedding();
 LoadPineconeVectorDB();
 
@@ -28,18 +28,6 @@ export class PotentialDuplicateRequestType extends PotentialDuplicateRequest {
   ListID: number;
 }
 
-@InputType()
-export class CompositeKeyInputType extends CompositeKey {
-  @Field(() => [KeyValuePairInputType])
-  KeyValuePairs: KeyValuePair[];
-}
-
-@ObjectType()
-export class CompositeKeyOutputType extends CompositeKey {
-  @Field(() => [KeyValuePairOutputType])
-  KeyValuePairs: KeyValuePair[];
-}
-
 @ObjectType()
 export class PotentialDuplicateType extends PotentialDuplicate {
   @Field(() => Float)

package/src/resolvers/UserFavoriteResolver.ts

@@ -1,10 +1,9 @@
 import { Metadata, KeyValuePair, CompositeKey } from '@memberjunction/core';
-import { AppContext, Arg, Ctx, Field, InputType, Int, Mutation, ObjectType, KeyValuePairInputType, KeyValuePairOutputType, Query, Resolver } from '@memberjunction/server';
+import { AppContext, Arg, CompositeKeyInputType, CompositeKeyOutputType, Ctx, Field, InputType, Int, Mutation, ObjectType, Query, Resolver } from '@memberjunction/server';
 import { UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { UserFavoriteEntity } from '@memberjunction/core-entities';
 
 import { UserFavorite_, UserFavoriteResolverBase } from '../generated/generated';
-import { CompositeKeyInputType, CompositeKeyOutputType } from './PotentialDuplicateRecordResolver';
 
 //****************************************************************************
 // INPUT TYPE for User Favorite Queries
@@ -15,7 +14,7 @@ export class UserFavoriteSearchParams {
   EntityID: number;
 
   @Field(() => CompositeKeyInputType)
-  CompositeKey: CompositeKey;
+  CompositeKey: CompositeKeyInputType;
 
   @Field(() => Int)
   UserID: number;
@@ -27,7 +26,7 @@ export class UserFavoriteSetParams {
   EntityID: number;
 
   @Field(() => CompositeKeyInputType)
-  CompositeKey: CompositeKey;
+  CompositeKey: CompositeKeyInputType;
 
   @Field(() => Int)
   UserID: number;
@@ -42,7 +41,7 @@ export class UserFavoriteResult {
   EntityID: number;
 
   @Field(() => CompositeKeyOutputType)
-  CompositeKey: CompositeKey;
+  CompositeKey: CompositeKeyOutputType;
 
   @Field(() => Int)
   UserID: number;
@@ -69,13 +68,15 @@ export class UserFavoriteResolver extends UserFavoriteResolverBase {
   @Query(() => UserFavoriteResult)
   async GetRecordFavoriteStatus(@Arg('params', () => UserFavoriteSearchParams) params: UserFavoriteSearchParams, @Ctx() {}: AppContext) {
     const md = new Metadata();
+    const pk = new CompositeKey(params.CompositeKey.KeyValuePairs);
+
     const e = md.Entities.find((e) => e.ID === params.EntityID);
     if (e)
       return {
         EntityID: params.EntityID,
         UserID: params.UserID,
-        CompositeKey: params.CompositeKey,
-        IsFavorite: await md.GetRecordFavoriteStatus(params.UserID, e.Name, params.CompositeKey),
+        CompositeKey: pk,
+        IsFavorite: await md.GetRecordFavoriteStatus(params.UserID, e.Name, pk),
         Success: true,
       };
     else throw new Error(`Entity ID:${params.EntityID} not found`);
@@ -84,10 +85,11 @@ export class UserFavoriteResolver extends UserFavoriteResolverBase {
   @Mutation(() => UserFavoriteResult)
   SetRecordFavoriteStatus(@Arg('params', () => UserFavoriteSetParams) params: UserFavoriteSetParams, @Ctx() { userPayload }: AppContext) {
     const md = new Metadata();
+    const pk = new CompositeKey(params.CompositeKey.KeyValuePairs);
     const e = md.Entities.find((e) => e.ID === params.EntityID);
     const u = UserCache.Users.find((u) => u.ID === userPayload.userRecord.ID);
     if (e) {
-      md.SetRecordFavoriteStatus(params.UserID, e.Name, params.CompositeKey, params.IsFavorite, u);
+      md.SetRecordFavoriteStatus(params.UserID, e.Name, pk, params.IsFavorite, u);
       return {
         Success: true,
         EntityID: params.EntityID,