Skip to content

[ALT-10963] Don't overwrite check_profile from server with an empty string. #39

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
KirillovProj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[ALT-10963] Don't overwrite check_profile from server with an empty string. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions hs-edu-format/src/org/hyperskill/academy/learning/yaml/YamlMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.hyperskill.academy.learning.courseFormat.hyperskill.HyperskillProject
import org.hyperskill.academy.learning.courseFormat.hyperskill.HyperskillStage
import org.hyperskill.academy.learning.courseFormat.hyperskill.HyperskillTopic
import org.hyperskill.academy.learning.courseFormat.tasks.CodeTask
import org.hyperskill.academy.learning.courseFormat.tasks.RemoteEduTask
import org.hyperskill.academy.learning.courseFormat.tasks.Task
import org.hyperskill.academy.learning.courseFormat.tasks.TheoryTask
import org.hyperskill.academy.learning.yaml.format.*
Expand All @@ -31,6 +32,7 @@ import org.hyperskill.academy.learning.yaml.format.hyperskill.HyperskillStageMix
import org.hyperskill.academy.learning.yaml.format.hyperskill.HyperskillTopicMixin
import org.hyperskill.academy.learning.yaml.format.remote.DataTaskAttemptYamlMixin
import org.hyperskill.academy.learning.yaml.format.remote.RemoteCourseYamlMixin
import org.hyperskill.academy.learning.yaml.format.remote.RemoteEduTaskYamlMixin
import org.hyperskill.academy.learning.yaml.format.remote.RemoteStudyItemYamlMixin
import org.hyperskill.academy.learning.yaml.format.student.FeedbackYamlMixin
import org.hyperskill.academy.learning.yaml.format.student.StudentTaskFileYamlMixin
Expand Down Expand Up @@ -87,6 +89,7 @@ object YamlMapper {
addMixIn(Lesson::class.java, LessonYamlMixin::class.java)
addMixIn(FrameworkLesson::class.java, FrameworkLessonYamlMixin::class.java)
addMixIn(Task::class.java, StudentTaskYamlMixin::class.java)
addMixIn(RemoteEduTask::class.java, RemoteEduTaskYamlMixin::class.java)
addMixIn(CodeTask::class.java, CodeTaskYamlMixin::class.java)
addMixIn(TheoryTask::class.java, TheoryTaskYamlUtil::class.java)
addMixIn(CheckFeedback::class.java, FeedbackYamlMixin::class.java)
Expand Down
5 changes: 4 additions & 1 deletion ...-core/src/org/hyperskill/academy/learning/yaml/format/student/StudentTaskChangeApplier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ class StudentTaskChangeApplier(project: Project) : TaskChangeApplier(project) {
when (existingItem) {
is EduTask -> {
if (existingItem is RemoteEduTask) {
existingItem.checkProfile = (deserializedItem as RemoteEduTask).checkProfile
val newCheckProfile = (deserializedItem as RemoteEduTask).checkProfile
if (newCheckProfile.isNotEmpty()) {
existingItem.checkProfile = newCheckProfile
}
}
}
}
Expand Down
Loading