chore: Simpler implementation for empty instance check

[sharat87]

Refactored the implementation of isUsersEmpty so that it works the same on release and on pg branches.

/test sanity

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/9797721649
Commit: f0ed5ee
Cypress dashboard.
Tags: @tag.Sanity

Summary by CodeRabbit

• New Features
  • Enhanced user filtering criteria with more efficient exclusion logic.
• Bug Fixes
  • Improved accuracy and performance of user count checks by updating the filtering method.

[coderabbitai]

Warning

Review failed

The pull request is closed.

Walkthrough

The recent changes introduce and utilize a new method, notIn, to the Bridge and BridgeQuery classes within the Appsmith server to improve query operations. Specifically, CustomUserRepositoryCEImpl replaces its email filtering logic with this new notIn criteria method, streamlining and enhancing the isUsersEmpty() method's functionality.

Changes

File Path	Change Summary
app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/bridge/Bridge.java	Added the notIn method to the Bridge class, which returns a BridgeQuery<T> object for improved query criteria.
app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/bridge/BridgeQuery.java	Added the notIn method to the BridgeQuery class, enabling the addition of new criteria checks to the query mechanism.
app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java	Updated the isUsersEmpty() method to use the Bridge.notIn() criteria for filtering, changed to limit to 1 result, and now returns a count based on the IdOnly projection.

Poem

In Bridge and Query, new pathways we weave,
With notIn criteria, clearer data we achieve.
The CustomUserRepo now sleeker and swift,
Through polished code, performance we lift.
Cheers to the devs, for making the call,
Modernizing our methods, with notIn for all! 🐇✨

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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>.
  • 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 generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @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 as 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 resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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.

[github-actions]

Failed server tests

• com.appsmith.server.fork.ApplicationForkingServiceTests#cloneApplicationForkWithConfigurationFalseWithActionsThrice
• com.appsmith.server.services.UserServiceTest#buildUserProfileDTO_WhenAnonymousUser_ReturnsProfile
• com.appsmith.server.services.UserServiceTest#getIntercomConsentOfUserOnCloudHosting_AlwaysTrue

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 52e8cda and f0ed5ee.

Files selected for processing (3)

• app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/bridge/Bridge.java (1 hunks)
• app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/bridge/BridgeQuery.java (1 hunks)
• app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java (2 hunks)

Additional comments not posted (3)

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java (1)

41-43: Ensure correct usage of Bridge.notIn.

The updated implementation uses Bridge.notIn to filter out system-generated emails. This approach simplifies the logic and improves readability. Ensure that getSystemGeneratedUserEmails() returns the correct set of emails to be excluded.

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/bridge/Bridge.java (1)

95-98: New method notIn looks good.

The notIn method is a useful addition for filtering out items not in a given collection. It is consistent with other methods in the Bridge class.

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/bridge/BridgeQuery.java (1)

80-83: New method notIn looks good.

The notIn method correctly adds a criteria check to exclude items in the specified collection. It is consistent with other methods in the BridgeQuery class.