Skip to content

Преподаватели: вынести в отдельную модель #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DedSec256 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Преподаватели: вынести в отдельную модель #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
872a2f6
Преподаватели: вынести в отдельную модель
DedSec256 Apr 24, 2025
986940c
wip
DedSec256 Apr 24, 2025
2d427e6
wip
DedSec256 Apr 25, 2025
1bd0d55
wip
DedSec256 Apr 25, 2025
b8ff75b
wip
DedSec256 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<CSharpLanguageVersion>8</CSharpLanguageVersion>
<WarningsAsErrors>0612</WarningsAsErrors>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion HwProj.Common/HwProj.Repositories/ReadOnlyRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public async Task<TEntity> GetAsync(TKey id)
return await Context.FindAsync<TEntity>(id).ConfigureAwait(false);
}

public async Task<TEntity> FindAsync(Expression<Func<TEntity, bool>> predicate)
public virtual async Task<TEntity> FindAsync(Expression<Func<TEntity, bool>> predicate)
{
return await Context.Set<TEntity>().AsNoTracking().FirstOrDefaultAsync(predicate).ConfigureAwait(false);
}
Expand Down
4 changes: 2 additions & 2 deletions HwProj.CoursesService/HwProj.CoursesService.API/Domains/MappingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static CourseDTO ToCourseDto(this Course course)
Name = course.Name,
GroupName = course.GroupName,
IsCompleted = course.IsCompleted,
MentorIds = course.MentorIds.Split("/"),
MentorIds = course.Mentors.Select(x => x.UserId).ToArray(),
IsOpen = course.IsOpen,
InviteCode = course.InviteCode,
CourseMates = course.CourseMates.Select(cm => cm.ToCourseMateViewModel()).ToArray(),
Expand All @@ -99,7 +99,7 @@ public static CoursePreview ToCoursePreview(this Course course)
Name = course.Name,
GroupName = course.GroupName,
IsCompleted = course.IsCompleted,
MentorIds = course.MentorIds.Split("/"),
MentorIds = course.Mentors.Select(x => x.UserId).ToArray(),
};

public static HomeworkTask ToHomeworkTask(this CreateTaskViewModel createTaskViewModel)
Expand Down
1 change: 0 additions & 1 deletion HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerAcceptToCourseEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ public class LecturerAcceptToCourseEvent : Event
{
public long CourseId { get; set; }
public string CourseName { get; set; }
public string MentorIds { get; set; }
public string StudentId { get; set; }
}
}
1 change: 0 additions & 1 deletion HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerRejectToCourseEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ public class LecturerRejectToCourseEvent : Event
{
public long CourseId { get; set; }
public string CourseName { get; set; }
public string MentorIds { get; set; }
public string StudentId { get; set; }
}
}
2 changes: 1 addition & 1 deletion HwProj.CoursesService/HwProj.CoursesService.API/Events/NewCourseMateEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class NewCourseMateEvent : Event
{
public long CourseId { get; set; }
public string CourseName { get; set; }
public string MentorIds { get; set; }
public string[] MentorIds { get; set; }
public string StudentId { get; set; }
public bool IsAccepted { get; set; }
}
Expand Down
Loading