@memberjunction/server 2.121.0 → 2.122.1

package/dist/resolvers/CreateQueryResolver.js

@@ -240,12 +240,16 @@ let QueryFieldType = class QueryFieldType {
     QueryID;
     Name;
     Description;
-    Type;
     Sequence;
     SQLBaseType;
     SQLFullType;
+    SourceEntityID;
+    SourceEntity;
+    SourceFieldName;
     IsComputed;
     ComputationDescription;
+    IsSummary;
+    SummaryDescription;
 };
 __decorate([
     Field(() => String),
@@ -263,10 +267,6 @@ __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
 ], QueryFieldType.prototype, "Description", void 0);
-__decorate([
-    Field(() => String, { nullable: true }),
-    __metadata("design:type", String)
-], QueryFieldType.prototype, "Type", void 0);
 __decorate([
     Field(() => Number),
     __metadata("design:type", Number)
@@ -279,6 +279,18 @@ __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
 ], QueryFieldType.prototype, "SQLFullType", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], QueryFieldType.prototype, "SourceEntityID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], QueryFieldType.prototype, "SourceEntity", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], QueryFieldType.prototype, "SourceFieldName", void 0);
 __decorate([
     Field(() => Boolean),
     __metadata("design:type", Boolean)
@@ -287,6 +299,14 @@ __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
 ], QueryFieldType.prototype, "ComputationDescription", void 0);
+__decorate([
+    Field(() => Boolean, { nullable: true }),
+    __metadata("design:type", Boolean)
+], QueryFieldType.prototype, "IsSummary", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], QueryFieldType.prototype, "SummaryDescription", void 0);
 QueryFieldType = __decorate([
     ObjectType()
 ], QueryFieldType);
@@ -295,10 +315,12 @@ let QueryParameterType = class QueryParameterType {
     ID;
     QueryID;
     Name;
+    Description;
     Type;
-    DefaultValue;
-    Comments;
     IsRequired;
+    DefaultValue;
+    SampleValue;
+    ValidationFilters;
 };
 __decorate([
     Field(() => String),
@@ -312,10 +334,18 @@ __decorate([
     Field(() => String),
     __metadata("design:type", String)
 ], QueryParameterType.prototype, "Name", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], QueryParameterType.prototype, "Description", void 0);
 __decorate([
     Field(() => String),
     __metadata("design:type", String)
 ], QueryParameterType.prototype, "Type", void 0);
+__decorate([
+    Field(() => Boolean),
+    __metadata("design:type", Boolean)
+], QueryParameterType.prototype, "IsRequired", void 0);
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
@@ -323,11 +353,11 @@ __decorate([
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
-], QueryParameterType.prototype, "Comments", void 0);
+], QueryParameterType.prototype, "SampleValue", void 0);
 __decorate([
-    Field(() => Boolean),
-    __metadata("design:type", Boolean)
-], QueryParameterType.prototype, "IsRequired", void 0);
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], QueryParameterType.prototype, "ValidationFilters", void 0);
 QueryParameterType = __decorate([
     ObjectType()
 ], QueryParameterType);
@@ -336,7 +366,7 @@ let QueryEntityType = class QueryEntityType {
     ID;
     QueryID;
     EntityID;
-    EntityName;
+    Entity;
 };
 __decorate([
     Field(() => String),
@@ -353,7 +383,7 @@ __decorate([
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
-], QueryEntityType.prototype, "EntityName", void 0);
+], QueryEntityType.prototype, "Entity", void 0);
 QueryEntityType = __decorate([
     ObjectType()
 ], QueryEntityType);
@@ -362,7 +392,7 @@ let QueryPermissionType = class QueryPermissionType {
     ID;
     QueryID;
     RoleID;
-    RoleName;
+    Role;
 };
 __decorate([
     Field(() => String),
@@ -379,7 +409,7 @@ __decorate([
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
-], QueryPermissionType.prototype, "RoleName", void 0);
+], QueryPermissionType.prototype, "Role", void 0);
 QueryPermissionType = __decorate([
     ObjectType()
 ], QueryPermissionType);
@@ -387,7 +417,17 @@ export { QueryPermissionType };
 let CreateQueryResultType = class CreateQueryResultType {
     Success;
     ErrorMessage;
-    QueryData;
+    ID;
+    Name;
+    Description;
+    CategoryID;
+    Category;
+    SQL;
+    Status;
+    QualityRank;
+    EmbeddingVector;
+    EmbeddingModelID;
+    EmbeddingModelName;
     Fields;
     Parameters;
     Entities;
@@ -404,7 +444,47 @@ __decorate([
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
-], CreateQueryResultType.prototype, "QueryData", void 0);
+], CreateQueryResultType.prototype, "ID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "Name", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "Description", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "CategoryID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "Category", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "SQL", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "Status", void 0);
+__decorate([
+    Field(() => Number, { nullable: true }),
+    __metadata("design:type", Number)
+], CreateQueryResultType.prototype, "QualityRank", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "EmbeddingVector", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "EmbeddingModelID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], CreateQueryResultType.prototype, "EmbeddingModelName", void 0);
 __decorate([
     Field(() => [QueryFieldType], { nullable: true }),
     __metadata("design:type", Array)
@@ -428,7 +508,17 @@ export { CreateQueryResultType };
 let UpdateQueryResultType = class UpdateQueryResultType {
     Success;
     ErrorMessage;
-    QueryData;
+    ID;
+    Name;
+    Description;
+    CategoryID;
+    Category;
+    SQL;
+    Status;
+    QualityRank;
+    EmbeddingVector;
+    EmbeddingModelID;
+    EmbeddingModelName;
     Fields;
     Parameters;
     Entities;
@@ -445,7 +535,47 @@ __decorate([
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
-], UpdateQueryResultType.prototype, "QueryData", void 0);
+], UpdateQueryResultType.prototype, "ID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "Name", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "Description", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "CategoryID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "Category", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "SQL", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "Status", void 0);
+__decorate([
+    Field(() => Number, { nullable: true }),
+    __metadata("design:type", Number)
+], UpdateQueryResultType.prototype, "QualityRank", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "EmbeddingVector", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "EmbeddingModelID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateQueryResultType.prototype, "EmbeddingModelName", void 0);
 __decorate([
     Field(() => [QueryFieldType], { nullable: true }),
     __metadata("design:type", Array)
@@ -469,7 +599,12 @@ export { UpdateQueryResultType };
 let DeleteQueryResultType = class DeleteQueryResultType {
     Success;
     ErrorMessage;
-    QueryData;
+    ID;
+    Name;
+    Description;
+    CategoryID;
+    SQL;
+    Status;
 };
 __decorate([
     Field(() => Boolean),
@@ -482,7 +617,27 @@ __decorate([
 __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
-], DeleteQueryResultType.prototype, "QueryData", void 0);
+], DeleteQueryResultType.prototype, "ID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], DeleteQueryResultType.prototype, "Name", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], DeleteQueryResultType.prototype, "Description", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], DeleteQueryResultType.prototype, "CategoryID", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], DeleteQueryResultType.prototype, "SQL", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], DeleteQueryResultType.prototype, "Status", void 0);
 DeleteQueryResultType = __decorate([
     ObjectType()
 ], DeleteQueryResultType);
@@ -530,16 +685,56 @@ let MJQueryResolverExtended = class MJQueryResolverExtended extends MJQueryResol
                 await provider.Refresh();
                 return {
                     Success: true,
-                    QueryData: JSON.stringify(record.GetAll()),
-                    Fields: record.QueryFields,
-                    Parameters: record.QueryParameters,
-                    Entities: record.QueryEntities.map(e => {
-                        return {
-                            ...e,
-                            EntityName: e.Entity
-                        };
-                    }),
-                    Permissions: record.QueryPermissions
+                    ID: record.ID,
+                    Name: record.Name,
+                    Description: record.Description,
+                    CategoryID: record.CategoryID,
+                    Category: record.Category,
+                    SQL: record.SQL,
+                    Status: record.Status,
+                    QualityRank: record.QualityRank,
+                    EmbeddingVector: record.EmbeddingVector,
+                    EmbeddingModelID: record.EmbeddingModelID,
+                    EmbeddingModelName: record.EmbeddingModel,
+                    Fields: record.QueryFields.map(f => ({
+                        ID: f.ID,
+                        QueryID: f.QueryID,
+                        Name: f.Name,
+                        Description: f.Description,
+                        Sequence: f.Sequence,
+                        SQLBaseType: f.SQLBaseType,
+                        SQLFullType: f.SQLFullType,
+                        SourceEntityID: f.SourceEntityID,
+                        SourceEntity: f.SourceEntity,
+                        SourceFieldName: f.SourceFieldName,
+                        IsComputed: f.IsComputed,
+                        ComputationDescription: f.ComputationDescription,
+                        IsSummary: f.IsSummary,
+                        SummaryDescription: f.SummaryDescription
+                    })),
+                    Parameters: record.QueryParameters.map(p => ({
+                        ID: p.ID,
+                        QueryID: p.QueryID,
+                        Name: p.Name,
+                        Description: p.Description,
+                        Type: p.Type,
+                        IsRequired: p.IsRequired,
+                        DefaultValue: p.DefaultValue,
+                        SampleValue: p.SampleValue,
+                        ValidationFilters: p.ValidationFilters
+                    })),
+                    Entities: record.QueryEntities.map(e => ({
+                        ID: e.ID,
+                        QueryID: e.QueryID,
+                        EntityID: e.EntityID,
+                        Entity: e.Entity
+                    })),
+                    Permissions: record.QueryPermissions.map(p => ({
+                        ID: p.ID,
+                        QueryID: p.QueryID,
+                        RoleID: p.RoleID,
+                        Role: p.Role
+                    }))
                 };
             }
             else {
@@ -548,16 +743,56 @@ let MJQueryResolverExtended = class MJQueryResolverExtended extends MJQueryResol
                     LogStatus(`[CreateQuery] Unique constraint detected for query '${input.Name}'. Using existing query (ID: ${existingQuery.ID}) created by concurrent request.`);
                     return {
                         Success: true,
-                        QueryData: JSON.stringify(existingQuery),
-                        Fields: existingQuery.Fields || [],
-                        Parameters: existingQuery.Parameters || [],
-                        Entities: existingQuery.Entities?.map(e => ({
+                        ID: existingQuery.ID,
+                        Name: existingQuery.Name,
+                        Description: existingQuery.Description,
+                        CategoryID: existingQuery.CategoryID,
+                        Category: existingQuery.Category,
+                        SQL: existingQuery.SQL,
+                        Status: existingQuery.Status,
+                        QualityRank: existingQuery.QualityRank,
+                        EmbeddingVector: existingQuery.EmbeddingVector,
+                        EmbeddingModelID: existingQuery.EmbeddingModelID,
+                        EmbeddingModelName: existingQuery.EmbeddingModel,
+                        Fields: existingQuery.Fields?.map((f) => ({
+                            ID: f.ID,
+                            QueryID: f.QueryID,
+                            Name: f.Name,
+                            Description: f.Description,
+                            Sequence: f.Sequence,
+                            SQLBaseType: f.SQLBaseType,
+                            SQLFullType: f.SQLFullType,
+                            SourceEntityID: f.SourceEntityID,
+                            SourceEntity: f.SourceEntity,
+                            SourceFieldName: f.SourceFieldName,
+                            IsComputed: f.IsComputed,
+                            ComputationDescription: f.ComputationDescription,
+                            IsSummary: f.IsSummary,
+                            SummaryDescription: f.SummaryDescription
+                        })) || [],
+                        Parameters: existingQuery.Parameters?.map((p) => ({
+                            ID: p.ID,
+                            QueryID: p.QueryID,
+                            Name: p.Name,
+                            Description: p.Description,
+                            Type: p.Type,
+                            IsRequired: p.IsRequired,
+                            DefaultValue: p.DefaultValue,
+                            SampleValue: p.SampleValue,
+                            ValidationFilters: p.ValidationFilters
+                        })) || [],
+                        Entities: existingQuery.Entities?.map((e) => ({
                             ID: e.ID,
                             QueryID: e.QueryID,
                             EntityID: e.EntityID,
-                            EntityName: e.Entity
+                            Entity: e.Entity
                         })) || [],
-                        Permissions: existingQuery.Permissions || []
+                        Permissions: existingQuery.Permissions?.map((p) => ({
+                            ID: p.ID,
+                            QueryID: p.QueryID,
+                            RoleID: p.RoleID,
+                            Role: p.Role
+                        })) || []
                     };
                 }
                 const errorMessage = record.LatestResult?.Message || '';
@@ -589,7 +824,7 @@ let MJQueryResolverExtended = class MJQueryResolverExtended extends MJQueryResol
                             ID: permissionEntity.ID,
                             QueryID: permissionEntity.QueryID,
                             RoleID: permissionEntity.RoleID,
-                            RoleName: permissionEntity.Role
+                            Role: permissionEntity.Role
                         });
                     }
                 }
@@ -678,46 +913,58 @@ let MJQueryResolverExtended = class MJQueryResolverExtended extends MJQueryResol
                 await this.createPermissions(provider, input.Permissions, queryID, context.userPayload.userRecord);
                 await queryEntity.RefreshRelatedMetadata(true);
             }
-            const fields = queryEntity.QueryFields.map(f => ({
-                ID: f.ID,
-                QueryID: f.QueryID,
-                Name: f.Name,
-                Description: f.Description || undefined,
-                Type: f.SQLBaseType || undefined,
-                Sequence: f.Sequence,
-                SQLBaseType: f.SQLBaseType || undefined,
-                SQLFullType: f.SQLFullType || undefined,
-                IsComputed: f.IsComputed,
-                ComputationDescription: f.ComputationDescription || undefined
-            }));
-            const parameters = queryEntity.QueryParameters.map(p => ({
-                ID: p.ID,
-                QueryID: p.QueryID,
-                Name: p.Name,
-                Type: p.Type,
-                DefaultValue: p.DefaultValue || undefined,
-                Comments: '',
-                IsRequired: p.IsRequired
-            }));
-            const entities = queryEntity.QueryEntities.map(e => ({
-                ID: e.ID,
-                QueryID: e.QueryID,
-                EntityID: e.EntityID,
-                EntityName: e.Entity || undefined
-            }));
-            const permissions = queryEntity.QueryPermissions.map(p => ({
-                ID: p.ID,
-                QueryID: p.QueryID,
-                RoleID: p.RoleID,
-                RoleName: p.Role || undefined
-            }));
             return {
                 Success: true,
-                QueryData: JSON.stringify(queryEntity.GetAll()),
-                Fields: fields,
-                Parameters: parameters,
-                Entities: entities,
-                Permissions: permissions
+                ID: queryEntity.ID,
+                Name: queryEntity.Name,
+                Description: queryEntity.Description,
+                CategoryID: queryEntity.CategoryID,
+                Category: queryEntity.Category,
+                SQL: queryEntity.SQL,
+                Status: queryEntity.Status,
+                QualityRank: queryEntity.QualityRank,
+                EmbeddingVector: queryEntity.EmbeddingVector,
+                EmbeddingModelID: queryEntity.EmbeddingModelID,
+                EmbeddingModelName: queryEntity.EmbeddingModel,
+                Fields: queryEntity.QueryFields.map(f => ({
+                    ID: f.ID,
+                    QueryID: f.QueryID,
+                    Name: f.Name,
+                    Description: f.Description,
+                    Sequence: f.Sequence,
+                    SQLBaseType: f.SQLBaseType,
+                    SQLFullType: f.SQLFullType,
+                    SourceEntityID: f.SourceEntityID,
+                    SourceEntity: f.SourceEntity,
+                    SourceFieldName: f.SourceFieldName,
+                    IsComputed: f.IsComputed,
+                    ComputationDescription: f.ComputationDescription,
+                    IsSummary: f.IsSummary,
+                    SummaryDescription: f.SummaryDescription
+                })),
+                Parameters: queryEntity.QueryParameters.map(p => ({
+                    ID: p.ID,
+                    QueryID: p.QueryID,
+                    Name: p.Name,
+                    Description: p.Description,
+                    Type: p.Type,
+                    IsRequired: p.IsRequired,
+                    DefaultValue: p.DefaultValue,
+                    SampleValue: p.SampleValue,
+                    ValidationFilters: p.ValidationFilters
+                })),
+                Entities: queryEntity.QueryEntities.map(e => ({
+                    ID: e.ID,
+                    QueryID: e.QueryID,
+                    EntityID: e.EntityID,
+                    Entity: e.Entity
+                })),
+                Permissions: queryEntity.QueryPermissions.map(p => ({
+                    ID: p.ID,
+                    QueryID: p.QueryID,
+                    RoleID: p.RoleID,
+                    Role: p.Role
+                }))
             };
         }
         catch (err) {
@@ -746,7 +993,12 @@ let MJQueryResolverExtended = class MJQueryResolverExtended extends MJQueryResol
             if (deletedQuery) {
                 return {
                     Success: true,
-                    QueryData: JSON.stringify(deletedQuery)
+                    ID: deletedQuery.ID,
+                    Name: deletedQuery.Name,
+                    Description: deletedQuery.Description,
+                    CategoryID: deletedQuery.CategoryID,
+                    SQL: deletedQuery.SQL,
+                    Status: deletedQuery.Status
                 };
             }
             else {