Refactor

Author: mackmarton

grade-management-new/GradeManagement.Bll/Services/AssignmentEventProcessorService.cs

@@ -1,8 +1,11 @@
-using GradeManagement.Data;
+using AutSoft.Linq.Enumerable;
+
+using GradeManagement.Data;
 using GradeManagement.Data.Models;
 using GradeManagement.Shared.Dtos.AssignmentEvents;
 using GradeManagement.Shared.Enums;
 
+using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 
 using Assignment = GradeManagement.Shared.Dtos.Assignment;
@@ -107,11 +110,12 @@ public async Task ConsumeCiEvaluationCompletedEventAsync(CiEvaluationCompleted c
 
         if (student.NeptunCode.IsNullOrEmpty())
         {
-            await _studentService.DeleteAsync(student.Id);
-            student = await _studentService.GetStudentModelByNeptunAsync(ciEvaluationCompleted.StudentNeptun);
-            student.GithubId = studentGitHubId;
-            assignment.StudentId = student.Id;
+            var newStudent = await _studentService.GetStudentModelByNeptunAsync(ciEvaluationCompleted.StudentNeptun);
+            newStudent.GithubId = studentGitHubId;
+            await _assignmentService.ChangeStudentIdOnAllAssignmentsAsync(student.Id, newStudent.Id);
             await _gradeManagementDbContext.SaveChangesAsync();
+            await _studentService.DeleteAsync(student.Id);
+            student = newStudent;
         }
 
         foreach (var scoreEvent in ciEvaluationCompleted.Scores)

grade-management-new/GradeManagement.Bll/Services/AssignmentService.cs

@@ -72,4 +72,16 @@ public async Task<IEnumerable<PullRequest>> GetAllPullRequestsByIdAsync(long id)
         return await _gradeManagementDbContext.Assignment
             .SingleEntityAsync(a => githubRepoName == a.GithubRepoName, 0);
     }
+
+    public async Task ChangeStudentIdOnAllAssignmentsAsync(long studentIdFrom, long studentIdTo)
+    {
+        var assignments = await _gradeManagementDbContext.Assignment.Where(a => a.StudentId == studentIdFrom)
+            .ToListAsync();
+        foreach (var assignment in assignments)
+        {
+            assignment.StudentId = studentIdTo;
+        }
+
+        await _gradeManagementDbContext.SaveChangesAsync();
+    }
 }

grade-management-new/GradeManagement.Bll/Services/StudentService.cs

@@ -101,8 +101,8 @@ public StudentService(GradeManagementDbContext gradeManagementDbContext, IMapper
     public async Task DeleteAsync(long id)
     {
         var studentEntity = await _gradeManagementDbContext.Student.SingleEntityAsync(s => s.Id == id, id);
-        _gradeManagementDbContext.GroupStudent.RemoveRange(
-            await _gradeManagementDbContext.GroupStudent.Where(gs => gs.StudentId == id).ToListAsync());
+        var groupStudents = await _gradeManagementDbContext.GroupStudent.Where(gs => gs.StudentId == id).ToListAsync();
+        _gradeManagementDbContext.GroupStudent.RemoveRange(groupStudents);
         _gradeManagementDbContext.Student.Remove(studentEntity);
         await _gradeManagementDbContext.SaveChangesAsync();
     }
@@ -133,8 +133,7 @@ public async Task<List<Assignment>> GetAllAssignmentsByIdAsync(long id)
         {
             student = new Data.Models.Student
             {
-                Name = "Auto created from GitHub ID: " + studentGitHubId,
-                GithubId = studentGitHubId
+                Name = "Auto created from GitHub ID: " + studentGitHubId, GithubId = studentGitHubId
             };
             _gradeManagementDbContext.Student.Add(student);
             await _gradeManagementDbContext.SaveChangesAsync();