Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions QuizExperiment.Admin/Client/Shared/Edit/RootComponent.razor
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@
</div>
</div>
</nav>
<!--Default Timeout bar -->
<nav class="navbar navbar-dark" style="background-color: #979696;">
<div class="container-fluid">
<div class="d-flex flex-row align-items-center" style="padding-left:93px;">
<div class="pe-3">
<span class="fs-5 text-light">Default Timeout (seconds)</span>
</div>
<div class="pe-3" style="width: 150px;">
<input @bind="@_questionSet.DefaultTimeout" type="number" min="1" class="form-control" placeholder="e.g. 30" />
</div>
<div>
<button class="btn btn-primary" @onclick="ApplyDefaultTimeoutToAllQuestions">Apply to All Questions</button>
</div>
</div>
</div>
</nav>

if (!AreAllQuestionsValid)
{
Expand Down Expand Up @@ -304,4 +320,22 @@
await Save();
NavigationManager.NavigateTo($"/manage?path={_questionSet.FolderPath}");
}

private void ApplyDefaultTimeoutToAllQuestions()
{
if (_questionSet?.DefaultTimeout > 0)
{
foreach (var question in _questions)
{
question.Timeout = _questionSet.DefaultTimeout.Value;
}
string message = $"Applied timeout of {_questionSet.DefaultTimeout.Value} seconds to all {_questions.Count} questions.";
toastService.ShowSuccess(message);
}
else
{
string message = "Please enter a valid timeout value (greater than 0).";
toastService.ShowError(message);
}
}
}
82 changes: 74 additions & 8 deletions QuizExperiment.Models.Test/JsonSerializationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ namespace QuizExperiment.Models.Test
{
public class JsonSerializationTests
{
private static JsonSerializerOptions GetJsonSerializerOptions()
{
var options = new JsonSerializerOptions();
options.Converters.Add(new PolymorphicQuestionConverter());
options.Converters.Add(new PolymorphicQuestionListConverter());
options.PropertyNamingPolicy = null;
return options;
}

[Fact]
public void DeserializeAndReserialize_V1Schema_PrintsOutput()
{
Expand All @@ -18,10 +27,7 @@ public void DeserializeAndReserialize_V1Schema_PrintsOutput()
jsonPath = Path.GetFullPath(jsonPath);
}
var json = File.ReadAllText(jsonPath);
var options = new JsonSerializerOptions();
options.Converters.Add(new PolymorphicQuestionConverter());
options.Converters.Add(new PolymorphicQuestionListConverter());
options.PropertyNamingPolicy = null;
var options = GetJsonSerializerOptions();

// Act
var questionSet = JsonSerializer.Deserialize<QuestionSet>(json, options);
Expand All @@ -45,10 +51,7 @@ public void SerializingMultipleQuestionTypes()
{
// Arrange
var baseDir = AppContext.BaseDirectory;
var options = new JsonSerializerOptions();
options.Converters.Add(new PolymorphicQuestionConverter());
options.Converters.Add(new PolymorphicQuestionListConverter());
options.PropertyNamingPolicy = null;
var options = GetJsonSerializerOptions();

// Act
var questionSet = new QuestionSet
Expand Down Expand Up @@ -85,5 +88,68 @@ public void SerializingMultipleQuestionTypes()
$"A question is missing the 'questionType' property: {question}");
}
}

[Fact]
public void DeserializeQuestionSetWithDefaultTimeout()
{
// Arrange
var options = GetJsonSerializerOptions();

// Act
var questionSet = new QuestionSet
{
Id = "test-id",
Title = "Test Quiz",
DefaultTimeout = 45,
Questions = new List<Question>
{
new MultipleChoiceQuestion
{
Title = "Test Question",
Options = new[] { "A", "B", "C", "D" },
CorrectAnswerIndex = 0,
Timeout = 30
}
}
};
var json = JsonSerializer.Serialize(questionSet, options);
var deserializedQuestionSet = JsonSerializer.Deserialize<QuestionSet>(json, options);

// Assert
Assert.NotNull(deserializedQuestionSet);
Assert.Equal(45, deserializedQuestionSet.DefaultTimeout);
Assert.Equal("Test Quiz", deserializedQuestionSet.Title);
}

[Fact]
public void DeserializeQuestionSetWithoutDefaultTimeout()
{
// Arrange
var options = GetJsonSerializerOptions();

// Act
var questionSet = new QuestionSet
{
Id = "test-id",
Title = "Test Quiz",
Questions = new List<Question>
{
new MultipleChoiceQuestion
{
Title = "Test Question",
Options = new[] { "A", "B", "C", "D" },
CorrectAnswerIndex = 0,
Timeout = 30
}
}
};
var json = JsonSerializer.Serialize(questionSet, options);
var deserializedQuestionSet = JsonSerializer.Deserialize<QuestionSet>(json, options);

// Assert
Assert.NotNull(deserializedQuestionSet);
Assert.Null(deserializedQuestionSet.DefaultTimeout);
Assert.Equal("Test Quiz", deserializedQuestionSet.Title);
}
}
}
3 changes: 2 additions & 1 deletion QuizExperiment.Models.Test/TestData/v1SchemaQuestionSet.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"correctAnswerIndex": 2
}
],
"folderPath": null
"folderPath": null,
"defaultTimeout": 30
}
3 changes: 2 additions & 1 deletion QuizExperiment.Models.Test/TestData/v2SchemaQuestionSet.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"timeout": 15
}
],
"folderPath": null
"folderPath": null,
"defaultTimeout": 25
}
3 changes: 3 additions & 0 deletions QuizExperiment.Models/QuestionSet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@ public class QuestionSet

[JsonPropertyName("folderPath")]
public string? FolderPath { get; set; }

[JsonPropertyName("defaultTimeout")]
public int? DefaultTimeout { get; set; }
}
}