From 039f93cf71151fb078d45109142e7c1d1f5c4cd5 Mon Sep 17 00:00:00 2001 From: ilitirit Date: Wed, 7 Aug 2024 15:10:47 +0200 Subject: [PATCH] Add place name; add missing territories --- .../Consumers/DutyCompletionResultConsumer.cs | 13 +++++++++++++ Expedience.Models/CurrentDutyInfo.cs | 1 + Expedience.Models/DutyCompletionResult.cs | 1 + 3 files changed, 15 insertions(+) diff --git a/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs b/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs index b9d3acf..7f8c26a 100644 --- a/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs +++ b/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs @@ -66,6 +66,19 @@ namespace Expedience.Api.Consumers dbContext.DutyCompletionResults.Add(completionResult); + // Insert this territory if it does not exist + if (dbContext.Territories.Any(t => t.TerritoryId == completionResult.TerritoryId) == false) + { + dbContext.Territories.Add(new Models.Territory + { + TerritoryId = completionResult.TerritoryId, + PlaceName = message.DutyInfo.PlaceName, + ContentId = "0", + ContentName = message.DutyInfo.ContentName, + Level = 0, + }); + } + var memberNumber = 0; var dutyMembers = new List(); foreach (var member in message.GroupMembers) diff --git a/Expedience.Models/CurrentDutyInfo.cs b/Expedience.Models/CurrentDutyInfo.cs index 95ac94f..b9848a2 100644 --- a/Expedience.Models/CurrentDutyInfo.cs +++ b/Expedience.Models/CurrentDutyInfo.cs @@ -14,6 +14,7 @@ namespace Expedience.Models private Stopwatch _stopwatch; public PlayerInfo Player { get; set; } public int TerritoryId { get; set; } + public string PlaceName { get; set; } public string ContentName { get; set; } public List PartyMembers { get; set; } = new(); public DateTime StartTime { get; } diff --git a/Expedience.Models/DutyCompletionResult.cs b/Expedience.Models/DutyCompletionResult.cs index cdeb720..45b5b2e 100644 --- a/Expedience.Models/DutyCompletionResult.cs +++ b/Expedience.Models/DutyCompletionResult.cs @@ -16,6 +16,7 @@ namespace Expedience.Models DutyInfo = new DutyInfo { TerritoryId = currentDuty.TerritoryId, + PlaceName = currentDuty.PlaceName, ContentName = currentDuty.ContentName, IsUnrestricted = currentDuty.IsUnrestricted, IsMinILevel = currentDuty.IsMinILevel,