Merge pull request #93 from boolean-uk/fix_jakub_elisabeth

added ID to userDTO and nullable user_cc

Author: johanreitan

exercise.wwwapi/DTOs/Users/UserDTO.cs

@@ -9,6 +9,7 @@ namespace exercise.wwwapi.DTOs.Users;
 
 public class UserDTO
 {       
+    public int Id { get; set; }
     [JsonPropertyName("email")]
     public string Email { get; set; }
 
@@ -52,6 +53,7 @@ public UserDTO()
 
     public UserDTO(User model)
     {
+        Id = model.Id;
         Email = model.Email;
         FirstName = model.FirstName;
         LastName = model.LastName;
@@ -61,14 +63,15 @@ public UserDTO(User model)
         Mobile = model.Mobile;
         Specialism = model.Specialism;
         Role = model.Role.ToString();
-        CohortId = model.User_CC.LastOrDefault()?.CohortCourse.CohortId; //autofetching the first element of usercc
-        CurrentStartdate = model.User_CC.LastOrDefault().CohortCourse.Cohort.StartDate; //autofetching the first element of usercc
-        CurrentEnddate = model.User_CC.LastOrDefault().CohortCourse.Cohort.EndDate; //autofetching the first element of usercc
+        CohortId = model.User_CC?.LastOrDefault()?.CohortCourse.CohortId; //autofetching the first element of usercc
+        CurrentStartdate = model.User_CC?.LastOrDefault()?.CohortCourse.Cohort.StartDate; //autofetching the first element of usercc
+        CurrentEnddate = model.User_CC?.LastOrDefault()?.CohortCourse.Cohort.EndDate; //autofetching the first element of usercc
         Notes = model.Notes.Select(n => new NoteDTO(n)).ToList();
     }
 
     public UserDTO(User model, PrivilegeLevel privilegeLevel)
     {
+        Id = model.Id;
         Email = model.Email;
         FirstName = model.FirstName;
         LastName = model.LastName;
@@ -78,9 +81,9 @@ public UserDTO(User model, PrivilegeLevel privilegeLevel)
         Mobile = model.Mobile;
         Specialism = model.Specialism;
         Role = model.Role.ToString();
-        CohortId = model.User_CC.LastOrDefault()?.CohortCourse.CohortId; //autofetching the first element of usercc
-        CurrentStartdate = model.User_CC.LastOrDefault().CohortCourse.Cohort.StartDate; //autofetching the first element of usercc
-        CurrentEnddate = model.User_CC.LastOrDefault().CohortCourse.Cohort.EndDate; //autofetching the first element of usercc
+        CohortId = model.User_CC?.LastOrDefault()?.CohortCourse.CohortId; //autofetching the first element of usercc
+        CurrentStartdate = model.User_CC?.LastOrDefault()?.CohortCourse.Cohort.StartDate; //autofetching the first element of usercc
+        CurrentEnddate = model.User_CC?.LastOrDefault()?.CohortCourse.Cohort.EndDate; //autofetching the first element of usercc
 
 
         if (privilegeLevel == PrivilegeLevel.Teacher)

exercise.wwwapi/Endpoints/UserEndpoints.cs

@@ -96,9 +96,14 @@ private static async Task<IResult> GetUsersByCohort(IRepository<Cohort> reposito
         var results = response.CohortCourses.SelectMany(a => a.UserCCs).Select(a => a.User).ToList();
         var dto_results = results.Select(a => new UserDTO(a));
 
+        var userRole = claimsPrincipal.Role();
+        var authorizedAsTeacher = AuthorizeTeacher(claimsPrincipal);
+
         var userData = new UsersSuccessDTO
         {
-            Users = results.Select(u => new UserDTO(u)).ToList() //if teacher loads students, also load notes for students.
+            Users = results.Select(user => authorizedAsTeacher
+            ? new UserDTO(user, PrivilegeLevel.Teacher) //if teacher loads students, also load notes for students.
+            : new UserDTO(user, PrivilegeLevel.Student)).ToList() //if teacher loads students, also load notes for students.
         };
 
         var responseObject = new ResponseDTO<UsersSuccessDTO>
@@ -117,7 +122,23 @@ private static async Task<IResult> GetUsersByCohortCourse(IRepository<CohortCour
         var results = response.UserCCs.Select(a => a.User).ToList();
         var dto_results = results.Select(a => new UserDTO(a));
 
-        return TypedResults.Ok(dto_results);
+        var userRole = claimsPrincipal.Role();
+        var authorizedAsTeacher = AuthorizeTeacher(claimsPrincipal);
+
+        var userData = new UsersSuccessDTO
+        {
+            Users = results.Select(user => authorizedAsTeacher
+            ? new UserDTO(user, PrivilegeLevel.Teacher) //if teacher loads students, also load notes for students.
+            : new UserDTO(user, PrivilegeLevel.Student)).ToList() //if teacher loads students, also load notes for students.
+        };
+
+        var responseObject = new ResponseDTO<UsersSuccessDTO>
+        {
+            Status = "success",
+            Data = userData
+        };
+
+        return TypedResults.Ok(responseObject);
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -252,13 +273,20 @@ public static async Task<IResult> GetUserById(IRepository<User> userRepository,
             return TypedResults.NotFound();
         }
 
-        var userData = new UserDTO(response);
-        // userData.CurrentStartdate = response.User_CC.ElementAt(0).CohortCourse.Cohort.StartDate;
+        var userRole = claimsPrincipal.Role();
+        var authorizedAsTeacher = AuthorizeTeacher(claimsPrincipal);
+
+        var userData = authorizedAsTeacher
+            ? new UserDTO(response, PrivilegeLevel.Teacher) //if teacher loads students, also load notes for students.
+            : new UserDTO(response, PrivilegeLevel.Student); //if teacher loads students, also load notes for students.
+        
+
         var responseObject = new ResponseDTO<UserDTO>
         {
             Status = "success",
             Data = userData
         };
+
         return TypedResults.Ok(responseObject);
     }