diff --git a/server/biz/GZCaseBiz.cs b/server/biz/GZCaseBiz.cs index b0da4f8..b014303 100644 --- a/server/biz/GZCaseBiz.cs +++ b/server/biz/GZCaseBiz.cs @@ -191,13 +191,11 @@ namespace Sockeye.Biz public void DigestSearchText(GZCase obj, Search.SearchIndexProcessObjectParameters searchParams) { if (obj != null) - searchParams.AddText(obj.DbId) - .AddText(obj.FetchCode) + searchParams.AddText(obj.CaseId) + .AddText(obj.Name) .AddText(obj.Wiki) .AddText(obj.Tags) - .AddText(obj.FetchEmail) - .AddText(obj.Key) - .AddText(obj.RegTo) + .AddText(obj.Notes) .AddCustomFields(obj.CustomFields); } @@ -262,7 +260,7 @@ namespace Sockeye.Biz foreach (GZCase w in orderedList) { if (!ReportRenderManager.KeepGoing(jobId)) return null; - await PopulateVizFields(w); + var jo = JObject.FromObject(w); if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"])) jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]); @@ -276,15 +274,6 @@ namespace Sockeye.Biz private VizCache vc = new VizCache(); - //populate viz fields from provided object - private async Task PopulateVizFields(GZCase o) - { - if (!vc.Has("customer", o.CustomerId)) - { - vc.Add(await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.Name).FirstOrDefaultAsync(), "customer", o.CustomerId); - } - o.CustomerViz = vc.Get("customer", o.CustomerId); - } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/models/Purchase.cs b/server/models/Purchase.cs index 9028bdb..ead257e 100644 --- a/server/models/Purchase.cs +++ b/server/models/Purchase.cs @@ -31,6 +31,9 @@ namespace Sockeye.Models public string Wiki { get; set; } public string CustomFields { get; set; } public List Tags { get; set; } + //workaround for notification + [NotMapped, JsonIgnore] + public string Name { get; set; } public Purchase() {