data types are better

Management/Services/CanvasService.cs

@@ -1,3 +1,4 @@
+using CanvasModel;
 using CanvasModel.Courses;
 using CanvasModel.EnrollmentTerms;
 using RestSharp;
@@ -40,35 +41,59 @@ public class CanvasService : ICanvasService
 
   public async Task<CourseModel> GetCourse(ulong courseId)
   {
-    var url = $"course/${courseId}";
+    var url = $"course/{courseId}";
     var request = new RestRequest(url);
-    var response = await webRequestor.GetAsync<CourseModel>(request);
+    var (data, response) = await webRequestor.GetAsync<CourseModel>(request);
 
-    if (response.Data == null)
+    if (data == null)
     {
       System.Console.WriteLine(response.Content);
       System.Console.WriteLine(response.ResponseUri);
       throw new Exception("error getting course from canvas");
     }
-    return response.Data;
+    return data;
+  }
+
+  public async Task<IEnumerable<CourseModule>> GetModules(ulong courseId)
+  {
+    var url = $"courses/{courseId}/modules";
+    var request = new RestRequest(url);
+    var modules = await PaginatedRequest<IEnumerable<CourseModule>>(request);
+    return modules.SelectMany(c => c).ToArray();
+  }
+
+  public async Task CreateModule(ulong courseId, string name)
+  {
+    var url = $"courses/{courseId}/modules";
+    var request = new RestRequest(url);
+    request.AddParameter("module[name]", name);
+
+    await webRequestor.PostAsync(request);
   }
 
   private async Task<IEnumerable<T>> PaginatedRequest<T>(RestRequest request)
   {
     var requestCount = 1;
     request.AddQueryParameter("per_page", "100");
-    RestResponse<T> response = await webRequestor.GetAsync<T>(request);
+    var (data, response) = await webRequestor.GetAsync<T>(request);
 
-    var returnData = response.Data != null ? new T[] { response.Data } : new T[] { };
+    if (response.ErrorMessage?.Length > 0)
+    {
+      System.Console.WriteLine("error in response");
+      System.Console.WriteLine(response.ErrorMessage);
+      throw new Exception("error in response");
+    }
+
+    var returnData = data != null ? new T[] { data } : new T[] { };
     var nextUrl = getNextUrl(response.Headers);
 
     while (nextUrl is not null)
     {
       requestCount += 1;
       RestRequest nextRequest = new RestRequest(nextUrl);
-      var nextResponse = await webRequestor.GetAsync<T>(nextRequest);
-      if (nextResponse.Data is not null)
-        returnData = returnData.Append(nextResponse.Data).ToArray();
+      var (nextData, nextResponse) = await webRequestor.GetAsync<T>(nextRequest);
+      if (nextData is not null)
+        returnData = returnData.Append(nextData).ToArray();
       nextUrl = getNextUrl(nextResponse.Headers);
     }
 

Management/Services/IWebRequestor.cs

@@ -2,6 +2,8 @@ using RestSharp;
 
 public interface IWebRequestor
 {
-  Task<RestResponse<T[]>> GetManyAsync<T>(RestRequest request);
-  Task<RestResponse<T>> GetAsync<T>(RestRequest request);
+  Task<(T[]?, RestResponse)> GetManyAsync<T>(RestRequest request);
+  Task<(T?, RestResponse)> GetAsync<T>(RestRequest request);
+  Task<RestResponse> PostAsync(RestRequest request);
+  Task<(T?, RestResponse)> PostAsync<T>(RestRequest request);
 }

Management/Services/WebRequestor.cs

@@ -13,16 +13,67 @@ public class WebRequestor : IWebRequestor
       ?? throw new Exception("CANVAS_TOKEN not in environment");
     client = new RestClient(BaseUrl);
     client.AddDefaultHeader("Authorization", $"Bearer {token}");
-
   }
 
-  public async Task<RestResponse<T[]>> GetManyAsync<T>(RestRequest request)
+  public async Task<(T[]?, RestResponse)> GetManyAsync<T>(RestRequest request)
   {
-    return await client.ExecuteGetAsync<T[]>(request);
+    var response = await client.ExecuteGetAsync(request);
+    return (Deserialize<T[]>(response), response);
   }
 
-  public async Task<RestResponse<T>> GetAsync<T>(RestRequest request)
+  public async Task<(T?, RestResponse)> GetAsync<T>(RestRequest request)
   {
-    return await client.ExecuteGetAsync<T>(request);
+    var response = await client.ExecuteGetAsync(request);
+    return (Deserialize<T>(response), response);
+  }
+
+  public async Task<RestResponse> PostAsync(RestRequest request)
+  {
+    var response = await client.ExecutePostAsync(request);
+    if (!response.IsSuccessful)
+    {
+      System.Console.WriteLine(response.Content);
+      System.Console.WriteLine(response.ResponseUri);
+      System.Console.WriteLine("error with response");
+      throw new Exception("error with response");
+    }
+    return response;
+  }
+
+  public async Task<(T?, RestResponse)> PostAsync<T>(RestRequest request)
+  {
+    var response = await client.ExecutePostAsync(request);
+    return (Deserialize<T>(response), response);
+  }
+
+  public T? Deserialize<T>(RestResponse response)
+  {
+    if (!response.IsSuccessful)
+    {
+      System.Console.WriteLine(response.Content);
+      System.Console.WriteLine(response.ResponseUri);
+      System.Console.WriteLine(response.ErrorMessage);
+      System.Console.WriteLine("error with response");
+      throw new Exception("error with response");
+    }
+    try
+    {
+      var data = JsonSerializer.Deserialize<T>(response.Content);
+
+      if (data == null)
+      {
+        System.Console.WriteLine(response.Content);
+        System.Console.WriteLine(response.ResponseUri);
+        System.Console.WriteLine("could not parse response, got empty object");
+      }
+      return data;
+    }
+    catch (JsonException ex)
+    {
+      System.Console.WriteLine(response.ResponseUri);
+      System.Console.WriteLine(response.Content);
+      Console.WriteLine($"An error occurred during deserialization: {ex.Message}");
+      throw ex;
+    }
   }
 }