Merge branch 'feature/fix-closeRecord' into 'develop'

fix close record

See merge request !50

Tsi1.Api/Tsi1.Api/Controllers/CourseController.cs

@@ -305,7 +305,7 @@ namespace Tsi1.Api.Controllers
             return Ok(result.Data);
         }
 
-        [Authorize(Roles = UserTypes.Professor)]
+        [Authorize(Roles = UserTypes.FacultyAdmin)]
         [HttpPost("CloseRecord/{courseId}")]
         public async Task<IActionResult> CloseRecord(int courseId)
         {
@@ -317,7 +317,7 @@ namespace Tsi1.Api.Controllers
                 return BadRequest(courseResult.Message);
             }
 
-            var studentCourseResult = await _studentCourseResultService.GetLastStudentCourseResults(courseId, userId);
+            var studentCourseResult = await _studentCourseResultService.GetLastStudentCourseResults(courseId, userId, false);
             if (studentCourseResult.HasError)
             {
                 return BadRequest(studentCourseResult.Message);

Tsi1.Api/Tsi1.BusinessLayer/Interfaces/IStudentCourseResultService.cs

@@ -17,7 +17,7 @@ namespace Tsi1.BusinessLayer.Interfaces
 
         Task<ServiceResult<StudentCourseResultPreviewDto>> GetMyLastResult(int courseId, int userId);
 
-        Task<ServiceResult<List<StudentCourseResultPreviewDto>>> GetLastStudentCourseResults(int courseId, int userId);
+        Task<ServiceResult<List<StudentCourseResultPreviewDto>>> GetLastStudentCourseResults(int courseId, int userId, bool isProfessor = true);
         Task<ServiceResult<List<StudentCourseResultQuantityDto>>> GetAllLastStudentCourseResults(int tenantId);
     }
 }

Tsi1.Api/Tsi1.BusinessLayer/Services/StudentCourseResultService.cs

@@ -99,17 +99,20 @@ namespace Tsi1.BusinessLayer.Services
             return result;
         }
 
-        public async Task<ServiceResult<List<StudentCourseResultPreviewDto>>> GetLastStudentCourseResults(int courseId, int userId)
+        public async Task<ServiceResult<List<StudentCourseResultPreviewDto>>> GetLastStudentCourseResults(int courseId, int userId, bool isProfessor = true)
         {
             var result = new ServiceResult<List<StudentCourseResultPreviewDto>>();
 
-            var professorValidation = await this.ProfessorValidations(courseId, userId);
-
-            if (professorValidation.HasError)
+            if (isProfessor)
             {
-                result.HasError = true;
-                result.AddMessage(professorValidation.Message);
-                return result;
+                var professorValidation = await this.ProfessorValidations(courseId, userId);
+
+                if (professorValidation.HasError)
+                {
+                    result.HasError = true;
+                    result.AddMessage(professorValidation.Message);
+                    return result;
+                } 
             }
 
             var studentIds = await _context.StudentCourses