Resolve merge conflicts in GradingService.java by combining refactored methods with logging#22
Merged
Conversation
… student repository
Feature code assignments
assignment_service now publishes the code to other services
added more logging
9 tasks
Resolved merge conflicts in GradingService.java by combining: - Refactored helper methods from bugfix branch - Detailed logging statements from main branch
Copilot
AI
changed the title
[WIP] Fix issue with multiple StudentCodeSubmittedEvents on reload
Resolve merge conflicts in GradingService.java by combining refactored methods with logging
Jan 15, 2026
MP-DG
approved these changes
Jan 15, 2026
This file contains hidden or 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
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.
Description of changes
Resolved merge conflicts between PR #21's bugfix branch and main by merging both code structures: the refactored helper methods from bugfix-multiple-proactive-feedback and the detailed
[GRADING-FLOW]logging statements from main.Conflict Resolution in GradingService.java:
ensureGradingEntityExists(),hasRepositoryLink(),findAndSetRepositoryLinkIfMissing(),syncAndUpdateGrading(),updateGradingFromExternalGrading(),handleCodeSubmissionEvent(),shouldSendCodeSubmissionEvent()lastProcessedCommitSha)Note: The local
bugfix-multiple-proactive-feedbackbranch (commit 4478eeb) contains the resolved conflicts but requires manual push due to environment constraints. Alternatively, merging this PR will update the bugfix branch with the resolution.How has this been tested?
Merge conflict resolution verified by inspecting the combined code structure. Build verification skipped due to Java 21 requirement vs Java 17 environment.
Checklist before requesting a review
the wiki/adr
Checklist for reviewer
the coding guidelines of
this project
will perform a database migration
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.