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-08-27 19:16:12 +00:00
parent 928764ce61
commit bdc923330d
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -42,8 +42,8 @@
"ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_ENVIRONMENT": "Development",
"AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4", "AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4",
//"AYANOVA_SET_SUPERUSER_PW": "l3tm3in", //"AYANOVA_SET_SUPERUSER_PW": "l3tm3in",
//"AYANOVA_LOG_LEVEL": "Info", "AYANOVA_LOG_LEVEL": "Info",
"AYANOVA_LOG_LEVEL": "Debug", // "AYANOVA_LOG_LEVEL": "Debug",
// "AYANOVA_LOG_LEVEL": "Trace", // "AYANOVA_LOG_LEVEL": "Trace",
"AYANOVA_DEFAULT_TRANSLATION": "en", "AYANOVA_DEFAULT_TRANSLATION": "en",
//TRANSLATION MUST BE en for Integration TESTING //TRANSLATION MUST BE en for Integration TESTING

32
server/AyaNova/AyaNova.csproj
View File

@@ -17,33 +17,33 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Bogus" Version="33.0.2" /> <PackageReference Include="Bogus" Version="33.0.2" />
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.8" /> <PackageReference Include="BouncyCastle.NetCore" Version="1.8.8" />
<PackageReference Include="ChoETL.JSON.NETStandard" Version="1.2.1.5" /> <PackageReference Include="ChoETL.JSON.NETStandard" Version="1.2.1.22" />
<PackageReference Include="Enums.NET" Version="4.0.0" /> <PackageReference Include="Enums.NET" Version="4.0.0" />
<PackageReference Include="jose-jwt" Version="3.1.1" /> <PackageReference Include="jose-jwt" Version="3.1.1" />
<PackageReference Include="MailKit" Version="2.11.1" /> <PackageReference Include="MailKit" Version="2.15.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.5" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="5.0.5"> <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="5.0.9">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.5" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.9" />
<PackageReference Include="Microsoft.OpenApi" Version="1.2.3" /> <PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" /> <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" /> <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
<PackageReference Include="NLog" Version="4.7.9" /> <PackageReference Include="NLog" Version="4.7.11" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.12.0" /> <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.5.1" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
<PackageReference Include="PuppeteerSharp" Version="4.0.0" /> <PackageReference Include="PuppeteerSharp" Version="5.0.0" />
<PackageReference Include="QRCoder" Version="1.4.1" /> <PackageReference Include="QRCoder" Version="1.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.3" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.3" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.3" /> <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.3" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.3" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.5" />
<PackageReference Include="TwoFactorAuth.Net" Version="1.4.0" /> <PackageReference Include="TwoFactorAuth.Net" Version="1.4.0" />
</ItemGroup> </ItemGroup>

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

@@ -4721,7 +4721,7 @@ namespace AyaNova.Biz
// //
internal static async Task GenerateAsync(AyContext ct, ILogger log) internal static async Task GenerateAsync(AyContext ct, ILogger log)
{ {
//if(!KeepOnWorking(log)) return; if(!KeepOnWorking(log)) return;
//Get a list of PM id's ready for conversion now //Get a list of PM id's ready for conversion now
@@ -4771,6 +4771,7 @@ namespace AyaNova.Biz
{ {
//extremely unlikely to happen but just in case... //extremely unlikely to happen but just in case...
log.LogError($"PM was not fetchable when attempting to process PM id: {pmid}, deleted during processing?"); log.LogError($"PM was not fetchable when attempting to process PM id: {pmid}, deleted during processing?");
if(!KeepOnWorking(log)) return;
continue; continue;
} }
try try
@@ -4861,6 +4862,7 @@ namespace AyaNova.Biz
{ {
log.LogError(ex, $"error updating PM after generation {p.Serial}"); log.LogError(ex, $"error updating PM after generation {p.Serial}");
await NotifyEventHelper.AddGeneralNotifyEvent(AyaType.PM, p.Id, NotifyEventType.PMGenerationFailed, $"Error updating PM after generation {p.Serial}", "Preventive Maintenance", ex); await NotifyEventHelper.AddGeneralNotifyEvent(AyaType.PM, p.Id, NotifyEventType.PMGenerationFailed, $"Error updating PM after generation {p.Serial}", "Preventive Maintenance", ex);
if(!KeepOnWorking(log)) return;
continue; continue;
} }
} }
@@ -4870,6 +4872,7 @@ namespace AyaNova.Biz
{ {
log.LogError(ex, $"error generating Work order from PM {p.Serial}"); log.LogError(ex, $"error generating Work order from PM {p.Serial}");
await NotifyEventHelper.AddGeneralNotifyEvent(AyaType.PM, p.Id, NotifyEventType.PMGenerationFailed, $"Error generating Work order from PM {p.Serial}", "Preventive Maintenance", ex); await NotifyEventHelper.AddGeneralNotifyEvent(AyaType.PM, p.Id, NotifyEventType.PMGenerationFailed, $"Error generating Work order from PM {p.Serial}", "Preventive Maintenance", ex);
if(!KeepOnWorking(log)) return;
continue; continue;
} }

2
server/AyaNova/util/DbUtil.cs
View File

@@ -565,7 +565,7 @@ namespace AyaNova.Util
// CALLED BY by login ping from client via notify controller // CALLED BY by login ping from client via notify controller
internal static async Task<bool> DBHasTrialUsersAsync(AyContext ct, ILogger _log) internal static async Task<bool> DBHasTrialUsersAsync(AyContext ct, ILogger _log)
{ {
_log.LogDebug("DB trial users presence check"); _log.LogDebug("DB trial users presence check for pre-login ping");
//There are 22 trial users (more but for internal use) in a trial database //There are 22 trial users (more but for internal use) in a trial database
if (await ct.User.LongCountAsync() < 22) return false; if (await ct.User.LongCountAsync() < 22) return false;