Fixed bug concerning exercise queries

Author: mackmarton

grade-management-new/GradeManagement.Bll/Profiles/AutoMapperProfile.cs

@@ -22,7 +22,10 @@ public AutoMapperProfile()
     {
         CreateMap<Assignment, Shared.Dtos.Assignment>();
         CreateMap<Course, Shared.Dtos.Course>();
-        CreateMap<Exercise, ExerciseResponse>();
+        CreateMap<Exercise, ExerciseResponse>().ForMember(dest => dest.ScoreTypes,
+            opt => opt.MapFrom(src =>
+                src.ScoreTypeExercises.Where(ste => ste.ExerciseId == src.Id)
+                    .ToDictionary(ste => ste.Order, ste => ste.ScoreType.Type)));
         CreateMap<Group, GroupResponse>();
         CreateMap<Language, Shared.Dtos.Language>();
         CreateMap<PullRequest, Shared.Dtos.PullRequest>();
@@ -32,7 +35,7 @@ public AutoMapperProfile()
         CreateMap<ScoreTypeExercise, Shared.Dtos.ScoreTypeExercise>();
         CreateMap<Semester, Shared.Dtos.Semester>();
         CreateMap<Student, StudentResponse>();
-        CreateMap<Subject, SubjectResponse>() .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.SubjectId));;
+        CreateMap<Subject, SubjectResponse>().ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.SubjectId));
         CreateMap<User, Shared.Dtos.User>();
     }
 }

grade-management-new/GradeManagement.Bll/Services/CourseService.cs

@@ -87,10 +87,11 @@ public async Task DeleteAsync(long id)
 
     public async Task<IEnumerable<ExerciseResponse>> GetAllExercisesByIdAsync(long id)
     {
-        return await gradeManagementDbContext.Exercise
+        var exercises = await gradeManagementDbContext.Exercise
             .Where(e => e.CourseId == id)
-            .ProjectTo<ExerciseResponse>(mapper.ConfigurationProvider)
+            .Include(e => e.ScoreTypeExercises).ThenInclude(ste => ste.ScoreType)
             .ToListAsync();
+        return mapper.Map<List<ExerciseResponse>>(exercises);
     }
 
     public async Task<IEnumerable<GroupResponse>> GetAllGroupsByIdAsync(long id)

grade-management-new/GradeManagement.Bll/Services/ExerciseService.cs

@@ -32,15 +32,15 @@ public class ExerciseService(
     public async Task<IEnumerable<ExerciseResponse>> GetAllAsync()
     {
         return await gradeManagementDbContext.Exercise
-            .Include(e => e.ScoreTypeExercises)
+            .Include(e => e.ScoreTypeExercises).ThenInclude(ste => ste.ScoreType)
             .ProjectTo<ExerciseResponse>(mapper.ConfigurationProvider)
             .ToListAsync();
     }
 
     public async Task<ExerciseResponse> GetByIdAsync(long id)
     {
         return await gradeManagementDbContext.Exercise
-            .Include(e => e.ScoreTypeExercises)
+            .Include(e => e.ScoreTypeExercises).ThenInclude(ste => ste.ScoreType)
             .ProjectTo<ExerciseResponse>(mapper.ConfigurationProvider)
             .SingleEntityAsync(e => e.Id == id, id);
     }