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

hooks

Browse Source
This commit is contained in:
Alex Mickelson
2024-02-07 16:21:04 -07:00
parent 292c06ecc9
commit 0881acd1f8
77 changed files with 239 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Management.Test/Markdown/AssignmentMarkdownTests.cs
View File

@@ -7,8 +7,8 @@ public class AssignmentMarkdownTests
{ {
var assignment = new LocalAssignment() var assignment = new LocalAssignment()
{ {
Name="test assignment", Name = "test assignment",
Description ="here is the description", Description = "here is the description",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD], SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD],
@@ -29,13 +29,13 @@ public class AssignmentMarkdownTests
{ {
var assignment = new LocalAssignment() var assignment = new LocalAssignment()
{ {
Name="test assignment", Name = "test assignment",
Description ="here is the description", Description = "here is the description",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD], SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD],
LocalAssignmentGroupName = "Final Project", LocalAssignmentGroupName = "Final Project",
Rubric = new List<RubricItem>() {} Rubric = new List<RubricItem>() { }
}; };
var assignmentMarkdown = assignment.ToMarkdown(); var assignmentMarkdown = assignment.ToMarkdown();
@@ -48,8 +48,8 @@ public class AssignmentMarkdownTests
{ {
var assignment = new LocalAssignment() var assignment = new LocalAssignment()
{ {
Name="test assignment", Name = "test assignment",
Description ="here is the description", Description = "here is the description",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
SubmissionTypes = [], SubmissionTypes = [],
@@ -71,8 +71,8 @@ public class AssignmentMarkdownTests
{ {
var assignment = new LocalAssignment() var assignment = new LocalAssignment()
{ {
Name="test assignment", Name = "test assignment",
Description ="here is the description", Description = "here is the description",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = null, LockAt = null,
SubmissionTypes = [], SubmissionTypes = [],
@@ -94,7 +94,7 @@ public class AssignmentMarkdownTests
{ {
var assignment = new LocalAssignment() var assignment = new LocalAssignment()
{ {
Name="test assignment", Name = "test assignment",
Description = "", Description = "",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
@@ -116,13 +116,14 @@ public class AssignmentMarkdownTests
{ {
var assignment = new LocalAssignment() var assignment = new LocalAssignment()
{ {
Name="test assignment", Name = "test assignment",
Description = "test assignment\n---\nsomestuff", Description = "test assignment\n---\nsomestuff",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
SubmissionTypes = [], SubmissionTypes = [],
LocalAssignmentGroupName = "Final Project", LocalAssignmentGroupName = "Final Project",
Rubric = new List<RubricItem>() { Rubric = new List<RubricItem>()
{
} }
}; };

101
Management.Test/Markdown/FileStorageTests.cs
View File

@@ -72,8 +72,10 @@ public class FileStorageTests
[Test] [Test]
public async Task CourseSettings_CanBeSavedAndLoaded() public async Task CourseSettings_CanBeSavedAndLoaded()
{ {
LocalCourse testCourse = new() { LocalCourse testCourse = new()
Settings = new() { {
Settings = new()
{
AssignmentGroups = [], AssignmentGroups = [],
Name = "Test Course with settings", Name = "Test Course with settings",
DaysOfWeek = [DayOfWeek.Monday, DayOfWeek.Wednesday], DaysOfWeek = [DayOfWeek.Monday, DayOfWeek.Wednesday],
@@ -96,13 +98,15 @@ public class FileStorageTests
[Test] [Test]
public async Task EmptyCourseModules_CanBeSavedAndLoaded() public async Task EmptyCourseModules_CanBeSavedAndLoaded()
{ {
LocalCourse testCourse = new() { LocalCourse testCourse = new()
{
Settings = new() { Name = "Test Course with modules" }, Settings = new() { Name = "Test Course with modules" },
Modules = [ Modules = [
new() { new()
Name="test module 1", {
Assignments= [], Name = "test module 1",
Quizzes=[] Assignments = [],
Quizzes = []
} }
] ]
}; };
@@ -118,26 +122,29 @@ public class FileStorageTests
[Test] [Test]
public async Task CourseModules_WithAssignments_CanBeSavedAndLoaded() public async Task CourseModules_WithAssignments_CanBeSavedAndLoaded()
{ {
LocalCourse testCourse = new() { LocalCourse testCourse = new()
{
Settings = new() { Name = "Test Course with modules and assignments" }, Settings = new() { Name = "Test Course with modules and assignments" },
Modules = [ Modules = [
new() { new()
Name="test module 1 with assignments", {
Assignments=[ Name = "test module 1 with assignments",
new () { Assignments = [
Name="test assignment", new()
Description ="here is the description", {
Name = "test assignment",
Description = "here is the description",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD], SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD],
LocalAssignmentGroupName = "Final Project", LocalAssignmentGroupName = "Final Project",
Rubric = [ Rubric = [
new() {Points = 4, Label="do task 1"}, new() { Points = 4, Label = "do task 1" },
new() {Points = 2, Label="do task 2"}, new() { Points = 2, Label = "do task 2" },
] ]
} }
], ],
Quizzes=[] Quizzes = []
} }
] ]
}; };
@@ -156,14 +163,17 @@ public class FileStorageTests
[Test] [Test]
public async Task CourseModules_WithQuizzes_CanBeSavedAndLoaded() public async Task CourseModules_WithQuizzes_CanBeSavedAndLoaded()
{ {
LocalCourse testCourse = new() { LocalCourse testCourse = new()
{
Settings = new() { Name = "Test Course with modules and quiz" }, Settings = new() { Name = "Test Course with modules and quiz" },
Modules = [ Modules = [
new() { new()
Name="test module 1 with quiz", {
Assignments=[], Name = "test module 1 with quiz",
Quizzes=[ Assignments = [],
new() { Quizzes = [
new()
{
Name = "Test Quiz", Name = "Test Quiz",
Description = "quiz description", Description = "quiz description",
LockAt = new DateTime(2022, 10, 3, 12, 5, 0), LockAt = new DateTime(2022, 10, 3, 12, 5, 0),
@@ -171,8 +181,9 @@ public class FileStorageTests
ShuffleAnswers = true, ShuffleAnswers = true,
OneQuestionAtATime = true, OneQuestionAtATime = true,
LocalAssignmentGroupName = "Assignments", LocalAssignmentGroupName = "Assignments",
Questions=[ Questions = [
new () { new()
{
Text = "test essay", Text = "test essay",
QuestionType = QuestionType.ESSAY, QuestionType = QuestionType.ESSAY,
Points = 1 Points = 1
@@ -196,8 +207,10 @@ public class FileStorageTests
[Test] [Test]
public async Task MarkdownStorage_FullyPopulated_DoesNotLoseData() public async Task MarkdownStorage_FullyPopulated_DoesNotLoseData()
{ {
LocalCourse testCourse = new() { LocalCourse testCourse = new()
Settings = new () { {
Settings = new()
{
AssignmentGroups = [], AssignmentGroups = [],
Name = "Test Course with lots of data", Name = "Test Course with lots of data",
DaysOfWeek = [DayOfWeek.Monday, DayOfWeek.Wednesday], DaysOfWeek = [DayOfWeek.Monday, DayOfWeek.Wednesday],
@@ -206,24 +219,27 @@ public class FileStorageTests
DefaultDueTime = new() { Hour = 1, Minute = 59 }, DefaultDueTime = new() { Hour = 1, Minute = 59 },
}, },
Modules = [ Modules = [
new() { new()
Name= "new test module", {
Name = "new test module",
Assignments = [ Assignments = [
new() { new()
Name="test assignment", {
Description ="here is the description", Name = "test assignment",
Description = "here is the description",
DueAt = new DateTime(), DueAt = new DateTime(),
LockAt = new DateTime(), LockAt = new DateTime(),
SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD], SubmissionTypes = [AssignmentSubmissionType.ONLINE_UPLOAD],
LocalAssignmentGroupName = "Final Project", LocalAssignmentGroupName = "Final Project",
Rubric = [ Rubric = [
new() { Points = 4, Label="do task 1" }, new() { Points = 4, Label = "do task 1" },
new() { Points = 2, Label="do task 2" }, new() { Points = 2, Label = "do task 2" },
] ]
} }
], ],
Quizzes = [ Quizzes = [
new() { new()
{
Name = "Test Quiz", Name = "Test Quiz",
Description = "quiz description", Description = "quiz description",
LockAt = new DateTime(), LockAt = new DateTime(),
@@ -233,7 +249,8 @@ public class FileStorageTests
LocalAssignmentGroupName = "someId", LocalAssignmentGroupName = "someId",
AllowedAttempts = -1, AllowedAttempts = -1,
Questions = [ Questions = [
new() { new()
{
Text = "test short answer", Text = "test short answer",
QuestionType = QuestionType.SHORT_ANSWER, QuestionType = QuestionType.SHORT_ANSWER,
Points = 1 Points = 1
@@ -257,8 +274,10 @@ public class FileStorageTests
[Test] [Test]
public async Task MarkdownStorage_CanPersistPages() public async Task MarkdownStorage_CanPersistPages()
{ {
LocalCourse testCourse = new() { LocalCourse testCourse = new()
Settings = new () { {
Settings = new()
{
AssignmentGroups = [], AssignmentGroups = [],
Name = "Test Course with page", Name = "Test Course with page",
DaysOfWeek = [DayOfWeek.Monday, DayOfWeek.Wednesday], DaysOfWeek = [DayOfWeek.Monday, DayOfWeek.Wednesday],
@@ -267,10 +286,12 @@ public class FileStorageTests
DefaultDueTime = new() { Hour = 1, Minute = 59 }, DefaultDueTime = new() { Hour = 1, Minute = 59 },
}, },
Modules = [ Modules = [
new(){ new()
{
Name = "page test module", Name = "page test module",
Pages = [ Pages = [
new () { new()
{
Name = "test page persistence", Name = "test page persistence",
DueAt = new DateTime(), DueAt = new DateTime(),
Text = "this is some\n## markdown\n" Text = "this is some\n## markdown\n"

2
Management.Test/Markdown/Quiz/MultipleChoiceTests.cs
View File

@@ -67,7 +67,7 @@ endline
*) true *) true
) false ) false
"; ";
var question = LocalQuizQuestion.ParseMarkdown(questionMarkdown, 0); var question = LocalQuizQuestion.ParseMarkdown(questionMarkdown, 0);
question.Answers.Count().Should().Be(2); question.Answers.Count().Should().Be(2);
} }
} }

4
Management.Test/Usings.cs
View File

@@ -1,3 +1,3 @@
global using NUnit.Framework;
global using FluentAssertions;
global using System.Text.Json; global using System.Text.Json;
global using FluentAssertions;
global using NUnit.Framework;

18
Management.Web/ConfigurationSetup.cs
View File

@@ -1,14 +1,14 @@
public static class ConfigurationSetup public static class ConfigurationSetup
{ {
public static void Canvas(WebApplicationBuilder builder) public static void Canvas(WebApplicationBuilder builder)
{ {
var canvas_token = builder.Configuration["CANVAS_TOKEN"] ?? throw new Exception("CANVAS_TOKEN is null"); var canvas_token = builder.Configuration["CANVAS_TOKEN"] ?? throw new Exception("CANVAS_TOKEN is null");
var canvas_url = builder.Configuration["CANVAS_URL"]; var canvas_url = builder.Configuration["CANVAS_URL"];
if (canvas_url == null) if (canvas_url == null)
{ {
Console.WriteLine("CANVAS_URL is null, defaulting to https://snow.instructure.com"); Console.WriteLine("CANVAS_URL is null, defaulting to https://snow.instructure.com");
builder.Configuration["CANVAS_URL"] = "https://snow.instructure.com"; builder.Configuration["CANVAS_URL"] = "https://snow.instructure.com";
}
} }
}
} }

3
Management.Web/Pages/Course/Module/ModuleItems/DroppableQuiz.razor.cs
View File

@@ -45,7 +45,8 @@ public class DroppableQuiz : ComponentBase
.Select(q => .Select(q =>
q.Name + q.Description != Quiz.Name + Quiz.Description q.Name + q.Description != Quiz.Name + Quiz.Description
? q : ? q :
q with { q with
{
DueAt = defaultDueTimeDate, DueAt = defaultDueTimeDate,
LockAt = q.LockAt > defaultDueTimeDate ? q.LockAt : defaultDueTimeDate LockAt = q.LockAt > defaultDueTimeDate ? q.LockAt : defaultDueTimeDate
} }

22
Management.Web/Pages/Error.cshtml.cs
View File

@@ -8,19 +8,19 @@ namespace Management.Web.Pages;
[IgnoreAntiforgeryToken] [IgnoreAntiforgeryToken]
public class ErrorModel : PageModel public class ErrorModel : PageModel
{ {
public string? RequestId { get; set; } public string? RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
private readonly ILogger<ErrorModel> _logger; private readonly ILogger<ErrorModel> _logger;
public ErrorModel(ILogger<ErrorModel> logger) public ErrorModel(ILogger<ErrorModel> logger)
{ {
_logger = logger; _logger = logger;
} }
public void OnGet() public void OnGet()
{ {
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
} }
} }

17
Management.Web/Program.cs
View File

@@ -1,24 +1,23 @@
global using System.Text.Json.Serialization;
global using System.Text.Json;
global using System.ComponentModel.DataAnnotations; global using System.ComponentModel.DataAnnotations;
global using Management.Services.Canvas; global using System.Text.Json;
global using Management.Services; global using System.Text.Json.Serialization;
global using CanvasModel.EnrollmentTerms;
global using CanvasModel.Courses;
global using CanvasModel; global using CanvasModel;
global using CanvasModel.Courses;
global using CanvasModel.EnrollmentTerms;
global using LocalModels; global using LocalModels;
global using Management.Planner; global using Management.Planner;
global using Management.Web.Shared.Components; global using Management.Services;
global using Management.Services.Canvas;
global using Management.Web.Shared; global using Management.Web.Shared;
global using Management.Web.Shared.Components;
using dotenv.net; using dotenv.net;
using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Hosting.Server.Features;
using OpenTelemetry;
using OpenTelemetry.Logs; using OpenTelemetry.Logs;
using OpenTelemetry.Metrics; using OpenTelemetry.Metrics;
using OpenTelemetry.Resources; using OpenTelemetry.Resources;
using OpenTelemetry.Trace; using OpenTelemetry.Trace;
using OpenTelemetry;
DotEnv.Load(); DotEnv.Load();

36
Management/Features/Configuration/CoursePlanner.cs
View File

@@ -1,14 +1,14 @@
using CanvasModel.EnrollmentTerms;
using CanvasModel.Courses;
using CanvasModel;
using LocalModels;
using CanvasModel.Assignments;
using CanvasModel.Modules;
using Management.Services.Canvas;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using CanvasModel.Quizzes; using CanvasModel;
using Management.Services; using CanvasModel.Assignments;
using CanvasModel.Courses;
using CanvasModel.EnrollmentTerms;
using CanvasModel.Modules;
using CanvasModel.Pages; using CanvasModel.Pages;
using CanvasModel.Quizzes;
using LocalModels;
using Management.Services;
using Management.Services.Canvas;
namespace Management.Planner; namespace Management.Planner;
@@ -181,13 +181,17 @@ public class CoursePlanner
CanvasAssignmentGroups = await canvas.AssignmentGroups.GetAll(canvasCourseId); CanvasAssignmentGroups = await canvas.AssignmentGroups.GetAll(canvasCourseId);
LocalCourse = LocalCourse with {Settings = LocalCourse.Settings with { LocalCourse = LocalCourse with
AssignmentGroups = LocalCourse.Settings.AssignmentGroups.Select(g => { {
var canvasGroup = CanvasAssignmentGroups.FirstOrDefault(c => c.Name == g.Name); Settings = LocalCourse.Settings with
return canvasGroup == null {
? g AssignmentGroups = LocalCourse.Settings.AssignmentGroups.Select(g =>
: g with {CanvasId = canvasGroup.Id}; {
}) var canvasGroup = CanvasAssignmentGroups.FirstOrDefault(c => c.Name == g.Name);
return canvasGroup == null
? g
: g with { CanvasId = canvasGroup.Id };
})
} }
}; };
} }

2
Management/Features/Configuration/PageEditorContext.cs
View File

@@ -112,7 +112,7 @@ public class PageEditorContext(
var canvasModule = getCurrentCanvasModule(Page, planner.LocalCourse); var canvasModule = getCurrentCanvasModule(Page, planner.LocalCourse);
if(canvasPage != null) if (canvasPage != null)
{ {
await canvas.CreatePageModuleItem( await canvas.CreatePageModuleItem(
(ulong)courseCanvasId, (ulong)courseCanvasId,

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

@@ -39,14 +39,15 @@ public static partial class ModuleSyncronizationExtensions
{ {
var canvasModuleItems = await canvas.Modules.GetModuleItems(canvasId, moduleCanvasId); var canvasModuleItems = await canvas.Modules.GetModuleItems(canvasId, moduleCanvasId);
var moduleItemsInCorrectOrder = canvasModuleItems var moduleItemsInCorrectOrder = canvasModuleItems
.OrderBy(canvasItem => { .OrderBy(canvasItem =>
{
if(canvasItem.Type == "Page") if (canvasItem.Type == "Page")
{ {
var localPage = localModule.Pages.FirstOrDefault(p => p.Name == canvasItem.Title); var localPage = localModule.Pages.FirstOrDefault(p => p.Name == canvasItem.Title);
Console.WriteLine(JsonSerializer.Serialize(localModule.Pages)); Console.WriteLine(JsonSerializer.Serialize(localModule.Pages));
if(localPage != null) if (localPage != null)
return localPage.DueAt.Date; return localPage.DueAt.Date;
} }
return canvasItem.ContentDetails?.DueAt?.Date; return canvasItem.ContentDetails?.DueAt?.Date;

2
Management/GlobalUsings.cs
View File

@@ -1,3 +1,3 @@
global using System.Text.Json.Serialization;
global using System.Text.Json; global using System.Text.Json;
global using System.Text.Json.Serialization;
global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Logging;

2
Management/Models/CanvasModels/Modules/CanvasModule.cs
View File

@@ -15,7 +15,7 @@ public record CanvasModule(
[property: JsonPropertyName("items")] [property: JsonPropertyName("items")]
IEnumerable<CanvasModuleItem>? Items, IEnumerable<CanvasModuleItem>? Items,
[property: JsonPropertyName("state")] string? State, // todo make sure this, [property: JsonPropertyName("state")] string? State, // todo make sure this,
// [OptIn] // [OptIn]
[property: JsonPropertyName("completed_at")] [property: JsonPropertyName("completed_at")]
DateTime? CompletedAt, DateTime? CompletedAt,
[property: JsonPropertyName("publish_final_grade")] bool? PublishFinalGrade, [property: JsonPropertyName("publish_final_grade")] bool? PublishFinalGrade,

2
Management/Models/CanvasModels/Pages/CanvasPage.cs
View File

@@ -1,6 +1,6 @@
namespace CanvasModel.Pages; namespace CanvasModel.Pages;
public record CanvasPage ( public record CanvasPage(
[property: JsonPropertyName("page_id")] ulong PageId, [property: JsonPropertyName("page_id")] ulong PageId,
[property: JsonPropertyName("url")] string Url, [property: JsonPropertyName("url")] string Url,
[property: JsonPropertyName("title")] string Title, [property: JsonPropertyName("title")] string Title,

2
Management/Models/Local/Assignment/LocalAssignment.cs
View File

@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
namespace LocalModels; namespace LocalModels;
public record LocalAssignment: IModuleItem public record LocalAssignment : IModuleItem
{ {
private string _name = ""; private string _name = "";
public string Name public string Name

2
Management/Models/Local/LocalCoursePage.cs
View File

@@ -1,6 +1,6 @@
namespace LocalModels; namespace LocalModels;
public record LocalCoursePage: IModuleItem public record LocalCoursePage : IModuleItem
{ {
public required string Name { get; init; } public required string Name { get; init; }
public required string Text { get; set; } public required string Text { get; set; }

4
Management/Models/Local/Quiz/LocalQuiz.cs
View File

@@ -3,7 +3,7 @@ using YamlDotNet.Serialization;
namespace LocalModels; namespace LocalModels;
public record LocalQuiz: IModuleItem public record LocalQuiz : IModuleItem
{ {
public required string Name { get; init; } public required string Name { get; init; }
@@ -171,7 +171,7 @@ Description: {Description}
public class QuizMarkdownParseException : Exception public class QuizMarkdownParseException : Exception
{ {
public QuizMarkdownParseException(string message): base(message) public QuizMarkdownParseException(string message) : base(message)
{ {
} }

2
Management/Models/Local/Quiz/LocalQuizQuestion.cs
View File

@@ -35,7 +35,7 @@ public record LocalQuizQuestion
return $"{questionTypeIndicator}{multilineMarkdownCompatibleText}"; return $"{questionTypeIndicator}{multilineMarkdownCompatibleText}";
} }
else if(QuestionType == "matching") else if (QuestionType == "matching")
{ {
return $"^ {answer.Text} - {answer.MatchedText}"; return $"^ {answer.Text} - {answer.MatchedText}";
} }

6
Management/Services/Canvas/CanvasModuleService.cs
View File

@@ -63,10 +63,12 @@ public class CanvasModuleService
if (items == null) if (items == null)
throw new Exception($"Error getting canvas module items for {url}"); throw new Exception($"Error getting canvas module items for {url}");
return items.Select(i => return items.Select(i =>
i with { i with
{
ContentDetails = i.ContentDetails == null ContentDetails = i.ContentDetails == null
? null ? null
: i.ContentDetails with { : i.ContentDetails with
{
DueAt = i.ContentDetails.DueAt?.ToLocalTime(), DueAt = i.ContentDetails.DueAt?.ToLocalTime(),
LockAt = i.ContentDetails.LockAt?.ToLocalTime(), LockAt = i.ContentDetails.LockAt?.ToLocalTime(),
} }

13
Management/Services/Canvas/CanvasQuizService.cs
View File

@@ -117,14 +117,16 @@ public class CanvasQuizService(
await Task.WhenAll(tasks); await Task.WhenAll(tasks);
} }
private async Task hackFixQuestionOrdering(ulong canvasCourseId, ulong canvasQuizId, IEnumerable<(CanvasQuizQuestion question, int position)> questionAndPositions ) private async Task hackFixQuestionOrdering(ulong canvasCourseId, ulong canvasQuizId, IEnumerable<(CanvasQuizQuestion question, int position)> questionAndPositions)
{ {
using var activity = DiagnosticsConfig.Source.StartActivity("hack fixing question ordering with reorder"); using var activity = DiagnosticsConfig.Source.StartActivity("hack fixing question ordering with reorder");
activity?.SetCustomProperty("canvasQuizId", canvasQuizId); activity?.SetCustomProperty("canvasQuizId", canvasQuizId);
activity?.SetTag("canvas syncronization", true); activity?.SetTag("canvas syncronization", true);
var order = questionAndPositions.OrderBy(t => t.position).Select(tuple => { var order = questionAndPositions.OrderBy(t => t.position).Select(tuple =>
return new { {
return new
{
type = "question", type = "question",
id = tuple.question.Id.ToString(), id = tuple.question.Id.ToString(),
}; };
@@ -182,9 +184,10 @@ public class CanvasQuizService(
private static object[] getAnswers(LocalQuizQuestion q) private static object[] getAnswers(LocalQuizQuestion q)
{ {
if(q.QuestionType == QuestionType.MATCHING) if (q.QuestionType == QuestionType.MATCHING)
return q.Answers return q.Answers
.Select(a => new { .Select(a => new
{
answer_match_left = a.Text, answer_match_left = a.Text,
answer_match_right = a.MatchedText answer_match_right = a.MatchedText
}) })

4
Management/Services/Canvas/CanvasService.cs
View File

@@ -1,11 +1,11 @@
using Microsoft.Extensions.Logging;
using CanvasModel; using CanvasModel;
using CanvasModel.Assignments; using CanvasModel.Assignments;
using CanvasModel.Courses; using CanvasModel.Courses;
using CanvasModel.EnrollmentTerms; using CanvasModel.EnrollmentTerms;
using CanvasModel.Modules; using CanvasModel.Modules;
using RestSharp;
using CanvasModel.Pages; using CanvasModel.Pages;
using Microsoft.Extensions.Logging;
using RestSharp;
namespace Management.Services.Canvas; namespace Management.Services.Canvas;

2
Management/Services/Files/FileStorageManager.cs
View File

@@ -47,7 +47,7 @@ public class FileStorageManager
public IEnumerable<string> GetEmptyDirectories() public IEnumerable<string> GetEmptyDirectories()
{ {
if(!Directory.Exists(_basePath)) if (!Directory.Exists(_basePath))
throw new DirectoryNotFoundException($"Cannot get empty directories, {_basePath} does not exist"); throw new DirectoryNotFoundException($"Cannot get empty directories, {_basePath} does not exist");
return Directory return Directory

2
Management/Services/Files/LoadMarkdownCourse.cs
View File

@@ -25,7 +25,7 @@ public class CourseMarkdownLoader
}) })
.Select(async d => await LoadCourseByPath(d)) .Select(async d => await LoadCourseByPath(d))
); );
return courses.OrderBy(c=>c.Settings.Name); return courses.OrderBy(c => c.Settings.Name);
} }
public async Task<LocalCourse> LoadCourseByPath(string courseDirectory) public async Task<LocalCourse> LoadCourseByPath(string courseDirectory)

13
Management/Services/WebRequestor.cs
View File

@@ -45,12 +45,15 @@ public class WebRequestor : IWebRequestor
var response = await client.ExecutePostAsync(request); var response = await client.ExecutePostAsync(request);
if (isRateLimited(response)) { if (isRateLimited(response))
if(retryCount < rateLimitRetryCount){ {
if (retryCount < rateLimitRetryCount)
{
logger.LogInformation($"hit rate limit on post, retry count is {retryCount} / {rateLimitRetryCount}, retrying"); logger.LogInformation($"hit rate limit on post, retry count is {retryCount} / {rateLimitRetryCount}, retrying");
Console.WriteLine($"hit rate limit on post, retry count is {retryCount} / {rateLimitRetryCount}, retrying"); Console.WriteLine($"hit rate limit on post, retry count is {retryCount} / {rateLimitRetryCount}, retrying");
Thread.Sleep(rateLimitSleepInterval); Thread.Sleep(rateLimitSleepInterval);
return await rateLimitAwarePostAsync(request, retryCount + 1);} return await rateLimitAwarePostAsync(request, retryCount + 1);
}
} }
if (!response.IsSuccessful) if (!response.IsSuccessful)
@@ -63,7 +66,7 @@ public class WebRequestor : IWebRequestor
private static bool isRateLimited(RestResponse response) private static bool isRateLimited(RestResponse response)
{ {
if(response.Content == null) if (response.Content == null)
return false; return false;
return response.StatusCode == HttpStatusCode.Forbidden return response.StatusCode == HttpStatusCode.Forbidden
&& response.Content.Contains("403 Forbidden (Rate Limit Exceeded)"); && response.Content.Contains("403 Forbidden (Rate Limit Exceeded)");
@@ -110,7 +113,7 @@ public class WebRequestor : IWebRequestor
{ {
if (e.StatusCode == HttpStatusCode.Forbidden) // && response.Content == "403 Forbidden (Rate Limit Exceeded)" if (e.StatusCode == HttpStatusCode.Forbidden) // && response.Content == "403 Forbidden (Rate Limit Exceeded)"
{ {
if(retryCount < rateLimitRetryCount) if (retryCount < rateLimitRetryCount)
{ {
logger.LogInformation($"hit rate limit in delete, retry count is {retryCount} / {rateLimitRetryCount}, retrying"); logger.LogInformation($"hit rate limit in delete, retry count is {retryCount} / {rateLimitRetryCount}, retrying");
Console.WriteLine($"hit rate limit in delete, retry count is {retryCount} / {rateLimitRetryCount}, retrying"); Console.WriteLine($"hit rate limit in delete, retry count is {retryCount} / {rateLimitRetryCount}, retrying");