refactor

Author: YuriUfimtsev

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/SolutionsController.cs

@@ -11,7 +11,6 @@
 using HwProj.Models.CoursesService.ViewModels;
 using HwProj.Models.Roles;
 using HwProj.Models.SolutionsService;
-using HwProj.Models.StatisticsService;
 using HwProj.SolutionsService.Client;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -136,47 +135,6 @@ public async Task<IActionResult> GetTaskSolutionsPageData(long taskId)
             return Ok(result);
         }
 
-        [Authorize]
-        [HttpGet("tasks/{taskId}")]
-        [ProducesResponseType(typeof(TaskSolutionStatisticsPageData), (int)HttpStatusCode.OK)]
-        public async Task<IActionResult> GetTaskSolutionsPageData(long taskId)
-        {
-            var course = await _coursesServiceClient.GetCourseByTask(taskId);
-            //TODO: CourseMentorOnlyAttribute
-            if (course == null || !course.MentorIds.Contains(UserId)) return Forbid();
-
-            var studentIds = course.CourseMates
-                .Where(t => t.IsAccepted)
-                .Select(t => t.StudentId)
-                .ToArray();
-
-            var getStudentsDataTask = AuthServiceClient.GetAccountsData(studentIds);
-            var getStatisticsTask = _solutionsClient.GetTaskSolutionStatistics(taskId);
-
-            await Task.WhenAll(getStudentsDataTask, getStatisticsTask);
-
-            var usersData = getStudentsDataTask.Result;
-            var statistics = getStatisticsTask.Result;
-            var statisticsDict = statistics.ToDictionary(t => t.StudentId);
-
-            var result = new TaskSolutionStatisticsPageData()
-            {
-                CourseId = course.Id,
-                StudentsSolutions = studentIds.Zip(usersData, (studentId, accountData) => new UserTaskSolutions
-                    {
-                        Solutions = statisticsDict.TryGetValue(studentId, out var studentSolutions)
-                            ? studentSolutions.Solutions
-                            : Array.Empty<Solution>(),
-                        User = accountData
-                    })
-                    .OrderBy(t => t.User.Surname)
-                    .ThenBy(t => t.User.Name)
-                    .ToArray()
-            };
-
-            return Ok(result);
-        }
-
         [HttpPost("{taskId}")]
         [Authorize(Roles = Roles.StudentRole)]
         [ProducesResponseType(typeof(long), (int)HttpStatusCode.OK)]
@@ -233,19 +191,6 @@ public async Task<IActionResult> PostEmptySolutionWithRate(long taskId, Solution
             return Ok();
         }
 
-        [HttpPost("rateEmptySolution/{taskId}")]
-        [Authorize(Roles = Roles.LecturerRole)]
-        public async Task<IActionResult> PostEmptySolutionWithRate(long taskId, SolutionViewModel model)
-        {
-            var course = await _coursesServiceClient.GetCourseByTask(taskId);
-            if (course == null || !course.MentorIds.Contains(UserId)) return Forbid();
-            if (course.CourseMates.All(t => t.StudentId != model.StudentId))
-                return BadRequest($"Студента с id {model.StudentId} не существует");
-
-            await _solutionsClient.PostEmptySolutionWithRate(taskId, model);
-            return Ok();
-        }
-
         [HttpPost("rateSolution/{solutionId}/{newRating}")]
         [Authorize(Roles = Roles.LecturerRole)]
         public async Task<IActionResult> RateSolution(long solutionId, int newRating,
@@ -329,4 +274,4 @@ public async Task<UnratedSolutionPreviews> GetUnratedSolutions(long? taskId)
             }
         }
     }
-}
+}

HwProj.SolutionsService/HwProj.SolutionsService.IntegrationTests/SolutionsStatsDomainTests.cs

@@ -58,13 +58,13 @@ private List<Solution> GenerateTestSolutionsForTask(int amount, long taskId) =>
             })
             .ToList();
 
-        private GroupViewModel GenerateGroupViewModel(long id, string[] studentIds) => new()
+        private GroupViewModel GenerateGroupViewModel(long id, string[] studentIds) => new GroupViewModel
         {
             Id = id,
             StudentsIds = studentIds
         };
 
-        private HomeworkViewModel GenerateHomeworkViewModel(long id, long courseId, int taskAmount) => new()
+        private HomeworkViewModel GenerateHomeworkViewModel(long id, long courseId, int taskAmount) => new HomeworkViewModel
         {
             Id = id,
             Title = "Test",
@@ -82,7 +82,7 @@ private List<Solution> MakeTestSolutions(CourseMateViewModel[] courseMates, Grou
             solutions[2].StudentId = courseMates[1].StudentId;
             solutions[0].GroupId = groups[0].Id;
             solutions[1].GroupId = groups[1].Id;
-            
+
             return solutions;
         }
 
@@ -127,15 +127,15 @@ public async Task GetCourseStatisticsTest()
             thirdStudentSolutions.Should().HaveCount(1);
             thirdStudentSolutions[0].Id.Should().Be(1);
         }
-        
+
         [Test]
         public async Task GetCourseTaskStatisticsTest()
         {
             var courseMates = GenerateCourseMatesViewModels(3).ToArray();
             var group1 = GenerateGroupViewModel(1, new[] { courseMates[0].StudentId, courseMates[1].StudentId });
             var group2 = GenerateGroupViewModel(2, new[] { courseMates[1].StudentId, courseMates[2].StudentId });
             var groups = new[] { group1, group2 };
-            
+
             var solutions = GenerateTestSolutionsForTask(3, 1);
             solutions[0].StudentId = courseMates[0].StudentId;
             solutions[0].GroupId = group1.Id;