Revert "Merge branch 'master' into CourseTokenCreation"

This reverts commit 73a5fcc.

Author: AlexPoziev

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/CoursesController.cs

@@ -175,16 +175,5 @@ public async Task<IActionResult> GetToken(long courseId)
             var token = await _coursesClient.GetToken(courseId);
             return Ok(token.Value);
         }
-
-        [HttpGet("tags/{courseId}")]
-        [Authorize(Roles = Roles.LecturerRole)]
-        [ProducesResponseType(typeof(string[]), (int)HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAllTagsForCourse(long courseId)
-        {
-            var result = await _coursesClient.GetAllTagsForCourse(courseId);
-            return result.Succeeded
-                ? Ok(result.Value) as IActionResult
-                : BadRequest(result.Errors);
-        }
     }
 }

HwProj.AuthService/HwProj.AuthService.API/Controllers/AccountController.cs

@@ -8,7 +8,6 @@
 using HwProj.Models.AuthService.ViewModels;
 using HwProj.Models.Result;
 using HwProj.Models.Roles;
-using HwProj.Utils.Authorization;
 using Microsoft.Extensions.Configuration;
 using User = HwProj.Models.AuthService.ViewModels.User;
 using System.Text.RegularExpressions;
@@ -132,7 +131,9 @@ public async Task<IActionResult> GetAllStudents()
         {
             var allStudents = await _accountService.GetUsersInRole(Roles.StudentRole);
             var result = allStudents
-                .Select(u => u.ToAccountDataDto(Roles.StudentRole))
+                .Select(u =>
+                    new AccountDataDto(u.Id, u.Name, u.Surname, u.Email, Roles.StudentRole, u.IsExternalAuth,
+                        u.MiddleName))
                 .ToArray();
 
             return Ok(result);

HwProj.AuthService/HwProj.AuthService.API/Services/AccountService.cs

@@ -13,7 +13,6 @@
 using HwProj.Models.AuthService.DTO;
 using HwProj.Models.AuthService.ViewModels;
 using HwProj.Models.Result;
-using HwProj.Utils.Authorization;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Octokit;
@@ -57,7 +56,15 @@ private async Task<AccountDataDto> GetAccountDataAsync(User user)
             if (user == null) return null;
             var userRoles = await _userManager.GetRolesAsync(user);
             var userRole = userRoles.FirstOrDefault() ?? Roles.StudentRole;
-            return user.ToAccountDataDto(userRole);
+            return new AccountDataDto(
+                user.Id,
+                user.Name,
+                user.Surname,
+                user.Email,
+                userRole,
+                user.IsExternalAuth,
+                user.MiddleName,
+                user.GitHubId);
         }
 
         public async Task<AccountDataDto> GetAccountDataAsync(string userId)
@@ -80,7 +87,8 @@ public async Task<AccountDataDto[]> GetAccountsDataAsync(string[] userIds)
                 var userId = userIds[i];
                 if (!users.TryGetValue(userId, out var user)) continue;
                 var roles = await _aspUserManager.GetRolesAsync(user);
-                accounts[i] = user.ToAccountDataDto(roles.FirstOrDefault() ?? Roles.StudentRole);
+                accounts[i] = new AccountDataDto(userId, user.Name, user.Surname, user.Email,
+                    roles.FirstOrDefault() ?? Roles.StudentRole, user.IsExternalAuth, user.MiddleName);
             }
 
             return accounts;

HwProj.Common/HwProj.Models/CoursesService/ViewModels/HomeworkViewModels.cs

@@ -22,8 +22,6 @@ public class CreateHomeworkViewModel
 
         public bool IsGroupWork { get; set; }
 
-        public List<string> Tags { get; set; } = new List<string>();
-
         public List<CreateTaskViewModel> Tasks { get; set; } = new List<CreateTaskViewModel>();
     }
 
@@ -49,8 +47,6 @@ public class HomeworkViewModel
 
         public bool IsGroupWork { get; set; }
 
-        public List<string> Tags { get; set; } = new List<string>();
-
         public List<HomeworkTaskViewModel> Tasks { get; set; } = new List<HomeworkTaskViewModel>();
     }
 }

HwProj.Common/HwProj.Utils/Auth/AuthExtensions.cs

@@ -1,6 +1,4 @@
 using System.Linq;
-using HwProj.Models.AuthService.DTO;
-using HwProj.Models.AuthService.ViewModels;
 using HwProj.Models.Roles;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
@@ -12,19 +10,6 @@ public static class AuthExtensions
         public static string? GetUserIdFromHeader(this HttpRequest request) =>
             request.Headers.TryGetValue("UserId", out var id) ? id.FirstOrDefault() : null;
 
-        public static AccountDataDto ToAccountDataDto(this User user, string role)
-        {
-            return new AccountDataDto(
-                user.Id,
-                user.Name,
-                user.Surname,
-                user.Email,
-                role,
-                user.IsExternalAuth,
-                user.MiddleName,
-                user.GitHubId);
-        }
-
         public static string GetUserName(this HttpRequest request)
         {
             return request.Query.First(x => x.Key == "_userName").Value.ToString();

HwProj.CoursesService/HwProj.CoursesService.API/Controllers/CoursesController.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Net;
 using HwProj.CoursesService.API.Repositories;
+using HwProj.Models;
 using HwProj.Models.AuthService.DTO;
 using HwProj.Models.CoursesService.DTO;
 using Microsoft.EntityFrameworkCore;
@@ -26,21 +27,18 @@ public class CoursesController : Controller
         private readonly ICourseTokenService _courseTokenService;
         private readonly ICoursesRepository _coursesRepository;
         private readonly ICourseMatesRepository _courseMatesRepository;
-        private readonly IHomeworksRepository _homeworksRepository;
         private readonly IMapper _mapper;
 
         public CoursesController(ICoursesService coursesService,
             ICourseTokenService courseTokenService,
             ICoursesRepository coursesRepository,
             ICourseMatesRepository courseMatesRepository,
-            IHomeworksRepository homeworksRepository,
             IMapper mapper)
         {
             _coursesService = coursesService;
             _courseTokenService = courseTokenService;
             _coursesRepository = coursesRepository;
             _courseMatesRepository = courseMatesRepository;
-            _homeworksRepository = homeworksRepository;
             _mapper = mapper;
         }
 
@@ -220,24 +218,5 @@ public async Task<IActionResult> GetToken(long courseId)
             var token = await _courseTokenService.GetTokenAsync(courseId);
             return Ok(token);
         }
-
-        [HttpGet("getAllTagsForCourse/{courseId}")]
-        [ProducesResponseType(typeof(string[]), (int)HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAllTagsForCourse(long courseId)
-        {
-            var homeworks = await _homeworksRepository
-                .FindAll(t => t.CourseId == courseId)
-                .ToListAsync();
-
-            var result = homeworks
-                .SelectMany(hw => hw.Tags?.Split(';') ?? Array.Empty<string>())
-                .Where(t => !string.IsNullOrEmpty(t))
-                .ToArray();
-
-            var defaultTags = new [] { "Контрольная работа", "Доп. баллы", "Командная работа" };
-            result = result.Concat(defaultTags).Distinct().ToArray();
-
-            return Ok(result);
-        }
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Domains/MappingExtensions.cs

@@ -2,17 +2,13 @@
 using HwProj.CoursesService.API.Models;
 using HwProj.Models.CoursesService.ViewModels;
 using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Internal;
 
 namespace HwProj.CoursesService.API.Domains
 {
     public static class MappingExtensions
     {
         public static HomeworkViewModel ToHomeworkViewModel(this Homework homework)
-        {
-            var tags = homework.Tags?.Split(';') ?? Array.Empty<string>();
-            return new HomeworkViewModel()
+            => new HomeworkViewModel()
             {
                 Id = homework.Id,
                 Title = homework.Title,
@@ -22,17 +18,13 @@ public static HomeworkViewModel ToHomeworkViewModel(this Homework homework)
                 IsDeadlineStrict = homework.IsDeadlineStrict,
                 PublicationDate = homework.PublicationDate,
                 CourseId = homework.CourseId,
-                IsGroupWork = tags.Contains("Командная работа"),
+                IsGroupWork = homework.IsGroupWork,
                 IsDeferred = DateTime.UtcNow < homework.PublicationDate,
                 Tasks = homework.Tasks.Select(t => t.ToHomeworkTaskViewModel()).ToList(),
-                Tags = tags.ToList(),
             };
-        }
 
         public static HomeworkTaskViewModel ToHomeworkTaskViewModel(this HomeworkTask task)
-        {
-            var tags = task.Homework.Tags?.Split(';') ?? Array.Empty<string>();
-            return new HomeworkTaskViewModel()
+            => new HomeworkTaskViewModel()
             {
                 Id = task.Id,
                 Title = task.Title,
@@ -43,10 +35,9 @@ public static HomeworkTaskViewModel ToHomeworkTaskViewModel(this HomeworkTask ta
                 IsDeadlineStrict = task.IsDeadlineStrict,
                 PublicationDate = task.PublicationDate,
                 IsDeferred = DateTime.UtcNow < task.PublicationDate,
-                IsGroupWork = tags.Contains("Командная работа"),
+                IsGroupWork = task.Homework.IsGroupWork,
                 HomeworkId = task.HomeworkId,
             };
-        }
 
         public static HomeworkTaskForEditingViewModel ToHomeworkTaskForEditingViewModel(this HomeworkTask task)
             => new HomeworkTaskForEditingViewModel()
@@ -108,8 +99,8 @@ public static Homework ToHomework(this CreateHomeworkViewModel createHomeworkVie
                 DeadlineDate = createHomeworkViewModel.DeadlineDate,
                 IsDeadlineStrict = createHomeworkViewModel.IsDeadlineStrict,
                 PublicationDate = createHomeworkViewModel.PublicationDate,
-                Tasks = createHomeworkViewModel.Tasks.Select(t => t.ToHomeworkTask()).ToList(),
-                Tags = createHomeworkViewModel.Tags.Join(";"),
+                IsGroupWork = createHomeworkViewModel.IsGroupWork,
+                Tasks = createHomeworkViewModel.Tasks.Select(t => t.ToHomeworkTask()).ToList()
             };
     }
 }