- * Indicates that the action should be deferred to the next workday. - *
- *- * Example 1: - * MO TU WE TH FR SA SO - * H WE WE -> Holiday/WeekEnd - * X -> Due date of action - * X' -> Deferred, effective due date of action - *- *
- * Example 2: - * TU WE TH FR SA SO MO - * H WE WE -> Holiday/WeekEnd - * X -> Due date of action - * X' -> Deferred, effective due date of action - *- * - */ - NEXT_WORKDAY, - - /** - *
- * Indicates that the action should preponed to the previous day - *
- *- * Example 1: - * MO TU WE TH FR SA SO - * H WE WE -> Holiday/WeekEnd - * X -> Due date of action - * X' -> Earlier, effective due date of action - *- *
- * Example 2: - * MO TU WE TH FR SA SO - * H WE WE -> Holiday/WeekEnd - * X -> Due date of action - * X' -> Earlier, effective due date of action - *- */ - PREVIOUS_WORKDAY; - - /** - * This method validates whether the given string represents a valid holiday weekend type. - * - * @param type to check - * @return whether the given type represents a valid holiday weekend type - */ - public static boolean isValidType(String type) { - return Arrays.stream(HolidayWeekendType.values()).anyMatch((holidayWeekendType) -> holidayWeekendType.name().equals(type)); - } -} diff --git a/financer-server/src/main/java/de/financer/model/IntervalType.java b/financer-server/src/main/java/de/financer/model/IntervalType.java deleted file mode 100644 index 952f9b8..0000000 --- a/financer-server/src/main/java/de/financer/model/IntervalType.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.financer.model; - -import java.util.Arrays; - -public enum IntervalType { - /** Indicates that an action should be executed every day */ - DAILY, - - /** Indicates that an action should be executed once a week */ - WEEKLY, - - /** Indicates that an action should be executed once a month */ - MONTHLY, - - /** Indicates that an action should be executed once a quarter */ - QUARTERLY, - - /** Indicates that an action should be executed once a year */ - YEARLY; - - /** - * This method validates whether the given string represents a valid interval type. - * - * @param type to check - * @return whether the given type represents a valid interval type - */ - public static boolean isValidType(String type) { - return Arrays.stream(IntervalType.values()).anyMatch((intervalType) -> intervalType.name().equals(type)); - } -} diff --git a/financer-server/src/main/java/de/financer/service/TransactionService.java b/financer-server/src/main/java/de/financer/service/TransactionService.java index 3f875bb..d9efca3 100644 --- a/financer-server/src/main/java/de/financer/service/TransactionService.java +++ b/financer-server/src/main/java/de/financer/service/TransactionService.java @@ -7,6 +7,7 @@ import de.financer.model.Account; import de.financer.model.AccountType; import de.financer.model.RecurringTransaction; import de.financer.model.Transaction; +import de.financer.util.ExpensePeriod; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; @@ -224,12 +225,17 @@ public class TransactionService { return response; } - public Long getExpensesCurrentPeriod() { - final LocalDate periodStart = LocalDate.now().withDayOfMonth(this.financerConfig.getMonthPeriodStartDay()); - final LocalDate periodEnd = periodStart.plusMonths(1); + public Long getExpensesCurrentPeriod(Integer monthPeriodStartDay) { + if (monthPeriodStartDay == null) { + return Long.valueOf(-1l); + } + + final ExpensePeriod expensePeriod = ExpensePeriod + .getCurrentExpensePeriod(monthPeriodStartDay); final Long expensesCurrentPeriod = this.transactionRepository - .getExpensesCurrentPeriod(periodStart, periodEnd, AccountType.EXPENSE, AccountType.LIABILITY); + .getExpensesCurrentPeriod(expensePeriod.getStart(), expensePeriod + .getEnd(), AccountType.EXPENSE, AccountType.LIABILITY); return Optional.ofNullable(expensesCurrentPeriod).orElse(Long.valueOf(0l)); } diff --git a/financer-server/src/main/resources/config/application.properties b/financer-server/src/main/resources/config/application.properties index 740c91d..51e132e 100644 --- a/financer-server/src/main/resources/config/application.properties +++ b/financer-server/src/main/resources/config/application.properties @@ -1,7 +1,7 @@ ### ### This is the main configuration file of the application. ### Filtering of the @...@ values happens via the maven-resource-plugin. The execution of the plugin is configured in -### the Spring Boot parent POM. +### the Spring Boot parent POM.// The same property exists on the server, look there for documentation spring.profiles.active=@activeProfiles@ @@ -46,7 +46,4 @@ spring.mail.host=localhost # Disable JMX as we don't need it and it blocks parallel deployment on Tomcat # because the connection pool cannot shutdown properly -spring.jmx.enabled=false - -# The day of month indicating the start of an expense period. Valid values range from 1-28 -financer.monthPeriodStartDay=15 \ No newline at end of file +spring.jmx.enabled=false \ No newline at end of file diff --git a/financer-web-client/pom.xml b/financer-web-client/pom.xml index 09c50fa..abbf5bf 100644 --- a/financer-web-client/pom.xml +++ b/financer-web-client/pom.xml @@ -10,7 +10,6 @@