From 998e18a090467b3be9f6a6ca2f6fd908dc123716 Mon Sep 17 00:00:00 2001 From: ilitirit Date: Fri, 14 Apr 2023 01:47:42 +0200 Subject: [PATCH] Remove ContentId --- Expedience.Api/Consumers/DutyCompletionResultConsumer.cs | 1 - Expedience.Infrastructure/Models/DutyCompletionResult.cs | 1 - Expedience.Infrastructure/Models/Territory.cs | 4 ---- Expedience.Models/CurrentDutyInfo.cs | 1 - Expedience.Models/DutyCompletionResult.cs | 1 - Expedience.Models/DutyInfo.cs | 1 - 6 files changed, 9 deletions(-) diff --git a/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs b/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs index 6fcc175..b9d3acf 100644 --- a/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs +++ b/Expedience.Api/Consumers/DutyCompletionResultConsumer.cs @@ -46,7 +46,6 @@ namespace Expedience.Api.Consumers { Id = message.UploadId, TerritoryId = message.DutyInfo.TerritoryId, - ContentId = message.DutyInfo.ContentId, UserId = user.UserId, HasEcho = message.DutyInfo.HasEcho, IsUnrestricted = message.DutyInfo.IsUnrestricted, diff --git a/Expedience.Infrastructure/Models/DutyCompletionResult.cs b/Expedience.Infrastructure/Models/DutyCompletionResult.cs index 70ebee2..4752fb0 100644 --- a/Expedience.Infrastructure/Models/DutyCompletionResult.cs +++ b/Expedience.Infrastructure/Models/DutyCompletionResult.cs @@ -5,7 +5,6 @@ public Guid Id { get; set; } public int UserId { get; set; } public int TerritoryId { get; set; } - public int ContentId { get; set; } public bool HasEcho { get; set; } public bool IsUnrestricted { get; set; } public bool IsMinILevel { get; set; } diff --git a/Expedience.Infrastructure/Models/Territory.cs b/Expedience.Infrastructure/Models/Territory.cs index ceeb6c7..9df98d6 100644 --- a/Expedience.Infrastructure/Models/Territory.cs +++ b/Expedience.Infrastructure/Models/Territory.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Expedience.Models { diff --git a/Expedience.Models/CurrentDutyInfo.cs b/Expedience.Models/CurrentDutyInfo.cs index cc79381..95ac94f 100644 --- a/Expedience.Models/CurrentDutyInfo.cs +++ b/Expedience.Models/CurrentDutyInfo.cs @@ -14,7 +14,6 @@ namespace Expedience.Models private Stopwatch _stopwatch; public PlayerInfo Player { get; set; } public int TerritoryId { get; set; } - public int ContentId { 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 1430024..cdeb720 100644 --- a/Expedience.Models/DutyCompletionResult.cs +++ b/Expedience.Models/DutyCompletionResult.cs @@ -17,7 +17,6 @@ namespace Expedience.Models { TerritoryId = currentDuty.TerritoryId, ContentName = currentDuty.ContentName, - ContentId = currentDuty.ContentId, IsUnrestricted = currentDuty.IsUnrestricted, IsMinILevel = currentDuty.IsMinILevel, IsNpcSupported = currentDuty.PartyMembers.Any(p => p.IsNpc), diff --git a/Expedience.Models/DutyInfo.cs b/Expedience.Models/DutyInfo.cs index e3ac585..292839b 100644 --- a/Expedience.Models/DutyInfo.cs +++ b/Expedience.Models/DutyInfo.cs @@ -9,7 +9,6 @@ namespace Expedience.Models public class DutyInfo { public int TerritoryId { get; set; } - public int ContentId { get; internal set; } public string ContentName { get; set; } public bool IsUnrestricted { get; set; } public bool HasEcho { get; set; }