diff --git a/server/biz/GZCaseBiz.cs b/server/biz/GZCaseBiz.cs index 53e917a..d610555 100644 --- a/server/biz/GZCaseBiz.cs +++ b/server/biz/GZCaseBiz.cs @@ -49,7 +49,6 @@ namespace Sockeye.Biz else { newObject.Tags = TagBiz.NormalizeTags(newObject.Tags); - newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields); await ct.GZCase.AddAsync(newObject); await ct.SaveChangesAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, SockEvent.Created), ct); @@ -91,7 +90,6 @@ namespace Sockeye.Biz } putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); - putObject.CustomFields = JsonUtil.CompactJson(putObject.CustomFields); await ValidateAsync(putObject, dbObject); if (HasErrors) return null; ct.Replace(dbObject, putObject); @@ -195,8 +193,7 @@ namespace Sockeye.Biz .AddText(obj.Name) .AddText(obj.Wiki) .AddText(obj.Tags) - .AddText(obj.Notes) - .AddCustomFields(obj.CustomFields); + .AddText(obj.Notes); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -218,8 +215,6 @@ namespace Sockeye.Biz //validate users choices for required non custom fields RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj); - //validate custom fields - CustomFieldsValidator.Validate(this, FormCustomization, proposedObj.CustomFields); } } @@ -414,7 +409,7 @@ namespace Sockeye.Biz log.LogDebug($"HandlePotentialNotificationEvent processing: [SockType:{this.BizType}, AyaEvent:{ayaEvent}]"); bool isNew = currentObj == null; - + //STANDARD EVENTS FOR ALL OBJECTS await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct); diff --git a/server/biz/LicenseBiz.cs b/server/biz/LicenseBiz.cs index 926cbbf..c10a20f 100644 --- a/server/biz/LicenseBiz.cs +++ b/server/biz/LicenseBiz.cs @@ -49,7 +49,6 @@ namespace Sockeye.Biz else { newObject.Tags = TagBiz.NormalizeTags(newObject.Tags); - newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields); await ct.License.AddAsync(newObject); await ct.SaveChangesAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, SockEvent.Created), ct); @@ -91,7 +90,6 @@ namespace Sockeye.Biz } putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); - putObject.CustomFields = JsonUtil.CompactJson(putObject.CustomFields); await ValidateAsync(putObject, dbObject); if (HasErrors) return null; ct.Replace(dbObject, putObject); @@ -197,8 +195,7 @@ namespace Sockeye.Biz .AddText(obj.Tags) .AddText(obj.FetchEmail) .AddText(obj.Key) - .AddText(obj.RegTo) - .AddCustomFields(obj.CustomFields); + .AddText(obj.RegTo); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -220,8 +217,6 @@ namespace Sockeye.Biz //validate users choices for required non custom fields RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj); - //validate custom fields - CustomFieldsValidator.Validate(this, FormCustomization, proposedObj.CustomFields); } } diff --git a/server/biz/ProductBiz.cs b/server/biz/ProductBiz.cs index d81fc61..55e5146 100644 --- a/server/biz/ProductBiz.cs +++ b/server/biz/ProductBiz.cs @@ -49,7 +49,6 @@ namespace Sockeye.Biz else { newObject.Tags = TagBiz.NormalizeTags(newObject.Tags); - newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields); await ct.Product.AddAsync(newObject); await ct.SaveChangesAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, SockEvent.Created), ct); @@ -91,7 +90,6 @@ namespace Sockeye.Biz } putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); - putObject.CustomFields = JsonUtil.CompactJson(putObject.CustomFields); await ValidateAsync(putObject, dbObject); if (HasErrors) return null; ct.Replace(dbObject, putObject); @@ -195,8 +193,7 @@ namespace Sockeye.Biz .AddText(obj.Name) .AddText(obj.Wiki) .AddText(obj.Tags) - .AddText(obj.OurCode) - .AddCustomFields(obj.CustomFields); + .AddText(obj.OurCode); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -218,8 +215,6 @@ namespace Sockeye.Biz //validate users choices for required non custom fields RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj); - //validate custom fields - CustomFieldsValidator.Validate(this, FormCustomization, proposedObj.CustomFields); } } diff --git a/server/biz/PurchaseBiz.cs b/server/biz/PurchaseBiz.cs index aa0e120..9026272 100644 --- a/server/biz/PurchaseBiz.cs +++ b/server/biz/PurchaseBiz.cs @@ -49,7 +49,6 @@ namespace Sockeye.Biz else { newObject.Tags = TagBiz.NormalizeTags(newObject.Tags); - newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields); await ct.Purchase.AddAsync(newObject); await ct.SaveChangesAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, SockEvent.Created), ct); @@ -91,7 +90,6 @@ namespace Sockeye.Biz } putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); - putObject.CustomFields = JsonUtil.CompactJson(putObject.CustomFields); await ValidateAsync(putObject, dbObject); if (HasErrors) return null; ct.Replace(dbObject, putObject); @@ -196,8 +194,7 @@ namespace Sockeye.Biz .AddText(obj.Wiki) .AddText(obj.Tags) .AddText(obj.PurchaseNotes) - .AddText(obj.VendorData) - .AddCustomFields(obj.CustomFields); + .AddText(obj.VendorData); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -219,8 +216,6 @@ namespace Sockeye.Biz //validate users choices for required non custom fields RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj); - //validate custom fields - CustomFieldsValidator.Validate(this, FormCustomization, proposedObj.CustomFields); } } diff --git a/server/biz/SubscriptionServerBiz.cs b/server/biz/SubscriptionServerBiz.cs index 716c3be..3335c81 100644 --- a/server/biz/SubscriptionServerBiz.cs +++ b/server/biz/SubscriptionServerBiz.cs @@ -49,7 +49,6 @@ namespace Sockeye.Biz else { newObject.Tags = TagBiz.NormalizeTags(newObject.Tags); - newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields); await ct.SubscriptionServer.AddAsync(newObject); await ct.SaveChangesAsync(); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, SockEvent.Created), ct); @@ -91,7 +90,6 @@ namespace Sockeye.Biz } putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); - putObject.CustomFields = JsonUtil.CompactJson(putObject.CustomFields); await ValidateAsync(putObject, dbObject); if (HasErrors) return null; ct.Replace(dbObject, putObject); @@ -201,8 +199,7 @@ namespace Sockeye.Biz .AddText(obj.OperatingSystem) .AddText(obj.CustomerSubDomain) .AddText(obj.Wiki) - .AddText(obj.Tags) - .AddCustomFields(obj.CustomFields); + .AddText(obj.Tags); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -224,8 +221,6 @@ namespace Sockeye.Biz //validate users choices for required non custom fields RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj); - //validate custom fields - CustomFieldsValidator.Validate(this, FormCustomization, proposedObj.CustomFields); } } @@ -420,7 +415,7 @@ namespace Sockeye.Biz log.LogDebug($"HandlePotentialNotificationEvent processing: [SockType:{this.BizType}, AyaEvent:{ayaEvent}]"); bool isNew = currentObj == null; - + //STANDARD EVENTS FOR ALL OBJECTS await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct); diff --git a/server/models/GZCase.cs b/server/models/GZCase.cs index 3352647..5d8bc73 100644 --- a/server/models/GZCase.cs +++ b/server/models/GZCase.cs @@ -20,7 +20,6 @@ namespace Sockeye.Models public string Name { get; set; } public string Notes { get; set; } public string Wiki { get; set; } - public string CustomFields { get; set; } public List Tags { get; set; } public GZCase() diff --git a/server/models/License.cs b/server/models/License.cs index 0110d38..ce7622e 100644 --- a/server/models/License.cs +++ b/server/models/License.cs @@ -29,7 +29,6 @@ namespace Sockeye.Models public DateTime MaintenanceExpire { get; set; } public string Wiki { get; set; } - public string CustomFields { get; set; } public List Tags { get; set; } //workaround for notification diff --git a/server/models/Product.cs b/server/models/Product.cs index 3d5295e..e1c37ba 100644 --- a/server/models/Product.cs +++ b/server/models/Product.cs @@ -21,7 +21,6 @@ namespace Sockeye.Models public string VendorCode { get; set; } public string OurCode { get; set; } public string Wiki { get; set; } - public string CustomFields { get; set; } public List Tags { get; set; } public Product() diff --git a/server/models/Purchase.cs b/server/models/Purchase.cs index ece8d80..37e2874 100644 --- a/server/models/Purchase.cs +++ b/server/models/Purchase.cs @@ -35,7 +35,6 @@ namespace Sockeye.Models public string VendorData { get; set; } public DateTime? ProcessedDate { get; set; } public string Wiki { get; set; } - public string CustomFields { get; set; } public List Tags { get; set; } //workaround for notification [NotMapped, JsonIgnore] diff --git a/server/models/SubscriptionServer.cs b/server/models/SubscriptionServer.cs index 57df10c..bca122e 100644 --- a/server/models/SubscriptionServer.cs +++ b/server/models/SubscriptionServer.cs @@ -33,7 +33,6 @@ namespace Sockeye.Models public long? CustomerId { get; set; } public long? LicenseId { get; set; } public string Wiki { get; set; } - public string CustomFields { get; set; } public List Tags { get; set; }