Refactor survey logic and enhance AnswerController

Updated `Survey.razor` to use `Value`/`ValueChanged` bindings for `MudCheckBox`, aligning with MudBlazor conventions.

Refactored `Survey.razor.cs` to introduce branching logic for question groups, adding `_groupsToVisit` and `_visitedGroups` for dynamic question loading.

Enhanced `AnswerController` with support for `QuestionGroups`, improved logging, and added handling for `SelectAllThatApplyQuestion` options. Refactored `PostAnswer` for better error handling and robustness. Improved chart data generation for `Rating1To10` questions.

General improvements include better readability, maintainability, and additional comments.

Author: David Warwick

JwtIdentity.Client/Pages/Survey/Survey.razor

@@ -138,8 +138,8 @@
                                             {
                                                 var index = i;
                                                 var option = saQuestion.Options[index];
-                                                <MudCheckBox @key="option" T="bool" Checked="@answer.SelectedOptions[index]"
-                                                            CheckedChanged="@((bool isChecked) => HandleSelectAllThatApplyOption(answer, index, isChecked, option.Id))"
+                                                <MudCheckBox @key="option" T="bool" Value="@answer.SelectedOptions[index]"
+                                                            ValueChanged="@((bool isChecked) => HandleSelectAllThatApplyOption(answer, index, isChecked, option.Id))"
                                                             Label="@option.OptionText" Color="Color.Primary" Disabled="@(Preview || (IsAnonymousUser && !AgreedToTerms))" />
                                             }
                                         </MudStack>

JwtIdentity.Client/Pages/Survey/Survey.razor.cs

@@ -47,7 +47,7 @@ public class SurveyModel : BlazorBase, IAsyncDisposable
         protected bool IsLastQuestion => CurrentQuestionIndex >= QuestionsToShow.Count - 1;
         protected bool IsFirstQuestion => CurrentQuestionIndex == 0;
         protected int TotalQuestionsShown => CurrentQuestionIndex + 1;
-        
+
         // Track which groups need to be visited based on branching logic
         private HashSet<int> _groupsToVisit = new();
         private HashSet<int> _visitedGroups = new();
@@ -544,7 +544,7 @@ protected void InitializeBranchingQuestions()
                 _groupsToVisit.Clear();
                 _groupsToVisit.Add(0); // Always start with group 0
                 _visitedGroups.Clear();
-                
+
                 LoadQuestionsForCurrentGroup();
             }
             CurrentQuestionIndex = 0;
@@ -556,7 +556,7 @@ private void LoadQuestionsForCurrentGroup()
                 .Where(q => q.GroupId == _currentGroupId)
                 .OrderBy(q => q.QuestionNumber)
                 .ToList();
-                
+
             QuestionsToShow.AddRange(groupQuestions);
             _visitedGroups.Add(_currentGroupId);
         }

JwtIdentity/Controllers/AnswerController.cs

@@ -1,5 +1,5 @@
-using System.Security.Claims;
 using JwtIdentity.Interfaces;
+using System.Security.Claims;
 
 namespace JwtIdentity.Controllers
 {
@@ -28,7 +28,7 @@ public AnswerController(ApplicationDbContext context, IMapper mapper, IApiAuthSe
         public async Task<ActionResult<AnswerViewModel>> GetAnswersForSurveyForLoggedInUser(string guid, [FromQuery] bool Preview)
         {
             _logger.LogInformation("Getting answers for survey {SurveyGuid} for logged-in user. Preview mode: {IsPreview}", guid, Preview);
-            
+
             try
             {
                 // get the ip address of the user
@@ -69,6 +69,7 @@ await _context.Answers
                 survey = await _context.Surveys
                     .Where(s => s.Guid == guid)
                     .Include(s => s.Questions).ThenInclude(q => q.Answers.Where(a => a.CreatedById == userId))
+                    .Include(x => x.QuestionGroups)
                     .FirstOrDefaultAsync();
 
                 if (survey == null)
@@ -105,17 +106,17 @@ await _context.Questions
                     .Where(mc => mcIds.Contains(mc.Id))
                     .Include(mc => mc.Options)
                     .LoadAsync();
-                    
+
                 // Now load each select-all-that-apply question's Options
                 await _context.Questions
                     .OfType<SelectAllThatApplyQuestion>()
                     .Where(sa => selectAllIds.Contains(sa.Id))
                     .Include(sa => sa.Options)
                     .LoadAsync();
 
-                _logger.LogInformation("Successfully retrieved survey {SurveyGuid} with {QuestionCount} questions for user {UserId}", 
+                _logger.LogInformation("Successfully retrieved survey {SurveyGuid} with {QuestionCount} questions for user {UserId}",
                     guid, survey.Questions.Count, userId);
-                    
+
                 return Ok(_mapper.Map<SurveyViewModel>(survey));
             }
             catch (DbUpdateException dbEx)
@@ -134,20 +135,20 @@ await _context.Questions
         public async Task<ActionResult<SurveyViewModel>> GetSurveyResults(string guid)
         {
             _logger.LogInformation("Getting survey results for survey {SurveyGuid}", guid);
-            
+
             try
             {
                 var survey = await _context.Surveys
                     .Where(s => s.Guid == guid)
                     .Include(s => s.Questions).ThenInclude(q => q.Answers)
                     .FirstOrDefaultAsync();
-                    
+
                 if (survey == null)
                 {
                     _logger.LogWarning("Survey with GUID {SurveyGuid} not found", guid);
                     return BadRequest("Survey does not exist");
                 }
-                
+
                 _logger.LogDebug("Found survey: {SurveyId}, {SurveyTitle}", survey.Id, survey.Title);
 
                 // Pull out the IDs of any multiple-choice questions in memory
@@ -156,7 +157,7 @@ public async Task<ActionResult<SurveyViewModel>> GetSurveyResults(string guid)
                     .Select(mc => mc.Id)
                     .ToList();
                 _logger.LogDebug("Found {Count} multiple choice questions", mcIds.Count);
-                    
+
                 // Pull out the IDs of any select-all-that-apply questions in memory
                 var selectAllIds = survey.Questions
                     .OfType<SelectAllThatApplyQuestion>()
@@ -170,17 +171,17 @@ await _context.Questions
                     .Where(mc => mcIds.Contains(mc.Id))
                     .Include(mc => mc.Options)
                     .LoadAsync();
-                    
+
                 // Now load each select-all-that-apply question's Options
                 await _context.Questions
                     .OfType<SelectAllThatApplyQuestion>()
                     .Where(sa => selectAllIds.Contains(sa.Id))
                     .Include(sa => sa.Options)
                     .LoadAsync();
 
-                _logger.LogInformation("Successfully retrieved survey results for {SurveyGuid} with {QuestionCount} questions", 
+                _logger.LogInformation("Successfully retrieved survey results for {SurveyGuid} with {QuestionCount} questions",
                     guid, survey.Questions.Count);
-                    
+
                 return Ok(_mapper.Map<SurveyViewModel>(survey));
             }
             catch (DbUpdateException dbEx)
@@ -199,7 +200,7 @@ await _context.Questions
         public async Task<ActionResult<SurveyDataViewModel>> GetAnswersForSurveyForCharts(string guid)
         {
             _logger.LogInformation("Getting chart data for survey {SurveyGuid}", guid);
-            
+
             try
             {
                 int userId = apiAuthService.GetUserId(User);
@@ -232,7 +233,7 @@ public async Task<ActionResult<SurveyDataViewModel>> GetAnswersForSurveyForChart
                     .Select(mc => mc.Id)
                     .ToList();
                 _logger.LogDebug("Found {Count} multiple choice questions", mcIds.Count);
-                    
+
                 // Pull out the IDs of any select-all-that-apply questions in memory
                 var selectAllIds = survey.Questions
                     .OfType<SelectAllThatApplyQuestion>()
@@ -246,7 +247,7 @@ await _context.Questions
                     .Where(mc => mcIds.Contains(mc.Id))
                     .Include(mc => mc.Options)
                     .LoadAsync();
-                    
+
                 // Now load each select-all-that-apply question's Options
                 await _context.Questions
                     .OfType<SelectAllThatApplyQuestion>()
@@ -282,7 +283,7 @@ await _context.Questions
                             // get the question.Answers as Rating1To10Answer
                             var ratingAnswers = await _context.Answers.OfType<Rating1To10Answer>().AsNoTracking().Where(a => a.QuestionId == question.Id).ToListAsync();
                             _logger.LogDebug("Found {Count} rating answers for question {QuestionId}", ratingAnswers.Count, question.Id);
-                            
+
                             var ratingGroups = ratingAnswers.GroupBy(a => a.SelectedOptionId).ToDictionary(g => g.Key, g => g.Count());
                             surveyDataViewModel.SurveyData = Enumerable.Range(1, 10).Select(i => new ChartData { X = i.ToString(), Y = ratingGroups.ContainsKey(i) ? ratingGroups[i] : 0 }).ToList();
                             surveyDataViewModel.Rating1To10Question = _mapper.Map<Rating1To10QuestionViewModel>(question);
@@ -373,9 +374,9 @@ await _context.Questions
                     surveyData.Add(surveyDataViewModel);
                 }
 
-                _logger.LogInformation("Successfully generated chart data for survey {SurveyGuid} with {QuestionCount} questions for user {UserId}", 
+                _logger.LogInformation("Successfully generated chart data for survey {SurveyGuid} with {QuestionCount} questions for user {UserId}",
                     guid, survey.Questions.Count, userId);
-                    
+
                 return Ok(surveyData);
             }
             catch (DbUpdateException dbEx)
@@ -400,7 +401,7 @@ await _context.Questions
         public async Task<ActionResult<AnswerViewModel>> PostAnswer(AnswerViewModel answerViewModel)
         {
             _logger.LogInformation("Saving answer for question ID {QuestionId}", answerViewModel?.QuestionId);
-            
+
             try
             {
                 if (answerViewModel == null)
@@ -424,10 +425,10 @@ public async Task<ActionResult<AnswerViewModel>> PostAnswer(AnswerViewModel answ
                 else
                 {
                     _logger.LogDebug("Updating existing answer ID {AnswerId}", answer.Id);
-                    
+
                     var existingAnswer = await _context.Answers.AsNoTracking()
                         .FirstOrDefaultAsync(x => x.Id == answerViewModel.Id);
-                        
+
                     if (existingAnswer == null)
                     {
                         _logger.LogWarning("Attempted to update answer ID {AnswerId} that doesn't exist", answer.Id);
@@ -450,9 +451,9 @@ public async Task<ActionResult<AnswerViewModel>> PostAnswer(AnswerViewModel answ
                 if (answer.Complete)
                 {
                     var surveyInfo = await (from q in _context.Questions
-                                             join s in _context.Surveys on q.SurveyId equals s.Id
-                                             where q.Id == answer.QuestionId
-                                             select new { SurveyId = s.Id, s.Guid })
+                                            join s in _context.Surveys on q.SurveyId equals s.Id
+                                            where q.Id == answer.QuestionId
+                                            select new { SurveyId = s.Id, s.Guid })
                                             .FirstOrDefaultAsync();
 
                     if (surveyInfo != null)
@@ -474,19 +475,19 @@ join s in _context.Surveys on q.SurveyId equals s.Id
             }
             catch (DbUpdateException dbEx)
             {
-                _logger.LogError(dbEx, "Database error occurred while saving answer for question {QuestionId}: {Message}", 
+                _logger.LogError(dbEx, "Database error occurred while saving answer for question {QuestionId}: {Message}",
                     answerViewModel?.QuestionId, dbEx.Message);
                 return StatusCode(StatusCodes.Status500InternalServerError, "A database error occurred. Please try again later.");
             }
             catch (InvalidCastException icEx)
             {
-                _logger.LogError(icEx, "Type casting error while processing answer of type {AnswerType}: {Message}", 
+                _logger.LogError(icEx, "Type casting error while processing answer of type {AnswerType}: {Message}",
                     answerViewModel?.AnswerType, icEx.Message);
                 return StatusCode(StatusCodes.Status500InternalServerError, "An error occurred processing the answer data. Please try again later.");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error saving answer for question {QuestionId}: {Message}", 
+                _logger.LogError(ex, "Error saving answer for question {QuestionId}: {Message}",
                     answerViewModel?.QuestionId, ex.Message);
                 return StatusCode(StatusCodes.Status500InternalServerError, "An unexpected error occurred. Please try again later.");
             }