Merge branch 'master' into CourseTokenCreation

Author: AlexPoziev

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

@@ -175,5 +175,16 @@ 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.CoursesService/HwProj.CoursesService.API/Controllers/CoursesController.cs

@@ -33,6 +33,7 @@ public CoursesController(ICoursesService coursesService,
             ICourseTokenService courseTokenService,
             ICoursesRepository coursesRepository,
             ICourseMatesRepository courseMatesRepository,
+            IHomeworksRepository homeworksRepository,
             IMapper mapper)
         {
             _coursesService = coursesService;
@@ -219,5 +220,24 @@ 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.Client/CoursesServiceClient.cs

@@ -491,6 +491,19 @@ public async Task<Result<TokenCredentials>> GetToken(long courseId)
             return await response.DeserializeAsync<Result<TokenCredentials>>();
         }
 
+        public async Task<Result<string[]>> GetAllTagsForCourse(long courseId)
+        {
+            using var httpRequest = new HttpRequestMessage(
+                HttpMethod.Get,
+                _coursesServiceUri + $"api/Courses/getAllTagsForCourse/{courseId}");
+
+            var response = await _httpClient.SendAsync(httpRequest);
+
+            return response.IsSuccessStatusCode
+                ? Result<string[]>.Success(await response.DeserializeAsync<string[]>())
+                : Result<string[]>.Failed();
+        }
+
         public async Task<bool> Ping()
         {
             try

HwProj.CoursesService/HwProj.CoursesService.Client/ICoursesServiceClient.cs

@@ -42,6 +42,7 @@ public interface ICoursesServiceClient
         Task<Result<AccountDataDto[]>> GetLecturersAvailableForCourse(long courseId);
         Task<Result<string[]>> GetAllTagsForCourse(long courseId);
         Task<Result<TokenCredentials>> GetToken(long courseId);
+        Task<Result<string[]>> GetAllTagsForCourse(long courseId);
         Task<bool> Ping();
     }
 }

hwproj.front/src/components/Homeworks/EditHomework.tsx

@@ -9,6 +9,7 @@ import {TextFieldWithPreview} from "../Common/TextFieldWithPreview";
 import PublicationAndDeadlineDates from "../Common/PublicationAndDeadlineDates";
 import Tags from "./HomeworkTags";
 import {Alert, Checkbox, FormControlLabel, Grid, Typography, TextField} from "@mui/material";
+import Tags from "./HomeworkTags";
 
 interface IEditHomeworkState {
     isLoaded: boolean;
@@ -216,7 +217,8 @@ const EditHomework: FC = () => {
                                     }
                                 />
                             </Grid>
-                            <Grid item style={{width: "90%", marginBottom: '20px'}}>
+                            <Grid item xs={11} style={{marginBottom: 15}}>
+                                <Tags editFlag={true} tags={editHomework.tags} courseId={editHomework.courseId} onTagsChange={handleTagsChange}/>
                                 <PublicationAndDeadlineDates
                                     hasDeadline={editHomework.hasDeadline}
                                     isDeadlineStrict={editHomework.isDeadlineStrict}