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

GH-909 Resolve auto-message issues with database query, and message ordering. #909

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

vLuckyyy
Copy link
Member

@vLuckyyy vLuckyyy commented Feb 12, 2025

Faulty Query:

The for loop added eq (equality) conditions for each UUID, but it did not correctly combine them using the OR operator.

The or(onlineUniqueIds.size()) method did not work as expected because it did not create a proper logical OR condition in SQL.

  • Let's assume we have 3 online players: UUID1, UUID2, UUID3.
  • Player UUID2 has ignored messages.
  • The faulty query might return an incorrect ignoredIds list, such as an empty list.
  • As a result, all players (including UUID2) received messages, even though UUID2 had ignored them.

Correct Behavior (After the Fix):

  • The corrected query returns an ignoredIds list containing only UUID2.
  • Messages are sent only to UUID1 and UUID3.
  • Player UUID2 does not receive messages, in accordance with their settings.

Copy link
Contributor

coderabbitai bot commented Feb 12, 2025

Walkthrough

This update makes a few clear changes across the auto message functionality. First, a redundant import in the AutoMessageCommand file was removed and then re-added without altering any method behavior. In the repository class, the old data model using an ignore wrapper has been replaced by a new table class, and related query logic and method signatures were adjusted accordingly. In the service routine, the recursive scheduling has been replaced with a timer-based method, and a documentation annotation was removed. Additionally, a new class has been introduced to represent a database table with a unique ID, and there was a minor comment fix in the messages file. Overall, the changes refine the internal implementations and update the data model without affecting public interfaces.

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@vLuckyyy vLuckyyy changed the title Resolve auto-message issues with database query, and message ordering. GH-909 Resolve auto-message issues with database query, and message ordering. Feb 12, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageService.java (1)

56-63: Better scheduling approach!

The timer-based scheduling is more reliable than recursive scheduling. However, consider adding error handling for the timer task.

 private void tick() {
     this.scheduler.timerAsync(
         () -> {
             if (this.settings.enabled()) {
-                this.broadcastNextMessage();
+                try {
+                    this.broadcastNextMessage();
+                } catch (Exception e) {
+                    // Log error and ensure timer continues
+                    this.server.getLogger().warning("Error broadcasting auto message: " + e.getMessage());
+                }
             }
         }, this.settings.interval(), this.settings.interval());
 }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 34aa32c and b7ffce0.

📒 Files selected for processing (5)
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java (1 hunks)
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java (3 hunks)
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageService.java (2 hunks)
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageTable.java (1 hunks)
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java (1 hunks)
✅ Files skipped from review due to trivial changes (2)
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java
  • eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java
🔇 Additional comments (3)
eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageTable.java (1)

7-18: Nice and clean table design!

The new table class is well-structured with proper ORM annotations and a clear purpose.

eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java (2)

33-39: Great fix for the database query issue!

The new where.in() approach is much better than the old loop-based query. This directly fixes the issue mentioned in the PR where player UUIDs weren't being combined correctly.


41-49: Simple and efficient filtering!

Good use of streams to filter out ignored players from the online players list.

this.action(
AutoMessageTable.class, dao -> {
Where<AutoMessageTable, Object> where = dao.queryBuilder().where();
where.in("unique_id", onlineUniqueIds);
Copy link
Member

Choose a reason for hiding this comment

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

jak to działą to mergujemy ^

Copy link
Member Author

Choose a reason for hiding this comment

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

yup, all is tested

@vLuckyyy vLuckyyy merged commit 1802ac8 into master Feb 13, 2025
3 checks passed
@vLuckyyy vLuckyyy deleted the fix-bug-in-database-automessages branch February 13, 2025 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants