From 7a2ee58617cfa31a5fc3f12a7391b3b63382e1df Mon Sep 17 00:00:00 2001
From: Alex Mickelson <alexmickelson96@gmail.com>
Date: Mon, 7 Aug 2023 18:41:04 -0600
Subject: [PATCH] added delete support for assignments

---
 .editorconfig                                 | 12 +++
 .../AssignmentForm/AssignmentForm.razor       | 40 +++++++++
 .../SubmissionTypeSelector.razor              | 18 +++--
 .../Shared/Components/ConfirmationModal.razor | 81 +++++++++++++++++++
 .../CoursePlannerSyncronizationExtensions.cs  |  5 ++
 .../CoursePlannerValidationExtensions.cs      | 13 ++-
 .../Canvas/CanvasAssignmentService.cs         | 31 ++++---
 Management/Services/IWebRequestor.cs          |  1 +
 Management/Services/WebRequestor.cs           | 47 ++++++-----
 9 files changed, 208 insertions(+), 40 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 Management.Web/Shared/Components/ConfirmationModal.razor

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..f9a4117
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# Top-most EditorConfig file
+root = true
+
+[*.cs]
+dotnet_naming_rule.methods_must_be_camel_case.severity = warning
+dotnet_naming_rule.methods_must_be_camel_case.symbols  = private_methods
+dotnet_naming_rule.methods_must_be_camel_case.style    = camel_case_style
+
+dotnet_naming_symbols.private_methods.applicable_kinds = method
+dotnet_naming_symbols.private_methods.applicable_accessibilities = private 
+
+dotnet_naming_style.camel_case_style.capitalization = camel_case
diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
index 368ecb2..de5257b 100644
--- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor
@@ -1,6 +1,7 @@
 @using Management.Web.Shared.Components
 
 @inject CoursePlanner planner
+@inject CanvasService canvas
 
 @code {
 
@@ -106,6 +107,40 @@
     submissionTypes = newTypes;
     StateHasChanged();
   }
+
+  private async Task HandleDelete()
+  {
+    if(planner.LocalCourse != null)
+    {
+      var assignment = Assignment;
+      var currentModule = planner
+        .LocalCourse
+        .Modules
+        .First(m => 
+          m.Assignments
+            .Select(a => a.Id)
+            .Contains(Assignment.Id)
+        ) ?? throw new Exception("handling assignment delete, could not find module");
+      var newModules = planner.LocalCourse.Modules.Select(m => 
+        m.Name == currentModule.Name
+          ? m with 
+          {
+            Assignments = m.Assignments.Where(a => a.Id != assignment.Id).ToArray()
+          }
+          : m
+      ).ToArray();
+
+      planner.LocalCourse = planner.LocalCourse with 
+      {
+        Modules = newModules
+      };
+      if(assignment.CanvasId != null && planner.LocalCourse.CanvasId != null)
+      {
+        ulong courseId = planner.LocalCourse.CanvasId ?? throw new Exception("cannot delete if no course id");
+        await canvas.Assignments.Delete(courseId, assignment);
+      }
+    }
+  }
 }
 
 <Modal @ref="AssignmentModal" OnHide="@(() => OnHide())">
@@ -156,6 +191,11 @@
     </form>
   </Body>
   <Footer>
+    <ConfirmationModal 
+      Label="Delete" 
+      Class="btn btn-danger"
+      OnConfirmAsync="HandleDelete"
+    />
     <button class="btn btn-primary" @onclick="submitHandler">
       Save
     </button>
diff --git a/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
index d12102b..97446e9 100644
--- a/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
+++ b/Management.Web/Shared/Components/AssignmentForm/SubmissionTypeSelector.razor
@@ -4,17 +4,19 @@
 {
   private IEnumerable<string> _types { get; set; } = Enumerable.Empty<string>();
   [Parameter, EditorRequired]
-  public IEnumerable<string> Types {
-    get => _types;
-    set 
+  public IEnumerable<string> Types { get; set; } = Enumerable.Empty<string>();
+
+  [Parameter, EditorRequired]
+  public Action<IEnumerable<string>> SetTypes { get; set; } = (_) => {};
+  protected override void OnParametersSet()
+  {
+    if (!Types.SequenceEqual(_types))
     {
-      _types = value;
+      _types = Types;
       renderKey++;
     }
   }
 
-  [Parameter, EditorRequired]
-  public Action<IEnumerable<string>> SetTypes { get; set; } = (_) => {};
   private string getLabel(string type)
   {
     return type.ToString().Replace("_", "") + "switch";
@@ -23,8 +25,8 @@
   private bool discussionIsSelected
   {
     get => Types.FirstOrDefault(
-              t => t == SubmissionType.DISCUSSION_TOPIC
-            ) != null;
+      t => t == SubmissionType.DISCUSSION_TOPIC
+    ) != null;
   }
   private int renderKey {get; set; } = 1;
 }
diff --git a/Management.Web/Shared/Components/ConfirmationModal.razor b/Management.Web/Shared/Components/ConfirmationModal.razor
new file mode 100644
index 0000000..7d67a92
--- /dev/null
+++ b/Management.Web/Shared/Components/ConfirmationModal.razor
@@ -0,0 +1,81 @@
+@using Management.Web.Shared.Components
+@namespace Management.Web.Shared.Components
+
+@code {
+  [Parameter]
+  public Action? OnConfirm { get; init; }
+  [Parameter]
+  public Action? OnDeny { get; init; }
+  [Parameter]
+  public Func<Task>? OnConfirmAsync { get; init; }
+  [Parameter]
+  public Func<Task>? OnDenyAsync { get; init; }
+  [Parameter]
+  [EditorRequired]
+  public string Label { get; set; } = "";
+  [Parameter]
+  [EditorRequired]
+  public string Class { get; set; } = "";
+
+  private Modal? modal { get; set; } = null;
+
+  private bool doingAsyncThings { get; set; } = false;
+
+  private async Task HandleDeny()
+  {
+    if(OnDeny != null)
+      OnDeny();
+    if(OnDenyAsync != null)
+    {
+      doingAsyncThings = true;
+      await OnDenyAsync();
+      doingAsyncThings = false;
+    }
+    modal?.Hide();
+  }
+  private async Task HandleConfirm()
+  {
+    if(OnConfirm != null)
+      OnConfirm();
+    if(OnConfirmAsync != null)
+    {
+      doingAsyncThings = true;
+      await OnConfirmAsync();
+      doingAsyncThings = false;
+    }
+    modal?.Hide(); 
+  }
+}
+
+<button 
+  class="btn btn-danger"
+  @onclick="() => modal?.Show()"
+>
+  @Label
+</button>
+
+<Modal @ref="modal">
+  <Title>Are you sure you want to @Label?</Title>
+  <Body>
+    <div class="text-center">
+      <button 
+        class="btn btn-secondary"
+        @onclick="HandleDeny"
+      >
+        no
+      </button>
+      <button 
+        class="btn btn-primary"
+        @onclick="HandleConfirm"
+      >
+        yes
+      </button>
+    </div>
+  </Body>
+  <Footer>
+    @if(doingAsyncThings)
+    {
+      <Spinnner />
+    }
+  </Footer>
+</Modal>
\ No newline at end of file
diff --git a/Management/Features/Configuration/CoursePlannerSyncronizationExtensions.cs b/Management/Features/Configuration/CoursePlannerSyncronizationExtensions.cs
index ae0b1ba..17f005b 100644
--- a/Management/Features/Configuration/CoursePlannerSyncronizationExtensions.cs
+++ b/Management/Features/Configuration/CoursePlannerSyncronizationExtensions.cs
@@ -127,9 +127,14 @@ public static partial class CoursePlannerSyncronizationExtensions
     if (!quiet)
     {
       if (!dueDatesSame)
+      {
+
         Console.WriteLine(
           $"Due dates different for {localAssignment.Name}, local: {localAssignment.DueAt}, in canvas {canvasAssignment.DueAt}"
         );
+        Console.WriteLine(JsonSerializer.Serialize(localAssignment.DueAt));
+        Console.WriteLine(JsonSerializer.Serialize(canvasAssignment.DueAt));
+      }
 
       if (!descriptionSame)
       {
diff --git a/Management/Features/Configuration/CoursePlannerValidationExtensions.cs b/Management/Features/Configuration/CoursePlannerValidationExtensions.cs
index 9e902b5..66238aa 100644
--- a/Management/Features/Configuration/CoursePlannerValidationExtensions.cs
+++ b/Management/Features/Configuration/CoursePlannerValidationExtensions.cs
@@ -16,8 +16,10 @@ public static class CoursePlannerExtensions
             .OrderBy(a => a.DueAt)
             .DistinctBy(a => a.Id)
             .Select(a => a.validateSubmissionTypes())
+            .Select(a => a.validateDates())
+            .ToArray()
         }
-    );
+    ).ToArray();
 
     var cleanStartDay = new DateTime(
       incomingCourse.StartDate.Year,
@@ -109,4 +111,13 @@ public static class CoursePlannerExtensions
       };
     return assignment;
   }
+
+    public static LocalAssignment validateDates(this LocalAssignment assignment)
+    {
+      return assignment with 
+      {
+        DueAt=assignment.DueAt.AddMilliseconds(0).AddMilliseconds(0),
+        LockAt=assignment.LockAt?.AddMilliseconds(0).AddMilliseconds(0)
+      };
+    }
 }
diff --git a/Management/Services/Canvas/CanvasAssignmentService.cs b/Management/Services/Canvas/CanvasAssignmentService.cs
index f8f1902..e40dc2e 100644
--- a/Management/Services/Canvas/CanvasAssignmentService.cs
+++ b/Management/Services/Canvas/CanvasAssignmentService.cs
@@ -6,7 +6,7 @@ namespace Management.Services.Canvas;
 
 public class CanvasAssignmentService
 {
-  private IWebRequestor webRequestor;
+  private readonly IWebRequestor webRequestor;
   private readonly CanvasServiceUtils utils;
 
   public CanvasAssignmentService(IWebRequestor webRequestor, CanvasServiceUtils utils)
@@ -34,7 +34,7 @@ public class CanvasAssignmentService
     string htmlDescription
   )
   {
-    System.Console.WriteLine($"creating assignment: {localAssignment.Name}");
+    Console.WriteLine($"creating assignment: {localAssignment.Name}");
     var url = $"courses/{courseId}/assignments";
     var request = new RestRequest(url);
     var body = new CanvasAssignmentCreationRequest()
@@ -62,7 +62,7 @@ public class CanvasAssignmentService
 
   public async Task Update(ulong courseId, LocalAssignment localAssignment, string htmlDescription)
   {
-    System.Console.WriteLine($"updating assignment: {localAssignment.Name}");
+    Console.WriteLine($"updating assignment: {localAssignment.Name}");
     var url = $"courses/{courseId}/assignments/{localAssignment.CanvasId}";
     var request = new RestRequest(url);
     var body = new CanvasAssignmentCreationRequest()
@@ -82,6 +82,19 @@ public class CanvasAssignmentService
     await CreateRubric(courseId, localAssignment);
   }
 
+  public async Task Delete(ulong courseId, LocalAssignment assignment)
+  {
+    Console.WriteLine($"deleting assignment from canvas {assignment.Name}");
+    var url = $"courses/{courseId}/assignments/{assignment.CanvasId}";
+    var request = new RestRequest(url);
+    var response = await webRequestor.DeleteAsync(request);
+    if (!response.IsSuccessful)
+    {
+      Console.WriteLine(url);
+      throw new Exception("Failed to delete assignment");
+    }
+  }
+
   public async Task CreateRubric(ulong courseId, LocalAssignment localAssignment)
   {
     if (localAssignment.CanvasId == null)
@@ -101,7 +114,7 @@ public class CanvasAssignmentService
       {
         description = rubricItem.Label,
         points = rubricItem.Points,
-        ratings = ratings
+        ratings
       };
       i++;
     }
@@ -130,9 +143,9 @@ public class CanvasAssignmentService
     var rubricCreationRequest = new RestRequest(creationUrl);
     rubricCreationRequest.AddBody(body);
     rubricCreationRequest.AddHeader("Content-Type", "application/json");
-
-    var (rubricCreationResponse, creationResponse) =
-      await webRequestor.PostAsync<CanvasRubricCreationResponse>(rubricCreationRequest);
+    var (rubricCreationResponse, _) = await webRequestor.PostAsync<CanvasRubricCreationResponse>(
+      rubricCreationRequest
+    );
 
     if (rubricCreationResponse == null)
       throw new Exception("failed to create rubric before association");
@@ -145,8 +158,6 @@ public class CanvasAssignmentService
     var pointAdjustmentRequest = new RestRequest(adjustmentUrl);
     pointAdjustmentRequest.AddBody(assignmentPointCorrectionBody);
     pointAdjustmentRequest.AddHeader("Content-Type", "application/json");
-    var (updatedAssignment, adjustmentResponse) = await webRequestor.PutAsync<CanvasAssignment>(
-      pointAdjustmentRequest
-    );
+    var (_, _) = await webRequestor.PutAsync<CanvasAssignment>(pointAdjustmentRequest);
   }
 }
diff --git a/Management/Services/IWebRequestor.cs b/Management/Services/IWebRequestor.cs
index 9a36444..e189bd1 100644
--- a/Management/Services/IWebRequestor.cs
+++ b/Management/Services/IWebRequestor.cs
@@ -8,4 +8,5 @@ public interface IWebRequestor
   Task<(T?, RestResponse)> PostAsync<T>(RestRequest request);
   Task<RestResponse> PutAsync(RestRequest request);
   Task<(T?, RestResponse)> PutAsync<T>(RestRequest request);
+  Task<RestResponse> DeleteAsync(RestRequest request);
 }
diff --git a/Management/Services/WebRequestor.cs b/Management/Services/WebRequestor.cs
index b07be97..3c7a77e 100644
--- a/Management/Services/WebRequestor.cs
+++ b/Management/Services/WebRequestor.cs
@@ -18,13 +18,13 @@ public class WebRequestor : IWebRequestor
   public async Task<(T[]?, RestResponse)> GetManyAsync<T>(RestRequest request)
   {
     var response = await client.ExecuteGetAsync(request);
-    return (Deserialize<T[]>(response), response);
+    return (deserialize<T[]>(response), response);
   }
 
   public async Task<(T?, RestResponse)> GetAsync<T>(RestRequest request)
   {
     var response = await client.ExecuteGetAsync(request);
-    return (Deserialize<T>(response), response);
+    return (deserialize<T>(response), response);
   }
 
   public async Task<RestResponse> PostAsync(RestRequest request)
@@ -32,9 +32,9 @@ public class WebRequestor : IWebRequestor
     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");
+      Console.WriteLine(response.Content);
+      Console.WriteLine(response.ResponseUri);
+      Console.WriteLine("error with response");
       throw new Exception("error with response");
     }
     return response;
@@ -43,7 +43,7 @@ public class WebRequestor : IWebRequestor
   public async Task<(T?, RestResponse)> PostAsync<T>(RestRequest request)
   {
     var response = await client.ExecutePostAsync(request);
-    return (Deserialize<T>(response), response);
+    return (deserialize<T>(response), response);
   }
 
   public async Task<RestResponse> PutAsync(RestRequest request)
@@ -51,9 +51,9 @@ public class WebRequestor : IWebRequestor
     var response = await client.ExecutePutAsync(request);
     // if (!response.IsSuccessful)
     // {
-    //   System.Console.WriteLine(response.Content);
-    //   System.Console.WriteLine(response.ResponseUri);
-    //   System.Console.WriteLine("error with response");
+    //   Console.WriteLine(response.Content);
+    //   Console.WriteLine(response.ResponseUri);
+    //   Console.WriteLine("error with response");
     //   throw new Exception("error with response");
     // }
     return response;
@@ -62,17 +62,22 @@ public class WebRequestor : IWebRequestor
   public async Task<(T?, RestResponse)> PutAsync<T>(RestRequest request)
   {
     var response = await client.ExecutePutAsync(request);
-    return (Deserialize<T>(response), response);
+    return (deserialize<T>(response), response);
   }
 
-  private T? Deserialize<T>(RestResponse response)
+  public async Task<RestResponse> DeleteAsync(RestRequest request)
+  {
+    return await client.DeleteAsync(request);
+  }
+
+  private static 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");
+      Console.WriteLine(response.Content);
+      Console.WriteLine(response.ResponseUri);
+      Console.WriteLine(response.ErrorMessage);
+      Console.WriteLine("error with response");
       // Console.WriteLine(JsonSerializer.Serialize(response));
       Console.WriteLine(JsonSerializer.Serialize(response.Request?.Parameters));
       throw new Exception($"error with response to {response.ResponseUri} {response.StatusCode}");
@@ -83,21 +88,21 @@ public class WebRequestor : IWebRequestor
 
       if (data == null)
       {
-        System.Console.WriteLine(response.Content);
-        System.Console.WriteLine(response.ResponseUri);
-        System.Console.WriteLine("could not parse response, got empty object");
+        Console.WriteLine(response.Content);
+        Console.WriteLine(response.ResponseUri);
+        Console.WriteLine("could not parse response, got empty object");
       }
       return data;
     }
-    catch (System.NotSupportedException )
+    catch (NotSupportedException)
     {
       Console.WriteLine(response.Content);
       throw;
     }
     catch (JsonException)
     {
-      System.Console.WriteLine(response.ResponseUri);
-      System.Console.WriteLine(response.Content);
+      Console.WriteLine(response.ResponseUri);
+      Console.WriteLine(response.Content);
       Console.WriteLine($"An error occurred during deserialization");
       throw;
     }