Skip to content

Commit 2e81928

Browse files
committed
Bug fixes
1 parent ed962e8 commit 2e81928

File tree

19 files changed

+266
-238
lines changed

19 files changed

+266
-238
lines changed

src/Server/Coderr.Server.Api/Core/Incidents/Queries/FindIncidentsResultItem.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ namespace Coderr.Server.Api.Core.Incidents.Queries
77
/// </summary>
88
public class FindIncidentsResultItem
99
{
10+
private string _name;
11+
1012
/// <summary>
1113
/// Creates new instance of <see cref="FindIncidentsResultItem" />.
1214
/// </summary>
@@ -53,6 +55,11 @@ protected FindIncidentsResultItem()
5355
/// </summary>
5456
public bool IsReOpened { get; set; }
5557

58+
/// <summary>
59+
/// When we recieved the last report.
60+
/// </summary>
61+
public DateTime LastReportReceivedAtUtc { get; set; }
62+
5663
/// <summary>
5764
/// When someone updated this incident (assigned/closed etc).
5865
/// </summary>
@@ -61,16 +68,20 @@ protected FindIncidentsResultItem()
6168
/// <summary>
6269
/// Incident name
6370
/// </summary>
64-
public string Name { get; private set; }
71+
public string Name
72+
{
73+
set
74+
{
75+
if (value.Length > 40)
76+
value = value.Substring(0, 35) + "[...]";
77+
_name = value;
78+
}
79+
get => _name;
80+
}
6581

6682
/// <summary>
6783
/// Total number of received reports (increased even if the number of stored reports are at the limit)
6884
/// </summary>
6985
public int ReportCount { get; set; }
70-
71-
/// <summary>
72-
/// When we recieved the last report.
73-
/// </summary>
74-
public DateTime LastReportReceivedAtUtc { get; set; }
7586
}
7687
}

src/Server/Coderr.Server.App/Coderr.Server.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<NoWarn>NU1701</NoWarn>
2323
</PackageReference>
2424
<PackageReference Include="DotNetCqs" Version="2.0.9" />
25-
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
25+
<PackageReference Include="Griffin.Framework" Version="2.0.1" />
2626
<PackageReference Include="log4net" Version="2.0.8" />
2727
<PackageReference Include="Markdig" Version="0.14.9" />
2828
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />

src/Server/Coderr.Server.App/Modules/MonthlyStats/CollectStatsJob.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public async Task ExecuteAsync()
3636
return;
3737

3838
var lastMonth = new DateTime(lastMonthDate.Year, lastMonthDate.Month, 1);
39-
if (_config.Value.LatestUploadedMonth == null)
40-
{
41-
await ReportAllFoundMonths(lastMonth);
42-
return;
43-
}
39+
//if (_config.Value.LatestUploadedMonth == null)
40+
//{
41+
// await ReportAllFoundMonths(lastMonth);
42+
// return;
43+
//}
4444

45-
if (_config.Value?.LatestUploadedMonth == lastMonth)
46-
return;
45+
//if (_config.Value?.LatestUploadedMonth == lastMonth)
46+
// return;
4747

4848

4949
await ReportMonth(lastMonth);
@@ -261,11 +261,14 @@ private async Task GetApps(Dictionary<int, ApplicationUsageStatisticsDto> apps)
261261
{
262262
while (await reader.ReadAsync())
263263
{
264+
var estimatedNumberOfErrors = reader[1];
265+
var numberOfDevelopers = reader[2];
264266
var item = new ApplicationUsageStatisticsDto()
265267
{
266268
ApplicationId = reader.GetInt32(0),
267-
EstimatedNumberOfErrors= reader.GetFieldValue<int?>(1),
268-
NumberOfDevelopers = reader.GetFieldValue<decimal?>(2)
269+
EstimatedNumberOfErrors =
270+
estimatedNumberOfErrors is DBNull ? 0 : (int) estimatedNumberOfErrors,
271+
NumberOfDevelopers = numberOfDevelopers is DBNull ? 0 : (decimal) numberOfDevelopers
269272
};
270273
apps[item.ApplicationId] = item;
271274
}

src/Server/Coderr.Server.Infrastructure/Coderr.Server.Infrastructure.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="DotNetCqs" Version="2.0.9" />
9-
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
9+
<PackageReference Include="Griffin.Framework" Version="2.0.1" />
1010
<PackageReference Include="log4net" Version="2.0.8" />
1111
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
1212
</ItemGroup>

src/Server/Coderr.Server.ReportAnalyzer/Coderr.Server.ReportAnalyzer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="DotNetCqs" Version="2.0.9" />
1111
<PackageReference Include="DotNetCqs.DependencyInjection.Microsoft" Version="1.0.0" />
1212
<PackageReference Include="DotNetCqs.Queues.AdoNet" Version="1.0.6" />
13-
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
13+
<PackageReference Include="Griffin.Framework" Version="2.0.1" />
1414
<PackageReference Include="log4net" Version="2.0.8" />
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />

src/Server/Coderr.Server.SqlServer/Coderr.Server.SqlServer.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="DotNetCqs" Version="2.0.9" />
9-
<PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
9+
<PackageReference Include="Griffin.Framework" Version="2.0.1" />
1010
<PackageReference Include="log4net" Version="2.0.8" />
1111
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
1212
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
@@ -30,5 +30,6 @@
3030
<None Remove="Schema\Update.v13.sql" />
3131
<None Remove="Schema\Update.v14.sql" />
3232
<None Remove="Schema\Update.v15.sql" />
33+
<None Remove="Schema\Update.v16.sql" />
3334
</ItemGroup>
3435
</Project>

src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public void AddMissedReport(DateTime date)
120120
{
121121
cmd.CommandText =
122122
@"update IgnoredReports set NumberOfReports=NumberOfReports+1 WHERE date = @date;
123-
IF @@ROWCOUNT=0 insert into IgnoredReports(NumberOfReports) values(1);";
124-
cmd.AddParameter("date", date);
123+
IF @@ROWCOUNT=0 insert into IgnoredReports(NumberOfReports, Date) values(1, Convert(date, GetUtcDate()));";
124+
cmd.AddParameter("date", date.Date);
125125
cmd.ExecuteNonQuery();
126126
}
127127
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
alter table applications alter column NumberOfFtes decimal(4,1) null;
2+
3+
UPDATE DatabaseSchema SET Version = 16;

src/Server/Coderr.Server.Web/Boot/Modules/BackgroundJobs.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public void Start(StartContext context)
1919
var adapter = new DependencyInjectionAdapter(context.ServiceProvider);
2020

2121
_backgroundJobManager = new BackgroundJobManager(adapter);
22+
_backgroundJobManager.ExecuteSequentially = true;
2223
_backgroundJobManager.JobFailed += OnBackgroundJobFailed;
2324
_backgroundJobManager.StartInterval = TimeSpan.FromSeconds(Debugger.IsAttached ? 0 : 10);
2425
_backgroundJobManager.ExecuteInterval = TimeSpan.FromMinutes(3);

src/Server/Coderr.Server.Web/ClientApp/boot.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@ AppRoot.Instance.loadCurrentUser()
276276

277277
}
278278
});
279+
ourVue.$router.beforeEach((to, from, next) => {
280+
next();
281+
});
279282
ourVue.$router.afterEach((to, from) => {
280283
hooks.afterRoute(to.path, from.path);
281284
})

0 commit comments

Comments
 (0)