merge from develop

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

@@ -65,11 +65,38 @@ namespace Tsi1.Api.Controllers
             var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
 
             var result = await _courseService.Matriculate(userId, courseId);
+            
             if (result.HasError)
             {
                 return BadRequest(result.Message);
             }
 
+            if (result.Data == false)
+            {
+                return NotFound(result.Message);
+            }
+
+            return Ok();
+        }
+
+        [Authorize(Roles = UserTypes.Student)]
+        [HttpPost("DropOutFromCourse/{courseId}")]
+        public async Task<IActionResult> DropOutFromCourse(int courseId)
+        {
+            var userId = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value);
+
+            var result = await _courseService.DropOutFromCourse(userId, courseId);
+
+            if (result.HasError)
+            {
+                return BadRequest(result.Message);
+            }
+
+            if (result.Data == false)
+            {
+                return NotFound(result.Message);
+            }
+
             return Ok();
         }
 
@@ -78,11 +105,36 @@ namespace Tsi1.Api.Controllers
         public async Task<IActionResult> AddProfessorToCourse(ProfessorCourseDto professorCourseDto)
         {
             var result = await _courseService.AddProfessorToCourse(professorCourseDto);
+            
             if (result.HasError)
             {
                 return BadRequest(result.Message);
             }
 
+            if (result.Data == false)
+            {
+                return NotFound(result.Message);
+            }
+
+            return Ok();
+        }
+
+        [Authorize(Roles = UserTypes.FacultyAdmin)]
+        [HttpPost("RemoveProfessorToCourse")]
+        public async Task<IActionResult> RemoveProfessorFromCourse(ProfessorCourseDto professorCourseDto)
+        {
+            var result = await _courseService.RemoveProfessorToCourse(professorCourseDto);
+            
+            if (result.HasError)
+            {
+                return BadRequest(result.Message);
+            }
+
+            if (result.Data == false)
+            {
+                return NotFound(result.Message);
+            }
+
             return Ok();
         }