Merge branch 'feature/exam' into test

合并冲突

src/Hotline.Application/Exam/Service/ExamManages/UserExamService.cs

@@ -256,7 +256,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             {
                 userExamItem = _mapper.Map<GradingExamItemDto, ExamUserExamItem>(gradingExtamItemDto, userExamItem);
 
-                await _userExamItemRepository.ValidateUpdateAsync(userExamItem, cancellationToken);
+                await _userExamItemRepository.UpdateWithValidateAsync(userExamItem, cancellationToken);
             }
 
             return await GetNextExamQuestion(gradingExtamItemDto);
@@ -270,7 +270,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             {
                 userExam = _mapper.Map<SubmitExamDto, ExamUserExam>(submitExamDto, userExam);
 
-                await _repository.ValidateUpdateAsync(userExam, cancellationToken);
+                await _repository.UpdateWithValidateAsync(userExam, cancellationToken);
             }
         }
 
@@ -366,8 +366,8 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
             startExamViewResponse.IsStart = true;
 
-            startExamViewResponse.TimeSpan = (int)(examManage.EndTime - examManage.StartTime).TotalMinutes;
-            startExamViewResponse.StartTime = examManage.StartTime;
+            startExamViewResponse.TimeSpan = examManage?.TimeSpan ?? 0;
+            startExamViewResponse.StartTime = examManage?.StartTime;
             return startExamViewResponse;
         }
 
@@ -492,7 +492,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
                 userExam.ToUpdate(_sessionContext);
 
-                await _repository.ValidateUpdateAsync(userExam, cancellationToken);
+                await _repository.UpdateWithValidateAsync(userExam, cancellationToken);
             }
         }
 
@@ -685,7 +685,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             {
                 userExamItems = _mapper.Map<List<GradingExamItemDto>, List<ExamUserExamItem>>(batchGradingExamItemDto.Items, userExamItems);
 
-                await _userExamItemRepository.ValidateUpdateAsync(userExamItems, cancellationToken);
+                await _userExamItemRepository.UpdateWithValidateAsync(userExamItems, cancellationToken);
             }
         }
 
@@ -898,7 +898,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
                     examAnswer.ToUpdate(_sessionContext);
 
-                    await _examAnswerRepository.ValidateUpdateAsync(examAnswer, cancellationToken);
+                    await _examAnswerRepository.UpdateWithValidateAsync(examAnswer, cancellationToken);
 
                     examAnswers.Add(examAnswer);
                 }
@@ -979,7 +979,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
                 entities.ToUpdate(_sessionContext);
 
-                await _userExamItemOptionRepository.ValidateUpdateAsync(entities, cancellationToken);
+                await _userExamItemOptionRepository.UpdateWithValidateAsync(entities, cancellationToken);
             }
 
 
@@ -995,7 +995,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
             userExamItem.ToUpdate(_sessionContext);
 
-            await _userExamItemRepository.ValidateUpdateAsync(userExamItem, cancellationToken);
+            await _userExamItemRepository.UpdateWithValidateAsync(userExamItem, cancellationToken);
 
             if (updateUserExamItemDto.QuestionType.CheckSelectType())
             {