Return empty students courses list (#64)

joeseggie · Jun 23, 2023 · 895857d · 895857d
1 parent 4b6e803
commit 895857d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/dev/HESIMS/HESIMS.Web/Controllers/StudentCoursesController.cs b/src/dev/HESIMS/HESIMS.Web/Controllers/StudentCoursesController.cs
@@ -46,7 +46,7 @@ public async Task<IActionResult> GetStudentCourseByIdAsync(Guid id)
         var result = await studentCourseService.GetStudentCourseByIdAsync(id);
         if (!result.IsSuccess)
         {
-            return NotFound(result.ErrorMessage);
+            return BadRequest(result.ErrorMessage);
         }
 
         var newStudentCourse = result.Value;

diff --git a/src/dev/HESIMS/HESIMS.Web/Data/Services/StudentCourseService.cs b/src/dev/HESIMS/HESIMS.Web/Data/Services/StudentCourseService.cs
@@ -93,13 +93,8 @@ public async Task<Result<IEnumerable<StudentCourse>>> GetStudentCoursesAsync(Gui
                                .Include(studentCourse => studentCourse.Scholarship)
                                .ThenInclude(scholarship => scholarship!.Country)
                                .AsQueryable();
-
-        if (!studentCoursesQuery.Any())
-        {
-            return Result<IEnumerable<StudentCourse>>.Failure("No student courses found.");
-        }
 
-        if (studentId is not null)
+        if (studentCoursesQuery.Any() && studentId is not null)
         {
             studentCoursesQuery = studentCoursesQuery.Where(studentCourse => studentCourse.StudentId == studentId);
         }