Skip to content

fix: ajuste no end point getExpenseDetails que requere o usuario auto… #191

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.

Sign up for GitHub

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

Merged
jv-ramos merged 1 commit into from
Nov 9, 2025
Merged

fix: ajuste no end point getExpenseDetails que requere o usuario auto… #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion backend/finboostplus_server/src/main/java/com/finboostplus/controller/GroupController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.finboostplus.DTO.SwitchAuthorityRequestDTO;
import com.finboostplus.model.Group;
import com.finboostplus.projection.GroupProjection;
import com.finboostplus.repository.GroupRepository;
import com.finboostplus.repository.UserRepository;
import com.finboostplus.service.CategoryService;
import com.finboostplus.service.ExpenseService;
Expand Down
10 changes: 8 additions & 2 deletions backend/finboostplus_server/src/main/java/com/finboostplus/service/ExpenseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,25 @@ public boolean createNewExpense(ExpenseCreateDTO expenseDTO, Long groupId) {

@Transactional(readOnly = true)
public UserExpenseDivisionDTO getExpenseInfoDetails(Long groupId, Long expenseId) {
userRepository.findByEmailIgnoreCase(userService.authenticated())
User user = userRepository.findByEmailIgnoreCase(userService.authenticated())
.orElseThrow(() -> new UserNotFoundException("Usuário não encontrado"));
Group group = groupRepository.findById(groupId)
.orElseThrow(() -> new GroupNotFoundException("Grupo não encontrado"));
Expense expense = expenseRepository.findById(expenseId).orElseThrow(
() -> new ForbiddenResourceException("Despesa nao encontrada"));
Category category = expense.getCategory();
List<UserExpenseDivisionProjection> memberList = getExpenseDivisionDetails(group.getId(), expenseId);
return new UserExpenseDivisionDTO(expense.getId(), expense.getTitle(),
boolean hasAuthority = groupMemberRepository.doesUserHasAnyAuthority(user.getId(), groupId, AUTHLEVELS);
boolean doesListContainMember = memberList.stream()
.anyMatch(item -> item.getUserId().equals(user.getId()));
if (hasAuthority || doesListContainMember) {
return new UserExpenseDivisionDTO(expense.getId(), expense.getTitle(),
expense.getDescription(), groupId, group.getName(), expense.getStatus(),
expense.getValue(), category.getId(), category.getName(), expense.getCreatedAt(),
expense.getDeadlineDate(),
memberList);
}
throw new ForbiddenResourceException("Acesso negado");
}

private List<UserExpenseDivisionProjection> getExpenseDivisionDetails(Long groupId, Long expenseId) {
Expand Down
2 changes: 2 additions & 0 deletions backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ public void removeGroupMember(Long groupId, Long memberId) {
String loggedAuth = loggedInMember.getAuthorization();
if ("OWNER".equals(loggedAuth)) {
groupMemberRepository.deleteByUserIdAndGroupId(memberId, groupId);
return;
} else if ("ADMIN".equals(loggedAuth) && "USER".equals(targetAuth)) {
groupMemberRepository.deleteByUserIdAndGroupId(memberId, groupId);
return;
}
throw new ForbiddenResourceException("Recurso não permitido");
}
Expand Down
Loading