alex/canvasManagement
1
0
Fork 0
mirror of https://github.com/alexmickelson/canvasManagement.git synced 2026-03-26 15:48:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

new syncronization for quizzes, add only

Browse Source
This commit is contained in:
Alex Mickelson
2023-10-10 10:47:36 -06:00
parent 8d5d820c50
commit 30109f4012
10 changed files with 139 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Management/Features/Configuration/Synchronization/ModuleSyncronizationExtensions.cs
View File

@@ -6,7 +6,7 @@ namespace Management.Planner;
public static partial class ModuleSyncronizationExtensions
{
internal static async Task<IEnumerable<LocalModule>> EnsureAllModulesExistInCanvas(
internal static async Task<IEnumerable<LocalModule>> CreateAllModules(
this LocalCourse localCourse,
ulong canvasCourseId,
IEnumerable<CanvasModule> canvasModules,
@@ -32,7 +32,7 @@ public static partial class ModuleSyncronizationExtensions
return newModules ?? throw new Exception("Error ensuring all modules exist in canvas");
}
internal static async Task SortCanvasModules(
internal static async Task SortCanvasModulesByLocalOrder(
this LocalCourse localCourse,
ulong canvasId,
IEnumerable<CanvasModule> canvasModules,
@@ -53,14 +53,13 @@ public static partial class ModuleSyncronizationExtensions
}
}
internal static async Task<LocalCourse> SyncModulesWithCanvasData(
internal static async Task<LocalCourse> GetCanvasIdsForLocalModules(
this LocalCourse localCourse,
ulong canvasId,
IEnumerable<CanvasModule> canvasModules,
CanvasService canvas
)
{
canvasModules = await canvas.Modules.GetModules(canvasId);
var canvasModules = await canvas.Modules.GetModules(canvasId);
return localCourse with
{
Modules = localCourse.Modules.Select(m =>
@@ -70,35 +69,38 @@ public static partial class ModuleSyncronizationExtensions
})
};
}
internal static async Task SortModuleItems(
public static async Task SortModuleItems(
this LocalModule localModule,
ulong canvasId,
ulong moduleCanvasId,
IEnumerable<CanvasModuleItem> canvasModuleItems,
CanvasService canvas
)
{
var localItemsWithCorrectOrder = localModule.Assignments
.OrderBy(a => a.DueAt)
.Select((a, i) => (Assignment: a, Position: i + 1));
var canvasModuleItems = await canvas.Modules.GetModuleItems(canvasId, moduleCanvasId);
var moduleItemsInCorrectOrder = canvasModuleItems
.OrderBy(i => i.ContentDetails?.DueAt)
.Select((a, i) => (Item: a, Position: i + 1));
// var localItemsWithCorrectOrder = localModule.Assignments
// .OrderBy(a => a.DueAt)
// .Select((a, i) => (Assignment: a, Position: i + 1));
var canvasContentIdsByCurrentPosition =
canvasModuleItems.ToDictionary(item => item.Position, item => item.ContentId)
?? new Dictionary<int, ulong?>();
// var canvasContentIdsByCurrentPosition =
// canvasModuleItems.ToDictionary(item => item.Position, item => item.ContentId)
// ?? new Dictionary<int, ulong?>();
foreach (var (localAssignment, position) in localItemsWithCorrectOrder)
foreach (var (moduleItem, position) in moduleItemsInCorrectOrder)
{
var itemIsInCorrectOrder =
canvasContentIdsByCurrentPosition.ContainsKey(position)
&& canvasContentIdsByCurrentPosition[position] == localAssignment.CanvasId;
var itemIsInCorrectOrder = moduleItem.Position == position;
var currentCanvasItem = canvasModuleItems.First(i => i.ContentId == localAssignment.CanvasId);
// var currentCanvasItem = canvasModuleItems.First(i => i.ContentId == moduleItem.CanvasId);
if (!itemIsInCorrectOrder)
{
await canvas.UpdateModuleItem(
canvasId,
moduleCanvasId,
currentCanvasItem with
moduleItem with
{
Position = position
}
@@ -182,7 +184,7 @@ public static partial class ModuleSyncronizationExtensions
? await canvas.Modules.GetModuleItems(canvasId, moduleCanvasId)
: canvasModulesItems[moduleCanvasId];
await localModule.SortModuleItems(canvasId, moduleCanvasId, canvasModuleItems, canvas);
await localModule.SortModuleItems(canvasId, moduleCanvasId, canvas);
}
}
}

48
Management/Features/Configuration/Synchronization/QuizSyncronizationExtensions.cs
View File

@@ -16,47 +16,45 @@ public static partial class QuizSyncronizationExtensions
internal static async Task<LocalCourse> SyncQuizzesWithCanvas(
this LocalCourse localCourse,
ulong canvasId,
IEnumerable<CanvasQuiz> canvasQuizzes,
CanvasService canvas
)
{
var moduleTasks = localCourse.Modules.Select(async m =>
{
return localCourse;
// var moduleTasks = localCourse.Modules.Select(async m =>
// {
var quizTasks = m.Quizzes
.Select(
async (q) => q.DueAt > DateTime.Now
? await localCourse.SyncQuizToCanvas(canvasId, q, canvasQuizzes, canvas)
: q
);
var quizzes = await Task.WhenAll(quizTasks);
return m with { Quizzes = quizzes };
});
// 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 };
// var modules = await Task.WhenAll(moduleTasks);
// return localCourse with { Modules = modules };
}
internal static async Task<LocalQuiz> SyncQuizToCanvas(
public static async Task<LocalQuiz> AddQuizToCanvas(
this LocalCourse localCourse,
ulong canvasCourseId,
LocalQuiz localQuiz,
IEnumerable<CanvasQuiz> canvasQuizzes,
CanvasService canvas
)
{
var isCreated = localQuiz.QuizIsCreated(canvasQuizzes);
var canvasAssignmentGroupId = localQuiz.GetCanvasAssignmentGroupId(localCourse.Settings.AssignmentGroups);
if (isCreated)
if (localCourse.Settings.CanvasId == null)
{
// TODO write update
}
else
{
return await canvas.Quizzes.Create(canvasCourseId, localQuiz, canvasAssignmentGroupId);
Console.WriteLine("Cannot add quiz to canvas without canvas course id");
return localQuiz;
}
ulong courseCanvasId = (ulong)localCourse.Settings.CanvasId;
return localQuiz;
var canvasAssignmentGroupId = localQuiz.GetCanvasAssignmentGroupId(localCourse.Settings.AssignmentGroups);
var canvasQuizId = await canvas.Quizzes.Create(courseCanvasId, localQuiz, canvasAssignmentGroupId);
return localQuiz with { CanvasId = canvasQuizId };
}
}