Start pulling patrol information

OSM.Models/Member.cs

@@ -12,8 +12,16 @@ public class Member
     public string Initial => LastName.Substring(0, 1) ?? string.Empty;
     [JsonPropertyName("lastname")]
     public string LastName { get; set; } = string.Empty;
-    [JsonPropertyName("patrolid")]
-    public int PatrolId { get; set; }
+
     [JsonPropertyName("badges")]
     public BadgeSummary[] Badges { get; set; }
+    [JsonPropertyName("patrolid")]
+    public int PatrolId { get; set; }
+    [JsonPropertyName("patrol_role_level")]
+    [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
+    public int PatrolRoleLevel { get; set; } = 0;
+    [JsonPropertyName("patrol_role_level_label")]
+    public string PatrolRole { get; set; } = string.Empty;
+    [JsonPropertyName("patrol_role_level_abbr")]
+    public string PatrolRoleAbbr { get; set; } = string.Empty;
 }

OSM.Models/Patrol.cs

@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace OSM.Models;
+
+public class Patrol
+{
+    [JsonPropertyName("patrolid")]
+    [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
+    public int Id { get; set; }
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+    [JsonPropertyName("members")]
+    public List<Member> Members { get; set; } = new();
+}

OSM.Tests/GetDataTests.cs

@@ -92,6 +92,17 @@ public async Task GetMembers()
         Assert.NotNull(me);
     }
 
+
+    [Fact]
+    public async Task GetPatrolsWithMembers()
+    {
+        var currentTerm = (await _client.GetTermsAsync()).ToArray().First(t => t.Current);
+
+        var patrols = (await _client.GetPatrols(currentTerm.Id)).ToArray();
+        Assert.NotNull(patrols);
+        Assert.NotEmpty(patrols);
+    }
+
     [Fact]
     public async Task BadgeCompletion()
     {

OSM/Interfaces/IOsmClient.cs

@@ -10,4 +10,5 @@ public interface IOsmClient
     Task<IList<Member>> GetMembersAsync(string termId);
     Task<IList<BadgeCompletion>> GetBadgeCompletion(string termId, string badgeId, string badgeVersion);
     Task<IList<Member>> GetPersonBadgeSummaryAsync(string termId);
+    Task<IList<Patrol>> GetPatrols(string termId, bool includeNoPatrol = true);
 }

OSM/OsmClient.cs

@@ -144,4 +144,24 @@ public async Task<IList<BadgeCompletion>> GetBadgeCompletion(string termId, stri
         if(evaluateResult.Matches == null || !evaluateResult.Matches.Any()) return Array.Empty<Member>();
         return evaluateResult.Matches.Select(match => JsonSerializer.Deserialize<Member>(match.Value.AsJsonString())).ToList();
     }
+
+    public async Task<IList<Patrol>> GetPatrols(string termId, bool includeNoPatrol = true)
+    {
+
+        var request = new RestRequest("/ext/members/patrols/");
+        request.Parameters.AddParameter(new QueryParameter("action", "getPatrolsWithPeople"));
+        request.Parameters.AddParameter(new QueryParameter("sectionid", _options.SectionId.ToString()));
+        request.Parameters.AddParameter(new QueryParameter("termid", termId));
+        request.Parameters.AddParameter(new QueryParameter("include_no_patrol", includeNoPatrol ? "y" : "n"));
+
+        var response = await _client.ExecuteGetAsync(request);
+        if (string.IsNullOrEmpty(response.Content)) return new List<Patrol>();
+        var node = JsonNode.Parse(response.Content!);
+
+        var evaluateResult = JsonPath.Parse($"$[*]").Evaluate(node);
+
+        if (evaluateResult.Matches == null || !evaluateResult.Matches.Any()) return Array.Empty<Patrol>();
+        return evaluateResult.Matches.Select(match => JsonSerializer.Deserialize<Patrol>(match.Value.AsJsonString()))
+            .ToList();
+    }
 }