wip

Author: DedSec256

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

@@ -7,7 +7,6 @@
 using HwProj.APIGateway.API.Models.Solutions;
 using HwProj.AuthService.Client;
 using HwProj.CoursesService.Client;
-using HwProj.Models.AuthService.DTO;
 using HwProj.Models.CoursesService;
 using HwProj.Models.CoursesService.DTO;
 using HwProj.Models.CoursesService.ViewModels;
@@ -38,7 +37,7 @@ public SolutionsController(ISolutionsServiceClient solutionsClient, IAuthService
     }
 
     [HttpGet("{solutionId}")]
-    [ProducesResponseType(typeof(Solution), (int)HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(SolutionDto), (int)HttpStatusCode.OK)]
     public async Task<IActionResult> GetSolutionById(long solutionId)
     {
         var result = await _solutionsClient.GetSolutionById(solutionId);
@@ -78,7 +77,7 @@ public async Task<IActionResult> GetStudentSolution(long taskId, string studentI
 
         var mentorIds = studentSolutions.Values
             .SelectMany(t => t.Tasks)
-            .SelectMany(t => t.Solution)
+            .SelectMany(t => t.Solutions)
             .Select(t => t.LecturerId ?? "")
             .Where(x => x != "")
             .Distinct()
@@ -88,7 +87,7 @@ public async Task<IActionResult> GetStudentSolution(long taskId, string studentI
 
         var solutionsGroupsIds = studentSolutions.Values
             .SelectMany(t => t.Tasks)
-            .First(x => x.Id == taskId).Solution
+            .First(x => x.Id == taskId).Solutions
             .Select(s => s.GroupId)
             .Distinct()
             .ToList();
@@ -120,7 +119,7 @@ public async Task<IActionResult> GetStudentSolution(long taskId, string studentI
                                         Title = task.Title,
                                         Tags = task.Tags,
                                         TaskId = task.Id.ToString(),
-                                        Solutions = t.Solution.Select(s => new GetSolutionModel(s,
+                                        Solutions = t.Solutions.Select(s => new GetSolutionModel(s,
                                             s.TaskId == taskId && s.GroupId is { } groupId
                                                 ? solutionsGroups[groupId].StudentsIds
                                                     .Select(x => accountsCache[x])

HwProj.APIGateway/HwProj.APIGateway.API/Models/Statistics/StatisticsCourseMatesModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using HwProj.Models.AuthService.DTO;
-using HwProj.Models.StatisticsService;
+using HwProj.Models.SolutionsService;
 
 namespace HwProj.APIGateway.API.Models.Statistics;
 
@@ -11,5 +11,5 @@ public class StatisticsCourseMatesModel
     public string Name { get; set; }
     public string Surname { get; set; }
     public AccountDataDto[] Reviewers { get; set; } = Array.Empty<AccountDataDto>();
-    public List<StatisticsCourseHomeworksModel> Homeworks { get; set; } = new();
+    public List<StudentSolutionsTableHomeworkDto> Homeworks { get; set; } = new();
 }

HwProj.Common/HwProj.Common.Net8/AuthExtensions.cs

@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Http;
+
+namespace HwProj.Common.Net8;
+
+public static class AuthExtensions
+{
+    public static string? GetUserIdFromHeader(this HttpRequest request) =>
+        request.Headers.TryGetValue("UserId", out var id) ? id.FirstOrDefault() : null;
+}

HwProj.Common/HwProj.Models/HwProj.Models.csproj

@@ -10,10 +10,7 @@
     <PackageReference Include="File.TypeChecker" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\HwProj.Repositories\HwProj.Repositories.csproj" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
 </Project>

HwProj.Common/HwProj.Models/SolutionsService/GetSolutionModel.cs

@@ -6,7 +6,7 @@ namespace HwProj.Models.SolutionsService
 {
     public class GetSolutionModel
     {
-        public GetSolutionModel(Solution model, AccountDataDto[]? groupMates, AccountDataDto? lecturer)
+        public GetSolutionModel(SolutionDto model, AccountDataDto[]? groupMates, AccountDataDto? lecturer)
         {
             Id = model.Id;
             GithubUrl = model.GithubUrl;

HwProj.Common/HwProj.Models/SolutionsService/SolutionDto.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace HwProj.Models.SolutionsService
+{
+    public class SolutionDto
+    {
+        public long Id { get; set; }
+        public string GithubUrl { get; set; }
+        public string Comment { get; set; }
+        public SolutionState State { get; set; }
+        public int Rating { get; set; }
+        public string StudentId { get; set; }
+        public string? LecturerId { get; set; }
+        public long? GroupId { get; set; }
+        public long TaskId { get; set; }
+        public DateTime PublicationDate { get; set; }
+        public bool IsModified { get; set; }
+        public DateTime? RatingDate { get; set; }
+        public string LecturerComment { get; set; }
+    }
+}

…els/SolutionsService/StudentSolutions.cs …/SolutionsService/StudentSolutionsDto.csHwProj.Common/HwProj.Models/SolutionsService/StudentSolutions.cs renamed to HwProj.Common/HwProj.Models/SolutionsService/StudentSolutionsDto.cs HwProj.Common/HwProj.Models/SolutionsService/StudentSolutions.cs renamed to HwProj.Common/HwProj.Models/SolutionsService/StudentSolutionsDto.cs

@@ -1,8 +1,8 @@
 namespace HwProj.Models.SolutionsService
 {
-    public class StudentSolutions
+    public class StudentSolutionsDto
     {
         public string StudentId { get; set; }
-        public Solution[] Solutions { get; set; }
+        public SolutionDto[] Solutions { get; set; }
     }
 }

HwProj.Common/HwProj.Models/SolutionsService/StudentSolutionsTableDto.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace HwProj.Models.SolutionsService
+{
+    public class StudentSolutionsTableDto
+    {
+        public string StudentId { get; set; }
+        public List<StudentSolutionsTableHomeworkDto> Homeworks { get; set; }
+    }
+
+    public class StudentSolutionsTableHomeworkDto
+    {
+        public long Id { get; set; }
+        public List<StudentSolutionsTableTaskDto> Tasks { get; set; } = new List<StudentSolutionsTableTaskDto>();
+    }
+
+    public class StudentSolutionsTableTaskDto
+    {
+        public long Id { get; set; }
+        public List<SolutionDto> Solutions { get; set; } = new List<SolutionDto>();
+    }
+}