From 274c3a177c17bd6df8c7c8997bbff8d11cd2cf91 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Tue, 10 Oct 2023 14:06:38 -0600 Subject: [PATCH] refactored quiz creation --- .../Features/Configuration/CoursePlanner.cs | 1 - .../Configuration/QuizEditorContext.cs | 2 +- .../QuizSyncronizationExtensions.cs | 25 ------------------- Management/Services/Canvas/CanvasService.cs | 4 +-- 4 files changed, 3 insertions(+), 29 deletions(-) diff --git a/Management/Features/Configuration/CoursePlanner.cs b/Management/Features/Configuration/CoursePlanner.cs index ff9343e..a52d7bc 100644 --- a/Management/Features/Configuration/CoursePlanner.cs +++ b/Management/Features/Configuration/CoursePlanner.cs @@ -172,7 +172,6 @@ public class CoursePlanner CanvasAssignments = await canvas.Assignments.GetAll(canvasId); CanvasModulesItems = await canvas.Modules.GetAllModulesItems(canvasId, CanvasModules); - LocalCourse = await LocalCourse.SyncQuizzesWithCanvas(CanvasQuizzes, canvas); await LocalCourse.SyncModuleItemsWithCanvas(canvasId, CanvasModulesItems, canvas); CanvasModulesItems = await canvas.Modules.GetAllModulesItems(canvasId, CanvasModules); diff --git a/Management/Features/Configuration/QuizEditorContext.cs b/Management/Features/Configuration/QuizEditorContext.cs index 596ddf8..2c68247 100644 --- a/Management/Features/Configuration/QuizEditorContext.cs +++ b/Management/Features/Configuration/QuizEditorContext.cs @@ -91,7 +91,7 @@ public class QuizEditorContext logger.Log("cannot add quiz to canvas, no course stored in planner"); return; } - var updatedQuiz = await planner.LocalCourse.AddQuizToCanvas(Quiz, planner.CanvasQuizzes, canvas); + var updatedQuiz = await planner.LocalCourse.AddQuizToCanvas(Quiz, canvas); diff --git a/Management/Features/Configuration/Synchronization/QuizSyncronizationExtensions.cs b/Management/Features/Configuration/Synchronization/QuizSyncronizationExtensions.cs index ebe2784..7487c40 100644 --- a/Management/Features/Configuration/Synchronization/QuizSyncronizationExtensions.cs +++ b/Management/Features/Configuration/Synchronization/QuizSyncronizationExtensions.cs @@ -14,34 +14,9 @@ public static partial class QuizSyncronizationExtensions return canvasQuizzes.Any(q => q.Id == localQuiz.CanvasId); } - internal static async Task SyncQuizzesWithCanvas( - this LocalCourse localCourse, - IEnumerable canvasQuizzes, - CanvasService canvas - ) - { - return localCourse; - // var moduleTasks = localCourse.Modules.Select(async m => - // { - - // var quizTasks = m.Quizzes - // .Select( - // async (q) => q.DueAt > DateTime.Now - // ? await localCourse.AddQuizToCanvas(q, canvasQuizzes, canvas) - // : q - // ); - // var quizzes = await Task.WhenAll(quizTasks); - // return m with { Quizzes = quizzes }; - // }); - - // var modules = await Task.WhenAll(moduleTasks); - // return localCourse with { Modules = modules }; - } - public static async Task AddQuizToCanvas( this LocalCourse localCourse, LocalQuiz localQuiz, - IEnumerable canvasQuizzes, CanvasService canvas ) { diff --git a/Management/Services/Canvas/CanvasService.cs b/Management/Services/Canvas/CanvasService.cs index c6f9694..f25a816 100644 --- a/Management/Services/Canvas/CanvasService.cs +++ b/Management/Services/Canvas/CanvasService.cs @@ -120,7 +120,7 @@ public class CanvasService { module_item = new { - title = title, + title, type = type.ToString(), content_id = contentId, } @@ -128,7 +128,7 @@ public class CanvasService var request = new RestRequest(url); request.AddBody(body); - var (newItem, response) = await webRequestor.PostAsync(request); + var (newItem, _response) = await webRequestor.PostAsync(request); if (newItem == null) throw new Exception("something went wrong updating module item"); }