wip

Author: DedSec256

HwProj.CoursesService/HwProj.CoursesService.API/Models/CourseContext.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using System;
+using Microsoft.EntityFrameworkCore;
 
 namespace HwProj.CoursesService.API.Models
 {
@@ -8,6 +9,7 @@ public sealed class CourseContext : DbContext
         public DbSet<CourseMate> CourseMates { get; set; }
         public DbSet<Group> Groups { get; set; }
         public DbSet<GroupMate> GroupMates { get; set; }
+        [Obsolete("Не используется")]
         public DbSet<TaskModel> TasksModels { get; set; }
         public DbSet<Homework> Homeworks { get; set; }
         public DbSet<HomeworkTask> Tasks { get; set; }

HwProj.CoursesService/HwProj.CoursesService.API/Models/Group.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using HwProj.Repositories.Net8;
 
@@ -15,6 +16,7 @@ public class Group : IEntity<long>
 
         public List<GroupMate> GroupMates { get; set; } = new List<GroupMate>();
 
+        [Obsolete("Не используется")]
         public List<TaskModel> Tasks { get; set; } = new List<TaskModel>();
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Repositories/Groups/GroupsRepository.cs

@@ -27,8 +27,6 @@ public IQueryable<Group> GetGroupsWithGroupMatesByCourse(long courseId)
             return Context.Set<Group>()
                 .Where(c => c.CourseId == courseId)
                 .Include(c => c.GroupMates)
-                .AsNoTracking()
-                .Include(c => c.Tasks)
                 .AsNoTracking();
         }
     }

HwProj.CoursesService/HwProj.CoursesService.API/Repositories/Groups/ITaskModelsRepository.cs

@@ -12,17 +12,14 @@ public class GroupsService : IGroupsService
     {
         private readonly IGroupsRepository _groupsRepository;
         private readonly IGroupMatesRepository _groupMatesRepository;
-        private readonly ITaskModelsRepository _taskModelsRepository;
         private readonly IMapper _mapper;
 
         public GroupsService(IGroupsRepository groupsRepository,
             IGroupMatesRepository groupMatesRepository,
-            ITaskModelsRepository taskModelsRepository,
             IMapper mapper)
         {
             _groupsRepository = groupsRepository;
             _groupMatesRepository = groupMatesRepository;
-            _taskModelsRepository = taskModelsRepository;
             _mapper = mapper;
         }
 
@@ -59,7 +56,6 @@ public async Task DeleteGroupAsync(long groupId)
         {
             var group = await _groupsRepository.GetAsync(groupId);
             group.GroupMates.RemoveAll(cm => true);
-            group.Tasks.RemoveAll(cm => true);
 
             await _groupsRepository.DeleteAsync(groupId).ConfigureAwait(false);
         }
@@ -73,24 +69,13 @@ public async Task UpdateAsync(long groupId, Group updated)
                 await _groupMatesRepository.DeleteAsync(groupMate.Id).ConfigureAwait(false);
             }
 
-            foreach (var task in group.Tasks.ToList())
-            {
-                await _taskModelsRepository.DeleteAsync(task.Id).ConfigureAwait(false);
-            }
-
             updated.GroupMates?.ForEach(cm => cm.GroupId = groupId);
-            updated.Tasks?.ForEach(cm => cm.GroupId = groupId);
 
             if (updated.GroupMates != null && updated.GroupMates.Count > 0)
             {
                 await _groupMatesRepository.AddRangeAsync(updated.GroupMates).ConfigureAwait(false);
             }
 
-            if (updated.Tasks != null && updated.Tasks.Count > 0)
-            {
-                await _taskModelsRepository.AddRangeAsync(updated.Tasks).ConfigureAwait(false);
-            }
-
             await _groupsRepository.UpdateAsync(groupId, g => new Group
             {
                 Name = updated.Name

HwProj.CoursesService/HwProj.CoursesService.API/Repositories/Groups/TaskModelsRepository.cs

@@ -33,7 +33,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddScoped<ICourseMatesRepository, CourseMatesRepository>();
             services.AddScoped<IGroupsRepository, GroupsRepository>();
             services.AddScoped<IGroupMatesRepository, GroupMatesRepository>();
-            services.AddScoped<ITaskModelsRepository, TaskModelsRepository>();
             services.AddScoped<IHomeworksRepository, HomeworksRepository>();
             services.AddScoped<ITasksRepository, TasksRepository>();
             services.AddScoped<ICoursesService, Services.CoursesService>();