@memberjunction/server 1.2.2 → 1.3.0

package/dist/resolvers/EntityRecordNameResolver.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityRecordNameResolver = exports.EntityRecordNameResult = exports.EntityRecordNameInput = void 0;
 const core_1 = require("@memberjunction/core");
 const type_graphql_1 = require("type-graphql");
-const MergeRecordsResolver_1 = require("./MergeRecordsResolver");
+const PotentialDuplicateRecordResolver_1 = require("./PotentialDuplicateRecordResolver");
 let EntityRecordNameInput = class EntityRecordNameInput {
 };
 exports.EntityRecordNameInput = EntityRecordNameInput;
@@ -24,9 +24,9 @@ __decorate([
     __metadata("design:type", String)
 ], EntityRecordNameInput.prototype, "EntityName", void 0);
 __decorate([
-    (0, type_graphql_1.Field)(() => [MergeRecordsResolver_1.PrimaryKeyValueInputType]),
-    __metadata("design:type", Array)
-], EntityRecordNameInput.prototype, "PrimaryKeyValues", void 0);
+    (0, type_graphql_1.Field)(() => PotentialDuplicateRecordResolver_1.CompositeKeyInputType),
+    __metadata("design:type", core_1.CompositeKey)
+], EntityRecordNameInput.prototype, "CompositeKey", void 0);
 exports.EntityRecordNameInput = EntityRecordNameInput = __decorate([
     (0, type_graphql_1.InputType)()
 ], EntityRecordNameInput);
@@ -42,9 +42,9 @@ __decorate([
     __metadata("design:type", String)
 ], EntityRecordNameResult.prototype, "Status", void 0);
 __decorate([
-    (0, type_graphql_1.Field)(() => [MergeRecordsResolver_1.PrimaryKeyValueOutputType]),
-    __metadata("design:type", Array)
-], EntityRecordNameResult.prototype, "PrimaryKeyValues", void 0);
+    (0, type_graphql_1.Field)(() => PotentialDuplicateRecordResolver_1.CompositeKeyOutputType),
+    __metadata("design:type", core_1.CompositeKey)
+], EntityRecordNameResult.prototype, "CompositeKey", void 0);
 __decorate([
     (0, type_graphql_1.Field)(() => String),
     __metadata("design:type", String)
@@ -57,44 +57,44 @@ exports.EntityRecordNameResult = EntityRecordNameResult = __decorate([
     (0, type_graphql_1.ObjectType)()
 ], EntityRecordNameResult);
 let EntityRecordNameResolver = class EntityRecordNameResolver {
-    async GetEntityRecordName(EntityName, PrimaryKeyValues, {}) {
+    async GetEntityRecordName(EntityName, CompositeKey, {}) {
         const md = new core_1.Metadata();
-        return await this.InnerGetEntityRecordName(md, EntityName, PrimaryKeyValues);
+        return await this.InnerGetEntityRecordName(md, EntityName, CompositeKey);
     }
     async GetEntityRecordNames(info, {}) {
         const result = [];
         const md = new core_1.Metadata();
         for (const i of info) {
-            result.push(await this.InnerGetEntityRecordName(md, i.EntityName, i.PrimaryKeyValues));
+            result.push(await this.InnerGetEntityRecordName(md, i.EntityName, i.CompositeKey));
         }
         return result;
     }
-    async InnerGetEntityRecordName(md, EntityName, primaryKeyValues) {
+    async InnerGetEntityRecordName(md, EntityName, CompositeKey) {
         const e = md.Entities.find((e) => e.Name === EntityName);
         if (e) {
-            const recordName = await md.GetEntityRecordName(e.Name, primaryKeyValues);
+            const recordName = await md.GetEntityRecordName(e.Name, CompositeKey);
             if (recordName)
-                return { Success: true, Status: 'OK', PrimaryKeyValues: primaryKeyValues, RecordName: recordName, EntityName: EntityName };
+                return { Success: true, Status: 'OK', CompositeKey, RecordName: recordName, EntityName };
             else
                 return {
                     Success: false,
-                    Status: `Name for record, or record ${primaryKeyValues.map(pkv => pkv.FieldName + ':' + pkv.Value).join(',')} itself not found, could be an access issue if user doesn't have Row Level Access (RLS) if RLS is enabled for this entity`,
-                    PrimaryKeyValues: primaryKeyValues,
-                    EntityName: EntityName,
+                    Status: `Name for record, or record ${CompositeKey.ToString()} itself not found, could be an access issue if user doesn't have Row Level Access (RLS) if RLS is enabled for this entity`,
+                    CompositeKey,
+                    EntityName
                 };
         }
         else
-            return { Success: false, Status: `Entity ${EntityName} not found`, PrimaryKeyValues: primaryKeyValues, EntityName: EntityName };
+            return { Success: false, Status: `Entity ${EntityName} not found`, CompositeKey, EntityName };
     }
 };
 exports.EntityRecordNameResolver = EntityRecordNameResolver;
 __decorate([
     (0, type_graphql_1.Query)(() => EntityRecordNameResult),
     __param(0, (0, type_graphql_1.Arg)('EntityName', () => String)),
-    __param(1, (0, type_graphql_1.Arg)('PrimaryKeyValues', () => [MergeRecordsResolver_1.PrimaryKeyValueInputType])),
+    __param(1, (0, type_graphql_1.Arg)('CompositeKey', () => PotentialDuplicateRecordResolver_1.CompositeKeyInputType)),
     __param(2, (0, type_graphql_1.Ctx)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array, Object]),
+    __metadata("design:paramtypes", [String, core_1.CompositeKey, Object]),
     __metadata("design:returntype", Promise)
 ], EntityRecordNameResolver.prototype, "GetEntityRecordName", null);
 __decorate([

package/dist/resolvers/EntityRecordNameResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityRecordNameResolver.js","sourceRoot":"","sources":["../../src/resolvers/EntityRecordNameResolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityRecordNameResolver.js","sourceRoot":"","sources":["../../src/resolvers/EntityRecordNameResolver.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/FileResolver.d.ts

@@ -1,11 +1,12 @@
 import { AppContext, PubSubEngine } from '@memberjunction/server';
-import { CreateFileInput, FileResolver as FileResolverBase, File_ } from '../generated/generated';
+import { CreateFileInput, FileResolver as FileResolverBase, File_, UpdateFileInput } from '../generated/generated';
 export declare class CreateUploadURLInput {
     FileID: number;
 }
 export declare class CreateFilePayload {
     File: File_;
     UploadUrl: string;
+    NameExists: boolean;
 }
 export declare class FileExt extends File_ {
     DownloadUrl: string;
@@ -14,8 +15,10 @@ export declare class FileResolver extends FileResolverBase {
     CreateFile(input: CreateFileInput, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<{
         File: {};
         UploadUrl: string;
+        NameExists: boolean;
     }>;
     DownloadUrl(file: File_, { userPayload }: AppContext): Promise<string>;
+    UpdateFile(input: UpdateFileInput, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<{}>;
     DeleteFile(ID: number, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<{}>;
 }
 //# sourceMappingURL=FileResolver.d.ts.map

package/dist/resolvers/FileResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/FileResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EAUV,YAAY,EAGb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,YAAY,IAAI,gBAAgB,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAElG,qBACa,oBAAoB;IAE/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBACa,iBAAiB;IAE5B,IAAI,EAAE,KAAK,CAAC;IAEZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBACa,OAAQ,SAAQ,KAAK;IAEhC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,SAAQ,gBAAgB;IAE1C,UAAU,CACuB,KAAK,EAAE,eAAe,EACpD,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;;;;IA4B1B,WAAW,CAAS,IAAI,EAAE,KAAK,EAAS,EAAE,WAAW,EAAE,EAAE,UAAU;IAenE,UAAU,CAAuB,EAAE,EAAE,MAAM,EAAS,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EAAY,MAAM,EAAE,YAAY;CAoBlI"}
+{"version":3,"file":"FileResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/FileResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EAUV,YAAY,EAGb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,YAAY,IAAI,gBAAgB,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEnH,qBACa,oBAAoB;IAE/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBACa,iBAAiB;IAE5B,IAAI,EAAE,KAAK,CAAC;IAEZ,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,qBACa,OAAQ,SAAQ,KAAK;IAEhC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,SAAQ,gBAAgB;IAE1C,UAAU,CACuB,KAAK,EAAE,eAAe,EACpD,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;;;;;IAgC1B,WAAW,CAAS,IAAI,EAAE,KAAK,EAAS,EAAE,WAAW,EAAE,EAAE,UAAU;IAenE,UAAU,CACuB,KAAK,EAAE,eAAe,EACpD,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;IAyB1B,UAAU,CAAuB,EAAE,EAAE,MAAM,EAAS,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EAAY,MAAM,EAAE,YAAY;CAoBlI"}

package/dist/resolvers/FileResolver.js

@@ -38,6 +38,10 @@ __decorate([
     (0, server_1.Field)(() => String),
     __metadata("design:type", String)
 ], CreateFilePayload.prototype, "UploadUrl", void 0);
+__decorate([
+    (0, server_1.Field)(() => Boolean),
+    __metadata("design:type", Boolean)
+], CreateFilePayload.prototype, "NameExists", void 0);
 exports.CreateFilePayload = CreateFilePayload = __decorate([
     (0, server_1.ObjectType)()
 ], CreateFilePayload);
@@ -58,6 +62,8 @@ let FileResolver = class FileResolver extends generated_1.FileResolver {
         const fileEntity = await md.GetEntityObject('Files', user);
         const providerEntity = await md.GetEntityObject('File Storage Providers', user);
         fileEntity.CheckPermissions(core_1.EntityPermissionType.Create, true);
+        const [sameName] = await this.findBy(dataSource, 'Files', { Name: input.Name, ProviderID: input.ProviderID });
+        const NameExists = Boolean(sameName);
         const fileRecord = (await super.CreateFile({ ...input, Status: 'Pending' }, { dataSource, userPayload }, pubSub));
         if (!fileRecord) {
             return null;
@@ -67,7 +73,7 @@ let FileResolver = class FileResolver extends generated_1.FileResolver {
         fileEntity.SetMany(updatedInput);
         await fileEntity.Save();
         const File = fileEntity.GetAll();
-        return { File, UploadUrl };
+        return { File, UploadUrl, NameExists };
     }
     async DownloadUrl(file, { userPayload }) {
         const md = new core_1.Metadata();
@@ -76,9 +82,26 @@ let FileResolver = class FileResolver extends generated_1.FileResolver {
         fileEntity.CheckPermissions(core_1.EntityPermissionType.Read, true);
         const providerEntity = await md.GetEntityObject('File Storage Providers', user);
         await providerEntity.Load(file.ProviderID);
-        const url = await (0, storage_1.createDownloadUrl)(providerEntity, file.ProviderKey ?? file.ID);
+        const url = await (0, storage_1.createDownloadUrl)(providerEntity, file.ProviderKey ?? file.Name);
         return url;
     }
+    async UpdateFile(input, { dataSource, userPayload }, pubSub) {
+        const md = new core_1.Metadata();
+        const user = this.GetUserFromPayload(userPayload);
+        const fileEntity = await md.GetEntityObject('Files', user);
+        fileEntity.CheckPermissions(core_1.EntityPermissionType.Update, true);
+        await fileEntity.Load(input.ID);
+        if (fileEntity.Name !== input.Name) {
+            const providerEntity = await md.GetEntityObject('File Storage Providers', user);
+            await providerEntity.Load(fileEntity.ProviderID);
+            const success = await (0, storage_1.moveObject)(providerEntity, fileEntity.Name, input.Name);
+            if (!success) {
+                throw new Error('Error updating object name');
+            }
+        }
+        const updatedFile = await super.UpdateFile(input, { dataSource, userPayload }, pubSub);
+        return updatedFile;
+    }
     async DeleteFile(ID, { dataSource, userPayload }, pubSub) {
         const md = new core_1.Metadata();
         const userInfo = this.GetUserFromPayload(userPayload);
@@ -91,7 +114,7 @@ let FileResolver = class FileResolver extends generated_1.FileResolver {
         if (fileEntity.Status === 'Uploaded') {
             const providerEntity = await md.GetEntityObject('File Storage Providers', userInfo);
             await providerEntity.Load(fileEntity.ProviderID);
-            await (0, storage_1.deleteObject)(providerEntity, fileEntity.ProviderKey ?? fileEntity.ID);
+            await (0, storage_1.deleteObject)(providerEntity, fileEntity.ProviderKey ?? fileEntity.Name);
         }
         return super.DeleteFile(ID, { dataSource, userPayload }, pubSub);
     }
@@ -114,6 +137,15 @@ __decorate([
     __metadata("design:paramtypes", [generated_1.File_, Object]),
     __metadata("design:returntype", Promise)
 ], FileResolver.prototype, "DownloadUrl", null);
+__decorate([
+    (0, server_1.Mutation)(() => generated_1.File_),
+    __param(0, (0, server_1.Arg)('input', () => generated_1.UpdateFileInput)),
+    __param(1, (0, server_1.Ctx)()),
+    __param(2, (0, server_1.PubSub)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [generated_1.UpdateFileInput, Object, server_1.PubSubEngine]),
+    __metadata("design:returntype", Promise)
+], FileResolver.prototype, "UpdateFile", null);
 __decorate([
     (0, server_1.Mutation)(() => generated_1.File_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),

package/dist/resolvers/FileResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileResolver.js","sourceRoot":"","sources":["../../src/resolvers/FileResolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileResolver.js","sourceRoot":"","sources":["../../src/resolvers/FileResolver.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/MergeRecordsResolver.d.ts

@@ -1,6 +1,7 @@
-import { PrimaryKeyValue } from '@memberjunction/core';
+import { CompositeKey } from '@memberjunction/core';
 import { PubSubEngine } from 'type-graphql';
 import { AppContext } from '../types';
+import { CompositeKeyOutputType } from './PotentialDuplicateRecordResolver';
 export declare class EntityDependencyResult {
     EntityName: string;
     RelatedEntityName: string;
@@ -9,11 +10,11 @@ export declare class EntityDependencyResult {
 export declare class EntityDependencyResolver {
     GetEntityDependencies(entityName: string, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<import("@memberjunction/core").EntityDependency[]>;
 }
-export declare class PrimaryKeyValueInputType {
+export declare class KeyValuePairInputType {
     FieldName: string;
     Value: string;
 }
-export declare class PrimaryKeyValueOutputType {
+export declare class KeyValuePairOutputType {
     FieldName: string;
     Value: string;
 }
@@ -21,10 +22,10 @@ export declare class RecordDependencyResult {
     EntityName: string;
     RelatedEntityName: string;
     FieldName: string;
-    PrimaryKeyValue: string;
+    CompositeKey: CompositeKey;
 }
 export declare class RecordDependencyResolver {
-    GetRecordDependencies(entityName: string, primaryKeyValues: PrimaryKeyValue[], { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<import("@memberjunction/core").RecordDependency[]>;
+    GetRecordDependencies(entityName: string, CompositeKey: CompositeKey, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<import("@memberjunction/core").RecordDependency[]>;
 }
 declare class FieldMapping {
     FieldName: string;
@@ -36,8 +37,8 @@ declare class FieldMappingOutput {
 }
 export declare class RecordMergeRequest {
     EntityName: string;
-    SurvivingRecordPrimaryKeyValues: PrimaryKeyValue[];
-    RecordsToMerge: PrimaryKeyValue[][];
+    SurvivingRecordCompositeKey: CompositeKey;
+    RecordsToMerge: CompositeKey[];
     FieldMap?: FieldMapping[];
 }
 export declare class RecordMergeRequestOutput {
@@ -47,7 +48,7 @@ export declare class RecordMergeRequestOutput {
     FieldMap?: FieldMappingOutput[];
 }
 export declare class RecordMergeDetailResult {
-    PrimaryKeyValues: PrimaryKeyValue[];
+    CompositeKey: CompositeKeyOutputType;
     Success: boolean;
     RecordMergeDeletionLogID?: number;
     Message?: string;

package/dist/resolvers/MergeRecordsResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MergeRecordsResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/MergeRecordsResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAiE,YAAY,EAAmB,MAAM,cAAc,CAAC;AAC5H,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,qBACa,sBAAsB;IAEjC,UAAU,EAAE,MAAM,CAAC;IAGnB,iBAAiB,EAAE,MAAM,CAAC;IAG1B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBACa,wBAAwB;IAE3B,qBAAqB,CACU,UAAU,EAAE,MAAM,EAC5C,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;CAYrC;AAGD,qBACa,wBAAwB;IAEnC,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBACa,yBAAyB;IAEpC,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,qBACa,sBAAsB;IAEjC,UAAU,EAAE,MAAM,CAAC;IAGnB,iBAAiB,EAAE,MAAM,CAAC;IAG1B,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,EAAE,MAAM,CAAC;CACzB;AAKD,qBACa,wBAAwB;IAE3B,qBAAqB,CACQ,UAAU,EAAE,MAAM,EACQ,gBAAgB,EAAE,eAAe,EAAE,EACvF,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;CAYnC;AAED,cACM,YAAY;IAEd,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,cACM,kBAAkB;IAEpB,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,kBAAkB;IAE3B,UAAU,EAAE,MAAM,CAAC;IAGnB,+BAA+B,EAAE,eAAe,EAAE,CAAC;IAGnD,cAAc,EAAE,eAAe,EAAE,EAAE,CAAC;IAGpC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;CAC7B;AAED,qBACa,wBAAwB;IAEjC,UAAU,EAAE,MAAM,CAAC;IAGnB,iBAAiB,EAAE,MAAM,CAAC;IAG1B,cAAc,EAAE,MAAM,EAAE,CAAC;IAGzB,QAAQ,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACnC;AAGD,qBACa,uBAAuB;IAEhC,gBAAgB,EAAE,eAAe,EAAE,CAAC;IAGpC,OAAO,EAAE,OAAO,CAAC;IAGjB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAGlC,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBACa,iBAAiB;IAE5B,OAAO,EAAE,OAAO,CAAC;IAGjB,aAAa,EAAE,MAAM,CAAC;IAGtB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,YAAY,EAAE,uBAAuB,EAAE,CAAC;IAGxC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED,qBACa,mBAAmB;IAEtB,YAAY,CAC0B,OAAO,EAAE,kBAAkB,EAC9D,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;CAYnC;AAGD,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"MergeRecordsResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/MergeRecordsResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAiE,YAAY,EAAmB,MAAM,cAAc,CAAC;AAC5H,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAyB,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAEnG,qBACa,sBAAsB;IAEjC,UAAU,EAAE,MAAM,CAAC;IAGnB,iBAAiB,EAAE,MAAM,CAAC;IAG1B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBACa,wBAAwB;IAE3B,qBAAqB,CACU,UAAU,EAAE,MAAM,EAC5C,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;CAYrC;AAGD,qBACa,qBAAqB;IAEhC,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBACa,sBAAsB;IAEjC,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,qBACa,sBAAsB;IAEjC,UAAU,EAAE,MAAM,CAAC;IAGnB,iBAAiB,EAAE,MAAM,CAAC;IAG1B,SAAS,EAAE,MAAM,CAAC;IAGlB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAKD,qBACa,wBAAwB;IAE3B,qBAAqB,CACQ,UAAU,EAAE,MAAM,EACD,YAAY,EAAE,YAAY,EACrE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;CAYnC;AAED,cACM,YAAY;IAEd,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,cACM,kBAAkB;IAEpB,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,kBAAkB;IAE3B,UAAU,EAAE,MAAM,CAAC;IAGnB,2BAA2B,EAAE,YAAY,CAAC;IAG1C,cAAc,EAAE,YAAY,EAAE,CAAC;IAG/B,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;CAC7B;AAED,qBACa,wBAAwB;IAEjC,UAAU,EAAE,MAAM,CAAC;IAGnB,iBAAiB,EAAE,MAAM,CAAC;IAG1B,cAAc,EAAE,MAAM,EAAE,CAAC;IAGzB,QAAQ,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACnC;AAGD,qBACa,uBAAuB;IAEhC,YAAY,EAAE,sBAAsB,CAAC;IAGrC,OAAO,EAAE,OAAO,CAAC;IAGjB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAGlC,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBACa,iBAAiB;IAE5B,OAAO,EAAE,OAAO,CAAC;IAGjB,aAAa,EAAE,MAAM,CAAC;IAGtB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,YAAY,EAAE,uBAAuB,EAAE,CAAC;IAGxC,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAED,qBACa,mBAAmB;IAEtB,YAAY,CAC0B,OAAO,EAAE,kBAAkB,EAC9D,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;CAYnC;AAGD,eAAe,wBAAwB,CAAC"}

package/dist/resolvers/MergeRecordsResolver.js

@@ -12,9 +12,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecordMergeResolver = exports.RecordMergeResult = exports.RecordMergeDetailResult = exports.RecordMergeRequestOutput = exports.RecordMergeRequest = exports.RecordDependencyResolver = exports.RecordDependencyResult = exports.PrimaryKeyValueOutputType = exports.PrimaryKeyValueInputType = exports.EntityDependencyResolver = exports.EntityDependencyResult = void 0;
+exports.RecordMergeResolver = exports.RecordMergeResult = exports.RecordMergeDetailResult = exports.RecordMergeRequestOutput = exports.RecordMergeRequest = exports.RecordDependencyResolver = exports.RecordDependencyResult = exports.KeyValuePairOutputType = exports.KeyValuePairInputType = exports.EntityDependencyResolver = exports.EntityDependencyResult = void 0;
 const core_1 = require("@memberjunction/core");
 const type_graphql_1 = require("type-graphql");
+const PotentialDuplicateRecordResolver_1 = require("./PotentialDuplicateRecordResolver");
 let EntityDependencyResult = class EntityDependencyResult {
 };
 exports.EntityDependencyResult = EntityDependencyResult;
@@ -58,34 +59,34 @@ __decorate([
 exports.EntityDependencyResolver = EntityDependencyResolver = __decorate([
     (0, type_graphql_1.Resolver)(EntityDependencyResult)
 ], EntityDependencyResolver);
-let PrimaryKeyValueInputType = class PrimaryKeyValueInputType {
+let KeyValuePairInputType = class KeyValuePairInputType {
 };
-exports.PrimaryKeyValueInputType = PrimaryKeyValueInputType;
+exports.KeyValuePairInputType = KeyValuePairInputType;
 __decorate([
     (0, type_graphql_1.Field)(() => String),
     __metadata("design:type", String)
-], PrimaryKeyValueInputType.prototype, "FieldName", void 0);
+], KeyValuePairInputType.prototype, "FieldName", void 0);
 __decorate([
     (0, type_graphql_1.Field)(() => String),
     __metadata("design:type", String)
-], PrimaryKeyValueInputType.prototype, "Value", void 0);
-exports.PrimaryKeyValueInputType = PrimaryKeyValueInputType = __decorate([
+], KeyValuePairInputType.prototype, "Value", void 0);
+exports.KeyValuePairInputType = KeyValuePairInputType = __decorate([
     (0, type_graphql_1.InputType)()
-], PrimaryKeyValueInputType);
-let PrimaryKeyValueOutputType = class PrimaryKeyValueOutputType {
+], KeyValuePairInputType);
+let KeyValuePairOutputType = class KeyValuePairOutputType {
 };
-exports.PrimaryKeyValueOutputType = PrimaryKeyValueOutputType;
+exports.KeyValuePairOutputType = KeyValuePairOutputType;
 __decorate([
     (0, type_graphql_1.Field)(() => String),
     __metadata("design:type", String)
-], PrimaryKeyValueOutputType.prototype, "FieldName", void 0);
+], KeyValuePairOutputType.prototype, "FieldName", void 0);
 __decorate([
     (0, type_graphql_1.Field)(() => String),
     __metadata("design:type", String)
-], PrimaryKeyValueOutputType.prototype, "Value", void 0);
-exports.PrimaryKeyValueOutputType = PrimaryKeyValueOutputType = __decorate([
+], KeyValuePairOutputType.prototype, "Value", void 0);
+exports.KeyValuePairOutputType = KeyValuePairOutputType = __decorate([
     (0, type_graphql_1.ObjectType)()
-], PrimaryKeyValueOutputType);
+], KeyValuePairOutputType);
 let RecordDependencyResult = class RecordDependencyResult {
 };
 exports.RecordDependencyResult = RecordDependencyResult;
@@ -102,17 +103,17 @@ __decorate([
     __metadata("design:type", String)
 ], RecordDependencyResult.prototype, "FieldName", void 0);
 __decorate([
-    (0, type_graphql_1.Field)(() => String),
-    __metadata("design:type", String)
-], RecordDependencyResult.prototype, "PrimaryKeyValue", void 0);
+    (0, type_graphql_1.Field)(() => PotentialDuplicateRecordResolver_1.CompositeKeyOutputType),
+    __metadata("design:type", core_1.CompositeKey)
+], RecordDependencyResult.prototype, "CompositeKey", void 0);
 exports.RecordDependencyResult = RecordDependencyResult = __decorate([
     (0, type_graphql_1.ObjectType)()
 ], RecordDependencyResult);
 let RecordDependencyResolver = class RecordDependencyResolver {
-    async GetRecordDependencies(entityName, primaryKeyValues, { dataSource, userPayload }, pubSub) {
+    async GetRecordDependencies(entityName, CompositeKey, { dataSource, userPayload }, pubSub) {
         try {
             const md = new core_1.Metadata();
-            const result = await md.GetRecordDependencies(entityName, primaryKeyValues);
+            const result = await md.GetRecordDependencies(entityName, CompositeKey);
             return result;
         }
         catch (e) {
@@ -125,11 +126,11 @@ exports.RecordDependencyResolver = RecordDependencyResolver;
 __decorate([
     (0, type_graphql_1.Query)(() => [RecordDependencyResult]),
     __param(0, (0, type_graphql_1.Arg)('entityName', () => String)),
-    __param(1, (0, type_graphql_1.Arg)('primaryKeyValues', () => [PrimaryKeyValueInputType])),
+    __param(1, (0, type_graphql_1.Arg)('CompositeKey', () => PotentialDuplicateRecordResolver_1.CompositeKeyInputType)),
     __param(2, (0, type_graphql_1.Ctx)()),
     __param(3, (0, type_graphql_1.PubSub)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array, Object, type_graphql_1.PubSubEngine]),
+    __metadata("design:paramtypes", [String, core_1.CompositeKey, Object, type_graphql_1.PubSubEngine]),
     __metadata("design:returntype", Promise)
 ], RecordDependencyResolver.prototype, "GetRecordDependencies", null);
 exports.RecordDependencyResolver = RecordDependencyResolver = __decorate([
@@ -169,11 +170,11 @@ __decorate([
     __metadata("design:type", String)
 ], RecordMergeRequest.prototype, "EntityName", void 0);
 __decorate([
-    (0, type_graphql_1.Field)(() => [PrimaryKeyValueInputType]),
-    __metadata("design:type", Array)
-], RecordMergeRequest.prototype, "SurvivingRecordPrimaryKeyValues", void 0);
+    (0, type_graphql_1.Field)(() => PotentialDuplicateRecordResolver_1.CompositeKeyInputType),
+    __metadata("design:type", core_1.CompositeKey)
+], RecordMergeRequest.prototype, "SurvivingRecordCompositeKey", void 0);
 __decorate([
-    (0, type_graphql_1.Field)(() => [[PrimaryKeyValueInputType]]),
+    (0, type_graphql_1.Field)(() => [PotentialDuplicateRecordResolver_1.CompositeKeyInputType]),
     __metadata("design:type", Array)
 ], RecordMergeRequest.prototype, "RecordsToMerge", void 0);
 __decorate([
@@ -209,9 +210,9 @@ let RecordMergeDetailResult = class RecordMergeDetailResult {
 };
 exports.RecordMergeDetailResult = RecordMergeDetailResult;
 __decorate([
-    (0, type_graphql_1.Field)(() => [PrimaryKeyValueOutputType]),
-    __metadata("design:type", Array)
-], RecordMergeDetailResult.prototype, "PrimaryKeyValues", void 0);
+    (0, type_graphql_1.Field)(() => PotentialDuplicateRecordResolver_1.CompositeKeyOutputType),
+    __metadata("design:type", PotentialDuplicateRecordResolver_1.CompositeKeyOutputType)
+], RecordMergeDetailResult.prototype, "CompositeKey", void 0);
 __decorate([
     (0, type_graphql_1.Field)(() => Boolean),
     __metadata("design:type", Boolean)

package/dist/resolvers/MergeRecordsResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"MergeRecordsResolver.js","sourceRoot":"","sources":["../../src/resolvers/MergeRecordsResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA2E;AAC3E,+CAA4H;AAIrH,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;CASlC,CAAA;AATY,wDAAsB;AAEjC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;0DACD;AAGnB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;iEACM;AAG1B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;yDACF;iCARP,sBAAsB;IADlC,IAAA,yBAAU,GAAE;GACA,sBAAsB,CASlC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAE3B,AAAN,KAAK,CAAC,qBAAqB,CACU,UAAkB,EAC5C,EAAE,UAAU,EAAE,WAAW,EAAc,EACpC,MAAoB;QAE9B,IAAI,CAAC;YACL,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,GAAG,EAAE,CAAC;YACT,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;CAEJ,CAAA;AAjBY,4DAAwB;AAE3B;IADL,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC;IAEjC,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAA;IAC/B,WAAA,IAAA,kBAAG,GAAE,CAAA;IACL,WAAA,IAAA,qBAAM,GAAE,CAAA;;qDAAS,2BAAY;;qEAUjC;mCAfQ,wBAAwB;IADpC,IAAA,uBAAQ,EAAC,sBAAsB,CAAC;GACpB,wBAAwB,CAiBpC;AAIM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAMpC,CAAA;AANY,4DAAwB;AAEnC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;2DACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;uDACN;mCALH,wBAAwB;IADpC,IAAA,wBAAS,GAAE;GACC,wBAAwB,CAMpC;AAGM,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;CAMrC,CAAA;AANY,8DAAyB;AAEpC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;4DACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;wDACN;oCALH,yBAAyB;IADrC,IAAA,yBAAU,GAAE;GACA,yBAAyB,CAMrC;AAIM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;CAYlC,CAAA;AAZY,wDAAsB;AAEjC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;0DACD;AAGnB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;iEACM;AAG1B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;yDACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;+DACI;iCAXb,sBAAsB;IADlC,IAAA,yBAAU,GAAE;GACA,sBAAsB,CAYlC;AAMM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAE3B,AAAN,KAAK,CAAC,qBAAqB,CACQ,UAAkB,EACQ,gBAAmC,EACvF,EAAE,UAAU,EAAE,WAAW,EAAc,EACpC,MAAoB;QAE5B,IAAI,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;YAC3E,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;YACZ,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;CACJ,CAAA;AAlBY,4DAAwB;AAE3B;IADL,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC;IAEnC,WAAA,IAAA,kBAAG,EAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAA;IAC/B,WAAA,IAAA,kBAAG,EAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAA;IACzD,WAAA,IAAA,kBAAG,GAAE,CAAA;IACL,WAAA,IAAA,qBAAM,GAAE,CAAA;;4DAAS,2BAAY;;qEAW/B;mCAjBQ,wBAAwB;IADpC,IAAA,uBAAQ,EAAC,sBAAsB,CAAC;GACpB,wBAAwB,CAkBpC;AAGD,IAAM,YAAY,GAAlB,MAAM,YAAY;CAMjB,CAAA;AAJG;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;+CACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;2CACN;AALZ,YAAY;IADjB,IAAA,wBAAS,GAAE;GACN,YAAY,CAMjB;AAGD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAMvB,CAAA;AAJG;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;qDACF;AAGlB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;iDACN;AALZ,kBAAkB;IADvB,IAAA,yBAAU,GAAE;GACP,kBAAkB,CAMvB;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAY9B,CAAA;AAZY,gDAAkB;AAE3B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;sDACD;AAGnB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,wBAAwB,CAAC,CAAC;;2EACW;AAGnD;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC;;0DACN;AAGpC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACtB;6BAXjB,kBAAkB;IAD9B,IAAA,wBAAS,GAAE;GACC,kBAAkB,CAY9B;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAYpC,CAAA;AAZY,4DAAwB;AAEjC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;4DACD;AAGnB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,kBAAG,CAAC;;mEACS;AAG1B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,kBAAG,CAAC,CAAC;;gEACM;AAGzB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACtB;mCAXvB,wBAAwB;IADpC,IAAA,yBAAU,GAAE;GACA,wBAAwB,CAYpC;AAIM,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;CAYnC,CAAA;AAZY,0DAAuB;AAEhC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,yBAAyB,CAAC,CAAC;;iEACL;AAGpC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,OAAO,CAAC;;wDACJ;AAGjB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,kBAAG,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;yEACD;AAGlC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;wDACrB;kCAXR,uBAAuB;IADnC,IAAA,yBAAU,GAAE;GACA,uBAAuB,CAYnC;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAe7B,CAAA;AAfY,8CAAiB;AAE5B;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,OAAO,CAAC;;kDACJ;AAGjB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;wDAChB;AAGtB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,kBAAG,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;2DACV;AAGzB;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,CAAC,uBAAuB,CAAC,CAAC;;uDACC;AAGxC;IADC,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,wBAAwB,CAAC;8BAC7B,wBAAwB;kDAAC;4BAdvB,iBAAiB;IAD7B,IAAA,yBAAU,GAAE;GACA,iBAAiB,CAe7B;AAGM,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAEtB,AAAN,KAAK,CAAC,YAAY,CAC0B,OAA2B,EAC9D,EAAE,UAAU,EAAE,WAAW,EAAc,EACpC,MAAoB;QAE5B,IAAI,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;YACtE,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;YACZ,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;CACJ,CAAA;AAjBY,kDAAmB;AAEtB;IADL,IAAA,uBAAQ,EAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;IAE/B,WAAA,IAAA,kBAAG,EAAC,SAAS,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAA;IACxC,WAAA,IAAA,kBAAG,GAAE,CAAA;IACL,WAAA,IAAA,qBAAM,GAAE,CAAA;;qCAF0C,kBAAkB,UAEnD,2BAAY;;uDAW/B;8BAhBQ,mBAAmB;IAD/B,IAAA,uBAAQ,EAAC,iBAAiB,CAAC;GACf,mBAAmB,CAiB/B;AAGD,kBAAe,wBAAwB,CAAC"}
+{"version":3,"file":"MergeRecordsResolver.js","sourceRoot":"","sources":["../../src/resolvers/MergeRecordsResolver.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/PotentialDuplicateRecordResolver.d.ts

@@ -1,20 +1,33 @@
-import { PotentialDuplicateRequest, PotentialDuplicateResponse, PotentialDuplicate } from '@memberjunction/core';
-import { PrimaryKeyValueInputType, PrimaryKeyValueOutputType } from './MergeRecordsResolver';
+import { PotentialDuplicateRequest, PotentialDuplicateResponse, PotentialDuplicate, KeyValuePair, CompositeKey, PotentialDuplicateResult } from '@memberjunction/core';
+import { KeyValuePairOutputType } from './MergeRecordsResolver';
 import { AppContext } from "../types";
 export declare class PotentialDuplicateRequestType extends PotentialDuplicateRequest {
+    EntityID: number;
+    RecordIDs: CompositeKey[];
     EntityDocumentID: number;
-    PrimaryKeyValues: PrimaryKeyValueInputType[];
-    EntitiyID: number;
-    EntityName: string;
     ProbabilityScore: number;
+    ListID: number;
+}
+export declare class CompositeKeyInputType extends CompositeKey {
+    KeyValuePairs: KeyValuePair[];
+}
+export declare class CompositeKeyOutputType extends CompositeKey {
+    KeyValuePairs: KeyValuePair[];
 }
 export declare class PotentialDuplicateType extends PotentialDuplicate {
     ProbabilityScore: number;
-    PrimaryKeyValues: PrimaryKeyValueOutputType[];
+    KeyValuePairs: KeyValuePairOutputType[];
 }
-export declare class PotentialDuplicateResponseType extends PotentialDuplicateResponse {
+export declare class PotentialDuplicateResultType extends PotentialDuplicateResult {
     EntityID: number;
     Duplicates: PotentialDuplicateType[];
+    RecordPrimaryKeys: CompositeKey;
+    DuplicateRunDetailMatchRecordIDs: number[];
+}
+export declare class PotentialDuplicateResponseType extends PotentialDuplicateResponse {
+    Status: 'Inprogress' | 'Success' | 'Error';
+    ErrorMessage?: string;
+    PotentialDuplicateResult: PotentialDuplicateResult[];
 }
 export declare class DuplicateRecordResolver {
     GetRecordDuplicates({ dataSource, userPayload }: AppContext, params: PotentialDuplicateRequestType): Promise<PotentialDuplicateResponseType>;

package/dist/resolvers/PotentialDuplicateRecordResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PotentialDuplicateRecordResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/PotentialDuplicateRecordResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,kBAAkB,EAAuC,MAAM,sBAAsB,CAAC;AACtJ,OAAO,EAAC,wBAAwB,EAAE,yBAAyB,EAAC,MAAM,wBAAwB,CAAA;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,qBACa,6BAA8B,SAAQ,yBAAyB;IAE1E,gBAAgB,EAAE,MAAM,CAAC;IAGzB,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAG7C,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,MAAM,CAAC;IAGnB,gBAAgB,EAAE,MAAM,CAAC;CAE1B;AAED,qBACa,sBAAuB,SAAQ,kBAAkB;IAE5D,gBAAgB,EAAE,MAAM,CAAC;IAGzB,gBAAgB,EAAE,yBAAyB,EAAE,CAAC;CAC/C;AAED,qBACa,8BAA+B,SAAQ,0BAA0B;IAG5E,QAAQ,EAAE,MAAM,CAAC;IAGjB,UAAU,EAAE,sBAAsB,EAAE,CAAC;CACtC;AAED,qBACa,uBAAuB;IAG5B,mBAAmB,CAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EAAgB,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,8BAA8B,CAAC;CAWxK"}
+{"version":3,"file":"PotentialDuplicateRecordResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/PotentialDuplicateRecordResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,kBAAkB,EAAY,YAAY,EAAY,YAAY,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAC3L,OAAO,EAAwB,sBAAsB,EAAC,MAAM,wBAAwB,CAAA;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAStC,qBACa,6BAA8B,SAAQ,yBAAyB;IAE1E,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,YAAY,EAAE,CAAC;IAG1B,gBAAgB,EAAE,MAAM,CAAC;IAGzB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBACa,qBAAsB,SAAQ,YAAY;IAErD,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,qBACa,sBAAuB,SAAQ,YAAY;IAEtD,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,qBACa,sBAAuB,SAAQ,kBAAkB;IAE5D,gBAAgB,EAAE,MAAM,CAAC;IAGzB,aAAa,EAAE,sBAAsB,EAAE,CAAC;CACzC;AAED,qBACa,4BAA6B,SAAQ,wBAAwB;IAExE,QAAQ,EAAE,MAAM,CAAC;IAGjB,UAAU,EAAE,sBAAsB,EAAE,CAAC;IAGrC,iBAAiB,EAAE,YAAY,CAAC;IAGhC,gCAAgC,EAAE,MAAM,EAAE,CAAC;CAC5C;AAED,qBACa,8BAA+B,SAAQ,0BAA0B;IAG5E,MAAM,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;IAG3C,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,wBAAwB,EAAE,wBAAwB,EAAE,CAAA;CACrD;AAED,qBACa,uBAAuB;IAG5B,mBAAmB,CAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EAAgB,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,8BAA8B,CAAC;CAWxK"}