sarsoo/Overflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shifting spills to a separate collection

Browse Source
This commit is contained in:
Andy Pack 2024-06-27 22:31:03 +01:00
parent c337b5b6a1
commit b9d76ca2f4
Signed by: sarsoo
GPG Key ID: A55BA3536A5E0ED7
7 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Overflow.Web/Components/Pages/Spills.razor
View File

@ -27,9 +27,17 @@
protected override async Task OnInitializedAsync()
{
job = database.GetCollection<SouthernWaterApiJob>(Static.CollectionName)
job = database.GetCollection<SouthernWaterApiJob>(Static.JobCollectionName)
.AsQueryable()
.OrderByDescending(j => j.EndTime)
.FirstOrDefault();
if (job is not null)
{
job.Spills = database.GetCollection<Spill>(Static.SpillCollectionName)
.AsQueryable()
.Where(s => s.JobId == job._id)
.ToList();
}
}
}

10
Overflow.Web/Components/Pages/SpillsCalendarPage.razor
View File

@ -32,9 +32,17 @@
protected override async Task OnInitializedAsync()
{
job = database.GetCollection<SouthernWaterApiJob>(Static.CollectionName)
job = database.GetCollection<SouthernWaterApiJob>(Static.JobCollectionName)
.AsQueryable()
.OrderByDescending(j => j.EndTime)
.FirstOrDefault();
if (job is not null)
{
job.Spills = database.GetCollection<Spill>(Static.SpillCollectionName)
.AsQueryable()
.Where(s => s.JobId == job._id)
.ToList();
}
}
}

2
Overflow/SouthernWater/SouthernWaterApi.cs
View File

@ -141,7 +141,7 @@ public partial class SouthernWaterApi
}
catch (TaskCanceledException e)
{
_logger.LogError(e, "HTTP Timeout Exception while loading page [{}], waiting {} before retrying", page, Static.Interval);
_logger.LogError(e, "HTTP Timeout Exception while loading page [{}], waiting {} before retrying", page, 1.5 * Static.Interval);
await Task.Delay(1.5 * Static.Interval);
}
}

1
Overflow/SouthernWater/SouthernWaterApiJob.cs
View File

@ -11,5 +11,6 @@ public class SouthernWaterApiJob
public DateTime? EndTime { get; set; }
public TimeSpan Interval { get; set; }
public int TotalItems { get; set; }
[BsonIgnore]
public List<Spill> Spills { get; set; }
}

17
Overflow/SouthernWater/SouthernWaterApiJobRunner.cs
View File

@ -36,6 +36,8 @@ public class SouthernWaterApiJobRunner(SouthernWaterApi client, ILogger<Southern
_logger.LogInformation("Processing page [{}/{}]", page.currentPage, page.totalPages);
page.items.ForEach(s => s.JobId = job._id);
job.TotalItems = page.totalItems;
job.Spills.AddRange(page.items);
try
@ -86,22 +88,17 @@ public class SouthernWaterApiJobRunnerPersisting(
IMongoDatabase mongo)
: SouthernWaterApiJobRunner(client, logger)
{
private readonly IMongoCollection<SouthernWaterApiJob> _collection = mongo.GetCollection<SouthernWaterApiJob>(Static.CollectionName);
private readonly IMongoCollection<SouthernWaterApiJob> _jobCollection = mongo.GetCollection<SouthernWaterApiJob>(Static.JobCollectionName);
private readonly IMongoCollection<Spill> _spillCollection = mongo.GetCollection<Spill>(Static.SpillCollectionName);
protected override async Task JobCreated(SouthernWaterApiJob job)
{
await _collection.InsertOneAsync(job);
await _jobCollection.InsertOneAsync(job);
}
protected override async Task PageLoaded(SouthernWaterApiJob job, PagedItems<Spill> page)
{
var finder = Builders<SouthernWaterApiJob>.Filter
.Eq(j => j._id, job._id);
var update = Builders<SouthernWaterApiJob>.Update
.PushEach(j => j.Spills, page.items);
await _collection.UpdateOneAsync(finder, update);
await _spillCollection.InsertManyAsync(page.items);
}
protected override async Task JobFinished(SouthernWaterApiJob job)
@ -113,6 +110,6 @@ public class SouthernWaterApiJobRunnerPersisting(
.Set(j => j.EndTime, job.EndTime)
.Set(j => j.TotalItems, job.TotalItems);
await _collection.UpdateOneAsync(finder, update);
await _jobCollection.UpdateOneAsync(finder, update);
}
}

5
Overflow/SouthernWater/Spill.cs
View File

@ -6,6 +6,11 @@ namespace Overflow.SouthernWater;
public class Spill
{
[JsonIgnore]
public ObjectId _id { get; set; }
[JsonIgnore]
public ObjectId JobId { get; set; }
[JsonPropertyName("id")]
public int sw_id { get; set; }
public int eventId { get; set; }

3
Overflow/Static.cs
View File

@ -3,7 +3,8 @@ namespace Overflow;
public static class Static
{
public static readonly string DatabaseName = "overflow";
public static readonly string CollectionName = "southern_water_api_job";
public static readonly string JobCollectionName = "southern_water_api_job";
public static readonly string SpillCollectionName = "southern_water_spills";
public static readonly TimeSpan Interval = TimeSpan.FromSeconds(30);
public static readonly int IntervalWiggleSeconds = 10;