Updating peasants

microservices/LocationsApi/Models/Dto.cs

@@ -22,6 +22,19 @@ public class BuildLocationRequest
     public string BuildingType { get; set; } = "LogCamp";
 }
 
+public class AssignWorkerRequest
+{
+    public int Q { get; set; }
+    public int R { get; set; }
+    public string UnitId { get; set; } = "";
+}
+
+public class DeassignWorkerRequest
+{
+    public int Q { get; set; }
+    public int R { get; set; }
+}
+
 public class LocationResponse
 {
     public string Id { get; set; } = "";
@@ -37,6 +50,11 @@ public class LocationResponse
     public DateTime? BuildingStartedAtUtc { get; set; }
     public DateTime? BuildingCompletesAtUtc { get; set; }
     public DateTime? BuildingBuiltAtUtc { get; set; }
+    public string? WorkerUnitId { get; set; }
+    public string? WorkerUnitType { get; set; }
+    public int StoredResourceAmount { get; set; }
+    public int StoredResourceCapacity { get; set; }
+    public DateTime? LastResourceGeneratedAtUtc { get; set; }
     public DateTime? HomeAssignedAtUtc { get; set; }
     public DateTime UpdatedAtUtc { get; set; }
     public bool IsVisible { get; set; } = true;
@@ -58,6 +76,11 @@ public class LocationResponse
         BuildingStartedAtUtc = revealDetails ? location.BuildingStartedAtUtc : null,
         BuildingCompletesAtUtc = revealDetails ? location.BuildingCompletesAtUtc : null,
         BuildingBuiltAtUtc = revealDetails ? location.BuildingBuiltAtUtc : null,
+        WorkerUnitId = revealDetails ? location.WorkerUnitId : null,
+        WorkerUnitType = revealDetails ? location.WorkerUnitType : null,
+        StoredResourceAmount = revealDetails ? location.StoredResourceAmount : 0,
+        StoredResourceCapacity = revealDetails ? location.StoredResourceCapacity : 0,
+        LastResourceGeneratedAtUtc = revealDetails ? location.LastResourceGeneratedAtUtc : null,
         HomeAssignedAtUtc = location.HomeAssignedAtUtc,
         UpdatedAtUtc = location.UpdatedAtUtc,
         IsVisible = true
@@ -80,6 +103,11 @@ public class LocationResponse
         BuildingStartedAtUtc = intel.BuildingStartedAtUtc,
         BuildingCompletesAtUtc = intel.BuildingCompletesAtUtc,
         BuildingBuiltAtUtc = intel.BuildingBuiltAtUtc,
+        WorkerUnitId = intel.WorkerUnitId,
+        WorkerUnitType = intel.WorkerUnitType,
+        StoredResourceAmount = intel.StoredResourceAmount,
+        StoredResourceCapacity = intel.StoredResourceCapacity,
+        LastResourceGeneratedAtUtc = intel.LastResourceGeneratedAtUtc,
         HomeAssignedAtUtc = intel.HomeAssignedAtUtc,
         UpdatedAtUtc = intel.ObservedAtUtc,
         IsVisible = true

microservices/LocationsApi/Models/Location.cs

@@ -21,6 +21,11 @@ public class Location
     public DateTime? BuildingStartedAtUtc { get; set; }
     public DateTime? BuildingCompletesAtUtc { get; set; }
     public DateTime? BuildingBuiltAtUtc { get; set; }
+    public string? WorkerUnitId { get; set; }
+    public string? WorkerUnitType { get; set; }
+    public int StoredResourceAmount { get; set; }
+    public int StoredResourceCapacity { get; set; } = 10;
+    public DateTime? LastResourceGeneratedAtUtc { get; set; }
     public DateTime? HomeAssignedAtUtc { get; set; }
     public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;
     public DateTime UpdatedAtUtc { get; set; } = DateTime.UtcNow;

microservices/LocationsApi/Models/LocationIntel.cs

@@ -22,6 +22,11 @@ public class LocationIntel
     public DateTime? BuildingStartedAtUtc { get; set; }
     public DateTime? BuildingCompletesAtUtc { get; set; }
     public DateTime? BuildingBuiltAtUtc { get; set; }
+    public string? WorkerUnitId { get; set; }
+    public string? WorkerUnitType { get; set; }
+    public int StoredResourceAmount { get; set; }
+    public int StoredResourceCapacity { get; set; } = 10;
+    public DateTime? LastResourceGeneratedAtUtc { get; set; }
     public DateTime? HomeAssignedAtUtc { get; set; }
     public DateTime ObservedAtUtc { get; set; } = DateTime.UtcNow;
     public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;

microservices/LocationsApi/Models/UnitDto.cs

@@ -76,6 +76,7 @@ public class PlayerUnitsResponse
 {
     public int CompletedScouts { get; set; }
     public int CompletedArchers { get; set; }
+    public int CompletedPeasants { get; set; }
     public List<UnitTrainingResponse> Training { get; set; } = [];
     public List<UnitInstanceResponse> Units { get; set; } = [];
 }