Fix overlap lesson bug #259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ypinhsuan
requested review from
a team,
dextertanyj and
samlsm
and removed request for
a team
dextertanyj
reviewed
Nov 2, 2020
Comment on lines
+96
to
+105
| /** | ||
| * Returns true if the class contains a {@code Lesson} that overlaps with the given {@code lesson} | ||
| * after removing {@code toRemove} from the list of lessons. | ||
| * | ||
| * @throws NullPointerException if the given {@code lesson} is null. | ||
| */ | ||
| public boolean hasOverlapLesson(Lesson lesson, Lesson toRemove) { | ||
| return lessons.stream().filter(l -> !l.equals(toRemove)).anyMatch(lesson::isOverlapLesson); | ||
| } | ||
|
|
There was a problem hiding this comment.
Nice, I like this method of resolving the check issue. @junlong4321 perhaps you can use this for the edit-student issue as well.
@ypinhsuan Would it be possible to overload the method instead of taking null for the second argument when it is an add operation?
There was a problem hiding this comment.
yep sure I think overload is better
# Conflicts: # src/main/java/tutorspet/logic/util/ModuleClassUtil.java
samlsm
approved these changes
Nov 3, 2020
| @@ -94,10 +95,19 @@ private boolean hasDuplicateLessons(List<Lesson> lessons, Lesson lessonToCheck) | |||
| return lessons.stream().anyMatch(lessonToCheck::isSameLesson); | |||
| } | |||
|
|
|||
| /** | |||
| * Checks if a {@code lesson} timing overlaps with another {@code Lesson} in the list. | |||
| * Overlapping lessons are detected by calling the {@code isOverlapLesson} method in {@code Lesson}. | |||
There was a problem hiding this comment.
Perhaps it might be good to specify class here?
Suggested change
| * Overlapping lessons are detected by calling the {@code isOverlapLesson} method in {@code Lesson}. | |
| * Overlapping lessons are detected by calling the {@code isOverlapLesson} method in {@code Lesson} class. |
# Conflicts: # src/test/java/tutorspet/storage/JsonSerializableTutorsPetTest.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #226