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

Browse Source
This commit is contained in:
John Cardinal
2021-12-28 00:44:27 +00:00
parent 09538483d3
commit 075747b5b9
44 changed files with 197 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/Controllers/ExportController.cs
View File

@@ -102,7 +102,7 @@ namespace AyaNova.Api.Controllers
case "csv":
using (var w = new ChoCSVWriter(outputSourceFullPath).WithFirstLineHeader())
{
var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest, DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT));
var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest, Guid.Empty);//todo: jobify
w.Write(ToDynamicList(dat));
}
break;
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
using (StreamWriter file = System.IO.File.CreateText(outputSourceFullPath))
using (JsonTextWriter writer = new JsonTextWriter(file))
{
var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest, DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT));
var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest, Guid.Empty);//todo: jobify
dat.WriteTo(writer);
}
break;

2
server/AyaNova/Controllers/ReportController.cs
View File

@@ -178,7 +178,7 @@ namespace AyaNova.Api.Controllers
JArray reportData;
try
{
reportData = await biz.GetReportData(selectedRequest, DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT));
reportData = await biz.GetReportDataForReportDesigner(selectedRequest);
if (reportData == null)
return BadRequest(new ApiErrorResponse(biz.Errors));
else

9
server/AyaNova/biz/ContractBiz.cs
View File

@@ -480,7 +480,7 @@ MULTIPLE discount / markup ITEMS
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -510,8 +510,7 @@ MULTIPLE discount / markup ITEMS
var PreTrans = await TranslationBiz.GetSubsetStaticAsync(new List<string> { "TimeSpanDays", "TimeSpanHours", "TimeSpanMinutes", "TimeSpanSeconds" }, UserTranslationId);
foreach (Contract w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w, ContractOverrideTypeEnumList, PreTrans);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -560,11 +559,11 @@ MULTIPLE discount / markup ITEMS
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/CustomerBiz.cs
View File

@@ -329,7 +329,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -354,8 +354,7 @@ namespace AyaNova.Biz
foreach (Customer w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -402,11 +401,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/CustomerNoteBiz.cs
View File

@@ -180,7 +180,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -194,8 +194,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (CustomerNote w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
ReportData.Add(jo);
@@ -215,11 +214,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
////////////////////////////////////////////////////////////////////////////////////////////////

9
server/AyaNova/biz/CustomerServiceRequestBiz.cs
View File

@@ -290,7 +290,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -317,8 +317,7 @@ namespace AyaNova.Biz
foreach (CustomerServiceRequest w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w, CustomerServiceRequestStatusEnumList, CustomerServiceRequestPriorityEnumList);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -346,11 +345,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/HeadOfficeBiz.cs
View File

@@ -286,7 +286,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -300,8 +300,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (HeadOffice w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -323,11 +322,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

2
server/AyaNova/biz/IExportAbleObject.cs
View File

@@ -13,7 +13,7 @@ namespace AyaNova.Biz
//Get items indicated in id list in exportable format
//called by ExportBiz rendering code
Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry);
Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId);
const int EXPORT_DATA_BATCH_SIZE = 100;
}

2
server/AyaNova/biz/IReportAbleObject.cs
View File

@@ -12,7 +12,7 @@ namespace AyaNova.Biz
//Get items indicated in id list in report format
//called by ReportBiz rendering code
Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry);
Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId);
const int REPORT_DATA_BATCH_SIZE = 100;

12
server/AyaNova/biz/JobsBiz.cs
View File

@@ -182,15 +182,15 @@ namespace AyaNova.Biz
if (ActivelyProcessing)
{
//System.Diagnostics.Debug.WriteLine("ProcessJobs called but actively processing other jobs so returning");
log.LogDebug("ProcessJobs called but actively processing other jobs so returning");
log.LogTrace("ProcessJobs called but actively processing other jobs so returning");
return;
}
if (!KeepOnWorking()) return;
ActivelyProcessing = true;
log.LogDebug("Processing internal jobs");
log.LogTrace("Processing internal jobs");
try
{
log.LogDebug("Processing level 1 internal jobs");
log.LogTrace("Processing level 1 internal jobs");
//### Critical internal jobs, these run even if there is a license related serverlock
//LICENSE FETCH
await CoreJobLicense.DoWorkAsync();
@@ -202,7 +202,7 @@ namespace AyaNova.Biz
ApiServerState serverState = ServiceProviderProvider.ServerState;
if (!KeepOnWorking()) return;
log.LogDebug("Processing level 2 internal jobs");
log.LogTrace("Processing level 2 internal jobs");
// #if (DEBUG)
// log.LogInformation("Processing semi-critical internal jobs (backup, pm, notification etc)");
@@ -239,7 +239,7 @@ namespace AyaNova.Biz
if (!KeepOnWorking()) return;
log.LogDebug("Processing exclusive dynamic jobs");
log.LogTrace("Processing exclusive dynamic jobs");
//BIZOBJECT DYNAMIC JOBS
//get a list of exclusive jobs that are due to happen
@@ -271,7 +271,7 @@ namespace AyaNova.Biz
///////////////////////////////////////
//NON-EXCLUSIVE JOBS
//
log.LogDebug("Processing non-exclusive dynamic jobs");
log.LogTrace("Processing non-exclusive dynamic jobs");
if (!KeepOnWorking()) return;
//These fire and forget but use a technique to bubble up exceptions anyway
List<OpsJob> sharedJobs = await GetReadyJobsNotExlusiveOnlyAsync();

9
server/AyaNova/biz/LoanUnitBiz.cs
View File

@@ -273,7 +273,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -287,8 +287,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (LoanUnit w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -310,11 +309,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/MemoBiz.cs
View File

@@ -278,7 +278,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -292,8 +292,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Memo w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -318,11 +317,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/PMBiz.cs
View File

@@ -814,7 +814,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//quote reports for entire quote or just sub parts all go through here
//if the ayatype is a descendant of the quote then only the portion of the quote from that descendant directly up to the header will be populated and returned
@@ -833,8 +833,7 @@ namespace AyaNova.Biz
foreach (PM w in batchResults)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
//PM header custom fields
@@ -955,11 +954,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/PartAssemblyBiz.cs
View File

@@ -326,7 +326,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -340,8 +340,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (PartAssembly w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -364,11 +363,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/PartBiz.cs
View File

@@ -500,7 +500,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -514,8 +514,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Part w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -545,11 +544,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/PartInventoryBiz.cs
View File

@@ -255,7 +255,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -279,8 +279,7 @@ namespace AyaNova.Biz
foreach (PartInventory w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w, AyaTypesEnumList, command);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -311,11 +310,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/PartInventoryDataListBiz.cs
View File

@@ -35,7 +35,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -56,8 +56,7 @@ namespace AyaNova.Biz
foreach (ViewPartInventoryList w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
ReportData.Add(jo);
}
@@ -70,11 +69,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/PartInventoryRequestDataListBiz.cs
View File

@@ -35,7 +35,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -56,8 +56,7 @@ namespace AyaNova.Biz
foreach (ViewPartInventoryRequestList w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
ReportData.Add(jo);
@@ -72,11 +71,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/PartWarehouseBiz.cs
View File

@@ -285,7 +285,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -299,8 +299,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (PartWarehouse w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -316,11 +315,11 @@ namespace AyaNova.Biz
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/ProjectBiz.cs
View File

@@ -274,7 +274,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -288,8 +288,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Project w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -313,11 +312,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/PurchaseOrderBiz.cs
View File

@@ -778,7 +778,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -792,8 +792,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (PurchaseOrder w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await SetDisplayFields(w, true);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -809,11 +808,11 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/QuoteBiz.cs
View File

@@ -790,7 +790,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//quote reports for entire quote or just sub parts all go through here
//if the ayatype is a descendant of the quote then only the portion of the quote from that descendant directly up to the header will be populated and returned
@@ -809,8 +809,7 @@ namespace AyaNova.Biz
foreach (Quote w in batchResults)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
//Quote header custom fields
@@ -979,11 +978,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/ReminderBiz.cs
View File

@@ -277,7 +277,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -291,8 +291,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Reminder w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -313,11 +312,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

550
server/AyaNova/biz/ReportBiz.cs
View File

@@ -283,9 +283,33 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORT DATA
//Data fetched to return to report designer for Client report design usage
//Data fetched to return to report render or for designer for Client report design usage
public async Task<Newtonsoft.Json.Linq.JArray> GetReportData(DataListSelectedRequest selectedRequest, DateTime renderTimeOutExpiry, bool requestIsCustomerWorkOrderReport = false)
public async Task<Newtonsoft.Json.Linq.JArray> GetReportDataForReportDesigner(DataListSelectedRequest selectedRequest)
{
var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportDataForReportDesigner");
AuthorizationRoles effectiveRoles = CurrentUserRoles;
if (selectedRequest.AType == AyaType.NoType)
{
AddError(ApiErrorCode.VALIDATION_REQUIRED, null, $"AType is required");
return null;
}
//Do we need to rehydrate the ID List from a DataList?
if (selectedRequest.SelectedRowIds.Length == 0)
selectedRequest.SelectedRowIds = await DataListSelectedProcessingOptions.RehydrateIdList(selectedRequest, ct, effectiveRoles, log, UserId, UserTranslationId);
log.LogDebug($"Instantiating biz object handler for {selectedRequest.AType}");
var biz = BizObjectFactory.GetBizObject(selectedRequest.AType, ct, UserId, CurrentUserRoles, UserTranslationId);
log.LogDebug($"Fetching data for {selectedRequest.SelectedRowIds.Length} {selectedRequest.AType} items");
return await ((IReportAbleObject)biz).GetReportData(selectedRequest, Guid.Empty);//Guid.empty signifies it's not a job calling it
}
public async Task<Newtonsoft.Json.Linq.JArray> GetReportData(DataListSelectedRequest selectedRequest, Guid jobId, bool requestIsCustomerWorkOrderReport = false)
{
var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportData");
AuthorizationRoles effectiveRoles = CurrentUserRoles;
@@ -306,464 +330,15 @@ namespace AyaNova.Biz
if (selectedRequest.SelectedRowIds.Length == 0)
selectedRequest.SelectedRowIds = await DataListSelectedProcessingOptions.RehydrateIdList(selectedRequest, ct, effectiveRoles, log, UserId, UserTranslationId);
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId))
return null;
log.LogDebug($"Instantiating biz object handler for {selectedRequest.AType}");
var biz = BizObjectFactory.GetBizObject(selectedRequest.AType, ct, UserId, CurrentUserRoles, UserTranslationId);
log.LogDebug($"Fetching data for {selectedRequest.SelectedRowIds.Length} {selectedRequest.AType} items");
return await ((IReportAbleObject)biz).GetReportData(selectedRequest, renderTimeOutExpiry);
return await ((IReportAbleObject)biz).GetReportData(selectedRequest, jobId);
}
////////////////////////////////////////////////////////////////////////////////////////////////
//RENDER
//
// public async Task<string> RenderReport(DataListReportRequest reportRequest, DateTime renderTimeOutExpiry, string apiUrl)
// {
// var log = AyaNova.Util.ApplicationLogging.CreateLogger("RenderReport");
// log.LogDebug($"ReportBiz::RenderReport id {reportRequest.ReportId}, timeout @ {renderTimeOutExpiry.ToString()}");
// //Customer User Report?
// bool RequestIsCustomerWorkOrderReport = false;
// if (reportRequest.ReportId == -100)
// {
// log.LogDebug("customer user report requested");
// //get the user and workorder data and set the actual report id or return null if not found
// var woTags = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == reportRequest.SelectedRowIds[0]).Select(x => x.Tags).FirstOrDefaultAsync();
// if (woTags == null) return null;
// var cr = await UserBiz.CustomerUserEffectiveRightsAsync(UserId, woTags);
// if (cr.ThisWOEffectiveWOReportId == null) return null;
// reportRequest.ReportId = (long)cr.ThisWOEffectiveWOReportId;
// RequestIsCustomerWorkOrderReport = true;
// }
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //get report, vet security, see what we need before init in case of issue
// log.LogDebug($"get report from db");
// var report = await ct.Report.FirstOrDefaultAsync(z => z.Id == reportRequest.ReportId);
// if (report == null)
// {
// AddError(ApiErrorCode.NOT_FOUND, "id");
// return null;
// }
// //If we get here via the /viewreport url in the client then there is no object type set so we need to set it here from the report
// if (reportRequest.AType == AyaType.NoType)
// {
// reportRequest.AType = report.AType;
// }
// AuthorizationRoles effectiveRoles = CurrentUserRoles;
// if (!RequestIsCustomerWorkOrderReport && !AyaNova.Api.ControllerHelpers.Authorized.HasReadFullRole(effectiveRoles, report.AType))
// {
// log.LogDebug($"bail: user unauthorized");
// AddError(ApiErrorCode.NOT_AUTHORIZED, null, $"User not authorized for {report.AType} type object");
// return null;
// }
// //Client meta data is required
// if (reportRequest.ClientMeta == null)
// {
// log.LogDebug($"bail: ClientMeta parameter is missing");
// AddError(ApiErrorCode.VALIDATION_MISSING_PROPERTY, null, "ClientMeta parameter is missing and required to render report");
// return null;
// }
// //includeWoItemDescendants?
// reportRequest.IncludeWoItemDescendants = report.IncludeWoItemDescendants;
// //Get data
// // #if (DEBUG)
// // log.LogInformation($"DBG: ReportBiz::RenderReport GetReportData");
// // #endif
// log.LogDebug("Getting report data now");
// var ReportData = await GetReportData(reportRequest, renderTimeOutExpiry, RequestIsCustomerWorkOrderReport);
// //if GetReportData errored then will return null so need to return that as well here
// if (ReportData == null)
// {
// log.LogDebug($"bail: ReportData == null");
// return null;
// }
// // #if (DEBUG)
// // log.LogInformation($"DBG: ReportBiz::RenderReport got report data");
// // #endif
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //initialization
// log.LogDebug("Initializing report rendering system");
// bool AutoDownloadChromium = true;
// if (string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH))
// {
// log.LogDebug($"Using default Chromium browser (downloaded)");
// }
// else
// {
// log.LogDebug($"Using user specified Chromium browser at {ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH}");
// AutoDownloadChromium = false;
// }
// var ReportJSFolderPath = Path.Combine(ServerBootConfig.AYANOVA_CONTENT_ROOT_PATH, "resource", "rpt");
// var lo = new LaunchOptions { Headless = true };
// if (!AutoDownloadChromium)
// {
// lo.ExecutablePath = ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PATH;
// /*
// troubleshooting links:
// https://developers.google.com/web/tools/puppeteer/troubleshooting
// These links might be worth looking at in future if diagnosing other issues:
// https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#running-on-alpine
// https://github.com/puppeteer/puppeteer/issues/1825
// const chromeFlags = [
// '--headless',
// '--no-sandbox',
// "--disable-gpu",
// "--single-process",
// "--no-zygote"
// ]
// */
// }
// else
// {
// // #if (DEBUG)
// // log.LogInformation($"DBG: ReportBiz::calling browserfetcher");
// // #endif
// log.LogDebug($"Windows: Calling browserFetcher download async now:");
// await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultChromiumRevision);
// }
// //Set Chromium args
// //*** DANGER: --disable-dev-shm-usage will crash linux ayanova when it runs out of memory ****
// //that was only suitable for dockerized scenario as it had an alt swap system
// //var OriginalDefaultArgs = "--disable-dev-shm-usage --single-process --no-sandbox --disable-gpu --no-zygote ";
// var DefaultArgs = "--headless --no-sandbox";
// if (!string.IsNullOrWhiteSpace(ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PARAMS))
// {
// log.LogDebug($"AYANOVA_REPORT_RENDER_BROWSER_PARAMS will be used: {ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PARAMS}");
// lo.Args = new string[] { $"{ServerBootConfig.AYANOVA_REPORT_RENDER_BROWSER_PARAMS}" };// AYANOVA_REPORT_RENDER_BROWSER_PARAMS
// }
// else
// {
// log.LogDebug($"AYANOVA_REPORT_RENDER_BROWSER_PARAMS not set, using defaults '{DefaultArgs}'");
// lo.Args = new string[] { DefaultArgs };
// }
// System.Text.StringBuilder PageLog = new System.Text.StringBuilder();
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //API DOCS http://www.puppeteersharp.com/api/index.html
// log.LogDebug($"Launching headless Browser and new page now:");
// using (var browser = await Puppeteer.LaunchAsync(lo))
// using (var page = (await browser.PagesAsync())[0])
// // using (var page = await browser.NewPageAsync())
// {
// //track this process for timeout purposes
// ReportRenderManager.SetProcess(browser.Process.Id, renderTimeOutExpiry, log);
// page.DefaultTimeout = 0;//infinite timeout as we are controlling how long the process can live for with the reportprocessmanager
// try
// {
// //info and error logging
// page.Console += async (sender, args) =>
// {
// switch (args.Message.Type)
// {
// case ConsoleType.Error:
// try
// {
// var errorArgs = await Task.WhenAll(args.Message.Args.Select(arg => arg.ExecutionContext.EvaluateFunctionAsync("(arg) => arg instanceof Error ? arg.message : arg", arg)));
// PageLog.AppendLine($"ERROR: {args.Message.Text} args: [{string.Join<object>(", ", errorArgs)}]");
// }
// catch { }
// break;
// case ConsoleType.Warning:
// PageLog.AppendLine($"WARNING: {args.Message.Text}");
// break;
// default:
// PageLog.AppendLine($"INFO: {args.Message.Text}");
// break;
// }
// };
// log.LogDebug($"Preparing page: adding base reporting scripts to page");
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //Add Handlebars JS for compiling and presenting
// //https://handlebarsjs.com/
// await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "ay-hb.js") });
// //add Marked for markdown processing
// //https://github.com/markedjs/marked
// await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "ay-md.js") });
// //add DOM Purify for markdown template sanitization processing
// //https://github.com/cure53/DOMPurify
// await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "ay-pf.js") });
// //add Bar code library if our bar code helper is referenced
// //https://github.com/metafloor/bwip-js
// if (report.Template.Contains("ayBC ") || report.JsHelpers.Contains("ayBC "))
// await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "ay-bc.js") });
// //add stock helpers
// await page.AddScriptTagAsync(new AddTagOptions() { Path = Path.Combine(ReportJSFolderPath, "ay-report.js") });
// //execute to add to handlebars
// await page.EvaluateExpressionAsync("ayRegisterHelpers();");
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// log.LogDebug($"Preparing page: adding this report's scripts, style and templates to page");
// //add report pre-render, helpers and style
// if (string.IsNullOrWhiteSpace(report.JsPrerender))
// {
// report.JsPrerender = "async function ayPrepareData(reportData){return reportData;}";
// }
// await page.AddScriptTagAsync(new AddTagOptions() { Content = report.JsPrerender });
// if (!string.IsNullOrWhiteSpace(report.JsHelpers))
// await page.AddScriptTagAsync(new AddTagOptions() { Content = report.JsHelpers });
// if (!string.IsNullOrWhiteSpace(report.Style))
// await page.AddStyleTagAsync(new AddTagOptions() { Content = report.Style });
// log.LogDebug($"Preparing page: adding Client meta data");
// //Client meta data to JSON string
// var clientMeta = reportRequest.ClientMeta.ToString();
// log.LogDebug($"Preparing page: adding Server meta data");
// //Server meta data
// var logo = await ct.Logo.AsNoTracking().SingleOrDefaultAsync();
// var HasSmallLogo = "false";
// var HasMediumLogo = "false";
// var HasLargeLogo = "false";
// if (logo != null)
// {
// if (logo.Small != null) HasSmallLogo = "true";
// if (logo.Medium != null) HasMediumLogo = "true";
// if (logo.Large != null) HasLargeLogo = "true";
// }
// var HasPostalAddress = !string.IsNullOrWhiteSpace(ServerGlobalBizSettings.Cache.PostAddress) ? "true" : "false";
// var HasStreetAddress = !string.IsNullOrWhiteSpace(ServerGlobalBizSettings.Cache.Address) ? "true" : "false";
// var serverMeta = $"{{ayApiUrl:`{apiUrl}`, HasSmallLogo:{HasSmallLogo}, HasMediumLogo:{HasMediumLogo}, HasLargeLogo:{HasLargeLogo},CompanyName: `{AyaNova.Core.License.ActiveKey.RegisteredTo}`,CompanyWebAddress:`{ServerGlobalBizSettings.Cache.WebAddress}`,CompanyEmailAddress:`{ServerGlobalBizSettings.Cache.EmailAddress}`,CompanyPhone1:`{ServerGlobalBizSettings.Cache.Phone1}`,CompanyPhone2:`{ServerGlobalBizSettings.Cache.Phone2}`,HasPostalAddress:{HasPostalAddress},CompanyPostAddress:`{ServerGlobalBizSettings.Cache.PostAddress}`,CompanyPostCity:`{ServerGlobalBizSettings.Cache.PostCity}`,CompanyPostRegion:`{ServerGlobalBizSettings.Cache.PostRegion}`,CompanyPostCountry:`{ServerGlobalBizSettings.Cache.PostCountry}`,CompanyPostCode:`{ServerGlobalBizSettings.Cache.PostCode}`,HasStreetAddress:{HasStreetAddress},CompanyAddress:`{ServerGlobalBizSettings.Cache.Address}`,CompanyCity:`{ServerGlobalBizSettings.Cache.City}`,CompanyRegion:`{ServerGlobalBizSettings.Cache.Region}`,CompanyCountry:`{ServerGlobalBizSettings.Cache.Country}`,CompanyLatitude:{ServerGlobalBizSettings.Cache.Latitude},CompanyLongitude:{ServerGlobalBizSettings.Cache.Longitude}}}";
// log.LogDebug($"Preparing page: adding Report meta data");
// //Custom fields definition for report usage
// string CustomFieldsTemplate = "null";
// var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == report.AType.ToString());
// if (FormCustomization != null)
// {
// CustomFieldsTemplate = FormCustomization.Template;
// }
// //Report meta data
// var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,AType:`{report.AType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportRequest.DataListKey}`,SelectedRowIds: `{string.Join(",", reportRequest.SelectedRowIds)}`}}";
// //duplicate meta data in report page wide variable for use by our internal functions
// await page.AddScriptTagAsync(new AddTagOptions() { Content = $"var AYMETA={{ ayReportMetaData:{reportMeta}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }}" });
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //#### DEBUGGING TOOL: view page contents
// // var pagecontent = await page.GetContentAsync();
// //prePareData / preRender
// var ReportDataObject = $"{{ ayReportData:{ReportData}, ayReportMetaData:{reportMeta}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }}";
// log.LogDebug($"PageLog before render:{PageLog.ToString()}");
// log.LogDebug($"Calling ayPreRender...");
// await page.WaitForExpressionAsync($"ayPreRender({ReportDataObject})");
// log.LogDebug($"ayPreRender completed");
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //compile the template
// log.LogDebug($"Calling Handlebars.compile...");
// var compileScript = $"Handlebars.compile(`{report.Template}`)(PreParedReportDataObject);";
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// var compiledHTML = await page.EvaluateExpressionAsync<string>(compileScript);
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //render report as HTML
// log.LogDebug($"Setting page content to compiled HTML");
// await page.SetContentAsync(compiledHTML);
// //add style (after page or it won't work)
// if (!string.IsNullOrWhiteSpace(report.Style))
// {
// log.LogDebug($"Adding report template Style CSS");
// await page.AddStyleTagAsync(new AddTagOptions { Content = report.Style });
// }
// string outputFileName = StringUtil.ReplaceLastOccurrence(FileUtil.NewRandomFileName, ".", "") + ".pdf";
// string outputFullPath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, outputFileName);
// //Set PDF options
// //https://pptr.dev/#?product=Puppeteer&version=v5.3.0&show=api-pagepdfoptions
// log.LogDebug($"Resolving PDF Options from report settings");
// var PdfOptions = new PdfOptions() { };
// PdfOptions.DisplayHeaderFooter = report.DisplayHeaderFooter;
// if (report.DisplayHeaderFooter)
// {
// var ClientPDFDate = reportRequest.ClientMeta["PDFDate"].Value<string>();
// var ClientPDFTime = reportRequest.ClientMeta["PDFTime"].Value<string>();
// PdfOptions.HeaderTemplate = report.HeaderTemplate.Replace("PDFDate", ClientPDFDate).Replace("PDFTime", ClientPDFTime);
// PdfOptions.FooterTemplate = report.FooterTemplate.Replace("PDFDate", ClientPDFDate).Replace("PDFTime", ClientPDFTime);
// }
// if (report.PaperFormat != ReportPaperFormat.NotSet)
// {
// switch (report.PaperFormat)
// {
// case ReportPaperFormat.A0:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A0;
// break;
// case ReportPaperFormat.A1:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A1;
// break;
// case ReportPaperFormat.A2:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A2;
// break;
// case ReportPaperFormat.A3:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A3;
// break;
// case ReportPaperFormat.A4:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A4;
// break;
// case ReportPaperFormat.A5:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A5;
// break;
// case ReportPaperFormat.A6:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.A6;
// break;
// case ReportPaperFormat.Ledger:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.Ledger;
// break;
// case ReportPaperFormat.Legal:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.Legal;
// break;
// case ReportPaperFormat.Letter:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.Letter;
// break;
// case ReportPaperFormat.Tabloid:
// PdfOptions.Format = PuppeteerSharp.Media.PaperFormat.Tabloid;
// break;
// }
// }
// PdfOptions.Landscape = report.Landscape;
// if (!string.IsNullOrWhiteSpace(report.MarginOptionsBottom))
// PdfOptions.MarginOptions.Bottom = report.MarginOptionsBottom;
// if (!string.IsNullOrWhiteSpace(report.MarginOptionsLeft))
// PdfOptions.MarginOptions.Left = report.MarginOptionsLeft;
// if (!string.IsNullOrWhiteSpace(report.MarginOptionsRight))
// PdfOptions.MarginOptions.Right = report.MarginOptionsRight;
// if (!string.IsNullOrWhiteSpace(report.MarginOptionsTop))
// PdfOptions.MarginOptions.Top = report.MarginOptionsTop;
// //holding this back until figure it out
// //it's not really a report property, but a print time / render property
// //PdfOptions.PageRanges=report.PageRanges;
// PdfOptions.PreferCSSPageSize = report.PreferCSSPageSize;
// PdfOptions.PrintBackground = report.PrintBackground;
// //Defaults to 1. Scale amount must be between 0.1 and 2.
// PdfOptions.Scale = report.Scale;
// if (DateTime.UtcNow > renderTimeOutExpiry)
// throw new ReportRenderTimeOutException();
// //render to pdf and return
// log.LogDebug($"Calling render page contents to PDF");
// await page.PdfAsync(outputFullPath, PdfOptions);//###### TODO: SLOW NEEDS TIMEOUT HERE ONCE SUPPORTED, open bug: https://github.com/hardkoded/puppeteer-sharp/issues/1710
// log.LogDebug($"Closing Page");
// await page.CloseAsync();
// log.LogDebug($"Closing Browser");
// await browser.CloseAsync();
// log.LogDebug($"Render completed, returning results");
// return outputFileName;
// }
// catch (ReportRenderTimeOutException)
// {
// log.LogDebug("Caught ReportRendertimeOutException, re-throwing");
// throw;
// }
// catch (PuppeteerSharp.TargetClosedException)
// {
// log.LogDebug("Caught PuppeteerSharp.TargetClosedException throwing as ReportRendertimeOutException (timed out and closed from process sweeper)");
// //we closed it because the timeout hit and the CoreJobReportRenderEngineProcessCleanup job cleaned it out
// //so return the error the client expects in this scenario
// throw new ReportRenderTimeOutException();
// }
// catch (Exception ex)
// {
// log.LogDebug(ex, $"Error during report rendering");
// //This is the error when a helper is used on the template but doesn't exist:
// //Evaluation failed: d
// //(it might also mean other things wrong with template)
// if (PageLog.Length > 0)
// {
// log.LogInformation($"Exception caught while rendering report \"{report.Name}\", report Page console log:");
// log.LogInformation(PageLog.ToString());
// }
// // var v=await page.GetContentAsync();//for debugging purposes
// throw;
// }
// finally
// {
// log.LogDebug($"reached finally block");
// if (!page.IsClosed)
// {
// log.LogDebug($"Page not closed in finally block, closing now");
// await page.CloseAsync();
// }
// if (!browser.IsClosed)
// {
// log.LogDebug($"Browser not closed in finally block, closing now");
// await browser.CloseAsync();
// }
// log.LogDebug($"Calling ReportRenderManager.RemoveProcess to stop tracking this process");
// ReportRenderManager.RemoveProcess(browser.Process.Id, log);
// }
// }
// }
////////////////////////////////////////////////////////////////////////////////////////////////
//RENDER
//
@@ -825,17 +400,10 @@ namespace AyaNova.Biz
//includeWoItemDescendants?
reportRequest.IncludeWoItemDescendants = report.IncludeWoItemDescendants;
//Do we need to rehydrate the ID List from a DataList?
if (reportRequest.SelectedRowIds.Length == 0)
reportRequest.SelectedRowIds = await DataListSelectedProcessingOptions.RehydrateIdList(reportRequest, ct, effectiveRoles, log, UserId, UserTranslationId);
//todo: put in job add job handler to do the remainder of this request
var JobName = $"LT:Report id: \"{reportRequest.ReportId}\" LT:{reportRequest.AType} ({reportRequest.SelectedRowIds.LongLength}) LT:User {userName}";
JObject o = JObject.FromObject(new
{
@@ -866,8 +434,8 @@ namespace AyaNova.Biz
var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::DoRenderJob");
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
var renderTimeOutExpiry = DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT);
ReportRenderManager.AddJob(job.GId, renderTimeOutExpiry, log);
ReportRenderManager.AddJob(job.GId, log);
// await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.JobType}");
//rehydrate job objects
@@ -887,15 +455,15 @@ namespace AyaNova.Biz
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Failed);
return;
}
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
//Get data
log.LogDebug("Getting report data now");
var ReportData = await GetReportData(reportRequest, renderTimeOutExpiry, RequestIsCustomerWorkOrderReport);
var ReportData = await GetReportData(reportRequest, job.GId, RequestIsCustomerWorkOrderReport);
//THIS is here to catch scenario where report data returned null because it expired, not because of an issue
if (!ReportRenderManager.KeepGoing(job.GId))
return;
//if GetReportData errored then will return null so need to return that as well here
if (ReportData == null)
{
@@ -905,15 +473,8 @@ namespace AyaNova.Biz
}
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
if (DateTime.UtcNow > renderTimeOutExpiry)
{
await HandleTimeOut(job, log, reportRequest, userName);
return;
}
//initialization
log.LogDebug("Initializing report rendering system");
bool AutoDownloadChromium = true;
@@ -976,12 +537,8 @@ namespace AyaNova.Biz
}
System.Text.StringBuilder PageLog = new System.Text.StringBuilder();
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
//API DOCS http://www.puppeteersharp.com/api/index.html
log.LogDebug($"Launching headless Browser and new page now:");
@@ -1020,12 +577,8 @@ namespace AyaNova.Biz
};
log.LogDebug($"Preparing page: adding base reporting scripts to page");
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
//Add Handlebars JS for compiling and presenting
//https://handlebarsjs.com/
@@ -1049,12 +602,8 @@ namespace AyaNova.Biz
//execute to add to handlebars
await page.EvaluateExpressionAsync("ayRegisterHelpers();");
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
log.LogDebug($"Preparing page: adding this report's scripts, style and templates to page");
//add report pre-render, helpers and style
@@ -1109,12 +658,8 @@ namespace AyaNova.Biz
//duplicate meta data in report page wide variable for use by our internal functions
await page.AddScriptTagAsync(new AddTagOptions() { Content = $"var AYMETA={{ ayReportMetaData:{reportMeta}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }}" });
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
//#### DEBUGGING TOOL: view page contents
// var pagecontent = await page.GetContentAsync();
@@ -1127,27 +672,17 @@ namespace AyaNova.Biz
await page.WaitForExpressionAsync($"ayPreRender({ReportDataObject})");
log.LogDebug($"ayPreRender completed");
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(job.GId))
{
return;
}
//compile the template
log.LogDebug($"Calling Handlebars.compile...");
var compileScript = $"Handlebars.compile(`{report.Template}`)(PreParedReportDataObject);";
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if(!ReportRenderManager.KeepGoing(job.GId)){
return;
}
if (!ReportRenderManager.KeepGoing(job.GId))
return;
var compiledHTML = await page.EvaluateExpressionAsync<string>(compileScript);
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if(!ReportRenderManager.KeepGoing(job.GId)){
return;
}
if (!ReportRenderManager.KeepGoing(job.GId))
return;
//render report as HTML
log.LogDebug($"Setting page content to compiled HTML");
@@ -1241,11 +776,8 @@ namespace AyaNova.Biz
PdfOptions.PrintBackground = report.PrintBackground;
//Defaults to 1. Scale amount must be between 0.1 and 2.
PdfOptions.Scale = report.Scale;
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if(!ReportRenderManager.KeepGoing(job.GId)){
return;
}
if (!ReportRenderManager.KeepGoing(job.GId))
return;
//render to pdf and return
log.LogDebug($"Calling render page contents to PDF");
await page.PdfAsync(outputFullPath, PdfOptions);//###### TODO: SLOW NEEDS TIMEOUT HERE ONCE SUPPORTED, open bug: https://github.com/hardkoded/puppeteer-sharp/issues/1710

9
server/AyaNova/biz/ReviewBiz.cs
View File

@@ -335,7 +335,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -349,8 +349,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Review w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -380,11 +379,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

6
server/AyaNova/biz/ServiceBankBiz.cs
View File

@@ -264,7 +264,7 @@
// ////////////////////////////////////////////////////////////////////////////////////////////////
// //REPORTING
// //
// public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
// public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
// {
// JArray ReportData = new JArray();
// while (idList.Any())
@@ -293,11 +293,11 @@
// // IMPORT EXPORT
// //
// public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
// public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
// {
// //for now just re-use the report data code
// //this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
// return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
// return await GetReportData(dataListSelectedRequest, jobId);
// }

9
server/AyaNova/biz/ServiceRateBiz.cs
View File

@@ -302,7 +302,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -316,8 +316,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (ServiceRate w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -333,11 +332,11 @@ namespace AyaNova.Biz
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/TaskGroupBiz.cs
View File

@@ -286,7 +286,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -300,8 +300,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (TaskGroup w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -317,11 +316,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/TaxCodeBiz.cs
View File

@@ -331,7 +331,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -345,8 +345,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (TaxCode w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -362,11 +361,11 @@ namespace AyaNova.Biz
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/TravelRateBiz.cs
View File

@@ -298,7 +298,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -312,8 +312,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (TravelRate w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -329,11 +328,11 @@ namespace AyaNova.Biz
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/UnitBiz.cs
View File

@@ -293,7 +293,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -307,8 +307,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Unit w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -381,11 +380,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/UnitMeterReadingBiz.cs
View File

@@ -142,7 +142,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -156,8 +156,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (UnitMeterReading w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
ReportData.Add(jo);
@@ -180,11 +179,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/UnitModelBiz.cs
View File

@@ -276,7 +276,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -290,8 +290,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (UnitModel w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -313,11 +312,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)

9
server/AyaNova/biz/UserBiz.cs
View File

@@ -1022,7 +1022,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -1045,8 +1045,7 @@ namespace AyaNova.Biz
//foreach (User w in orderedList)
foreach (var w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w, UserTypesEnumList);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -1081,11 +1080,11 @@ namespace AyaNova.Biz
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

9
server/AyaNova/biz/VendorBiz.cs
View File

@@ -315,7 +315,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -329,8 +329,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (Vendor w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -346,11 +345,11 @@ namespace AyaNova.Biz
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}

19
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -938,7 +938,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
// #if (DEBUG)
// var watch = System.Diagnostics.Stopwatch.StartNew();
@@ -952,20 +952,19 @@ namespace AyaNova.Biz
while (idList.Any())
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE);
idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray();
List<WorkOrder> batchResults = new List<WorkOrder>();
foreach (long batchId in batch)
{
if (!ReportRenderManager.KeepGoing(jobId)) return null;
batchResults.Add(await WorkOrderGetPartialAsync(dataListSelectedRequest.AType, batchId, dataListSelectedRequest.IncludeWoItemDescendants, true));
}
foreach (WorkOrder w in batchResults)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
var jo = JObject.FromObject(w);
//WorkOrder header custom fields
@@ -1114,11 +1113,11 @@ namespace AyaNova.Biz
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}
////////////////////////////////////////////////////////////////////////////////////////////////
@@ -3275,7 +3274,7 @@ namespace AyaNova.Biz
Tax = (TaxCode)oc.Get("tax", o.TaxCodeId);
}
if (Tax != null)
o.TaxCodeViz = Tax.Name;

4
server/AyaNova/generator/CoreJobBackup.cs
View File

@@ -29,7 +29,7 @@ namespace AyaNova.Biz
if (BackupIsRunning) return;
if (!OnDemand)
{
log.LogDebug("Checking if backup should run");
log.LogTrace("Checking if backup should run");
if (!ServerGlobalOpsSettingsCache.Backup.Active)
{
log.LogDebug("Automatic backup is set to INACTIVE - not backing up");
@@ -38,7 +38,7 @@ namespace AyaNova.Biz
if (DateTime.UtcNow < ServerGlobalOpsSettingsCache.NextBackup)
{
log.LogDebug("Not past backup time yet");
log.LogTrace("Not past backup time yet");
return;
}
}

6
server/AyaNova/generator/CoreJobLicense.cs
View File

@@ -33,7 +33,7 @@ namespace AyaNova.Biz
//
public static async Task DoWorkAsync()
{
log.LogDebug("Job starting");
log.LogTrace("Job starting");
var tsSinceLastCheck = DateTime.UtcNow - _lastCheck;
//which track are we on?
/*
@@ -56,10 +56,10 @@ namespace AyaNova.Biz
tsCheckFrequency = SLOW_TRACK;
break;
}
log.LogDebug($"Check frequency{tsCheckFrequency}");
log.LogTrace($"Check frequency{tsCheckFrequency}");
if (tsSinceLastCheck < tsCheckFrequency)
{
log.LogDebug($"Not yet");
log.LogTrace($"Not yet");
return;
}

6
server/AyaNova/generator/CoreJobNotify.cs
View File

@@ -34,16 +34,16 @@ namespace AyaNova.Biz
//
public static async Task DoWorkAsync()
{
log.LogDebug("Checking if Notify should run");
log.LogTrace("Checking if Notify should run");
if (NotifyIsRunning)
{
log.LogDebug("Notify is running already exiting this cycle");
log.LogTrace("Notify is running already exiting this cycle");
return;
}
//This will get triggered roughly every minute, but we don't want to deliver that frequently
if (DateTime.UtcNow - lastRun < RUN_EVERY_INTERVAL)
{
log.LogDebug($"Notify ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
log.LogTrace($"Notify ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
return;
}
try

6
server/AyaNova/generator/CoreJobPMGenerate.cs
View File

@@ -31,16 +31,16 @@ namespace AyaNova.Biz
public static async Task DoWorkAsync()
{
log.LogDebug("Checking if PMGenerate should run");
log.LogTrace("Checking if PMGenerate should run");
if (IsRunning)
{
log.LogDebug("PMGenerate is running already exiting this cycle");
log.LogTrace("PMGenerate is running already exiting this cycle");
return;
}
//This will get triggered roughly every minute, but we don't want to deliver that frequently
if (DateTime.UtcNow - lastRun < RUN_EVERY_INTERVAL)
{
log.LogDebug($"PMGenerate ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
log.LogTrace($"PMGenerate ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
return;
}
try

6
server/AyaNova/generator/CoreJobPMInventoryCheck.cs
View File

@@ -31,16 +31,16 @@ namespace AyaNova.Biz
public static async Task DoWorkAsync()
{
log.LogDebug("Checking if CoreJobPMInventoryCheck should run");
log.LogTrace("Checking if CoreJobPMInventoryCheck should run");
if (IsRunning)
{
log.LogDebug("CoreJobPMInventoryCheck is running already exiting this cycle");
log.LogTrace("CoreJobPMInventoryCheck is running already exiting this cycle");
return;
}
//This will get triggered roughly every minute, but we don't want to deliver that frequently
if (DateTime.UtcNow - lastRun < RUN_EVERY_INTERVAL)
{
log.LogDebug($"CoreJobPMInventoryCheck ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
log.LogTrace($"CoreJobPMInventoryCheck ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
return;
}

5
server/AyaNova/generator/CoreJobReportRenderEngineProcessCleanup.cs
View File

@@ -14,7 +14,7 @@ namespace AyaNova.Biz
private static DateTime _lastRun = DateTime.UtcNow;
//SET LOW INTENTIONALLY AS CAN EAT UP A LOT OF RESOURCES QUICKLY IF RUN'S PAST TIME
private static TimeSpan tsRunEvery = new TimeSpan(0, 1, 1);//every this minutes run the cleanup task
private static TimeSpan tsRunEvery = new TimeSpan(0, 0, 20);//every twenty seconds run the cleanup task
////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -23,9 +23,8 @@ namespace AyaNova.Biz
{
if (DateUtil.IsAfterDuration(_lastRun, tsRunEvery))
{
log.LogDebug("Checking for expired processes");
log.LogTrace("Checking for expired report jobs");
await Util.ReportRenderManager.KillExpiredRenders(log);
//FileUtil.CleanTemporaryFilesFolder(new TimeSpan(0,5,0));//erase any files found to be older than 5 minutes
var now = DateTime.UtcNow;
_lastRun = now;
}

2
server/AyaNova/generator/CoreJobSweeper.cs
View File

@@ -17,7 +17,7 @@ namespace AyaNova.Biz
{
private static ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger("CoreJobSweeper");
private static DateTime lastSweep = DateTime.MinValue;
private static TimeSpan SWEEP_EVERY_INTERVAL = new TimeSpan(0, 0, 10);
private static TimeSpan SWEEP_EVERY_INTERVAL = new TimeSpan(0, 10, 10);//every ten minutes roughly
private static TimeSpan SUCCEEDED_JOBS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(14, 0, 0, 0);//14 days
private static TimeSpan FAILED_JOBS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(14, 0, 0, 0);//14 days (gives people time to notice and look into it)
private static TimeSpan INTERNAL_JOBS_LOGS_DELETE_AFTER_THIS_TIMESPAN = new TimeSpan(14, 0, 0, 0);//14 days

6
server/AyaNova/util/ReportProcessManager.cs
View File

@@ -107,10 +107,10 @@ namespace AyaNova.Util
}
internal static void AddJob(Guid jobId, DateTime expires, ILogger log)
internal static void AddJob(Guid jobId, ILogger log)
{
log.LogDebug($"AddJob - {jobId} to the collection");
_baginstances.Add(new ReportRenderInstanceInfo(jobId, expires));
_baginstances.Add(new ReportRenderInstanceInfo(jobId, DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT)));
log.LogInformation($"AddJob - there are currently {_baginstances.Count} instances in the collection");
}
@@ -144,6 +144,8 @@ namespace AyaNova.Util
internal static bool KeepGoing(Guid jobId)
{
//if job id is empty it means it was called from outside of a job (report designer get data for example)
if(jobId==Guid.Empty) return true;
foreach (var i in _baginstances)
{
if (i.JobId == jobId)