preset the scores (#6)

sei-tspencer · web-flow · commit c9d12ff8bd17 · 2022-12-02T13:23:36.000-05:00
Co-authored-by: sei-tspencer &lt;trspencer@sei.cmu.edu&gt;
diff --git a/Cite.Api/Services/SubmissionService.cs b/Cite.Api/Services/SubmissionService.cs
@@ -628,8 +628,7 @@ private async Task<SubmissionEntity> UpdateScoreAsync(CancellationToken ct, Guid
                     && b.MoveNumber == targetSubmission.MoveNumber - 1);
             if (baseSubmission != null)
             {
-                var submissionScore = 0.0;
-                var submissionCount = 0;
+                targetSubmission.Score = baseSubmission.Score;
                 foreach (var targetSubmissionCategory in targetSubmission.SubmissionCategories)
                 {
                     var baseSubmissionCategory = baseSubmission.SubmissionCategories.First(sc => sc.ScoringCategoryId == targetSubmissionCategory.ScoringCategoryId);
@@ -642,14 +641,8 @@ private async Task<SubmissionEntity> UpdateScoreAsync(CancellationToken ct, Guid
                             submissionOption.DateModified = DateTime.UtcNow;
                         }
                     }
-                    CalculateCategoryScore(targetSubmissionCategory);
-                    if (!String.IsNullOrWhiteSpace(targetSubmissionCategory.ScoringCategory.CalculationEquation))
-                    {
-                        submissionScore += targetSubmissionCategory.Score;
-                        submissionCount ++;
-                    }
+                    targetSubmissionCategory.Score = baseSubmissionCategory.Score;
                 };
-                targetSubmission.Score = submissionScore / submissionCount;
                 _context.Submissions.Update(targetSubmission);
                 await _context.SaveChangesAsync(ct);
             }

Original file line number	Diff line number	Diff line change
`@@ -628,8 +628,7 @@ private async Task<SubmissionEntity> UpdateScoreAsync(CancellationToken ct, Guid`
`628`	`628`	`&& b.MoveNumber == targetSubmission.MoveNumber - 1);`
`629`	`629`	`if (baseSubmission != null)`
`630`	`630`	`{`
`631`		`- var submissionScore = 0.0;`
`632`		`- var submissionCount = 0;`
	`631`	`+ targetSubmission.Score = baseSubmission.Score;`
`633`	`632`	`foreach (var targetSubmissionCategory in targetSubmission.SubmissionCategories)`
`634`	`633`	`{`
`635`	`634`	`var baseSubmissionCategory = baseSubmission.SubmissionCategories.First(sc => sc.ScoringCategoryId == targetSubmissionCategory.ScoringCategoryId);`
`@@ -642,14 +641,8 @@ private async Task<SubmissionEntity> UpdateScoreAsync(CancellationToken ct, Guid`
`642`	`641`	`submissionOption.DateModified = DateTime.UtcNow;`
`643`	`642`	`}`
`644`	`643`	`}`
`645`		`- CalculateCategoryScore(targetSubmissionCategory);`
`646`		`- if (!String.IsNullOrWhiteSpace(targetSubmissionCategory.ScoringCategory.CalculationEquation))`
`647`		`- {`
`648`		`- submissionScore += targetSubmissionCategory.Score;`
`649`		`- submissionCount ++;`
`650`		`- }`
	`644`	`+ targetSubmissionCategory.Score = baseSubmissionCategory.Score;`
`651`	`645`	`};`
`652`		`- targetSubmission.Score = submissionScore / submissionCount;`
`653`	`646`	`_context.Submissions.Update(targetSubmission);`
`654`	`647`	`await _context.SaveChangesAsync(ct);`
`655`	`648`	`}`