Refact duty/content

Expedience.Api/Consumers/DutyCompletionResultConsumer.cs

@@ -43,7 +43,8 @@ namespace Expedience.Api.Consumers
             var completionResult = new DutyCompletionResult
             {
                 Id = message.UploadId,
-                DutyId = message.DutyInfo.DutyId,
+                TerritoryId = message.DutyInfo.TerritoryId,
+                ContentId = message.DutyInfo.ContentId,
                 UserId = user.UserId,
                 HasEcho = message.DutyInfo.HasEcho,
                 IsUnrestricted = message.DutyInfo.IsUnrestricted,
@@ -59,6 +60,7 @@ namespace Expedience.Api.Consumers
                 PluginVersion = message.ClientInfo.PluginVersion,
                 Lang = message.ClientInfo.GameLanguage,
                 DataCenter = message.DataCenter,
+                UploadedAt = message.UploadDateUtc,
             };
 
             dbContext.DutyCompletionResults.Add(completionResult);

Expedience.Api/Controllers/ExpedienceController.cs

@@ -96,7 +96,7 @@ namespace Expedience.Api.Controllers
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Error obtaining user name for World Id {worldId} and hash {userHash}: {errorMessage}", ex.Message);
+                    _logger.LogError(ex, "Error obtaining user name for World Id {worldId} and hash {userHash}: {errorMessage}", worldId, userHash, ex.Message);
                 }
                 finally
                 {
@@ -107,6 +107,8 @@ namespace Expedience.Api.Controllers
             {
                 _logger.LogError("Could not acquire lock for {lockKey}", lockKey);
             }
+
+            return StatusCode(500);
         }
     }
 }

Expedience.Infrastructure/Models/Duty.cs

@@ -9,7 +9,7 @@ namespace Expedience.Infrastructure.Models
     public class Duty
     {
         public int Id { get; set; }
-        public string DutyName { get; set; }
+        public string ContentName { get; set; }
         public string DutyType { get; set; }
         
     }

Expedience.Infrastructure/Models/DutyCompletionResult.cs

@@ -4,7 +4,8 @@
     {
         public Guid Id { get; set; }
         public int UserId { get; set; }
-        public int DutyId { 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; }
@@ -20,6 +21,7 @@
         public string Lang { get; set; }
         public List<DutyMember> DutyMembers { get; set; }
         public string DataCenter { get; set; }
+        public DateTime UploadedAt { get; set; }
 
     }
 }

Expedience.Models/CurrentDutyInfo.cs

@@ -13,8 +13,9 @@ namespace Expedience.Models
 
         private Stopwatch _stopwatch;
         public PlayerInfo Player { get; set; }
-        public int DutyId { get; set; }
+        public int TerritoryId { get; set; }
-        public string DutyName { get; set; }
+        public int ContentId { get; set; }
+        public string ContentName { get; set; }
         public List<GroupMemberInfo> PartyMembers { get; set; } = new();
         public DateTime StartTime { get; }
         public DateTime EndTime { get; private set; }

Expedience.Models/DutyCompletionResult.cs

@@ -15,8 +15,9 @@ namespace Expedience.Models
         {
             DutyInfo = new DutyInfo
             {
-                DutyId = currentDuty.DutyId,
+                TerritoryId = currentDuty.TerritoryId,
-                DutyName = currentDuty.DutyName,
+                ContentName = currentDuty.ContentName,
+                ContentId = currentDuty.ContentId,
                 IsUnrestricted = currentDuty.IsUnrestricted,
                 IsMinILevel = currentDuty.IsMinILevel,
                 IsNpcSupported = currentDuty.PartyMembers.Any(p => p.IsNpc),

Expedience.Models/DutyInfo.cs

@@ -8,8 +8,9 @@ namespace Expedience.Models
 {
     public class DutyInfo
     {
-        public int DutyId { get; set; }
+        public int TerritoryId { get; set; }
-        public string DutyName { get; set; }
+        public int ContentId { get; internal set; }
+        public string ContentName { get; set; }
         public bool IsUnrestricted { get; set; }
         public bool HasEcho { get; set; }
         public bool IsNpcSupported { get; set; }