Fixed merge

Author: Roman Eriksen

exercise.wwwapi/DTOs/Cohort/CohortDTO.cs

@@ -4,6 +4,8 @@ public class CohortDTO
     {
         public string Title { get; set; }
 
-        public ICollection<UserCohortDTO> UserCohorts { get; set; } = new List<UserCohortDTO>();
+        public ICollection<UserCohortDTO> Students { get; set; } = new List<UserCohortDTO>();
+
+        public ICollection<UserCohortDTO> Teachers { get; set; } = new List<UserCohortDTO>();
     }
 }

exercise.wwwapi/DTOs/Cohort/UserCohortDTO.cs

@@ -4,8 +4,6 @@ namespace exercise.wwwapi.DTOs.Cohort
 {
     public class UserCohortDTO
     {
-        public UserBasicDTO User {  get; set; }
-
-        public string Cohort { get; set; }
+        public UserBasicDTO User { get; set; }
     }
 }

exercise.wwwapi/Models/Cohort.cs

@@ -14,5 +14,4 @@ public class Cohort
         [JsonIgnore]
         public ICollection<UserCohort> UserCohorts { get; set; } = new List<UserCohort>();
     }
-}
-|
+}

exercise.wwwapi/Tools/MappingProfile.cs

@@ -17,11 +17,13 @@ public MappingProfile()
             CreateMap<User, UserDTO>();
             CreateMap<User, UserBasicDTO>();
             CreateMap<Post, PostDTO>();
-            CreateMap<Cohort, CohortDTO>();
+
+            CreateMap<Cohort, CohortDTO>()
+                .ForMember(dest => dest.Students, opt => opt.MapFrom(src => src.UserCohorts.Where(u => u.User.Role == Roles.student)))
+                .ForMember(dest => dest.Teachers, opt => opt.MapFrom(src => src.UserCohorts.Where(u => u.User.Role == Roles.teacher)));
 
             CreateMap<UserCohort, UserCohortDTO>()
-                .ForMember(dest => dest.User, opt => opt.MapFrom(src => src.User))
-                .ForMember(dest => dest.Cohort, opt => opt.MapFrom(src => src.Cohort.Title));
+                .ForMember(dest => dest.User, opt => opt.MapFrom(src => src.User));
             //CreateMap<UserCohortDTO, UserBasicDTO>();
 
             CreateMap<PostComment, PostCommentDTO>()