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
2020-06-05 19:43:01 +00:00
parent 4e73531145
commit 7e43d4a3e3
4 changed files with 131 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devdocs/todo.txt
View File

@@ -3,7 +3,8 @@
{"login": "OpsAdminLimited","password": "OpsAdminLimited"} {"login": "OpsAdminLimited","password": "OpsAdminLimited"}
todo: FAKER, is there a leak, do I need to dispose of it somehow, am I using it right?
(it appeared high in objects in allocated memory when investigating memory consumption)

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

@@ -69,7 +69,7 @@ namespace AyaNova.Api.Controllers
// //test allocation and cleanup // //test allocation and cleanup
// for (int x = 0; x < 100000; x++) // for (int x = 0; x < 100000; x++)
// { // {
// AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext; // using (AyContext ct = ServiceProviderProvider.DBContext)
// var v=await ct.Widget.Where(z=>z.Serial<100).ToListAsync(); // var v=await ct.Widget.Where(z=>z.Serial<100).ToListAsync();
// // int i = await ct.Database.ExecuteSqlRawAsync($"select * from aglobalbizsettings"); // // int i = await ct.Database.ExecuteSqlRawAsync($"select * from aglobalbizsettings");
// } // }

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

@@ -36,7 +36,6 @@ namespace AyaNova.Biz
log.LogTrace("Sweep starting"); log.LogTrace("Sweep starting");
using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext) using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{ {
//SWEEP SUCCESSFUL JOBS //SWEEP SUCCESSFUL JOBS
//calculate cutoff to delete //calculate cutoff to delete
DateTime dtDeleteCutoff = DateTime.UtcNow - SUCCEEDED_JOBS_DELETE_AFTER_THIS_TIMESPAN; DateTime dtDeleteCutoff = DateTime.UtcNow - SUCCEEDED_JOBS_DELETE_AFTER_THIS_TIMESPAN;
@@ -64,7 +63,6 @@ namespace AyaNova.Biz
private static async Task sweepAsync(AyContext ct, DateTime dtDeleteCutoff, JobStatus jobStatus) private static async Task sweepAsync(AyContext ct, DateTime dtDeleteCutoff, JobStatus jobStatus)
{ {
// AyContext ct = ServiceProviderProvider.DBContext;
//Get the deleteable succeeded jobs list //Get the deleteable succeeded jobs list
var jobs = await ct.OpsJob var jobs = await ct.OpsJob
.AsNoTracking() .AsNoTracking()
@@ -96,8 +94,6 @@ namespace AyaNova.Biz
/// </summary> /// </summary>
private static async Task killStuckJobsAsync(AyContext ct, DateTime dtRunningDeadline) private static async Task killStuckJobsAsync(AyContext ct, DateTime dtRunningDeadline)
{ {
// AyContext ct = ServiceProviderProvider.DBContext;
//Get the deleteable succeeded jobs list //Get the deleteable succeeded jobs list
var jobs = await ct.OpsJob var jobs = await ct.OpsJob
.AsNoTracking() .AsNoTracking()
@@ -119,7 +115,6 @@ namespace AyaNova.Biz
private static async Task SweepInternalJobsLogsAsync(AyContext ct, DateTime dtDeleteCutoff) private static async Task SweepInternalJobsLogsAsync(AyContext ct, DateTime dtDeleteCutoff)
{ {
// AyContext ct = ServiceProviderProvider.DBContext;
//Get the deleteable list (this is for reporting, could easily just do it in one go) //Get the deleteable list (this is for reporting, could easily just do it in one go)
var logs = await ct.OpsJobLog var logs = await ct.OpsJobLog
.AsNoTracking() .AsNoTracking()

277
server/AyaNova/util/Seeder.cs
View File

@@ -87,9 +87,6 @@ namespace AyaNova.Util
apiServerState.SetOpsOnly("Seeding database with sample data"); apiServerState.SetOpsOnly("Seeding database with sample data");
//WIDGET sample form customization //WIDGET sample form customization
{ {
@@ -140,15 +137,12 @@ namespace AyaNova.Util
}; };
//Create and save to db //Create and save to db
using (var cct = ServiceProviderProvider.DBContext) using (var ct = ServiceProviderProvider.DBContext)
{ await FormCustomBiz.GetBiz(ct).CreateAsync(fc);
await FormCustomBiz.GetBiz(cct).CreateAsync(fc);
}
} }
//Create a couple of DataListView's for development and testing //Create a couple of DataListView's for development and testing
{ {
var dlv = new DataListView() var dlv = new DataListView()
{ {
Name = "Name starts with generic", Name = "Name starts with generic",
@@ -156,14 +150,11 @@ namespace AyaNova.Util
ListKey = "TestWidgetDataList", ListKey = "TestWidgetDataList",
Public = true, Public = true,
ListView = @"[{""fld"": ""widgetname"",""filter"": {""any"":false,""items"": [{""op"": ""%-"",""value"": ""Generic""}]}}]" ListView = @"[{""fld"": ""widgetname"",""filter"": {""any"":false,""items"": [{""op"": ""%-"",""value"": ""Generic""}]}}]"
}; };
//Create and save to db //Create and save to db
using (var cct = ServiceProviderProvider.DBContext) using (var ct = ServiceProviderProvider.DBContext)
{ await DataListViewBiz.GetBiz(ct).CreateAsync(dlv);
await DataListViewBiz.GetBiz(cct).CreateAsync(dlv);
}
dlv = new DataListView() dlv = new DataListView()
{ {
@@ -172,14 +163,11 @@ namespace AyaNova.Util
ListKey = "TestWidgetDataList", ListKey = "TestWidgetDataList",
Public = true, Public = true,
ListView = @"[{""fld"": ""widgetname"",""filter"": {""any"":false,""items"": [{""op"": ""%-"",""value"": ""Awesome""}]}},{""fld"":""widgetserial""},{""fld"":""widgetdollaramount""},{""fld"":""widgetusertype""},{""fld"":""widgetstartdate""},{""fld"":""widgetactive""},{""fld"":""username""},{""fld"":""widgettags""},{""fld"":""widgetcustom1""},{""fld"":""widgetcustom2""}]" ListView = @"[{""fld"": ""widgetname"",""filter"": {""any"":false,""items"": [{""op"": ""%-"",""value"": ""Awesome""}]}},{""fld"":""widgetserial""},{""fld"":""widgetdollaramount""},{""fld"":""widgetusertype""},{""fld"":""widgetstartdate""},{""fld"":""widgetactive""},{""fld"":""username""},{""fld"":""widgettags""},{""fld"":""widgetcustom1""},{""fld"":""widgetcustom2""}]"
}; };
//Create and save to db //Create and save to db
using (var cct = ServiceProviderProvider.DBContext) using (var ct = ServiceProviderProvider.DBContext)
{ await DataListViewBiz.GetBiz(ct).CreateAsync(dlv);
await DataListViewBiz.GetBiz(cct).CreateAsync(dlv);
}
} }
@@ -560,13 +548,6 @@ namespace AyaNova.Util
if (translationId == 0) if (translationId == 0)
translationId = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID; translationId = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
//Don't do the following commented out, it's slower
// using (var ct = ServiceProviderProvider.DBContext)
// {
// UserBiz Biz = UserBiz.GetBiz(ct);
Faker Fake = new Faker(); Faker Fake = new Faker();
for (int x = 0; x < count; x++) for (int x = 0; x < count; x++)
@@ -592,7 +573,7 @@ namespace AyaNova.Util
u.UserType = userType; u.UserType = userType;
u.EmployeeNumber = "A-" + (454 + SeededUserCount).ToString() + "-Y"; u.EmployeeNumber = "A-" + (454 + SeededUserCount).ToString() + "-Y";
u.Notes = Fake.Lorem.Sentence(null,5);//Fake.Lorem.Paragraph(2); u.Notes = Fake.Lorem.Sentence(null, 5);//Fake.Lorem.Paragraph(2);
//TODO: After have USER and HEADOFFICE and VENDOR, if usertype is subcontractor or client or headoffice it needs to set a corresponding user's parent org record id to go with it //TODO: After have USER and HEADOFFICE and VENDOR, if usertype is subcontractor or client or headoffice it needs to set a corresponding user's parent org record id to go with it
//use provided tags or generate them //use provided tags or generate them
if (tags == null) if (tags == null)
@@ -607,143 +588,143 @@ namespace AyaNova.Util
u.UserOptions.CurrencyName = "USD"; u.UserOptions.CurrencyName = "USD";
u.UserOptions.UiColor = Fake.Internet.Color(); u.UserOptions.UiColor = Fake.Internet.Color();
// u.Wiki = @" // u.Wiki = @"
// # Markdown quick reference for Wiki pages // # Markdown quick reference for Wiki pages
// *** // ***
// *** // ***
// <br> // <br>
// ## Markdown and Wiki documents // ## Markdown and Wiki documents
// Wiki's are formatted using **[Markdown](https://en.wikipedia.org/wiki/Markdown)** a plain text formatting language. // Wiki's are formatted using **[Markdown](https://en.wikipedia.org/wiki/Markdown)** a plain text formatting language.
// This document is a quick reference guide and at the bottom is a link to a more comprehensive guide online. // This document is a quick reference guide and at the bottom is a link to a more comprehensive guide online.
// You can also use the formatting toolbar above to perform the same tasks. // You can also use the formatting toolbar above to perform the same tasks.
// # Headings // # Headings
// # Heading 1st level // # Heading 1st level
// ## Heading 2nd level // ## Heading 2nd level
// ### Heading 3rd level // ### Heading 3rd level
// #### Heading 4th level // #### Heading 4th level
// ##### Heading 5th level // ##### Heading 5th level
// ###### Heading 6th level // ###### Heading 6th level
// *** // ***
// # Emphasis text styles // # Emphasis text styles
// *Italic* // *Italic*
// **Bold** // **Bold**
// ~~Strike-through~~ // ~~Strike-through~~
// ***Bold And Italic*** // ***Bold And Italic***
// # Quote blocks // # Quote blocks
// > ""Morbi eget dapibus felis. Vivamus venenatis porttitor tortor sit amet rutrum. // > ""Morbi eget dapibus felis. Vivamus venenatis porttitor tortor sit amet rutrum.
// Pellentesque aliquet quam enim, eu volutpat urna rutrum a. Nam vehicula nunc // Pellentesque aliquet quam enim, eu volutpat urna rutrum a. Nam vehicula nunc
// > // >
// > mauris, a ultricies libero efficitur sed. *Class aptent* taciti sociosqu ad // > mauris, a ultricies libero efficitur sed. *Class aptent* taciti sociosqu ad
// litora torquent per conubia nostra, per inceptos himenaeos. Sed molestie // litora torquent per conubia nostra, per inceptos himenaeos. Sed molestie
// imperdiet consectetur."" // imperdiet consectetur.""
// # Lists // # Lists
// ### Unordered list // ### Unordered list
// * List // * List
// * List // * List
// * List // * List
// ### Ordered list // ### Ordered list
// 1. One // 1. One
// 2. Two // 2. Two
// 3. Three // 3. Three
// ### Auto number ordered list // ### Auto number ordered list
// Ordered lists don't need the numbers to be in order, just that they start with 1: // Ordered lists don't need the numbers to be in order, just that they start with 1:
// 1. Item // 1. Item
// 1. another item // 1. another item
// 1. more item // 1. more item
// ### Nested lists // ### Nested lists
// * First // * First
// * subitem One // * subitem One
// * subitem Two // * subitem Two
// * Second // * Second
// 1. sub one // 1. sub one
// 2. sub two // 2. sub two
// # Blank lines // # Blank lines
// You can force extra blank lines by entering `<br>` here are two blank ... // You can force extra blank lines by entering `<br>` here are two blank ...
// <br> // <br>
// <br> // <br>
// ...lines. // ...lines.
// # Horizontal rules // # Horizontal rules
// *** // ***
// # Blocks // # Blocks
// `Inline block` with backticks // `Inline block` with backticks
// ``` // ```
// Multi-line block // Multi-line block
// print '3 backticks or' // print '3 backticks or'
// print 'indent 4 spaces' // print 'indent 4 spaces'
// ``` // ```
// # Task lists // # Task lists
// - [ ] task one // - [ ] task one
// - [x] task two (completed) // - [x] task two (completed)
// # TABLES // # TABLES
// | First | Last | Year | // | First | Last | Year |
// | -------- | -------- | -------- | // | -------- | -------- | -------- |
// | John | Doe | 2000 | // | John | Doe | 2000 |
// | Mary | Smith | 2001 | // | Mary | Smith | 2001 |
// | T. | Persson | 2010 | // | T. | Persson | 2010 |
// # Hyperlinks // # Hyperlinks
// Inline text link and and optional tooltip: // Inline text link and and optional tooltip:
// Link to [our website](https://ayanova.com ""Hover text tooltip"") example // Link to [our website](https://ayanova.com ""Hover text tooltip"") example
// If you don't need an inline link you can simply enter it in angle brackets: // If you don't need an inline link you can simply enter it in angle brackets:
// <https://ayanova.com> // <https://ayanova.com>
// Even email links work: // Even email links work:
// <support@ayanova.com> // <support@ayanova.com>
// <br> // <br>
// You can also use emphasis characters with links: // You can also use emphasis characters with links:
// Link to **[our website](https://ayanova.com)** example // Link to **[our website](https://ayanova.com)** example
// # Image // # Image
// This is how you insert an image into a wiki // This is how you insert an image into a wiki
// ![Image](https://www.ayanova.com/images/AyaNovaIcon256.png) // ![Image](https://www.ayanova.com/images/AyaNovaIcon256.png)
// # Emojis // # Emojis
// As with all areas of AyaNova where you can enter text, you can also use emoji characters: // As with all areas of AyaNova where you can enter text, you can also use emoji characters:
// # 😀⚽🏒🍕🚗☀❤😎 // # 😀⚽🏒🍕🚗☀❤😎
// <br> // <br>
// # Markdown guide // # Markdown guide
// A more detailed markdown guide is available here: // A more detailed markdown guide is available here:
// <https://www.markdownguide.org/> // <https://www.markdownguide.org/>
// *** // ***
// "; // ";
//this seems wrong but is actually faster!? //this seems wrong to get a new context inside a loop but in testing is actually faster!?
UserBiz Biz = UserBiz.GetBiz(ServiceProviderProvider.DBContext); using (AyContext ct = ServiceProviderProvider.DBContext)
//allow creation of not entirely ready users (missing client id or subcontractor vendor id etc)
Biz.SeedOrImportRelaxedRulesMode = true;
var NewObject = await Biz.CreateAsync(u);
if (NewObject == null)
{ {
log.LogError($"Seeder::GenSeedUser error creating user {u.Name}\r\n" + Biz.GetErrorsAsString()); UserBiz Biz = UserBiz.GetBiz(ct);
throw new System.Exception("Seeder::GenSeedUser error creating user\r\n" + Biz.GetErrorsAsString()); //allow creation of not entirely ready users (missing client id or subcontractor vendor id etc)
Biz.SeedOrImportRelaxedRulesMode = true;
var NewObject = await Biz.CreateAsync(u);
if (NewObject == null)
{
log.LogError($"Seeder::GenSeedUser error creating user {u.Name}\r\n" + Biz.GetErrorsAsString());
throw new System.Exception("Seeder::GenSeedUser error creating user\r\n" + Biz.GetErrorsAsString());
}
} }
//}
} }
SeededUserCount += count; SeededUserCount += count;
@@ -756,9 +737,9 @@ namespace AyaNova.Util
{ {
//this is 4 times slower than doing it inside the loop below //this is 4 times slower than doing it inside the loop below
//seems counterintuitive but maybe it's to do with the db context not being refreshed? //seems counterintuitive but maybe it's to do with the db context not being refreshed?
// WidgetBiz biz = WidgetBiz.GetBiz(ServiceProviderProvider.DBContext);
var f = new Bogus.Faker();
var f = new Bogus.Faker();//todo: this *can't* be right, I'm seeding 20k widgets in some cases
//RANDOM ROLES //RANDOM ROLES
@@ -772,43 +753,37 @@ namespace AyaNova.Util
Widget o = new Widget(); Widget o = new Widget();
o.Name = Uniquify(f.Commerce.ProductName()); o.Name = Uniquify(f.Commerce.ProductName());
o.Active = true; o.Active = true;
// o.StartDate = f.Date.Between(DateTime.Now, DateTime.Now.AddMinutes(60)).ToUniversalTime();
// o.EndDate = f.Date.Between(DateTime.Now.AddMinutes(90), DateTime.Now.AddHours(5)).ToUniversalTime();
// o.StartDate = DateTime.Now.ToUniversalTime();
// o.EndDate = DateTime.Now.AddMinutes(60).ToUniversalTime();
DateTime dtSeed = f.Date.Between(seedStartWindow, seedEndWindow).ToUniversalTime(); DateTime dtSeed = f.Date.Between(seedStartWindow, seedEndWindow).ToUniversalTime();
o.StartDate = dtSeed; o.StartDate = dtSeed;
o.EndDate = dtSeed.AddMinutes(60).ToUniversalTime(); o.EndDate = dtSeed.AddMinutes(60).ToUniversalTime();
o.DollarAmount = Convert.ToDecimal(f.Commerce.Price()); o.DollarAmount = Convert.ToDecimal(f.Commerce.Price());
//Random but valid enum //Random but valid enum
UserType randomUserType = (UserType)values.GetValue(random.Next(values.Length)); UserType randomUserType = (UserType)values.GetValue(random.Next(values.Length));
o.UserType = randomUserType; o.UserType = randomUserType;
o.Notes = f.Lorem.Sentence(null, 5);
o.Notes = f.Lorem.Sentence(null,5);
o.Tags = RandomTags(f); o.Tags = RandomTags(f);
o.UserId = f.Random.Int(1, SeededUserCount); o.UserId = f.Random.Int(1, SeededUserCount);
//RANDOM CUSTOM FIELD DATA //RANDOM CUSTOM FIELD DATA
var c1 = DateUtil.UniversalISO8661Format(f.Date.Between(DateTime.Now.AddYears(-1), DateTime.Now.AddYears(1))); var c1 = DateUtil.UniversalISO8661Format(f.Date.Between(DateTime.Now.AddYears(-1), DateTime.Now.AddYears(1)));
var c2 = f.Lorem.Sentence(null,5); var c2 = f.Lorem.Sentence(null, 5);
var c3 = f.Random.Int(1, 99999999); var c3 = f.Random.Int(1, 99999999);
var c4 = f.Random.Bool().ToString().ToLowerInvariant(); var c4 = f.Random.Bool().ToString().ToLowerInvariant();
var c5 = f.Random.Decimal(); var c5 = f.Random.Decimal();
o.CustomFields = $@"{{c1:""{c1}"",c2:""{c2}"",c3:{c3},c4:{c4},c5:{c5}}}"; o.CustomFields = $@"{{c1:""{c1}"",c2:""{c2}"",c3:{c3},c4:{c4},c5:{c5}}}";
//This seems wrong to do in a loop but is 4 times faster this way ?!? //This seems wrong to do in a loop but is 4 times faster this way ?!?
WidgetBiz biz = WidgetBiz.GetBiz(ServiceProviderProvider.DBContext); using (AyContext ct = ServiceProviderProvider.DBContext)
var NewObject = await biz.CreateAsync(o);
if (NewObject == null)
{ {
log.LogError($"Seeder::GenSeedWidget error creating widget {o.Name}\r\n" + biz.GetErrorsAsString()); WidgetBiz biz = WidgetBiz.GetBiz(ct);
throw new System.Exception("Seeder::GenSeedWidget error creating widget\r\n" + biz.GetErrorsAsString()); var NewObject = await biz.CreateAsync(o);
if (NewObject == null)
{
log.LogError($"Seeder::GenSeedWidget error creating widget {o.Name}\r\n" + biz.GetErrorsAsString());
throw new System.Exception("Seeder::GenSeedWidget error creating widget\r\n" + biz.GetErrorsAsString());
}
} }
} }
} }