NapoleonDynamite/munera-vaadin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: chart generation

Browse source
This commit is contained in:
effe 2024-09-14 13:52:37 -04:00
parent f5f764ee5b
commit 8f4a571b0f
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/main/java/com/application/munera/views/dashboard/DashboardView.java
View file

@ -3,6 +3,7 @@ package com.application.munera.views.dashboard;
import com.application.munera.data.Expense; import com.application.munera.data.Expense;
import com.application.munera.data.Person; import com.application.munera.data.Person;
import com.application.munera.data.User; import com.application.munera.data.User;
import com.application.munera.facades.PersonFacade;
import com.application.munera.services.ExpenseService; import com.application.munera.services.ExpenseService;
import com.application.munera.services.PersonService; import com.application.munera.services.PersonService;
import com.application.munera.services.UserService; import com.application.munera.services.UserService;
@ -29,17 +30,15 @@ import java.util.stream.Collectors;
public class DashboardView extends Div { public class DashboardView extends Div {
private final ExpenseService expenseService; private final ExpenseService expenseService;
private final PersonService personService; private final PersonFacade personFacade;
private final UserService userService;
private final User loggedUser; private final User loggedUser;
private final Person loggedPerson; private final Person loggedPerson;
public DashboardView(final ExpenseService expenseService, final PersonService personService, UserService userService) { public DashboardView(ExpenseService expenseService, UserService userService, PersonFacade personFacade) {
this.expenseService = expenseService; this.expenseService = expenseService;
this.personService = personService; this.personFacade = personFacade;
this.userService = userService;
loggedUser = userService.getLoggedInUser(); loggedUser = userService.getLoggedInUser();
loggedPerson = personService.getLoggedInPerson(); loggedPerson = personFacade.getLoggedInPerson();
addClassName("highcharts-view"); // Optional CSS class for styling addClassName("highcharts-view"); // Optional CSS class for styling
VerticalLayout mainLayout = new VerticalLayout(); VerticalLayout mainLayout = new VerticalLayout();
@ -197,18 +196,22 @@ public class DashboardView extends Div {
} }
private String generateNegativeColumnChartScript() { private String generateNegativeColumnChartScript() {
final var people = personService.findAllExcludeLoggedUser(loggedUser).stream() final var people = personFacade.findAllExcludeLoggedUser(loggedUser);
.filter(person -> personService.calculateNetBalance(person).compareTo(BigDecimal.ZERO) != 0) // Create a map to store person names and their balances
.toList(); Map<String, Double> personData = people.stream()
if (people.isEmpty()) return generatePlaceholderChartScript("bottomLeftChart", "All Payments Settled"); .map(person -> {
BigDecimal balance = personFacade.calculateNetBalance(person);
Map<String, Double> personData = new LinkedHashMap<>(); // Return an array with the person’s first name and the balance
return new Object[]{person.getFirstName(), balance};
for (Person person : people) { })
BigDecimal balance = personService.calculateNetBalance(person); .filter(entry -> ((BigDecimal) entry[1]).compareTo(BigDecimal.ZERO) != 0)
// Invert the balance value .collect(Collectors.toMap(
personData.put(person.getFirstName(), balance.negate().doubleValue()); entry -> (String) entry[0],
} entry -> ((BigDecimal) entry[1]).negate().doubleValue(),
(existing, replacement) -> existing,
LinkedHashMap::new // Preserves insertion order
));
if (personData.isEmpty()) return generatePlaceholderChartScript("bottomLeftChart", "All Payments Settled");
// Prepare series data for Highcharts with conditional coloring // Prepare series data for Highcharts with conditional coloring
StringBuilder data = new StringBuilder("["); StringBuilder data = new StringBuilder("[");