Fixed comments, deleted old files

Author: Roman Eriksen

exercise.wwwapi/DTOs/Cohort/UserCohortDTO.cs

@@ -52,10 +52,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey(ccu => ccu.UserId);
             #endregion CohortCourse
 
-            modelBuilder.Entity<UserCohort>()
-                .HasKey(uc => new { uc.UserId, uc.CohortId });
-
-
             modelBuilder.Entity<User>()
                 .Property(u => u.Role)
                 .HasConversion<string>();
@@ -89,6 +85,5 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         public DbSet<Course> Courses { get; set; }
         public DbSet<CohortCourse> CohortCourses { get; set; }
         public DbSet<CohortCourseUser> CohortCourseUsers { get; set; }
-        public DbSet<UserCohort> UserCohorts { get; set; }
     }
 }

exercise.wwwapi/Data/DataContext.cs

@@ -6,6 +6,7 @@
 using exercise.wwwapi.Repository;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
 namespace exercise.wwwapi.Endpoints
 {
@@ -17,6 +18,7 @@ public static void ConfigureCohortEndpoints(this WebApplication app)
             cohorts.MapPost("/", CreateCohort).WithSummary("Create a cohort");
             cohorts.MapGet("/", GetAllCohorts).WithSummary("Get all cohorts");
             cohorts.MapGet("/{id}", GetCohort).WithSummary("Get a cohort by ID");
+            //cohorts.MapGet("/{userId}", GetCohortByUserId).WithSummary("");
             cohorts.MapPost("/{cohortId}/{userId}/{courseId}", AddUserToCohort).WithSummary("Add a user to a cohort");
             cohorts.MapDelete("/{cohortId}/{userId}/{courseId}", DeleteUserFromCohort).WithSummary("Delete a user from a cohort");
         }
@@ -73,10 +75,13 @@ public static async Task<IResult> CreateCohort(
         {
 
             var results = cohortService.GetAllFiltered(c => c.Title == request.Title);
-            if (results != null) return TypedResults.BadRequest(new ResponseDTO<object>
-            {
-                Message = $"Cohort with name {request.Title} already exists"
-            });
+            Console.WriteLine(results);
+            if (results.Any()) 
+                return TypedResults.BadRequest(new ResponseDTO<object>
+                {
+                    Message = $"Cohort with name '{request.Title}' already exists",
+                    Data = results
+                });
 
             Cohort cohort = new Cohort() { Title = request.Title };
 
@@ -128,10 +133,11 @@ public static async Task<IResult> AddUserToCohort(
         {
             // 1. Get the user
             var user = userService.GetById(userId);
-            if (user == null) return TypedResults.BadRequest(new ResponseDTO<object>
-            {
-                Message = $"User with Id {userId} not found."
-            });
+            if (user == null) 
+                return TypedResults.BadRequest(new ResponseDTO<object>
+                {
+                    Message = $"User with Id {userId} not found."
+                });
 
             // 2. Get the cohort including its users and courses for verification steps
             var cohort = cohortService.GetById(cohortId, q =>
@@ -141,10 +147,11 @@ public static async Task<IResult> AddUserToCohort(
                     .ThenInclude(cc => cc.CohortCourseUsers)
                         .ThenInclude(ccu => ccu.User));
 
-            if (cohort == null) return TypedResults.BadRequest(new ResponseDTO<object>
-            {
-                Message = $"Cohort with Id {cohortId} not found."
-            });
+            if (cohort == null) 
+                return TypedResults.BadRequest(new ResponseDTO<object>
+                {
+                    Message = $"Cohort with Id {cohortId} not found."
+                });
 
             // 3. Verify that the course exists in this cohort
             var cohortCourse = cohort.CohortCourses.FirstOrDefault(cc => cc.CourseId == courseId);
@@ -155,11 +162,11 @@ public static async Task<IResult> AddUserToCohort(
                 });
 
             // 4. Check if the user is already in this cohort
-            if (cohortCourse.CohortCourseUsers.Any(cu => cu.UserId == userId))
-                return TypedResults.BadRequest(new ResponseDTO<object>
-                {
-                    Message = "User is already a member of this cohort."
-                });
+            //if (cohortCourse.CohortCourseUsers.Any(cu => cu.UserId == userId))
+            //    return TypedResults.BadRequest(new ResponseDTO<object>
+            //    {
+            //        Message = "User is already a member of this cohort."
+            //    }); 
 
             // 7. Add user to CohortCourseUser
             var existingCcu = cohortCourseUserService
@@ -196,7 +203,7 @@ public static async Task<IResult> AddUserToCohort(
             }
             return TypedResults.BadRequest(new ResponseDTO<object>
             {
-                Message = "Failed to add user."
+                Message = "User is already in the specified course in the cohort."
             });
         }
 
@@ -232,6 +239,19 @@ public static async Task<IResult> DeleteUserFromCohort(
                 Message = $"Cohort with Id {cohortId} not found."
             });
 
+            var isTrue = false;
+            foreach (var cc in cohort.CohortCourses)
+            {
+                if (cc.CohortCourseUsers.Any(ccu => ccu.UserId == userId)) isTrue = true;     
+            }
+            if (!isTrue)
+                {
+                return TypedResults.BadRequest(new ResponseDTO<object>
+                {
+                    Message = "The specified user is not part of this cohort."
+                });
+            }
+
             // 3. Verify that the course exists in this cohort
             var cohortCourse = cohort.CohortCourses.FirstOrDefault(cc => cc.CourseId == courseId);
             if (cohortCourse == null)
@@ -241,10 +261,10 @@ public static async Task<IResult> DeleteUserFromCohort(
                 });
 
             // 4. Check if the user is already in this cohort
-            if (!cohortCourse.CohortCourseUsers.Any(cu => cu.UserId == userId))
+            if (!cohortCourse.CohortCourseUsers.Any(cu => cu.UserId == userId && cu.CourseId == courseId))
                 return TypedResults.BadRequest(new ResponseDTO<object>
                 {
-                    Message = "User is not a member of this cohort."
+                    Message = "User is in cohort, but is not taking the specified course."
                 });
 
             // 7. Add user to CohortCourseUser