diff --git a/Domain/Schedule/Day.cs b/Domain/Schedule/Day.cs deleted file mode 100644 index 0da9657..0000000 --- a/Domain/Schedule/Day.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace Mirea.Api.DataAccess.Domain.Schedule; - -public class Day -{ - public int Id { get; set; } - public DayOfWeek Index { get; set; } - public int PairNumber { get; set; } - - public int LessonId { get; set; } - public Lesson? Lesson { get; set; } - public int GroupId { get; set; } - public Group? Group { get; set; } -} \ No newline at end of file diff --git a/Domain/Schedule/Lesson.cs b/Domain/Schedule/Lesson.cs index 0851f0e..3ff5e52 100644 --- a/Domain/Schedule/Lesson.cs +++ b/Domain/Schedule/Lesson.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; namespace Mirea.Api.DataAccess.Domain.Schedule; @@ -6,9 +7,15 @@ public class Lesson { public int Id { get; set; } public bool IsEven { get; set; } - public required string Discipline { get; set; } + public DayOfWeek DayOfWeek { get; set; } + public int PairNumber { get; set; } - public List? TypeOfOccupations { get; set; } - public List? ProfessorToLesson { get; set; } - public Day? Day { get; set; } + public int GroupId { get; set; } + public Group? Group { get; set; } + public int TypeOfOccupationId { get; set; } + public TypeOfOccupation? TypeOfOccupation { get; set; } + public int DisciplineId { get; set; } + public Discipline? Discipline { get; set; } + + public List? LessonAssociations { get; set; } } \ No newline at end of file