First pass of reducing constants needed

Author: dlmcpaul

src/main/java/com/hz/mymoney/configuration/AccountConstants.java

@@ -10,16 +10,18 @@ private AccountConstants() {}
 	// Income
 	public static final String INCOME_PREFIX = "Income:";
 	public static final String EMPLOYMENT_SALARY = "Income:Employment:Salary";
+	public static final String INTEREST_INCOME = "Income:Cash:Int Paid";
+	public static final String INVESTMENT_INCOME = "Income:Investment:";
+	public static final String IMPUTATION_INCOME = "Income:Investment:Imputation:Tax Credit";
+
 	public static final String DIVIDEND_INCOME = "Income:Investment:Dividends";
+	public static final String FRANKED_DIVIDEND = "Income:Investment:Dividends:Franked";
+	public static final String UNFRANKED_DIVIDEND ="Income:Investment:Dividends:Unfranked";
 	public static final String DISTRIBUTION_INCOME = "Income:Investment:Distribution";
 	public static final String REINVESTMENT_INCOME = "Income:Investment:Reinvestment";
 	public static final String CAPITAL_GAINS_INCOME = "Income:Investment:Capital Gains";
 	public static final String CAPITAL_LOSSES_INCOME = "Income:Investment:Capital Losses";
 	public static final String CAPITAL_RETURN_INCOME = "Income:Investment:Capital Return";
-	public static final String INTEREST_INCOME = "Income:Cash:Int Paid";
-	public static final String FRANKED_DIVIDEND = "Income:Investment:Dividends:Franked";
-	public static final String UNFRANKED_DIVIDEND ="Income:Investment:Dividends:Unfranked";
-	public static final String IMPUTATION_INCOME = "Income:Investment:Imputation:Tax Credit";
 	public static final String INCOME_OTHER = "Income:Investment:Miscellaneous Income";
 
 	// Expenses
@@ -39,7 +41,7 @@ private AccountConstants() {}
 
 	public static final String SUPER_CONTRIBUTION_NOTE = "Super Contribution Transfer";  // To identify Super Contributions
 
-	// Investments
+	// Investment Assets
 	public static final String SHARES = "Assets:Shares:";       // Where shares are tracked
 	public static final String STOCKBROKER = "Assets:Broker:";   // Where stockbroker accounts are tracked
 	public static final String FUNDS = "Assets:Fund:";          // Where Fund accounts are tracked

src/main/java/com/hz/mymoney/data/models/internal/ChartOfAccounts.java

@@ -120,47 +120,14 @@ public LocalDate getNextDistributionDateForCode(String code) {
 				.collect(Collectors.toCollection(PriorityQueue::new)));
 	}
 
-	public BigDecimal getTotalFrankedDividendsForCode(String code) {
-		return this.sumAmountForAccountWithCode(FRANKED_DIVIDEND, code);
-	}
-
-	public BigDecimal getTotalUnFrankedDividendsForCode(String code) {
-		return this.sumAmountForAccountWithCode(UNFRANKED_DIVIDEND, code);
-	}
-
-	public BigDecimal getTotalMiscIncomeForCode(String code) {
-		return this.sumAmountForAccountWithCode(INCOME_OTHER, code);
-	}
-
-	public BigDecimal getTotalCapitalGainsForCode(String code) {
-		return this.sumAmountForAccountWithCode(CAPITAL_GAINS_INCOME, code);
-	}
-
-	// None in conversion
-	public BigDecimal getTotalCapitalLossesForCode(String code) {
-		return this.sumAmountForAccountWithCode(CAPITAL_LOSSES_INCOME, code);
-	}
-
-	public BigDecimal getTotalCapitalReturnsForCode(String code) {
-		return this.sumAmountForAccountWithCode(CAPITAL_RETURN_INCOME, code);
-	}
-
-	// Fund type distribution or reinvestment
-	public BigDecimal getTotalDistributionsForCode(String code) {
-		return this.sumAmountForAccountWithCode(DISTRIBUTION_INCOME, code)
-				.add(this.sumAmountForAccountWithCode(REINVESTMENT_INCOME, code));
-	}
-
 	public BigDecimal getTotalInvestmentIncomeForCode(String code) {
-		return this.getTotalFrankedDividendsForCode(code)
-				.add(this.getTotalUnFrankedDividendsForCode(code))
-				.add(this.getTotalMiscIncomeForCode(code))
-				.add(this.getTotalCapitalGainsForCode(code))
-				.add(this.getTotalCapitalReturnsForCode(code))
-				.add(this.getTotalDistributionsForCode(code));
+		return Arrays.stream(INVESTMENT_INCOME
+				.split(","))
+				.map(x -> this.sumAmountForAccountsWithCode(x, code))
+				.reduce(BigDecimal.ZERO, BigDecimal::add);
 	}
 
-	private BigDecimal sumAmountForAccountWithCode(String accountType, String code) {
+	private BigDecimal sumAmountForAccountExactWithCode(String accountType, String code) {
 		return accounts.stream()
 				.filter(account -> account.getName().equalsIgnoreCase(accountType))
 				.map(account -> account.getMovementsForCode(code))
@@ -170,6 +137,16 @@ private BigDecimal sumAmountForAccountWithCode(String accountType, String code)
 				.setScale(2, RoundingMode.HALF_UP);
 	}
 
+	private BigDecimal sumAmountForAccountsWithCode(String accountType, String code) {
+		return accounts.stream()
+				.filter(account -> account.getName().toLowerCase().startsWith(accountType.toLowerCase()))
+				.map(account -> account.getMovementsForCode(code))
+				.map(this::sum)
+				.reduce(BigDecimal.ZERO, BigDecimal::add)
+				.abs()
+				.setScale(2, RoundingMode.HALF_UP);
+	}
+
 	private BigDecimal sum(Collection<Movement> movements) {
 		return movements.stream()
 				.map(Movement::amount)

src/main/java/com/hz/mymoney/ui/models/templates/TaxYear.java

@@ -83,11 +83,13 @@ List<Transaction> getEarnedIncomeTransactions() {
 	List<Transaction> getInvestmentIncomeTransactions() {
 		List<Transaction> result = new ArrayList<>();
 
-		result.addAll(this.filter(incomeTransactions, DIVIDEND_INCOME));
-		result.addAll(this.filter(incomeTransactions, CAPITAL_GAINS_INCOME));
-		result.addAll(this.filter(incomeTransactions, CAPITAL_RETURN_INCOME));
 		result.addAll(this.filter(incomeTransactions, INTEREST_INCOME));
-		result.addAll(this.filter(incomeTransactions, DISTRIBUTION_INCOME));
+		result.addAll(this.filter(incomeTransactions, INVESTMENT_INCOME));
+
+//		result.addAll(this.filter(incomeTransactions, DIVIDEND_INCOME));
+//		result.addAll(this.filter(incomeTransactions, CAPITAL_GAINS_INCOME));
+//		result.addAll(this.filter(incomeTransactions, CAPITAL_RETURN_INCOME));
+//		result.addAll(this.filter(incomeTransactions, DISTRIBUTION_INCOME));
 
 		return result;
 	}