dbg3

Author: sei-tspencer

Cite.Api/Cite.Api.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <Version>1.8.2-dbg2</Version>
+    <Version>1.8.2-dbg3</Version>
     <TargetFramework>net8.0</TargetFramework>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>

Cite.Api/Services/EvaluationService.cs

@@ -505,41 +505,40 @@ private async Task VerifyOfficialAndTeamSubmissions(EvaluationEntity evaluation,
             // get a list of moves for the evaluation
             var moves = await _moveService.GetByEvaluationAsync(evaluation.Id, ct);
             // verify submissions exist for all moves
-            foreach (var move in moves)
+            // make sure all official and team submissions exist
+            var moveNumber = evaluation.CurrentMoveNumber;
+            if (!submissionList.Any(s => s.UserId == null && s.TeamId == null && s.MoveNumber == moveNumber))
             {
-                // make sure all official and team submissions exist
-                if (!submissionList.Any(s => s.UserId == null && s.TeamId == null && s.MoveNumber == move.MoveNumber))
+                var submission = new Submission()
+                {
+                    Id = Guid.NewGuid(),
+                    EvaluationId = evaluation.Id,
+                    TeamId = null,
+                    UserId = null,
+                    ScoringModelId = evaluation.ScoringModelId,
+                    MoveNumber = moveNumber,
+                    DateCreated = DateTime.UtcNow
+                };
+                _logger.LogDebug("Make Official submission for move " + moveNumber.ToString());
+                await _submissionService.CreateNewSubmission(_context, submission, ct);
+            }
+            // team submissions
+            foreach (var team in evaluationTeamList)
+            {
+                if (!submissionList.Any(s => s.UserId == null && s.TeamId == team.Id && s.MoveNumber == moveNumber))
                 {
                     var submission = new Submission() {
                         Id = Guid.NewGuid(),
                         EvaluationId = evaluation.Id,
-                        TeamId = null,
+                        TeamId = team.Id,
                         UserId = null,
                         ScoringModelId = evaluation.ScoringModelId,
-                        MoveNumber = move.MoveNumber,
+                        MoveNumber = moveNumber,
                         DateCreated = DateTime.UtcNow
                     };
-                    _logger.LogInformation("Make Official submission for move " + move.MoveNumber.ToString());
+                    _logger.LogDebug("Make Team submission for move " + moveNumber + "  team=" + submission.TeamId.ToString());
                     await _submissionService.CreateNewSubmission(_context, submission, ct);
                 }
-                // team submissions
-                foreach (var team in evaluationTeamList)
-                {
-                    if (!submissionList.Any(s => s.UserId == null && s.TeamId == team.Id && s.MoveNumber == move.MoveNumber))
-                    {
-                        var submission = new Submission() {
-                            Id = Guid.NewGuid(),
-                            EvaluationId = evaluation.Id,
-                            TeamId = team.Id,
-                            UserId = null,
-                            ScoringModelId = evaluation.ScoringModelId,
-                            MoveNumber = move.MoveNumber,
-                            DateCreated = DateTime.UtcNow
-                        };
-                        _logger.LogInformation("Make Team submission for move " + move.MoveNumber + "  team=" + submission.TeamId.ToString());
-                        await _submissionService.CreateNewSubmission(_context, submission, ct);
-                    }
-                }
             }
 
         }

Cite.Api/Services/SubmissionService.cs

@@ -643,6 +643,7 @@ private async Task<SubmissionEntity> createRequestedSubmissionAndOthers(ViewMode
                         (s.UserId == submission.UserId)))
                         {
                             submission.MoveNumber = move.MoveNumber;
+                            _logger.LogDebug("Creating new submission from createRequestedSubmissionAndOthers");
                             await CreateNewSubmission(_context, submission, ct);
                         }
                     }
@@ -667,17 +668,17 @@ public async Task<SubmissionEntity> CreateNewSubmission(CiteContext citeContext,
             submissionEntity.Status = Data.Enumerations.ItemStatus.Active;
             submissionEntity.Evaluation = null;
             submissionEntity.ScoringModel = null;
-            citeContext.Submissions.Add(submissionEntity);
             // catch race condition if we try to add the same submission twice
             try
             {
-                await citeContext.SaveChangesAsync(ct);
                 var scoringModelEntity = await citeContext.ScoringModels
                     .Include(sm => sm.ScoringCategories)
                     .ThenInclude(sc => sc.ScoringOptions)
                     .FirstAsync(sm => sm.Id == submissionEntity.ScoringModelId);
-                await CreateSubmissionCategories(submissionEntity, scoringModelEntity, ct);
-                _logger.LogInformation("Created submission for move " + submission.MoveNumber.ToString());
+                CreateSubmissionCategories(submissionEntity, scoringModelEntity, ct);
+                citeContext.Submissions.Add(submissionEntity);
+                await citeContext.SaveChangesAsync(ct);
+                _logger.LogDebug("Created submission for move " + submission.MoveNumber.ToString());
 
                 return submissionEntity;
             }
@@ -915,33 +916,37 @@ public async Task<bool> DeleteAsync(Guid id, CancellationToken ct)
             return await GetAsync(submissionId, ct);
         }
 
-        private async Task<IEnumerable<SubmissionCategoryEntity>> CreateSubmissionCategories(
+        private IEnumerable<SubmissionCategoryEntity> CreateSubmissionCategories(
             SubmissionEntity submissionEntity, ScoringModelEntity scoringModelEntity, CancellationToken ct)
         {
             foreach (var scoringCategoryEntity in scoringModelEntity.ScoringCategories)
             {
-                var submissionCategoryEntity = new SubmissionCategoryEntity();
-                submissionCategoryEntity.ScoringCategoryId = scoringCategoryEntity.Id;
-                submissionCategoryEntity.SubmissionId = submissionEntity.Id;
-                submissionCategoryEntity.Score = 0;
-                _context.SubmissionCategories.Add(submissionCategoryEntity);
-                await _context.SaveChangesAsync(ct);
-                await CreateSubmissionOptions(submissionCategoryEntity, scoringCategoryEntity, ct);
+                var submissionCategoryEntity = new SubmissionCategoryEntity()
+                {
+                    Id = Guid.NewGuid(),
+                    ScoringCategoryId = scoringCategoryEntity.Id,
+                    SubmissionId = submissionEntity.Id,
+                    Score = 0,
+                };
+                CreateSubmissionOptions(submissionCategoryEntity, scoringCategoryEntity, ct);
+                submissionEntity.SubmissionCategories.Add(submissionCategoryEntity);
             }
             return submissionEntity.SubmissionCategories;
         }
 
-        private async Task<IEnumerable<SubmissionOptionEntity>> CreateSubmissionOptions(
+        private IEnumerable<SubmissionOptionEntity> CreateSubmissionOptions(
             SubmissionCategoryEntity submissionCategoryEntity, ScoringCategoryEntity scoringCategoryEntity, CancellationToken ct)
         {
             foreach (var scoringOptionEntity in scoringCategoryEntity.ScoringOptions)
             {
-                var submissionOptionEntity = new SubmissionOptionEntity();
-                submissionOptionEntity.ScoringOptionId = scoringOptionEntity.Id;
-                submissionOptionEntity.SubmissionCategoryId = submissionCategoryEntity.Id;
-                submissionOptionEntity.IsSelected = false;
-                _context.SubmissionOptions.Add(submissionOptionEntity);
-                await _context.SaveChangesAsync(ct);
+                var submissionOptionEntity = new SubmissionOptionEntity()
+                {
+                    Id = Guid.NewGuid(),
+                    ScoringOptionId = scoringOptionEntity.Id,
+                    SubmissionCategoryId = submissionCategoryEntity.Id,
+                    IsSelected = false
+                };
+                submissionCategoryEntity.SubmissionOptions.Add(submissionOptionEntity);
             }
             return submissionCategoryEntity.SubmissionOptions;
         }