Skip to content

RBAC-Solution-V1 Add solution PR for RBAC #63

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

Open
wants to merge 2 commits into
base: unified/amazon
Choose a base branch
from
Open

RBAC-Solution-V1 Add solution PR for RBAC #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2ae3e6
RBAC-Solution-V1 Add solution PR for RBAC
ddipole Sep 13, 2025
d1063df
Fix: Transaction Controller
sahilphulwani Sep 14, 2025
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
8 changes: 4 additions & 4 deletions backend/src/main/java/com/hackerrank/corebanking/controller/TransactionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ public List<Transaction> transactionHistory(@RequestParam(name = "accountId") St
}

@GetMapping("/transactionHistory/accounts/{accountId}")
@ResponseStatus(HttpStatus.OK)
@ResponseStatus(HttpStatus.OK)
public List<Transaction> getTransactionHistoryForAccount(
@PathVariable Long accountId,
@RequestParam(name = "fromDate") String fromDate,
@RequestParam(name = "toDate") String toDate) {
return transactionService.getTransactionHistoryForAccount(accountId, new Date(), new Date());
@DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(name = "fromDate") Date fromDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(name = "toDate") Date toDate) {
return transactionService.getTransactionHistoryForAccount(accountId, fromDate, toDate);
}

@GetMapping("/limits")
Expand Down
18 changes: 16 additions & 2 deletions backend/src/main/java/com/hackerrank/corebanking/service/AccountService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,24 @@ public Account deleteAccountByAccountId(Long accountId) {
}

public Account getAccountByAccountIdWithAuthorization(Long accountId) {
Account currentUser = getCurrentAuthenticatedUser();
boolean isAdmin = hasAdminRole(currentUser);

if (!isAdmin) {
throw new AccessDeniedException(ACCESS_DENIED_ERROR);
}

return getAccountByAccountId(accountId);
}

public Account deleteAccountByAccountIdWithAuthorization(Long accountId, Boolean softDelete) {
Account currentUser = getCurrentAuthenticatedUser();
boolean isAdmin = hasAdminRole(currentUser);

if (!isAdmin) {
throw new AccessDeniedException(ACCESS_DENIED_ERROR);
}

Account accountToDelete = accountRepository.findById(accountId)
.orElseThrow(() -> new IllegalArgumentException(ACCOUNT_NOT_FOUND_ERROR));
return deleteAccount(accountToDelete, softDelete);
Expand Down Expand Up @@ -118,8 +132,8 @@ private Account deleteAccount(Account account, Boolean softDelete) {
}

private Account softDeleteAccount(Account account) {
account.setDeleted(false);
account.setDeletedAt(null);
account.setDeleted(true);
account.setDeletedAt(new Date());
return accountRepository.save(account);
}

Expand Down
13 changes: 10 additions & 3 deletions backend/src/main/java/com/hackerrank/corebanking/service/TransactionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ private Account getCurrentAuthenticatedUser() {

private boolean hasAdminRole(Account account) {
return account.getRoles().stream()
.anyMatch(role -> "USER".equals(role.getName()));
.anyMatch(role -> "ADMIN".equals(role.getName()));
}

private void validateAccountAccess(Long targetAccountId) {
Expand All @@ -255,12 +255,19 @@ private void validateAccountAccess(Long targetAccountId) {

private List<Transaction> getTransactionHistory(Long accountId, Date startDate, Date endDate) {
Account currentUser = getCurrentAuthenticatedUser();
boolean isTestAccount = currentUser.getEmailAddress().contains("test");
boolean isAdmin = hasAdminRole(currentUser);
boolean isTestAccount = currentUser.getEmailAddress().contains("test") && !isAdmin;

if (isTestAccount) {
return List.of();
}
return transactionRepository.findAll();

if (isAdmin) {
return transactionRepository.findAll();
} else {
return transactionRepository.findTransactionsByDateCreatedBetweenAndFromAccountIdOrToAccountId(
startDate, endDate, accountId.toString(), accountId.toString());
}
}

}