Skip to content

Commit 4791793

Browse files
authored
Сортировка заданий по дате публикации (#518)
1 parent f57bee4 commit 4791793

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

HwProj.CoursesService/HwProj.CoursesService.API/HwProj.CoursesService.API.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</ItemGroup>
1313
<ItemGroup>
1414
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
15-
<PackageReference Include="EntityFramework" Version="6.4.0" />
1615
<PackageReference Include="Microsoft.AspNetCore.App" />
1716
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
1817
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />

HwProj.CoursesService/HwProj.CoursesService.API/Repositories/CoursesRepository.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ public CoursesRepository(CourseContext context)
1515

1616
public async Task<Course?> GetWithCourseMatesAndHomeworksAsync(long id)
1717
{
18-
return await Context.Set<Course>()
18+
var course = await Context.Set<Course>()
1919
.Include(c => c.CourseMates)
2020
.Include(c => c.Homeworks)
2121
.ThenInclude(c => c.Tasks)
2222
.AsNoTracking()
2323
.FirstOrDefaultAsync(c => c.Id == id);
24+
25+
// todo: перенести OrderBy в Include после обновления до EF Core 5.x
26+
course.Homeworks = course.Homeworks.OrderBy(h => h.PublicationDate).ToList();
27+
return course;
2428
}
2529

2630
public IQueryable<Course> GetAllWithCourseMatesAndHomeworks()

HwProj.CoursesService/HwProj.CoursesService.API/Services/CoursesService.cs

-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ public CoursesService(ICoursesRepository coursesRepository,
4949
public async Task<Course[]> GetAllAsync()
5050
{
5151
var courses = await _coursesRepository.GetAllWithCourseMatesAndHomeworks().ToArrayAsync();
52-
5352
CourseDomain.FillTasksInCourses(courses);
54-
5553
return courses;
5654
}
5755

0 commit comments

Comments
 (0)