Skip to content

fix find groups for user and add vote deletion when user removed from…#94

Merged
ssjablonski merged 3 commits into
mainfrom
backend/fix
Jun 24, 2025
Merged

fix find groups for user and add vote deletion when user removed from…#94
ssjablonski merged 3 commits into
mainfrom
backend/fix

Conversation

@szymongrabski

@szymongrabski szymongrabski commented Jun 24, 2025

Copy link
Copy Markdown
Contributor

… group

Summary by Sourcery

Fix group query to fetch only user-associated groups, add automatic vote cleanup when removing a member, and update related repository methods and tests.

New Features:

  • Delete all votes cast by a user in a group upon their removal from that group.

Enhancements:

  • Refactor group retrieval to a membership-based query and rename the repository method accordingly.
  • Annotate member removal operation as transactional to ensure atomic vote deletion.

Tests:

  • Mock and verify vote deletion in group membership removal tests.
  • Update tests to use the renamed group retrieval repository method.

Chores:

  • Remove trailing comma from NotificationType enum.
  • Clean up extraneous whitespace in ActivityService.

@sourcery-ai

sourcery-ai Bot commented Jun 24, 2025

Copy link
Copy Markdown

Reviewer's Guide

This PR refactors group membership retrieval by replacing and renaming the repository query, implements automatic deletion of a user’s votes when they’re removed from a group (including service wiring and tests), and applies minor formatting cleanups.

Sequence diagram for user removal from group and vote deletion

sequenceDiagram
    participant Admin as actor Admin/User
    participant GroupService
    participant GroupMembershipService
    participant VoteRepository
    participant GroupMembershipRepository

    Admin->>GroupService: removeMemberFromGroup(groupId, userId, currentUser)
    GroupService->>GroupMembershipService: removeMemberFromGroup(groupId, userId, currentUser)
    GroupMembershipService->>VoteRepository: deleteUserVotesInGroup(groupId, userId)
    VoteRepository-->>GroupMembershipService: (votes deleted)
    GroupMembershipService->>GroupMembershipRepository: delete(membership)
    GroupMembershipRepository-->>GroupMembershipService: (membership deleted)
    GroupMembershipService-->>GroupService: (done)
    GroupService-->>Admin: (done)
Loading

Class diagram for updated GroupRepository and VoteRepository

classDiagram
    class GroupRepository {
        +Page<Group> findGroupsByUserMembership(Long userId, Pageable pageable)
    }
    class VoteRepository {
        +void deleteUserVotesInGroup(Long groupId, Long userId)
    }
Loading

Class diagram for updated GroupMembershipService

classDiagram
    class GroupMembershipService {
        +GroupMembershipResponse addMemberToGroup(Long groupId, Long userId, GroupRole role, User currentUser)
        +void removeMemberFromGroup(Long groupId, Long userId, User currentUser)
        -VoteRepository voteRepository
    }
Loading

File-Level Changes

Change Details Files
Refactor group membership query and method
  • Simplify JPQL to select by membership only
  • Rename repository method to findGroupsByUserMembership
  • Update service call and map results to responses
  • Adjust tests to mock and verify the new method
GroupRepository.java
GroupService.java
GroupServiceTest.java
Add vote deletion when removing a group member
  • Define deleteUserVotesInGroup @Modifying query in VoteRepository
  • Inject VoteRepository and annotate removeMemberFromGroup as @transactional
  • Invoke vote deletion before membership removal
  • Mock and verify vote deletion in membership service test
VoteRepository.java
GroupMembershipService.java
GroupMembershipServiceTest.java
Minor code style cleanups
  • Remove extra blank line in ActivityService
  • Eliminate trailing comma in NotificationType enum
ActivityService.java
NotificationType.java

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Hey @szymongrabski - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@github-actions

Copy link
Copy Markdown

Code Coverage

File Coverage [96.45%] 🍏
GroupService.java 100% 🍏
GroupMembershipService.java 100% 🍏
NotificationType.java 100% 🍏
ActivityService.java 83.47% 🍏
Total Project Coverage 81.89% 🍏

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Summary of Changes

Hello @szymongrabski, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses an issue with group retrieval for users and introduces vote deletion when a user is removed from a group. The changes ensure that group memberships are accurately reflected and that orphaned votes are cleaned up when a user leaves a group, maintaining data integrity.

Highlights

  • Group Retrieval: Modified the GroupRepository to more accurately find groups a user is a member of by adjusting the query to only check for membership via GroupMembership entries.
  • Vote Deletion: Implemented a mechanism to delete a user's votes within a group when the user is removed from that group. This ensures data consistency and prevents orphaned votes.
  • Transactional Management: Added @Transactional annotation to removeMemberFromGroup method in GroupMembershipService to ensure atomicity of operations.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Code Review

This pull request addresses finding groups for a user and adds vote deletion upon user removal. It includes repository, service, and test updates. Consider using Spring's @Transactional and verifying vote deletion in tests. Also, there's a suggestion to remove the trailing comma from the NotificationType enum.

@@ -1,5 +1,6 @@
package share.fare.backend.service;

import jakarta.transaction.Transactional;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

medium

Consider using org.springframework.transaction.annotation.Transactional instead of jakarta.transaction.Transactional for better consistency with Spring framework-specific features.

Suggested change
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;

when(groupMembershipRepository.findByGroupAndUser(testGroup, testUser2)).thenReturn(Optional.ofNullable(testMembership));
doNothing().when(groupMembershipRepository).delete(testMembership);

doNothing().when(voteRepository).deleteUserVotesInGroup(1L, 2L);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

medium

Verify that voteRepository.deleteUserVotesInGroup is called to ensure votes are deleted when a user is removed from a group.

Suggested change
doNothing().when(voteRepository).deleteUserVotesInGroup(1L, 2L);
verify(voteRepository, times(1)).deleteUserVotesInGroup(1L, 2L);

@github-actions

Copy link
Copy Markdown

Code Coverage

File Coverage [96.47%] 🍏
GroupService.java 100% 🍏
GroupMembershipService.java 100% 🍏
NotificationType.java 100% 🍏
ActivityService.java 83.47% 🍏
Total Project Coverage 81.9% 🍏

@ssjablonski ssjablonski merged commit 69a4aa2 into main Jun 24, 2025
1 check passed
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