From da0cf48dc35cab3a8bf52fe3cd96e81631c59ff3 Mon Sep 17 00:00:00 2001 From: Cedric Hornberger Date: Tue, 7 Jul 2026 21:55:55 +0200 Subject: [PATCH] feat: persist splitMode/splitPercentage and list defaultSplitPercentage Co-Authored-By: Claude Opus 4.8 --- .../app/xpensely_server/model/Expense.java | 8 +++++++ .../model/ExpenseChangeRequest.java | 5 ++++ .../xpensely_server/model/ExpenseInput.java | 5 ++++ .../xpensely_server/model/ExpenseList.java | 2 ++ .../app/xpensely_server/model/SplitMode.java | 6 +++++ .../services/ExpenseListService.java | 4 ++++ .../services/ExpenseListServiceTest.java | 24 +++++++++++++++++++ 7 files changed, 54 insertions(+) create mode 100644 src/main/java/de/zendric/app/xpensely_server/model/SplitMode.java diff --git a/src/main/java/de/zendric/app/xpensely_server/model/Expense.java b/src/main/java/de/zendric/app/xpensely_server/model/Expense.java index 34bc45f..59983b3 100644 --- a/src/main/java/de/zendric/app/xpensely_server/model/Expense.java +++ b/src/main/java/de/zendric/app/xpensely_server/model/Expense.java @@ -6,6 +6,8 @@ import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonBackReference; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; @@ -36,6 +38,12 @@ public class Expense { private Double personalUseAmount; private Double otherPersonAmount; private String category; + + @Enumerated(EnumType.STRING) + private SplitMode splitMode; + + private Integer splitPercentage; + private LocalDate date; private LocalDateTime lastModified; diff --git a/src/main/java/de/zendric/app/xpensely_server/model/ExpenseChangeRequest.java b/src/main/java/de/zendric/app/xpensely_server/model/ExpenseChangeRequest.java index 561ff11..1414a03 100644 --- a/src/main/java/de/zendric/app/xpensely_server/model/ExpenseChangeRequest.java +++ b/src/main/java/de/zendric/app/xpensely_server/model/ExpenseChangeRequest.java @@ -33,6 +33,9 @@ public class ExpenseChangeRequest { private Double personalUseAmount; private Double otherPersonAmount; + private SplitMode splitMode; + private Integer splitPercentage; + @NotNull(message = "Date is required") private LocalDate date; @@ -55,6 +58,8 @@ public class ExpenseChangeRequest { // The edit dialog sends "" for a missing category; store null so the // stub state stays uniform and history diffs don't report null -> "". expense.setCategory(category == null || category.isBlank() ? null : category); + expense.setSplitMode(splitMode == null ? SplitMode.DETAILED : splitMode); + expense.setSplitPercentage(splitPercentage); return expense; } diff --git a/src/main/java/de/zendric/app/xpensely_server/model/ExpenseInput.java b/src/main/java/de/zendric/app/xpensely_server/model/ExpenseInput.java index ee11b4b..00531fa 100644 --- a/src/main/java/de/zendric/app/xpensely_server/model/ExpenseInput.java +++ b/src/main/java/de/zendric/app/xpensely_server/model/ExpenseInput.java @@ -33,6 +33,9 @@ public class ExpenseInput { private Double personalUseAmount; private Double otherPersonAmount; + private SplitMode splitMode; + private Integer splitPercentage; + @NotNull(message = "Date is required") private LocalDate date; @@ -56,6 +59,8 @@ public class ExpenseInput { expense.setOwner(appUser); expense.setTitle(title); expense.setCategory(category); + expense.setSplitMode(splitMode == null ? SplitMode.DETAILED : splitMode); + expense.setSplitPercentage(splitPercentage); return expense; } diff --git a/src/main/java/de/zendric/app/xpensely_server/model/ExpenseList.java b/src/main/java/de/zendric/app/xpensely_server/model/ExpenseList.java index 4902f2f..3b4db33 100644 --- a/src/main/java/de/zendric/app/xpensely_server/model/ExpenseList.java +++ b/src/main/java/de/zendric/app/xpensely_server/model/ExpenseList.java @@ -31,6 +31,8 @@ public class ExpenseList { private String name; + private Integer defaultSplitPercentage = 50; + private String inviteCode; @JsonIgnore private LocalDateTime inviteCodeExpiration; diff --git a/src/main/java/de/zendric/app/xpensely_server/model/SplitMode.java b/src/main/java/de/zendric/app/xpensely_server/model/SplitMode.java new file mode 100644 index 0000000..4c48bfb --- /dev/null +++ b/src/main/java/de/zendric/app/xpensely_server/model/SplitMode.java @@ -0,0 +1,6 @@ +package de.zendric.app.xpensely_server.model; + +public enum SplitMode { + DETAILED, + PERCENTAGE +} diff --git a/src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java b/src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java index 57756e7..e76c1b2 100644 --- a/src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java +++ b/src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java @@ -137,6 +137,8 @@ public class ExpenseListService { existingExpense.setDate(updatedExpense.getDate()); existingExpense.setOwner(updatedExpense.getOwner()); existingExpense.setCategory(updatedExpense.getCategory()); + existingExpense.setSplitMode(updatedExpense.getSplitMode()); + existingExpense.setSplitPercentage(updatedExpense.getSplitPercentage()); existingExpense.setLastModified(LocalDateTime.now()); Expense saved = expenseRepository.save(existingExpense); @@ -153,6 +155,8 @@ public class ExpenseListService { copy.setPersonalUseAmount(e.getPersonalUseAmount()); copy.setOtherPersonAmount(e.getOtherPersonAmount()); copy.setCategory(e.getCategory()); + copy.setSplitMode(e.getSplitMode()); + copy.setSplitPercentage(e.getSplitPercentage()); copy.setDate(e.getDate()); copy.setOwner(e.getOwner()); return copy; diff --git a/src/test/java/de/zendric/app/xpensely_Server/services/ExpenseListServiceTest.java b/src/test/java/de/zendric/app/xpensely_Server/services/ExpenseListServiceTest.java index 7c30ef6..5f90ed1 100644 --- a/src/test/java/de/zendric/app/xpensely_Server/services/ExpenseListServiceTest.java +++ b/src/test/java/de/zendric/app/xpensely_Server/services/ExpenseListServiceTest.java @@ -3,6 +3,7 @@ package de.zendric.app.xpensely_Server.services; import de.zendric.app.xpensely_server.model.AppUser; import de.zendric.app.xpensely_server.model.Expense; import de.zendric.app.xpensely_server.model.ExpenseList; +import de.zendric.app.xpensely_server.model.SplitMode; import de.zendric.app.xpensely_server.repo.ExpenseListRepository; import de.zendric.app.xpensely_server.repo.ExpenseRepository; import de.zendric.app.xpensely_server.repo.XpenselyCustomCategoryRepository; @@ -109,6 +110,29 @@ class ExpenseListServiceTest { assertThat(beforeCaptor.getValue().getAmount()).isEqualTo(12.0); } + @Test + void updateExpense_persistsSplitModeAndPercentage() { + AppUser actor = new AppUser(); actor.setId(1L); + ExpenseList list = new ExpenseList(); list.setId(10L); list.setOwner(actor); + Expense existing = makeExpense(5L, "Groceries", 100.0); + list.setExpenses(new ArrayList<>(List.of(existing))); + + Expense incoming = makeExpense(5L, "Groceries", 100.0); + incoming.setDate(LocalDate.now()); + incoming.setOwner(list.getOwner()); + incoming.setSplitMode(SplitMode.PERCENTAGE); + incoming.setSplitPercentage(70); + + when(repository.findById(10L)).thenReturn(Optional.of(list)); + when(expenseRepository.findById(5L)).thenReturn(Optional.of(existing)); + when(expenseRepository.save(any(Expense.class))).thenAnswer(inv -> inv.getArgument(0)); + + Expense saved = service.updateExpense(10L, incoming, actor); + + assertThat(saved.getSplitMode()).isEqualTo(SplitMode.PERCENTAGE); + assertThat(saved.getSplitPercentage()).isEqualTo(70); + } + @Test void deleteById_deletesHistoryEntriesBeforeDeletingList() { service.deleteById(10L);