Cedric/XpenselyServer
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

initial Release request #1

Merged
Cedric merged 34 commits from dev into main 2025-01-12 10:46:30 +01:00
Conversation 0 Commits 34 Files Changed 31 +5 -3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0ee56e4e52 - Show all commits

4
src/main/java/de/zendric/app/xpensely_server/controller/ExpenseListController.java
View File

@@ -143,7 +143,6 @@ class ExpenseListController {
} }
@PostMapping("/accept-invite") @PostMapping("/accept-invite")
public ResponseEntity<?> acceptInvite(@RequestBody InviteRequest inviteRequest) { public ResponseEntity<?> acceptInvite(@RequestBody InviteRequest inviteRequest) {
ExpenseList list = expenseListService.findByInviteCode(inviteRequest.getInviteCode()); ExpenseList list = expenseListService.findByInviteCode(inviteRequest.getInviteCode());
@@ -151,6 +150,9 @@ class ExpenseListController {
list.getInviteCodeExpiration().isBefore(LocalDateTime.now())) { list.getInviteCodeExpiration().isBefore(LocalDateTime.now())) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Invalid or expired invite code"); return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Invalid or expired invite code");
} }
if (list.getSharedWith() != null) {
return ResponseEntity.status(HttpStatus.IM_USED).body("List has already been shared");
}
AppUser user = null; AppUser user = null;
try { try {
user = userService.getUser(inviteRequest.getUserId()); user = userService.getUser(inviteRequest.getUserId());

4
src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java
View File

@@ -71,7 +71,7 @@ public class ExpenseListService {
if (expenseList.getOwner().getId().equals(id)) { if (expenseList.getOwner().getId().equals(id)) {
userSpecificList.add(expenseList); userSpecificList.add(expenseList);
} else { } else {
if (sharedWith.getId().equals(id)) { if (sharedWith != null && sharedWith.getId().equals(id)) {
userSpecificList.add(expenseList); userSpecificList.add(expenseList);
} }
} }
@@ -88,7 +88,7 @@ public class ExpenseListService {
if (expenseList.getOwner().getUsername().equals(username)) { if (expenseList.getOwner().getUsername().equals(username)) {
userSpecificList.add(expenseList); userSpecificList.add(expenseList);
} else { } else {
if (sharedWith.getUsername().equals(username)) { if (sharedWith != null && sharedWith.getUsername().equals(username)) {
userSpecificList.add(expenseList); userSpecificList.add(expenseList);
} }
} }