Delete redundant properties in get by ID DTOs (#63)

romandykyi · Dec 28, 2023 · 7fc591f · 7fc591f
1 parent 208c3f7
commit 7fc591f
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 37 deletions.
diff --git a/Core/Dtos/University/GroupViewDto.cs b/Core/Dtos/University/GroupViewDto.cs
@@ -4,5 +4,4 @@ namespace EUniversity.Core.Dtos.University;
 
 public record GroupViewDto(int Id, string Name,
     DateTimeOffset CreationDate, DateTimeOffset UpdateDate,
-    TeacherPreviewDto? Teacher, CoursePreviewDto Course,
-    IEnumerable<StudentPreviewDto> Students);
+    TeacherPreviewDto? Teacher, CoursePreviewDto Course);
diff --git a/Core/Dtos/University/SemesterViewDto.cs b/Core/Dtos/University/SemesterViewDto.cs
@@ -2,5 +2,4 @@
 
 public record SemesterViewDto(int Id, string Name,
     DateTimeOffset CreationDate, DateTimeOffset UpdateDate,
-    DateTimeOffset DateFrom, DateTimeOffset DateTo,
-    IEnumerable<StudentSemesterViewDto> StudentEnrollments);
+    DateTimeOffset DateFrom, DateTimeOffset DateTo);
diff --git a/Infrastructure/Services/University/GroupsService.cs b/Infrastructure/Services/University/GroupsService.cs
@@ -13,7 +13,6 @@ public class GroupsService :
         Entities
         .Include(e => e.Course)
         .Include(e => e.Teacher)
-        .Include(e => e.Students)
         .AsNoTracking();
 
     protected override IQueryable<Group> GetPageQuery =>

diff --git a/Infrastructure/Services/University/SemestersService.cs b/Infrastructure/Services/University/SemestersService.cs
@@ -9,12 +9,6 @@ public class SemestersService :
     BaseCrudService<Semester, int, SemesterPreviewDto, SemesterViewDto, SemesterCreateDto, SemesterCreateDto>,
     ISemestersService
 {
-    protected override IQueryable<Semester> GetByIdQuery =>
-        Entities
-        .Include(e => e.StudentEnrollments)
-        .ThenInclude(e => e.Student)
-        .AsNoTracking();
-
     public SemestersService(ApplicationDbContext dbContext) : base(dbContext)
     {
     }

diff --git a/IntegrationTests/Controllers/University/GroupsControllerTests.cs b/IntegrationTests/Controllers/University/GroupsControllerTests.cs
@@ -35,7 +35,6 @@ protected override void AssertThatViewDtosAreEqual(GroupViewDto expected, GroupV
             Assert.That(actual.Name, Is.EqualTo(expected.Name));
             Assert.That(actual.Course, Is.EqualTo(expected.Course));
             Assert.That(actual.Teacher, Is.EqualTo(expected.Teacher));
-            Assert.That(actual.Students, Is.EquivalentTo(expected.Students));
         });
     }
 
@@ -58,14 +57,10 @@ protected override GroupCreateDto GetInvalidUpdateDto()
 
     protected override GroupViewDto GetTestDetailsDto()
     {
-        List<StudentPreviewDto> students = new()
-        {
-            new(Guid.NewGuid().ToString(), "test-user", "Student1", "Student2", null)
-        };
         return new(DefaultId, "Group",
             DateTimeOffset.Now, DateTimeOffset.Now,
             TeacherPreviewDto,
-            CoursePreviewDto, students);
+            CoursePreviewDto);
     }
 
     protected override GroupPreviewDto GetTestPreviewDto()

diff --git a/IntegrationTests/Controllers/University/SemestersControllerTests.cs b/IntegrationTests/Controllers/University/SemestersControllerTests.cs
@@ -28,18 +28,6 @@ public override void SetUpService()
         ServiceMock = WebApplicationFactory.SemestersServiceMock;
     }
 
-    protected override void AssertThatViewDtosAreEqual(SemesterViewDto expected, SemesterViewDto actual)
-    {
-        Assert.Multiple(() =>
-        {
-            Assert.That(actual.Id, Is.EqualTo(expected.Id));
-            Assert.That(actual.Name, Is.EqualTo(expected.Name));
-            Assert.That(actual.DateFrom, Is.EqualTo(expected.DateFrom));
-            Assert.That(actual.DateTo, Is.EqualTo(expected.DateTo));
-            Assert.That(actual.StudentEnrollments, Is.EquivalentTo(expected.StudentEnrollments));
-        });
-    }
-
     protected override bool AssertThatFilterWasApplied(IFilter<Semester> filter)
     {
         return filter is SemestersFilter semestersFilter &&
@@ -59,14 +47,9 @@ protected override SemesterCreateDto GetInvalidUpdateDto()
 
     protected override SemesterViewDto GetTestDetailsDto()
     {
-        StudentPreviewDto student = new("test-id", "test-user", "Test", "User", null);
-        List<StudentSemesterViewDto> enrollments = new()
-        {
-            new(student, DateTimeOffset.Now)
-        };
         return new(DefaultId, "Test semester",
            DateTimeOffset.Now, DateTimeOffset.Now,
-            DateTimeOffset.MinValue, DateTimeOffset.MaxValue, enrollments);
+            DateTimeOffset.MinValue, DateTimeOffset.MaxValue);
     }
 
     protected override SemesterPreviewDto GetTestPreviewDto()

diff --git a/IntegrationTests/Services/University/GroupsServiceTests.cs b/IntegrationTests/Services/University/GroupsServiceTests.cs
@@ -89,7 +89,6 @@ public override async Task GetById_ElementExists_ReturnsValidElement()
             Assert.That(result.Name, Is.EqualTo(expectedResult.Name));
             Assert.That(result.Teacher, Is.EqualTo(expectedResult.Teacher));
             Assert.That(result.Course, Is.EqualTo(expectedResult.Course));
-            Assert.That(result.Students, Is.EquivalentTo(expectedResult.Students));
         });
     }
 

diff --git a/IntegrationTests/Services/University/SemestersServiceTests.cs b/IntegrationTests/Services/University/SemestersServiceTests.cs
@@ -68,7 +68,6 @@ public override async Task GetById_ElementExists_ReturnsValidElement()
             Assert.That(result.Name, Is.EqualTo(expectedResult.Name));
             Assert.That(result.DateFrom, Is.EqualTo(expectedResult.DateFrom));
             Assert.That(result.DateTo, Is.EqualTo(expectedResult.DateTo));
-            Assert.That(result.StudentEnrollments, Is.EquivalentTo(expectedResult.StudentEnrollments));
         });
     }
 }