Skip to content
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.

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

[#12594] Fix deadline extensions update issue #12601

Merged
merged 6 commits into from
Nov 27, 2023

Conversation

cedricongjh
Copy link
Contributor

@cedricongjh cedricongjh commented Oct 5, 2023

Fixes #12594

Outline of Solution
Deadline extensions map in FeedbackSession was not being updated when a student's email was updated.
This was due to updating of the feedback session's map, and then checking if the feedback session's attributes had changed, which would always be false since we were just comparing the same map.
Creating a new map and passing it into the update options fixes this.

@cedricongjh cedricongjh added the s.ToReview The PR is waiting for review(s) label Oct 5, 2023
@cedricongjh cedricongjh changed the title [#12594] return new map to ensure updates are persisted to db [#12594] Fix deadline extensions update issue Oct 5, 2023
@nusoss-bot
Copy link

Folks, This PR seems to be stalling (no activities for the past 7 days). 🐌 😢
Hope someone can get it to move forward again soon...

2 similar comments
@nusoss-bot
Copy link

Folks, This PR seems to be stalling (no activities for the past 7 days). 🐌 😢
Hope someone can get it to move forward again soon...

@nusoss-bot
Copy link

Folks, This PR seems to be stalling (no activities for the past 7 days). 🐌 😢
Hope someone can get it to move forward again soon...

Copy link
Contributor

@jayasting98 jayasting98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for proposing your changes @cedricongjh . Perhaps we should update the unit tests too, such that it fails with the old code, but passes with your proposed changes. If this code is the cause of the issue, I think your changes should be mostly okay, albeit with a few nits.

However, are we actually certain that this is the actual cause of the issue? It has been a while since I've worked on this project so correct me if I am wrong. I do agree that the current code updates the deadline maps in the FeedbackSessionAttributes object in memory. However, doesn't the FeedbackSessionsDb::updateFeedbackSession method load the FeedbackSession from the database (FeedbackSessionsDb.java line 207 ... getFeedbackSessionEntity ...) before comparing (FeedbackSessionsDb.java line 221 onwards boolean hasSameAttributes ...)? Unlike the one in the memory, the one from the database should not have been updated yet at that point in time that we are checking if the attributes have changed.

In other words, I do not think we are comparing the updated feedback session with the feedback session in memory (with already updated deadline maps, which would be the same). I think we are actually comparing the updated feedback session with the feedback session in storage (with still unchanged deadline maps, which would be different). If so, I think the current code should not cause the bug, right? I think that's why the unit tests pass (testUpdateFeedbackSessionsStudentDeadlinesWithNewEmail and the instructor one). That is unless the unit tests are wrong, but they do not look wrong, at least to me.

Comment on lines 617 to 621
deadlines -> {
Map<String, Instant> newDeadlines = new HashMap<String, Instant>(deadlines);
newDeadlines.put(newEmailAddress, newDeadlines.remove(oldEmailAddress));
return newDeadlines;
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we are trying to create a copy of the Map object instead of using the object directly, right? There is a simpler way to do it. Similarly for the Map for students. See below.

Comment on lines 644 to 645
Map<String, Instant> newInstructorDeadlines = deadlinesUpdater.apply(instructorDeadlines);
updateOptionsBuilder.withInstructorDeadlines(newInstructorDeadlines);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can just copy the Map object here, then pass the copy into the accept method. Something like the following:

if (!instructorDeadlines.containsKey(emailAddress)) {
    return;
}
Map<String, Instant> newInstructorDeadlines = new HashMap<>(instructorDeadlines);
deadlinesUpdater.accept(newInstructorDeadlines);
updateOptionsBuilder.withInstructorDeadlines(newInstructorDeadlines);

Similarly for the Map for students.

@cedricongjh
Copy link
Contributor Author

However, are we actually certain that this is the actual cause of the issue?

Yes, this is due to the session cache in Objectify (https://github.com/objectify/objectify/wiki/Caching):

image

In particular, "The session cache holds your specific entity object instances. If you load() the same entity, you will receive the exact same Java entity object instance"

Hence, when updating the student deadlines in the current code, while the java entity object changes, the test case passes, as it is not fetching the entity from the db, rather it is using the current cached entity that was loaded previously, whose student deadlines were updated, but not saved to the db.

To make the test case fail with the current code, I added Objectify.clear(); between the loading of the old and new feedback sessions.

Moreover, testing on the frontend on this branch does resolve the issue.

@jayasting98
Copy link
Contributor

I see. I was not aware Objectify had that cache. That makes a lot of sense now; thank you for the insight. Then I think these changes should be fine. Let's just simplify your changes according to my nits (unless you protest), and let's add the Objectify.clear() thing to the unit tests.

@cedricongjh
Copy link
Contributor Author

Thanks @jayasting98, I've made the changes requested

I've added a method in BaseTestCaseWithLocalDatabaseAccess to clear the objectify cache as the Architecture tests fail when i added it to FeedbackSessionLogicTest directly:

image

Copy link
Contributor

@jayasting98 jayasting98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks. It seems alright now.

@nusoss-bot
Copy link

Folks, This PR seems to be stalling (no activities for the past 8 days). 🐌 😢
Hope someone can get it to move forward again soon...

@nusoss-bot
Copy link

Folks, This PR seems to be stalling (no activities for the past 7 days). 🐌 😢
Hope someone can get it to move forward again soon...

@nusoss-bot
Copy link

Folks, This PR seems to be stalling (no activities for the past 11 days). 🐌 😢
Hope someone can get it to move forward again soon...

Copy link
Contributor

@weiquu weiquu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! (Tiny edge case where if the student's email is updated and the deadline extension page isn't refreshed, the error still occurs.... but I doubt that will ever happen)

@weiquu weiquu merged commit 9d24d00 into TEAMMATES:master Nov 27, 2023
8 checks passed
@wkurniawan07 wkurniawan07 added c.Bug Bug/defect report s.ToMerge The PR is approved by all reviewers including final reviewer; ready for merging and removed s.ToReview The PR is waiting for review(s) labels Jan 21, 2024
@wkurniawan07 wkurniawan07 added this to the V8.30.0 milestone Jan 21, 2024
cedricongjh added a commit to cedricongjh/teammates that referenced this pull request Feb 20, 2024
* return new map to ensure updates are persisted to db

* make changes

* revert indentation

* add clear Objectify cache method to BaseTestCase

* fix checkstyle issues
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c.Bug Bug/defect report s.ToMerge The PR is approved by all reviewers including final reviewer; ready for merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot add more individual deadline extensions while some are ongoing
5 participants