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

fix: set the right status for adding and deleting memebers #60

Merged
merged 1 commit into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.List;
import java.util.Map;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down Expand Up @@ -54,13 +55,22 @@ public ResponseEntity<List<UserDTO3>> findGroupUsers(@PathVariable("groupId") Lo

@PostMapping("/groups/{groupId}/members")
public ResponseEntity<String> addGroupMembers(@PathVariable("groupId") Long groupId, @RequestBody Map<String, List<Long>>users) {
Boolean added=groupService.addGroupMembers(groupId, users.get("members"));
if(!added){
return new ResponseEntity(HttpStatus.UNAUTHORIZED);}
else{
return new ResponseEntity(HttpStatus.OK);}


return ResponseEntity.ok(groupService.addGroupMembers(groupId, users.get("members")));
}

@DeleteMapping("/groups/{groupId}/members/{memberid}")
public ResponseEntity<String> removeGroupMember(@PathVariable("groupId") Long groupId, @PathVariable("memberid") Long memberId) {
return ResponseEntity.ok(groupService.removeGroupMember(groupId, memberId));
Boolean deleted=groupService.removeGroupMember(groupId, memberId);
if(!deleted){
return new ResponseEntity(HttpStatus.UNAUTHORIZED);}
else{
return new ResponseEntity(HttpStatus.OK);}
}
@PostMapping("/groups/{groupId}/admins")
public ResponseEntity<?> addAdmin(@RequestBody Map<String, Long> userId, @PathVariable("groupId") Long groupId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ public List<UserDTO3> findUsers(Long groupId) {
return groupMembersDTOs;

}
public String addGroupMembers(Long groupId, List<Long> users) {
public Boolean addGroupMembers(Long groupId, List<Long> users) {
User connectedUser = functions.getConnectedUser();
Membership membership = membershipRepository.findByUserIdAndGroupId(connectedUser.getId(), groupId);

if(membership == null || !membership.getIsAdmin()) {
return "You are not allowed to add members to this group";
return false;
}else{
for (Long user : users) {
Membership m = new Membership();
Expand All @@ -127,20 +127,20 @@ public String addGroupMembers(Long groupId, List<Long> users) {
m.setJoiningDate(new java.util.Date(System.currentTimeMillis()));
membershipRepository.save(m);
}
return "Group members added successfully";
return true;
}

}
@Transactional
public String removeGroupMember(Long groupId, Long memberId) {
public Boolean removeGroupMember(Long groupId, Long memberId) {
User connectedUser = functions.getConnectedUser();
Membership membership = membershipRepository.findByUserIdAndGroupId(connectedUser.getId(), groupId);

if(membership == null || !membership.getIsAdmin()) {
return "You are not allowed to add members to this group";
return false;
}else{
membershipRepository.deleteByGroupIdAndUserId(groupId, memberId);
return "Group member removed successfully";}
return true;}
}
public GroupDTO3 getGroup(Long groupId) {
Group group = groupRepository.findById(groupId).get();
Expand Down
Loading