admin/sockeye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-12-22 21:17:03 +00:00
parent 3dda9ae433
commit 2d42058a46
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/biz/GZCaseBiz.cs
View File

@@ -191,13 +191,11 @@ namespace Sockeye.Biz
public void DigestSearchText(GZCase obj, Search.SearchIndexProcessObjectParameters searchParams) public void DigestSearchText(GZCase obj, Search.SearchIndexProcessObjectParameters searchParams)
{ {
if (obj != null) if (obj != null)
searchParams.AddText(obj.DbId) searchParams.AddText(obj.CaseId)
.AddText(obj.FetchCode) .AddText(obj.Name)
.AddText(obj.Wiki) .AddText(obj.Wiki)
.AddText(obj.Tags) .AddText(obj.Tags)
.AddText(obj.FetchEmail) .AddText(obj.Notes)
.AddText(obj.Key)
.AddText(obj.RegTo)
.AddCustomFields(obj.CustomFields); .AddCustomFields(obj.CustomFields);
} }
@@ -262,7 +260,7 @@ namespace Sockeye.Biz
foreach (GZCase w in orderedList) foreach (GZCase w in orderedList)
{ {
if (!ReportRenderManager.KeepGoing(jobId)) return null; if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w); var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"])) if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]); jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -276,15 +274,6 @@ namespace Sockeye.Biz
private VizCache vc = new VizCache(); 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);
}
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////

3
server/models/Purchase.cs
View File

@@ -31,6 +31,9 @@ namespace Sockeye.Models
public string Wiki { get; set; } public string Wiki { get; set; }
public string CustomFields { get; set; } public string CustomFields { get; set; }
public List<string> Tags { get; set; } public List<string> Tags { get; set; }
//workaround for notification
[NotMapped, JsonIgnore]
public string Name { get; set; }
public Purchase() public Purchase()
{ {