From 1a54ae96611e868ff5408a96083fe293db17d193 Mon Sep 17 00:00:00 2001 From: Armin Wolf Date: Sun, 3 Mar 2024 13:08:48 +0100 Subject: [PATCH] initial commit --- .gitignore | 215 +------ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 59925 bytes .mvn/wrapper/maven-wrapper.properties | 18 + mvnw | 316 ++++++++++ mvnw.cmd | 188 ++++++ pom.xml | 120 ++++ .../FinanceAnalyzerApplication.java | 14 + .../financeanalyzer/conf/BankAccount.java | 61 ++ .../financeanalyzer/conf/Configuration.java | 36 ++ .../conf/SpringConfiguration.java | 15 + .../controller/ConverterController.java | 111 ++++ .../controller/CustomErrorController.java | 31 + .../controller/FileController.java | 38 ++ .../controller/MainController.java | 55 ++ .../controller/ReportController.java | 57 ++ .../controller/UploadController.java | 38 ++ .../financeanalyzer/dao/ReportDAO.java | 151 +++++ .../financeanalyzer/dao/TableDataDAO.java | 37 ++ .../financeanalyzer/dao/TransactionDAO.java | 555 ++++++++++++++++++ .../charts/factories/BubbleChartFactory.java | 60 ++ .../charts/factories/ColumnChartFactory.java | 74 +++ .../charts/factories/LineChartFactory.java | 42 ++ .../dao/charts/model/Chart.java | 46 ++ .../dao/charts/model/Column.java | 20 + .../dao/charts/model/DataLabels.java | 59 ++ .../dao/charts/model/Filter.java | 45 ++ .../dao/charts/model/HighChartDAO.java | 125 ++++ .../dao/charts/model/LayoutAlgorithm.java | 76 +++ .../dao/charts/model/Packedbubble.java | 95 +++ .../dao/charts/model/PlotOptions.java | 28 + .../dao/charts/model/Series.java | 62 ++ .../dao/charts/model/SeriesElement.java | 50 ++ .../dao/charts/model/Style.java | 46 ++ .../dao/charts/model/Title.java | 28 + .../dao/charts/model/ToolTip.java | 39 ++ .../dao/charts/model/XAxis.java | 20 + .../dao/charts/model/YAxis.java | 32 + .../financeanalyzer/dao/model/OutputData.java | 147 +++++ .../financeanalyzer/service/CacheService.java | 24 + .../service/ConverterService.java | 16 + .../financeanalyzer/service/FileService.java | 134 +++++ .../service/ReportService.java | 181 ++++++ .../service/usecases/CashFlowService.java | 67 +++ .../service/usecases/IncomeService.java | 21 + .../usecases/OtherTransactionService.java | 23 + .../usecases/StandingOrderService.java | 29 + .../financeanalyzer/util/Constants.java | 18 + .../DateFormatStringComparatorForOrder.java | 9 + .../financeanalyzer/util/DateUtil.java | 113 ++++ .../financeanalyzer/util/NumberUtil.java | 16 + .../util/OrderDateStringComparator.java | 20 + .../financeanalyzer/util/RandomColorUtil.java | 17 + .../financeanalyzer/util/StreamUtil.java | 29 + .../util/TransactionDateStringComparator.java | 22 + ...ransactionDateStringReverseComparator.java | 22 + .../financeanalyzer/util/UrlUtil.java | 12 + .../util/XlsxToJsonConverter.java | 68 +++ src/main/resources/application.properties | 1 + src/main/resources/static/css/styles.css | 137 +++++ src/main/resources/templates/error/404.html | 22 + src/main/resources/templates/error/500.html | 22 + .../templates/fragments/body_end_scripts.html | 7 + .../templates/fragments/html_head.html | 19 + .../templates/fragments/navigation.html | 16 + .../templates/fragments/page_title.html | 3 + .../resources/templates/fragments/table.html | 15 + src/main/resources/templates/layout.html | 14 + src/main/resources/templates/reports.html | 119 ++++ src/main/resources/templates/upload.html | 50 ++ 69 files changed, 4230 insertions(+), 186 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/de/arminwolf/financeanalyzer/FinanceAnalyzerApplication.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/conf/BankAccount.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/conf/Configuration.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/conf/SpringConfiguration.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/controller/ConverterController.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/controller/CustomErrorController.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/controller/FileController.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/controller/MainController.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/controller/ReportController.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/controller/UploadController.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/ReportDAO.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/TableDataDAO.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/TransactionDAO.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/BubbleChartFactory.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/ColumnChartFactory.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/LineChartFactory.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Chart.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Column.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/DataLabels.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Filter.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/HighChartDAO.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/LayoutAlgorithm.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Packedbubble.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/PlotOptions.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Series.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/SeriesElement.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Style.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Title.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/ToolTip.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/XAxis.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/YAxis.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/dao/model/OutputData.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/CacheService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/ConverterService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/FileService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/ReportService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/usecases/CashFlowService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/usecases/IncomeService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/usecases/OtherTransactionService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/service/usecases/StandingOrderService.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/Constants.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/DateFormatStringComparatorForOrder.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/DateUtil.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/NumberUtil.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/OrderDateStringComparator.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/RandomColorUtil.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/StreamUtil.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringComparator.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringReverseComparator.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/UrlUtil.java create mode 100644 src/main/java/de/arminwolf/financeanalyzer/util/XlsxToJsonConverter.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/static/css/styles.css create mode 100644 src/main/resources/templates/error/404.html create mode 100644 src/main/resources/templates/error/500.html create mode 100644 src/main/resources/templates/fragments/body_end_scripts.html create mode 100644 src/main/resources/templates/fragments/html_head.html create mode 100644 src/main/resources/templates/fragments/navigation.html create mode 100644 src/main/resources/templates/fragments/page_title.html create mode 100644 src/main/resources/templates/fragments/table.html create mode 100644 src/main/resources/templates/layout.html create mode 100644 src/main/resources/templates/reports.html create mode 100644 src/main/resources/templates/upload.html diff --git a/.gitignore b/.gitignore index 1d90047..549e00a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,190 +1,33 @@ -# ---> Java -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -replay_pid* - -# ---> JetBrains -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# SonarLint plugin -.idea/sonarlint/ - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -# ---> Linux -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -# ---> macOS -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# ---> Gradle -.gradle -**/build/ -!src/**/build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -# Avoid ignore Gradle wrappper properties -!gradle-wrapper.properties - -# Cache of project -.gradletasknamecache - -# Eclipse Gradle plugin generated files -# Eclipse Core -.project -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# ---> Maven +HELP.md target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -# https://github.com/takari/maven-wrapper#usage-without-binary-jar -.mvn/wrapper/maven-wrapper.jar +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ -# Eclipse m2e generated files -# Eclipse Core -.project -# JDT-specific (Eclipse Java Development Tools) +### STS ### +.apt_generated .classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..bf82ff01c6cdae4a1bb754a6e062954d77ac5c11 GIT binary patch literal 59925 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

dy!05UMhSKsK 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 VCNKd3JGtOvEm(5t0lFyE{{i--k}m)N literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ca5ab4b --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a8d0a52 --- /dev/null +++ b/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.1.0-SNAPSHOT + + + de.arminwolf + finance-analyzer + 0.0.1-SNAPSHOT + finance-analyzer + App to Analyze Excel Exports from Finanzguru + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-test + test + + + + nz.net.ultraq.thymeleaf + thymeleaf-layout-dialect + 3.2.0 + + + + + org.apache.poi + poi + 5.1.0 + + + + org.apache.poi + poi-ooxml + 5.1.0 + + + + com.fasterxml.jackson.core + jackson-core + 2.13.1 + + + + com.fasterxml.jackson.core + jackson-databind + 2.16.1 + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + 2.13.1 + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + + diff --git a/src/main/java/de/arminwolf/financeanalyzer/FinanceAnalyzerApplication.java b/src/main/java/de/arminwolf/financeanalyzer/FinanceAnalyzerApplication.java new file mode 100644 index 0000000..f7d288d --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/FinanceAnalyzerApplication.java @@ -0,0 +1,14 @@ +package de.arminwolf.financeanalyzer; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FinanceAnalyzerApplication { + + + public static void main(String[] args) { + SpringApplication.run(FinanceAnalyzerApplication.class, args); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/conf/BankAccount.java b/src/main/java/de/arminwolf/financeanalyzer/conf/BankAccount.java new file mode 100644 index 0000000..9a3a1b1 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/conf/BankAccount.java @@ -0,0 +1,61 @@ +package de.arminwolf.financeanalyzer.conf; + +import java.io.Serializable; +import java.util.Objects; + +public class BankAccount implements Serializable, Comparable { + + private String iban; + private String bankAccountName; + + + public BankAccount() { + } + + + public BankAccount(final String iban, final String bankAccountName) { + this.iban = iban; + this.bankAccountName = bankAccountName; + } + + + @Override + public int compareTo(final BankAccount o) { + return bankAccountName.compareTo(o.bankAccountName); + } + + + public String getIban() { + return iban; + } + + + public void setIban(final String iban) { + this.iban = iban; + } + + + public String getBankAccountName() { + return bankAccountName; + } + + + public void setBankAccountName(final String bankAccountName) { + this.bankAccountName = bankAccountName; + } + + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final BankAccount that = (BankAccount) o; + return Objects.equals(iban, that.iban) && Objects.equals(bankAccountName, that.bankAccountName); + } + + + @Override + public int hashCode() { + return Objects.hash(iban, bankAccountName); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/conf/Configuration.java b/src/main/java/de/arminwolf/financeanalyzer/conf/Configuration.java new file mode 100644 index 0000000..e41ed8f --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/conf/Configuration.java @@ -0,0 +1,36 @@ +package de.arminwolf.financeanalyzer.conf; + +import java.util.HashSet; +import java.util.Set; + +public class Configuration { + + private Set bankAccounts; + private int numberOfMonths; + + + public Configuration() { + this.numberOfMonths = 1; + this.bankAccounts = new HashSet<>(); + } + + + public Set getBankAccounts() { + return bankAccounts; + } + + + public void setBankAccounts(final Set bankAccounts) { + this.bankAccounts = bankAccounts; + } + + + public int getNumberOfMonths() { + return numberOfMonths; + } + + + public void setNumberOfMonths(final int numberOfMonths) { + this.numberOfMonths = numberOfMonths; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/conf/SpringConfiguration.java b/src/main/java/de/arminwolf/financeanalyzer/conf/SpringConfiguration.java new file mode 100644 index 0000000..513af36 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/conf/SpringConfiguration.java @@ -0,0 +1,15 @@ +package de.arminwolf.financeanalyzer.conf; + +import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SpringConfiguration { + + @Bean + public LayoutDialect layoutDialect() { + return new LayoutDialect(); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/controller/ConverterController.java b/src/main/java/de/arminwolf/financeanalyzer/controller/ConverterController.java new file mode 100644 index 0000000..52448be --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/controller/ConverterController.java @@ -0,0 +1,111 @@ +package de.arminwolf.financeanalyzer.controller; + +import de.arminwolf.financeanalyzer.conf.BankAccount; +import de.arminwolf.financeanalyzer.conf.Configuration; +import de.arminwolf.financeanalyzer.service.CacheService; +import de.arminwolf.financeanalyzer.service.ConverterService; +import de.arminwolf.financeanalyzer.service.FileService; +import de.arminwolf.financeanalyzer.util.Constants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/data") +public class ConverterController { + + @Autowired + ConverterService service; + + @Autowired + CacheService cacheService; + + @Autowired + FileService fileService; + + + @PostMapping("/convert") + public String convert(RedirectAttributes redirectAttributes, @RequestParam("file") MultipartFile file) { + try (InputStream in = file.getInputStream()) { + Optional json = service.convert(in); + if (json.isPresent()) { + File workingDirectory = fileService.getOrCreateWorkingDirectory(); + Path tempFile = Files.createFile(Paths.get(workingDirectory.getPath(), "finance-analyzer.json")); + Path path = Files.writeString(tempFile, json.get(), StandardCharsets.UTF_8); + + cacheService.put("currentJsonFile", path.toAbsolutePath().toFile().toString()); + Configuration configuration = new Configuration(); + Set bankAccounts = + Arrays.stream(fileService.getJsonFile()) + .map(t -> new BankAccount(t.getReferenzkonto(), t.getNameReferenzkonto())) + .collect(Collectors.toSet()); + + configuration.setBankAccounts(bankAccounts); + fileService.saveConfiguration(configuration); + redirectAttributes.addFlashAttribute("result", "Converted successfully!"); + return "redirect:/data/success"; + } else { + redirectAttributes.addFlashAttribute("result", "Error while converting"); + return "redirect:/data/error"; + } + + } catch (IOException e) { + redirectAttributes.addFlashAttribute("result", "Error while converting"); + return "redirect:/data/error"; + } + } + + + @PostMapping("/load") + public String convert(RedirectAttributes redirectAttributes, + @RequestParam("account") String account, + @RequestParam("month") String month) { + redirectAttributes.addFlashAttribute("result", "Converted successfully!"); + redirectAttributes.addFlashAttribute("account", account); + redirectAttributes.addFlashAttribute("month", month); + System.out.println("[ Load Method ] Account: " + account); + System.out.println("[ Load Method ] Month: " + month); + return "redirect:/data/success"; + } + + + @GetMapping("/templates/error") + public String handleError(@ModelAttribute("result") String result, Model model) { + model.addAttribute("result", result); + return Constants.ERROR; + } + + + @GetMapping("/success") + public String handleSuccess(RedirectAttributes redirectAttributes, + @ModelAttribute("result") String result, + @ModelAttribute("account") String account, + @ModelAttribute("month") String month, + Model model) { + redirectAttributes.addFlashAttribute("result", "Converted successfully!"); + redirectAttributes.addFlashAttribute("account", account); + redirectAttributes.addFlashAttribute("month", month); + redirectAttributes.addFlashAttribute("result", result); + return "redirect:/".concat(Constants.REPORTS).concat("/"); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/controller/CustomErrorController.java b/src/main/java/de/arminwolf/financeanalyzer/controller/CustomErrorController.java new file mode 100644 index 0000000..97b384f --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/controller/CustomErrorController.java @@ -0,0 +1,31 @@ +package de.arminwolf.financeanalyzer.controller; + +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.boot.web.servlet.error.ErrorController; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +public class CustomErrorController implements ErrorController { + + @RequestMapping("/error") + public String handleError(HttpServletRequest request) { + Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE); + + if (status != null) { + int statusCode = Integer.parseInt(status.toString()); + + if(statusCode == HttpStatus.NOT_FOUND.value()) { + System.out.println(request.getRequestURL()); + return "/error/404"; + } + else if(statusCode == HttpStatus.INTERNAL_SERVER_ERROR.value()) { + return "/error/500"; + } + } + + return "/error"; + } +} \ No newline at end of file diff --git a/src/main/java/de/arminwolf/financeanalyzer/controller/FileController.java b/src/main/java/de/arminwolf/financeanalyzer/controller/FileController.java new file mode 100644 index 0000000..f54207c --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/controller/FileController.java @@ -0,0 +1,38 @@ +package de.arminwolf.financeanalyzer.controller; + +import de.arminwolf.financeanalyzer.service.CacheService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Objects; + +@RestController +@RequestMapping("/file") +public class FileController { + + + @Autowired + CacheService cacheService; + + + @RequestMapping(value = "/current", method = RequestMethod.GET, produces = "application/json") + public ResponseEntity get() throws IOException { + + if (Objects.nonNull(cacheService.get("currentJsonFile"))) { + String jsonFile = Files.readString(Paths.get(cacheService.get("currentJsonFile").toString())); + if (Objects.nonNull(jsonFile) && !jsonFile.isEmpty()) { + return ResponseEntity.ok(jsonFile); + } + } + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("No persistent JSON found. Upload a new one."); + + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/controller/MainController.java b/src/main/java/de/arminwolf/financeanalyzer/controller/MainController.java new file mode 100644 index 0000000..edbb33b --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/controller/MainController.java @@ -0,0 +1,55 @@ +package de.arminwolf.financeanalyzer.controller; + +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.util.UrlUtil; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; + +import java.util.Objects; +import java.util.Optional; + +import static de.arminwolf.financeanalyzer.util.Constants.INDEX; + +@Controller +public class MainController { + + + @GetMapping("/") + public String get(Model model, HttpServletRequest request) { + RestTemplate restTemplate = new RestTemplate(); + + try { + final Optional response = getTransactions(request, restTemplate); + if (response.isEmpty()) { + return "redirect:/upload/"; + } else { + // Verarbeiten Sie hier die Antwort + model.addAttribute("data", response.get()); + return INDEX; + } + } catch (Exception e) { + e.printStackTrace(System.err); + return "redirect:/upload"; + } + + } + + private static Optional getTransactions(final HttpServletRequest request, final RestTemplate restTemplate) { + try { + TransactionDAO[] forObject = restTemplate.getForObject(UrlUtil.getRelativeUrl(request, "/file/current"), TransactionDAO[].class); + if (Objects.isNull(forObject)) { + return Optional.empty(); + } else { + return Optional.of(forObject); + } + } catch (RestClientException e) { + return Optional.empty(); + } + + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/controller/ReportController.java b/src/main/java/de/arminwolf/financeanalyzer/controller/ReportController.java new file mode 100644 index 0000000..2aeecf4 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/controller/ReportController.java @@ -0,0 +1,57 @@ +package de.arminwolf.financeanalyzer.controller; + +import de.arminwolf.financeanalyzer.conf.Configuration; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.dao.ReportDAO; +import de.arminwolf.financeanalyzer.dao.TableDataDAO; +import de.arminwolf.financeanalyzer.service.CacheService; +import de.arminwolf.financeanalyzer.service.ReportService; +import de.arminwolf.financeanalyzer.util.Constants; +import de.arminwolf.financeanalyzer.util.DateUtil; +import de.arminwolf.financeanalyzer.util.UrlUtil; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.client.RestTemplate; + +import java.time.LocalDate; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +@Controller +@RequestMapping("/reports") +public class ReportController { + + @Autowired + private ReportService reportService; + + @GetMapping("/") + public String reports(@ModelAttribute("account") String iban, + @ModelAttribute("month") String month, + Model model, HttpServletRequest request) { + RestTemplate restTemplate = new RestTemplate(); + if (Objects.isNull(iban) || iban.isEmpty()) { + return "redirect:/upload/"; + } + + try { + final String fileURL = UrlUtil.getRelativeUrl(request, "/file/current"); + final TransactionDAO[] response = restTemplate.getForObject(fileURL, TransactionDAO[].class); + if (Objects.isNull(response)) { + return "redirect:/upload"; + } else { + reportService.createReport(response, month, iban, model); + return Constants.REPORTS; + } + } catch (Exception e) { + System.err.println("Error: " + e.getMessage()); + return "redirect:/upload/"; + } + + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/controller/UploadController.java b/src/main/java/de/arminwolf/financeanalyzer/controller/UploadController.java new file mode 100644 index 0000000..e5e4ba9 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/controller/UploadController.java @@ -0,0 +1,38 @@ +package de.arminwolf.financeanalyzer.controller; + +import de.arminwolf.financeanalyzer.conf.Configuration; +import de.arminwolf.financeanalyzer.service.CacheService; +import de.arminwolf.financeanalyzer.service.FileService; +import de.arminwolf.financeanalyzer.service.ReportService; +import de.arminwolf.financeanalyzer.util.Constants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap; + +@Controller +@RequestMapping("/upload") +public class UploadController { + @Autowired + FileService fileService; + + @Autowired + CacheService cacheService; + + + @GetMapping("/") + public String upload(Model model) { + final RedirectAttributes redirectAttributes = new RedirectAttributesModelMap(); + fileService.getJsonFileName().ifPresent(jsonFileName -> { + cacheService.put("currentJsonFile", jsonFileName); + cacheService.put("configuration", fileService.getConfiguration()); + model.addAttribute("foundJsonFile", jsonFileName); + model.addAttribute("accounts", ((Configuration) cacheService.get("configuration")).getBankAccounts()); + }); + + return Constants.INDEX; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/ReportDAO.java b/src/main/java/de/arminwolf/financeanalyzer/dao/ReportDAO.java new file mode 100644 index 0000000..91eb95d --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/ReportDAO.java @@ -0,0 +1,151 @@ +package de.arminwolf.financeanalyzer.dao; + +import de.arminwolf.financeanalyzer.dao.charts.model.HighChartDAO; +import de.arminwolf.financeanalyzer.dao.charts.model.Series; +import de.arminwolf.financeanalyzer.dao.charts.factories.BubbleChartFactory; +import de.arminwolf.financeanalyzer.dao.charts.factories.ColumnChartFactory; +import de.arminwolf.financeanalyzer.dao.charts.factories.LineChartFactory; +import de.arminwolf.financeanalyzer.dao.model.OutputData; +import de.arminwolf.financeanalyzer.util.NumberUtil; +import de.arminwolf.financeanalyzer.util.OrderDateStringComparator; +import org.apache.commons.math3.util.Pair; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +public class ReportDAO { + + + private HighChartDAO cashFlowChart; + private HighChartDAO accountBalanceLineChart; + private HighChartDAO transactionCategoriesBubbleChart; + + private Set standingOutputData; + private Set notStandingOutputData; + private List incomeList; + + + public ReportDAO() { + this.standingOutputData = new HashSet<>(); + this.notStandingOutputData = new HashSet<>(); + this.incomeList = new ArrayList<>(); + } + + + public Set getStandingOrders() { + return this.standingOutputData; + } + + + public List getSortedStandingOrders() { + return this.standingOutputData.stream().sorted(new OrderDateStringComparator()).collect(Collectors.toList()); + } + + + public Float getStandingOrdersAmount() { + return NumberUtil.round(getStandingOrders().stream().map(OutputData::getAmountAsFloat).reduce(0f, Float::sum)); + } + + + public Float getNotStandingOrdersAmount() { + return NumberUtil.round(getNotStandingOrders().stream().map(OutputData::getAmountAsFloat).reduce(0f, Float::sum)); + } + + + public HighChartDAO getTransactionCategoriesBubbleChart() { + return transactionCategoriesBubbleChart; + } + + + public void setIncomeList(final List incomes) { + this.incomeList = incomes.stream() + .map(t -> new OutputData(t.getVerwendungszweck(), t)) + .sorted(new OrderDateStringComparator()) + .collect(Collectors.toList()); + } + + + public List getIncomeList() { + return incomeList; + } + + + public void setNotStandingOrders(final List notStandingOrders) { + Set list = new HashSet<>(); + notStandingOrders.forEach(order -> list.add(new OutputData(order))); + this.notStandingOutputData = list; + } + + + public final Set getNotStandingOrders() { + return notStandingOutputData; + } + + + public final List getSortedNotStandingOrders() { + return notStandingOutputData.stream().sorted(new OrderDateStringComparator()).collect(Collectors.toList()); + } + + + public Float getTotalExpense() { + return getStandingOrdersAmount() + getNotStandingOrdersAmount(); + } + + + public void setTransactionCategoriesBubbleChart(final List transactions) { + this.transactionCategoriesBubbleChart = BubbleChartFactory.createBubbleChart("Kateogrien der Transaktionen", transactions); + } + + + public void setAccountBalanceLineChart(final List> pairList) { + String title = "Verlauf des Kontostandes"; + String chartTitle = "Kontostand in EUR"; + List series = new ArrayList<>(); + Series data = new Series(); + data.setData(pairList.stream().map(e -> Float.parseFloat(e.getValue())).collect(Collectors.toList())); + series.add(data); + + this.accountBalanceLineChart = LineChartFactory.createLineChart(title, chartTitle, pairList.stream().map(Pair::getKey).collect(Collectors.toList()), series); + } + + + public HighChartDAO getAccountBalanceLineChart() { + return accountBalanceLineChart; + } + + + public void setCashFlowChart(final Map> ausgaben, final Map> einnahmen) { + this.cashFlowChart = + ColumnChartFactory.createColumnChart("Cashflow", + "Einnahmen und Ausgaben", + ausgaben, "Ausgaben", + einnahmen, "Einnahmen"); + } + + + public HighChartDAO getCashFlowChart() { + return cashFlowChart; + } + + + public Float getIncome() { + return this.incomeList.stream().map(OutputData::getAmountAsFloat).reduce(0f, Float::sum); + } + + + public Float getDiff() { + return NumberUtil.round(Math.abs(getIncome()) - Math.abs(getTotalExpense())); + } + + + public void setStandingOrders(final Collection orders) { + Set list = new HashSet<>(); + orders.forEach(order -> list.add(new OutputData(order))); + this.standingOutputData = list; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/TableDataDAO.java b/src/main/java/de/arminwolf/financeanalyzer/dao/TableDataDAO.java new file mode 100644 index 0000000..fc05802 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/TableDataDAO.java @@ -0,0 +1,37 @@ +package de.arminwolf.financeanalyzer.dao; + +import java.util.List; + +public class TableDataDAO { + + private List headers; + private List> rows; + + + public List getHeaders() { + return headers; + } + + + public void setHeaders(final List headers) { + this.headers = headers; + } + + + public List> getRows() { + return rows; + } + + + public void setRows(final List> rows) { + this.rows = rows; + } + + + + public static class TableDataFactory { + public static TableDataDAO createTableDataDTO() { + return new TableDataDAO(); + } + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/TransactionDAO.java b/src/main/java/de/arminwolf/financeanalyzer/dao/TransactionDAO.java new file mode 100644 index 0000000..bf3b882 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/TransactionDAO.java @@ -0,0 +1,555 @@ +package de.arminwolf.financeanalyzer.dao; + + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "mandatsreferenz", + "analyse-vom-frei-verfuegbaren-einkommen-ausgeschlossen", + "analyse-vertrag", + "e-ref", + "analyse-hauptkategorie", + "analyse-umsatzart", + "analyse-woche", + "analyse-monat", + "analyse-quartal", + "kontostand", + "analyse-vertrags-id", + "waehrung", + "verwendungszweck", + "buchungstag", + "analyse-vertragsturnus", + "analyse-betrag", + "betrag", + "name-referenzkonto", + "beguenstigter/auftraggeber", + "analyse-umbuchung", + "iban-beguenstigter/auftraggeber", + "referenzkonto", + "analyse-unterkategorie", + "analyse-jahr", + "glaeubiger-id" +}) +public class TransactionDAO { + + @JsonProperty("mandatsreferenz") + private String mandatsreferenz; + @JsonProperty("analyse-vom-frei-verfuegbaren-einkommen-ausgeschlossen") + private String analyseVomFreiVerfuegbarenEinkommenAusgeschlossen; + @JsonProperty("analyse-vertrag") + private String analyseVertrag; + @JsonProperty("e-ref") + private String eRef; + @JsonProperty("analyse-hauptkategorie") + private String analyseHauptkategorie; + @JsonProperty("analyse-umsatzart") + private String analyseUmsatzart; + @JsonProperty("analyse-woche") + private String analyseWoche; + @JsonProperty("analyse-monat") + private String analyseMonat; + @JsonProperty("analyse-quartal") + private String analyseQuartal; + @JsonProperty("kontostand") + private String kontostand; + @JsonProperty("analyse-vertrags-id") + private String analyseVertragsId; + @JsonProperty("waehrung") + private String waehrung; + @JsonProperty("verwendungszweck") + private String verwendungszweck; + @JsonProperty("buchungstag") + private String buchungstag; + @JsonProperty("analyse-vertragsturnus") + private String analyseVertragsturnus; + @JsonProperty("analyse-betrag") + private String analyseBetrag; + @JsonProperty("betrag") + private String betrag; + @JsonProperty("name-referenzkonto") + private String nameReferenzkonto; + @JsonProperty("beguenstigter/auftraggeber") + private String beguenstigterAuftraggeber; + @JsonProperty("analyse-umbuchung") + private String analyseUmbuchung; + @JsonProperty("iban-beguenstigter/auftraggeber") + private String ibanBeguenstigterAuftraggeber; + @JsonProperty("referenzkonto") + private String referenzkonto; + @JsonProperty("analyse-unterkategorie") + private String analyseUnterkategorie; + @JsonProperty("analyse-jahr") + private String analyseJahr; + @JsonProperty("glaeubiger-id") + private String glaeubigerId; + @JsonIgnore + private final Map additionalProperties = new LinkedHashMap(); + + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + + @JsonProperty("analyse-betrag") + public String getAnalyseBetrag() { + return analyseBetrag; + } + + + @JsonProperty("analyse-hauptkategorie") + public String getAnalyseHauptkategorie() { + return analyseHauptkategorie; + } + + + @JsonProperty("analyse-jahr") + public String getAnalyseJahr() { + return analyseJahr; + } + + + @JsonProperty("analyse-monat") + public String getAnalyseMonat() { + return analyseMonat; + } + + + @JsonProperty("analyse-quartal") + public String getAnalyseQuartal() { + return analyseQuartal; + } + + + @JsonProperty("analyse-umbuchung") + public String getAnalyseUmbuchung() { + return analyseUmbuchung; + } + + + @JsonProperty("analyse-umsatzart") + public String getAnalyseUmsatzart() { + return analyseUmsatzart; + } + + + @JsonProperty("analyse-unterkategorie") + public String getAnalyseUnterkategorie() { + return analyseUnterkategorie; + } + + + @JsonProperty("analyse-vertrag") + public String getAnalyseVertrag() { + return analyseVertrag; + } + + + @JsonProperty("analyse-vertrags-id") + public String getAnalyseVertragsId() { + return analyseVertragsId; + } + + + @JsonProperty("analyse-vertragsturnus") + public String getAnalyseVertragsturnus() { + return analyseVertragsturnus; + } + + + @JsonProperty("analyse-vom-frei-verfuegbaren-einkommen-ausgeschlossen") + public String getAnalyseVomFreiVerfuegbarenEinkommenAusgeschlossen() { + return analyseVomFreiVerfuegbarenEinkommenAusgeschlossen; + } + + + @JsonProperty("analyse-woche") + public String getAnalyseWoche() { + return analyseWoche; + } + + + @JsonProperty("beguenstigter/auftraggeber") + public String getBeguenstigterAuftraggeber() { + return beguenstigterAuftraggeber; + } + + + @JsonProperty("betrag") + public String getBetrag() { + return betrag; + } + + + public float getBetragAsFloat() { + return Float.parseFloat(betrag); + } + + + @JsonProperty("buchungstag") + public String getBuchungstag() { + return buchungstag; + } + + + @JsonProperty("glaeubiger-id") + public String getGlaeubigerId() { + return glaeubigerId; + } + + + @JsonProperty("iban-beguenstigter/auftraggeber") + public String getIbanBeguenstigterAuftraggeber() { + return ibanBeguenstigterAuftraggeber; + } + + + @JsonProperty("kontostand") + public String getKontostand() { + return kontostand; + } + + + @JsonProperty("mandatsreferenz") + public String getMandatsreferenz() { + return mandatsreferenz; + } + + + @JsonProperty("name-referenzkonto") + public String getNameReferenzkonto() { + return nameReferenzkonto; + } + + + @JsonProperty("referenzkonto") + public String getReferenzkonto() { + return referenzkonto; + } + + + @JsonProperty("verwendungszweck") + public String getVerwendungszweck() { + return verwendungszweck; + } + + + @JsonProperty("waehrung") + public String getWaehrung() { + return waehrung; + } + + + @JsonProperty("e-ref") + public String geteRef() { + return eRef; + } + + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + + @JsonProperty("analyse-betrag") + public void setAnalyseBetrag(String analyseBetrag) { + this.analyseBetrag = analyseBetrag; + } + + + @JsonProperty("analyse-hauptkategorie") + public void setAnalyseHauptkategorie(String analyseHauptkategorie) { + this.analyseHauptkategorie = analyseHauptkategorie; + } + + + @JsonProperty("analyse-jahr") + public void setAnalyseJahr(String analyseJahr) { + this.analyseJahr = analyseJahr; + } + + + @JsonProperty("analyse-monat") + public void setAnalyseMonat(String analyseMonat) { + this.analyseMonat = analyseMonat; + } + + + @JsonProperty("analyse-quartal") + public void setAnalyseQuartal(String analyseQuartal) { + this.analyseQuartal = analyseQuartal; + } + + + @JsonProperty("analyse-umbuchung") + public void setAnalyseUmbuchung(String analyseUmbuchung) { + this.analyseUmbuchung = analyseUmbuchung; + } + + + @JsonProperty("analyse-umsatzart") + public void setAnalyseUmsatzart(String analyseUmsatzart) { + this.analyseUmsatzart = analyseUmsatzart; + } + + + @JsonProperty("analyse-unterkategorie") + public void setAnalyseUnterkategorie(String analyseUnterkategorie) { + this.analyseUnterkategorie = analyseUnterkategorie; + } + + + @JsonProperty("analyse-vertrag") + public void setAnalyseVertrag(String analyseVertrag) { + this.analyseVertrag = analyseVertrag; + } + + + @JsonProperty("analyse-vertrags-id") + public void setAnalyseVertragsId(String analyseVertragsId) { + this.analyseVertragsId = analyseVertragsId; + } + + + @JsonProperty("analyse-vertragsturnus") + public void setAnalyseVertragsturnus(String analyseVertragsturnus) { + this.analyseVertragsturnus = analyseVertragsturnus; + } + + + @JsonProperty("analyse-vom-frei-verfuegbaren-einkommen-ausgeschlossen") + public void setAnalyseVomFreiVerfuegbarenEinkommenAusgeschlossen(String analyseVomFreiVerfuegbarenEinkommenAusgeschlossen) { + this.analyseVomFreiVerfuegbarenEinkommenAusgeschlossen = analyseVomFreiVerfuegbarenEinkommenAusgeschlossen; + } + + + @JsonProperty("analyse-woche") + public void setAnalyseWoche(String analyseWoche) { + this.analyseWoche = analyseWoche; + } + + + @JsonProperty("beguenstigter/auftraggeber") + public void setBeguenstigterAuftraggeber(String beguenstigterAuftraggeber) { + if (beguenstigterAuftraggeber.contains("Abbuchung")) { + this.beguenstigterAuftraggeber = "Sparkasse Münsterland Ost"; + } else { + this.beguenstigterAuftraggeber = beguenstigterAuftraggeber; + } + + } + + + @JsonProperty("betrag") + public void setBetrag(String betrag) { + this.betrag = betrag; + } + + + @JsonProperty("buchungstag") + public void setBuchungstag(String buchungstag) { + this.buchungstag = buchungstag; + } + + + @JsonProperty("glaeubiger-id") + public void setGlaeubigerId(String glaeubigerId) { + this.glaeubigerId = glaeubigerId; + } + + + @JsonProperty("iban-beguenstigter/auftraggeber") + public void setIbanBeguenstigterAuftraggeber(String ibanBeguenstigterAuftraggeber) { + this.ibanBeguenstigterAuftraggeber = ibanBeguenstigterAuftraggeber; + } + + + @JsonProperty("kontostand") + public void setKontostand(String kontostand) { + this.kontostand = kontostand; + } + + + @JsonProperty("mandatsreferenz") + public void setMandatsreferenz(String mandatsreferenz) { + this.mandatsreferenz = mandatsreferenz; + } + + + @JsonProperty("name-referenzkonto") + public void setNameReferenzkonto(String nameReferenzkonto) { + this.nameReferenzkonto = nameReferenzkonto; + } + + + @JsonProperty("referenzkonto") + public void setReferenzkonto(String referenzkonto) { + this.referenzkonto = referenzkonto; + } + + + @JsonProperty("verwendungszweck") + public void setVerwendungszweck(String verwendungszweck) { + this.verwendungszweck = verwendungszweck; + } + + + @JsonProperty("waehrung") + public void setWaehrung(String waehrung) { + this.waehrung = waehrung; + } + + + @JsonProperty("e-ref") + public void seteRef(String eRef) { + this.eRef = eRef; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(TransactionDAO.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('['); + sb.append("mandatsreferenz"); + sb.append('='); + sb.append(((this.mandatsreferenz == null) ? "" : this.mandatsreferenz)); + sb.append(','); + sb.append("analyseVomFreiVerfuegbarenEinkommenAusgeschlossen"); + sb.append('='); + sb.append(((this.analyseVomFreiVerfuegbarenEinkommenAusgeschlossen == null) ? "" : this.analyseVomFreiVerfuegbarenEinkommenAusgeschlossen)); + sb.append(','); + sb.append("analyseVertrag"); + sb.append('='); + sb.append(((this.analyseVertrag == null) ? "" : this.analyseVertrag)); + sb.append(','); + sb.append("eRef"); + sb.append('='); + sb.append(((this.eRef == null) ? "" : this.eRef)); + sb.append(','); + sb.append("analyseHauptkategorie"); + sb.append('='); + sb.append(((this.analyseHauptkategorie == null) ? "" : this.analyseHauptkategorie)); + sb.append(','); + sb.append("analyseUmsatzart"); + sb.append('='); + sb.append(((this.analyseUmsatzart == null) ? "" : this.analyseUmsatzart)); + sb.append(','); + sb.append("analyseWoche"); + sb.append('='); + sb.append(((this.analyseWoche == null) ? "" : this.analyseWoche)); + sb.append(','); + sb.append("analyseMonat"); + sb.append('='); + sb.append(((this.analyseMonat == null) ? "" : this.analyseMonat)); + sb.append(','); + sb.append("analyseQuartal"); + sb.append('='); + sb.append(((this.analyseQuartal == null) ? "" : this.analyseQuartal)); + sb.append(','); + sb.append("kontostand"); + sb.append('='); + sb.append(((this.kontostand == null) ? "" : this.kontostand)); + sb.append(','); + sb.append("analyseVertragsId"); + sb.append('='); + sb.append(((this.analyseVertragsId == null) ? "" : this.analyseVertragsId)); + sb.append(','); + sb.append("waehrung"); + sb.append('='); + sb.append(((this.waehrung == null) ? "" : this.waehrung)); + sb.append(','); + sb.append("verwendungszweck"); + sb.append('='); + sb.append(((this.verwendungszweck == null) ? "" : this.verwendungszweck)); + sb.append(','); + sb.append("buchungstag"); + sb.append('='); + sb.append(((this.buchungstag == null) ? "" : this.buchungstag)); + sb.append(','); + sb.append("analyseVertragsturnus"); + sb.append('='); + sb.append(((this.analyseVertragsturnus == null) ? "" : this.analyseVertragsturnus)); + sb.append(','); + sb.append("analyseBetrag"); + sb.append('='); + sb.append(((this.analyseBetrag == null) ? "" : this.analyseBetrag)); + sb.append(','); + sb.append("betrag"); + sb.append('='); + sb.append(((this.betrag == null) ? "" : this.betrag)); + sb.append(','); + sb.append("nameReferenzkonto"); + sb.append('='); + sb.append(((this.nameReferenzkonto == null) ? "" : this.nameReferenzkonto)); + sb.append(','); + sb.append("beguenstigterAuftraggeber"); + sb.append('='); + sb.append(((this.beguenstigterAuftraggeber == null) ? "" : this.beguenstigterAuftraggeber)); + sb.append(','); + sb.append("analyseUmbuchung"); + sb.append('='); + sb.append(((this.analyseUmbuchung == null) ? "" : this.analyseUmbuchung)); + sb.append(','); + sb.append("ibanBeguenstigterAuftraggeber"); + sb.append('='); + sb.append(((this.ibanBeguenstigterAuftraggeber == null) ? "" : this.ibanBeguenstigterAuftraggeber)); + sb.append(','); + sb.append("referenzkonto"); + sb.append('='); + sb.append(((this.referenzkonto == null) ? "" : this.referenzkonto)); + sb.append(','); + sb.append("analyseUnterkategorie"); + sb.append('='); + sb.append(((this.analyseUnterkategorie == null) ? "" : this.analyseUnterkategorie)); + sb.append(','); + sb.append("analyseJahr"); + sb.append('='); + sb.append(((this.analyseJahr == null) ? "" : this.analyseJahr)); + sb.append(','); + sb.append("glaeubigerId"); + sb.append('='); + sb.append(((this.glaeubigerId == null) ? "" : this.glaeubigerId)); + sb.append(','); + sb.append("additionalProperties"); + sb.append('='); + sb.append(((this.additionalProperties == null) ? "" : this.additionalProperties)); + sb.append(','); + if (sb.charAt((sb.length() - 1)) == ',') { + sb.setCharAt((sb.length() - 1), ']'); + } else { + sb.append(']'); + } + return sb.toString(); + } + + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final TransactionDAO that = (TransactionDAO) o; + return Objects.equals(referenzkonto, that.referenzkonto) + && Objects.equals(analyseBetrag, that.analyseBetrag) + && Objects.equals(verwendungszweck, that.verwendungszweck) + && Objects.equals(betrag, that.betrag) + && Objects.equals(ibanBeguenstigterAuftraggeber, that.ibanBeguenstigterAuftraggeber); + } + + + @Override + public int hashCode() { + return Objects.hash(referenzkonto, verwendungszweck, analyseBetrag, betrag, ibanBeguenstigterAuftraggeber); + } +} \ No newline at end of file diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/BubbleChartFactory.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/BubbleChartFactory.java new file mode 100644 index 0000000..2ce3302 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/BubbleChartFactory.java @@ -0,0 +1,60 @@ +package de.arminwolf.financeanalyzer.dao.charts.factories; + +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.dao.charts.model.Chart; +import de.arminwolf.financeanalyzer.dao.charts.model.HighChartDAO; +import de.arminwolf.financeanalyzer.dao.charts.model.Packedbubble; +import de.arminwolf.financeanalyzer.dao.charts.model.PlotOptions; +import de.arminwolf.financeanalyzer.dao.charts.model.Series; +import de.arminwolf.financeanalyzer.dao.charts.model.SeriesElement; +import de.arminwolf.financeanalyzer.dao.charts.model.Title; +import de.arminwolf.financeanalyzer.dao.charts.model.ToolTip; +import de.arminwolf.financeanalyzer.util.RandomColorUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +public class BubbleChartFactory { + + public static HighChartDAO createBubbleChart( + final String pTitle, + final List transactions) { + HighChartDAO highChartDAO = new HighChartDAO(); + highChartDAO.setTitle(new Title(pTitle)); + + highChartDAO.setChart(new Chart("packedbubble", "75%")); + + List series = new ArrayList<>(); + List colors = new ArrayList<>(); + + AtomicInteger min = new AtomicInteger(0); + AtomicInteger max = new AtomicInteger(0); + + transactions.stream() + .collect(Collectors.groupingBy(TransactionDAO::getAnalyseHauptkategorie)) + .forEach((key, value) -> { + Series data = new Series(); + data.setName(key); + Float reduce = value.stream().reduce(0f, (a, b) -> a + (-1.0f * b.getBetragAsFloat()), Float::sum); + min.set(Math.min(min.get(), reduce.intValue())); + max.set(Math.max(max.get(), reduce.intValue())); + data.setComplexData(value.stream().map(b -> new SeriesElement(b.getBeguenstigterAuftraggeber(), -1.0f * b.getBetragAsFloat())).collect(Collectors.toList())); + series.add(data); + colors.add(RandomColorUtil.getRandomColor()); + }); + + PlotOptions plotOptions = new PlotOptions(); + plotOptions.setPackedbubble(new Packedbubble()); + plotOptions.getPackedbubble().setzMax(max.get()); + plotOptions.getPackedbubble().setzMin(min.get()); + plotOptions.getPackedbubble().getDataLabels().getFilter().setValue(Double.valueOf(0.2 * max.get()).intValue()); + highChartDAO.setPlotOptions(plotOptions); + + highChartDAO.setTooltip(new ToolTip("{point.name}: {point.value} €", true)); + highChartDAO.setColors(colors); + highChartDAO.setSeries(series); + return highChartDAO; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/ColumnChartFactory.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/ColumnChartFactory.java new file mode 100644 index 0000000..d996db5 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/ColumnChartFactory.java @@ -0,0 +1,74 @@ +package de.arminwolf.financeanalyzer.dao.charts.factories; + +import de.arminwolf.financeanalyzer.dao.charts.model.Chart; +import de.arminwolf.financeanalyzer.dao.charts.model.Column; +import de.arminwolf.financeanalyzer.dao.charts.model.HighChartDAO; +import de.arminwolf.financeanalyzer.dao.charts.model.PlotOptions; +import de.arminwolf.financeanalyzer.dao.charts.model.Series; +import de.arminwolf.financeanalyzer.dao.charts.model.Title; +import de.arminwolf.financeanalyzer.dao.charts.model.XAxis; +import de.arminwolf.financeanalyzer.dao.charts.model.YAxis; +import de.arminwolf.financeanalyzer.util.RandomColorUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class ColumnChartFactory { + + public static HighChartDAO createColumnChart( + final String pTitle, + final String pChartTitle, + final Map> ausgaben, + final String pAusgabenTitle, + final Map> einnahmen, + final String pEinnahmenTitle) { + + HighChartDAO chart = new HighChartDAO(); + + PlotOptions plotOptions = new PlotOptions(); + Column column = new Column(); + //column.setStacking("normal"); + plotOptions.setColumn(column); + chart.setPlotOptions(plotOptions); + + chart.setTitle(new Title(pTitle)); + + XAxis xAxis = new XAxis(); + xAxis.setCategories(List.of("Einname", "Ausgabe")); + chart.setXAxis(xAxis); + + YAxis yAxis = new YAxis(); + yAxis.setMin(0); + yAxis.setTitle(new Title(pChartTitle)); + chart.setYAxis(yAxis); + + chart.setChart(new Chart("column")); + + Series einnahmenSeries = new Series(); + einnahmenSeries.setStack(1); + einnahmenSeries.setName(pEinnahmenTitle); + einnahmenSeries.setData(einnahmen.values() + .stream() + .map(floats -> floats.stream().reduce(0.0f, Float::sum)) + .collect(Collectors.toList())); + + + Series ausgabenSeries = new Series(); + ausgabenSeries.setStack(0); + ausgabenSeries.setName(pAusgabenTitle); + ausgabenSeries.setData(ausgaben.values() + .stream() + .map(floats -> floats.stream().map(Math::abs).reduce(0.0f, Float::sum)) + .collect(Collectors.toList())); + + chart.setColors(List.of(RandomColorUtil.getRandomColor(), RandomColorUtil.getRandomColor())); + + List series = new ArrayList<>(); + series.add(einnahmenSeries); + series.add(ausgabenSeries); + chart.setSeries(series); + return chart; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/LineChartFactory.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/LineChartFactory.java new file mode 100644 index 0000000..94da89e --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/factories/LineChartFactory.java @@ -0,0 +1,42 @@ +package de.arminwolf.financeanalyzer.dao.charts.factories; + +import de.arminwolf.financeanalyzer.dao.charts.model.Chart; +import de.arminwolf.financeanalyzer.dao.charts.model.HighChartDAO; +import de.arminwolf.financeanalyzer.dao.charts.model.Series; +import de.arminwolf.financeanalyzer.dao.charts.model.Title; +import de.arminwolf.financeanalyzer.dao.charts.model.XAxis; +import de.arminwolf.financeanalyzer.dao.charts.model.YAxis; +import de.arminwolf.financeanalyzer.util.RandomColorUtil; + +import java.util.List; + +public class LineChartFactory { + + + public static HighChartDAO createLineChart(final String pTitle, final String pChartTitle, final List categories, final List pData) { + HighChartDAO lineChart = new HighChartDAO(); + Title title = new Title(); + title.setText(pTitle); + lineChart.setTitle(title); + + XAxis xAxis = new XAxis(); + xAxis.setCategories(categories); + + YAxis yAxis = new YAxis(); + Title chartTitle = new Title(); + chartTitle.setText(pChartTitle); + yAxis.setTitle(chartTitle); + + lineChart.setXAxis(xAxis); + lineChart.setYAxis(yAxis); + + + Chart chart = new Chart(); + chart.setType("line"); + + lineChart.setChart(chart); + lineChart.setColors(List.of(RandomColorUtil.getRandomColor())); + lineChart.setSeries(pData); + return lineChart; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Chart.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Chart.java new file mode 100644 index 0000000..6b3d837 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Chart.java @@ -0,0 +1,46 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import java.io.Serializable; + +public class Chart implements Serializable { + + private String type; + private String height; + + + public Chart() { + this.type = ""; + } + + + public Chart(final String type) { + this.type = type; + } + + + public Chart(final String type, final String height) { + this.type = type; + this.height = height; + } + + + public String getHeight() { + return height; + } + + + public void setHeight(final String height) { + this.height = height; + } + + + public String getType() { + return this.type; + } + + + public void setType(String type) { + this.type = type; + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Column.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Column.java new file mode 100644 index 0000000..19f8abb --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Column.java @@ -0,0 +1,20 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import java.io.Serializable; + +public class Column implements Serializable { + + private String stacking; + + + public String getStacking() { + return this.stacking; + } + + + public void setStacking(String stacking) { + this.stacking = stacking; + } + + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/DataLabels.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/DataLabels.java new file mode 100644 index 0000000..46e308c --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/DataLabels.java @@ -0,0 +1,59 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + + + +public class DataLabels { + + private boolean enabled; + private String format; + private Filter filter; + private Style style; + + + public DataLabels(boolean enabled, String format, Filter filter, Style style) { + this.enabled = enabled; + this.format = format; + this.filter = filter; + this.style = style; + } + + + public boolean isEnabled() { + return enabled; + } + + + public void setEnabled(final boolean enabled) { + this.enabled = enabled; + } + + + public String getFormat() { + return format; + } + + + public void setFormat(final String format) { + this.format = format; + } + + + public Filter getFilter() { + return filter; + } + + + public void setFilter(final Filter filter) { + this.filter = filter; + } + + + public Style getStyle() { + return style; + } + + + public void setStyle(final Style style) { + this.style = style; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Filter.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Filter.java new file mode 100644 index 0000000..c75747d --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Filter.java @@ -0,0 +1,45 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +public class Filter { + + private String property; + private String operator; + private int value; + + + public Filter(String property, String operator, int value) { + this.property = property; + this.operator = operator; + this.value = value; + } + + + public String getProperty() { + return property; + } + + + public void setProperty(final String property) { + this.property = property; + } + + + public String getOperator() { + return operator; + } + + + public void setOperator(final String operator) { + this.operator = operator; + } + + + public int getValue() { + return value; + } + + + public void setValue(final int value) { + this.value = value; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/HighChartDAO.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/HighChartDAO.java new file mode 100644 index 0000000..c911652 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/HighChartDAO.java @@ -0,0 +1,125 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; +import java.util.List; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class HighChartDAO implements Serializable { + + private PlotOptions plotOptions; + private ToolTip tooltip; + private YAxis yAxis; + private XAxis xAxis; + private List series; + private Title title; + private Chart chart; + private List colors; + + + @JsonProperty("tooltip") + public ToolTip getTooltip() { + return tooltip; + } + + + public void setTooltip(final ToolTip tooltip) { + this.tooltip = tooltip; + } + + + public YAxis getyAxis() { + return yAxis; + } + + + public void setyAxis(final YAxis yAxis) { + this.yAxis = yAxis; + } + + + public XAxis getxAxis() { + return xAxis; + } + + + public void setxAxis(final XAxis xAxis) { + this.xAxis = xAxis; + } + + + public List getColors() { + return colors; + } + + + public void setColors(final List colors) { + this.colors = colors; + } + + + public PlotOptions getPlotOptions() { + return this.plotOptions; + } + + + public void setPlotOptions(PlotOptions plotOptions) { + this.plotOptions = plotOptions; + } + + + @JsonProperty("yAxis") + public YAxis getYAxis() { + return this.yAxis; + } + + + public void setYAxis(YAxis yAxis) { + this.yAxis = yAxis; + } + + + @JsonProperty("xAxis") + public XAxis getXAxis() { + return this.xAxis; + } + + + public void setXAxis(XAxis xAxis) { + this.xAxis = xAxis; + } + + + public List getSeries() { + return this.series; + } + + + public void setSeries(List series) { + this.series = series; + } + + + public Title getTitle() { + return this.title; + } + + + public void setTitle(Title title) { + this.title = title; + } + + + public Chart getChart() { + return this.chart; + } + + + public void setChart(Chart chart) { + this.chart = chart; + } + +} + diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/LayoutAlgorithm.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/LayoutAlgorithm.java new file mode 100644 index 0000000..2662df4 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/LayoutAlgorithm.java @@ -0,0 +1,76 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +public class LayoutAlgorithm { + + private double gravitationalConstant; + private boolean splitSeries; + private boolean seriesInteraction; + private boolean dragBetweenSeries; + private boolean parentNodeLimit; + + + public LayoutAlgorithm( + final double gravitationalConstant, + final boolean splitSeries, + final boolean seriesInteraction, + final boolean dragBetweenSeries, + final boolean parentNodeLimit + ) { + + this.gravitationalConstant = gravitationalConstant; + this.splitSeries = splitSeries; + this.seriesInteraction = seriesInteraction; + this.dragBetweenSeries = dragBetweenSeries; + this.parentNodeLimit = parentNodeLimit; + } + + + public double getGravitationalConstant() { + return gravitationalConstant; + } + + + public void setGravitationalConstant(final double gravitationalConstant) { + this.gravitationalConstant = gravitationalConstant; + } + + + public boolean isSplitSeries() { + return splitSeries; + } + + + public void setSplitSeries(final boolean splitSeries) { + this.splitSeries = splitSeries; + } + + + public boolean isSeriesInteraction() { + return seriesInteraction; + } + + + public void setSeriesInteraction(final boolean seriesInteraction) { + this.seriesInteraction = seriesInteraction; + } + + + public boolean isDragBetweenSeries() { + return dragBetweenSeries; + } + + + public void setDragBetweenSeries(final boolean dragBetweenSeries) { + this.dragBetweenSeries = dragBetweenSeries; + } + + + public boolean isParentNodeLimit() { + return parentNodeLimit; + } + + + public void setParentNodeLimit(final boolean parentNodeLimit) { + this.parentNodeLimit = parentNodeLimit; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Packedbubble.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Packedbubble.java new file mode 100644 index 0000000..32aefb8 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Packedbubble.java @@ -0,0 +1,95 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +public class Packedbubble { + + private String minSize; + private String maxSize; + private int zMin; + private int zMax; + private LayoutAlgorithm layoutAlgorithm; + private DataLabels dataLabels; + + + public Packedbubble(String minSize, String maxSize, int zMin, int zMax, LayoutAlgorithm layoutAlgorithm, DataLabels dataLabels) { + this.minSize = minSize; + this.maxSize = maxSize; + this.zMin = zMin; + this.zMax = zMax; + this.layoutAlgorithm = layoutAlgorithm; + this.dataLabels = dataLabels; + } + + + public Packedbubble() { + this.minSize = "20%"; + this.maxSize = "100%"; + this.zMin = 0; + this.zMax = 1000; + this.layoutAlgorithm = new LayoutAlgorithm(0.02, true, false, true, true); + this.dataLabels = new DataLabels( + true, "{point.name}", + new Filter("y", ">", 0), + new Style("black", "none", "normal") + ); + } + + + public String getMinSize() { + return minSize; + } + + + public void setMinSize(final String minSize) { + this.minSize = minSize; + } + + + public String getMaxSize() { + return maxSize; + } + + + public void setMaxSize(final String maxSize) { + this.maxSize = maxSize; + } + + + public int getzMin() { + return zMin; + } + + + public void setzMin(final int zMin) { + this.zMin = zMin; + } + + + public int getzMax() { + return zMax; + } + + + public void setzMax(final int zMax) { + this.zMax = zMax; + } + + + public LayoutAlgorithm getLayoutAlgorithm() { + return layoutAlgorithm; + } + + + public void setLayoutAlgorithm(final LayoutAlgorithm layoutAlgorithm) { + this.layoutAlgorithm = layoutAlgorithm; + } + + + public DataLabels getDataLabels() { + return dataLabels; + } + + + public void setDataLabels(final DataLabels dataLabels) { + this.dataLabels = dataLabels; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/PlotOptions.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/PlotOptions.java new file mode 100644 index 0000000..c715be5 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/PlotOptions.java @@ -0,0 +1,28 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +public class PlotOptions { + + private Packedbubble packedbubble; + + private Column column; + + + public Column getColumn() { + return this.column; + } + + + public void setColumn(Column column) { + this.column = column; + } + + + public Packedbubble getPackedbubble() { + return packedbubble; + } + + + public void setPackedbubble(final Packedbubble packedbubble) { + this.packedbubble = packedbubble; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Series.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Series.java new file mode 100644 index 0000000..c8e2776 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Series.java @@ -0,0 +1,62 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +public class Series implements Serializable { + + private Set complexData; + private List data; + + private int stack = 0; + + private String name; + + + + public void setComplexData(Collection data) { + this.complexData = new HashSet<>(data); + } + + + public String getName() { + return this.name; + } + + + public int getStack() { + return stack; + } + + + public void setName(String name) { + this.name = name; + } + + + public void setData(final List data) { + this.data = data; + } + + + @JsonProperty("data") + public List getData() { + + if (Objects.isNull(data)) { + return this.complexData.stream().toList(); + } else { + return this.data; + } + } + + + public void setStack(final int i) { + this.stack = i; + } +} \ No newline at end of file diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/SeriesElement.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/SeriesElement.java new file mode 100644 index 0000000..e85f082 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/SeriesElement.java @@ -0,0 +1,50 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import java.util.Objects; + +public class SeriesElement { + + private String name; + private Float value; + + + public SeriesElement(final String name, final Float value) { + this.name = name; + this.value = value; + } + + + public String getName() { + return name; + } + + + public void setName(final String name) { + this.name = name; + } + + + public Float getValue() { + return value; + } + + + public void setValue(final Float value) { + this.value = value; + } + + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final SeriesElement that = (SeriesElement) o; + return Objects.equals(name, that.name) && Objects.equals(value, that.value); + } + + + @Override + public int hashCode() { + return Objects.hash(name, value); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Style.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Style.java new file mode 100644 index 0000000..facaaa8 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Style.java @@ -0,0 +1,46 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +public class Style { + + private String color; + private String textOutline; + private String fontWeight; + + + public Style(String color, String textOutline, String fontWeight) { + this.color = color; + this.textOutline = textOutline; + this.fontWeight = fontWeight; + } + + + public String getColor() { + return color; + } + + + public void setColor(final String color) { + this.color = color; + } + + + public String getTextOutline() { + return textOutline; + } + + + public void setTextOutline(final String textOutline) { + this.textOutline = textOutline; + } + + + public String getFontWeight() { + return fontWeight; + } + + + public void setFontWeight(final String fontWeight) { + this.fontWeight = fontWeight; + } +} + diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Title.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Title.java new file mode 100644 index 0000000..23a37b2 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/Title.java @@ -0,0 +1,28 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import java.io.Serializable; + +public class Title implements Serializable { + + private String text; + + + public Title() { + this.text = ""; + } + + + public Title(final String text) { + this.text = text; + } + + + public String getText() { + return this.text; + } + + + public void setText(String text) { + this.text = text; + } +} \ No newline at end of file diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/ToolTip.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/ToolTip.java new file mode 100644 index 0000000..d724710 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/ToolTip.java @@ -0,0 +1,39 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +public class ToolTip { + + private String pointFormat; + private boolean useHTML; + + + public ToolTip(String pointFormat, boolean useHTML) { + this.pointFormat = pointFormat; + this.useHTML = useHTML; + } + + + public ToolTip() { + this.pointFormat = "{point.name}: {point.value}"; + this.useHTML = true; + } + + + public String getPointFormat() { + return pointFormat; + } + + + public void setPointFormat(final String pointFormat) { + this.pointFormat = pointFormat; + } + + + public boolean isUseHTML() { + return useHTML; + } + + + public void setUseHTML(final boolean useHTML) { + this.useHTML = useHTML; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/XAxis.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/XAxis.java new file mode 100644 index 0000000..37f2461 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/XAxis.java @@ -0,0 +1,20 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import java.io.Serializable; +import java.util.Collection; + +public class XAxis implements Serializable { + + private Collection categories; + + + public Collection getCategories() { + return this.categories; + } + + + public void setCategories(Collection categories) { + this.categories = categories; + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/YAxis.java b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/YAxis.java new file mode 100644 index 0000000..071b33c --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/charts/model/YAxis.java @@ -0,0 +1,32 @@ +package de.arminwolf.financeanalyzer.dao.charts.model; + +import java.io.Serializable; + +public class YAxis implements Serializable { + + private Title title; + private int min; + + + public Title getTitle() { + return this.title; + } + + + public void setMin(final int i) { + this.min=i; + } + + + public int getMin() { + return min; + } + + + public void setTitle(Title title) { + this.title = title; + } + + + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/dao/model/OutputData.java b/src/main/java/de/arminwolf/financeanalyzer/dao/model/OutputData.java new file mode 100644 index 0000000..8f4c6df --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/dao/model/OutputData.java @@ -0,0 +1,147 @@ +package de.arminwolf.financeanalyzer.dao.model; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.util.DateUtil; +import de.arminwolf.financeanalyzer.util.NumberUtil; + +import java.time.LocalDate; +import java.util.Date; +import java.util.Map; +import java.util.Objects; + +public class OutputData implements Comparable { + + @JsonProperty("id") + public String id; + @JsonProperty("amount") + public String amount; + @JsonProperty("amountAsFloat") + public Float amountAsFloat; + @JsonProperty("contractTurnaround") + public String contractTurnaround; + + @JsonProperty("contractTurnaround") + public String date; + @JsonProperty("recipient") + public String recipient; + @JsonProperty("purpose") + public String purpose; + + + + public OutputData(final Map.Entry order) { + this(order.getKey(), order.getValue()); + } + + + public OutputData(final String id, final TransactionDAO transaction) { + this.id = id; + this.amount = transaction.getBetrag().concat(" ").concat(transaction.getWaehrung()); + this.contractTurnaround = transaction.getAnalyseVertragsturnus().isBlank() ? "monatlich" : transaction.getAnalyseVertragsturnus(); + this.amountAsFloat = Float.parseFloat(transaction.getBetrag()); + this.date = DateUtil.prettyPrint(DateUtil.parse(transaction.getBuchungstag())); + this.purpose = transaction.getVerwendungszweck().trim().isEmpty() ? + "Überweisung an " + transaction.getBeguenstigterAuftraggeber() : + transaction.getVerwendungszweck(); + this.recipient = transaction.getBeguenstigterAuftraggeber(); + } + + + public OutputData(final TransactionDAO t) { + this(LocalDate.now().toString(), t); + } + + + public String getDate() { + return date; + } + + + public void setDate(final String date) { + this.date = date; + } + + + @Override + public int compareTo(final OutputData o) { + return getAmountAsFloat().compareTo(o.getAmountAsFloat()); + } + + + public Float getAmountAsFloat() { + return NumberUtil.round(amountAsFloat); + } + + + public void setAmountAsFloat(final Float amountAsFloat) { + this.amountAsFloat = amountAsFloat; + } + + + public String getId() { + return id; + } + + + public void setId(final String id) { + this.id = id; + } + + + public String getAmount() { + return amount; + } + + + public void setAmount(final String amount) { + this.amount = amount; + } + + + + public String getContractTurnaround() { + return contractTurnaround; + } + + + public void setContractTurnaround(final String contractTurnaround) { + this.contractTurnaround = contractTurnaround; + } + + + public String getPurpose() { + return purpose; + } + + + public void setPurpose(final String purpose) { + this.purpose = purpose; + } + + + public String getRecipient() { + return recipient; + } + + + public void setRecipient(final String recipient) { + this.recipient = recipient; + } + + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final OutputData outputData = (OutputData) o; + return Objects.equals(amount, outputData.amount) && Objects.equals(contractTurnaround, outputData.contractTurnaround) && Objects.equals(date, outputData.date) && Objects.equals(recipient, outputData.recipient) && Objects.equals(purpose, outputData.purpose); + } + + + @Override + public int hashCode() { + return Objects.hash(amount, contractTurnaround, date, recipient, purpose); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/CacheService.java b/src/main/java/de/arminwolf/financeanalyzer/service/CacheService.java new file mode 100644 index 0000000..278adc2 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/CacheService.java @@ -0,0 +1,24 @@ +package de.arminwolf.financeanalyzer.service; + +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class CacheService { + + private final Map cache = new HashMap<>(); + + + public void put(final String key, final Object value) { + System.out.printf("Added to Cache. Key: [%s], Value: [%s]\n", key, value); + cache.put(key, value); + } + + + public Object get(final String key) { + return cache.get(key); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/ConverterService.java b/src/main/java/de/arminwolf/financeanalyzer/service/ConverterService.java new file mode 100644 index 0000000..ee38e5b --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/ConverterService.java @@ -0,0 +1,16 @@ +package de.arminwolf.financeanalyzer.service; + +import de.arminwolf.financeanalyzer.util.XlsxToJsonConverter; +import org.springframework.stereotype.Service; + +import java.io.InputStream; +import java.util.Optional; + +@Service +public class ConverterService { + + public Optional convert(InputStream in) { + return XlsxToJsonConverter.writeJson(XlsxToJsonConverter.readXlsx(in)); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/FileService.java b/src/main/java/de/arminwolf/financeanalyzer/service/FileService.java new file mode 100644 index 0000000..9ea9953 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/FileService.java @@ -0,0 +1,134 @@ +package de.arminwolf.financeanalyzer.service; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import de.arminwolf.financeanalyzer.conf.Configuration; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Stream; + +@Service +public class FileService { + + + public static final String CONFIGURATION_JSON = "configuration.json"; + @Autowired + private CacheService cacheService; + + + public Configuration getConfiguration() { + File workingDirectory = getOrCreateWorkingDirectory(); + Path configurationFilePath = Paths.get(workingDirectory.toPath().toString(), CONFIGURATION_JSON); + + System.out.printf("Loading '%s'\n", configurationFilePath); + ObjectMapper objectMapper = new ObjectMapper(); + try { + return objectMapper.readValue(configurationFilePath.toFile(), Configuration.class); + } catch (IOException e) { + System.out.printf("Error while accesing '%s'\n", configurationFilePath); + } + + return new Configuration(); + } + + + public Optional getJsonFileName() { + File workingDirectory = getOrCreateWorkingDirectory(); + final Path jsonFilePath = Paths.get(workingDirectory.toPath().toString(), "finance-analyzer.json"); + if (!jsonFilePath.toFile().exists()) { + return Optional.empty(); + } else { + String absolutePath = jsonFilePath.toAbsolutePath().toString(); + System.out.println("Absolute Path of json file: " + absolutePath); + return Optional.of(absolutePath); + } + } + + + public boolean isJsonPresent() { + File orCreateWorkingDirectory = getOrCreateWorkingDirectory(); + return getJsonFiles(orCreateWorkingDirectory).findFirst().isPresent(); + } + + + private Stream getJsonFiles(final File orCreateWorkingDirectory) { + return Arrays.stream(Objects.requireNonNull(orCreateWorkingDirectory.list((dir, name) -> name.endsWith(".json")))); + } + + + public TransactionDAO[] getJsonFile() { + File workingDirectory = getOrCreateWorkingDirectory(); + final Path jsonFilePath = Paths.get(workingDirectory.toPath().toString(), "finance-analyzer.json"); + if (!jsonFilePath.toFile().exists()) { + throw new IllegalStateException("Could not load json file."); + } else { + + System.out.printf("Loading '%s'\n", jsonFilePath); + ObjectMapper objectMapper = new ObjectMapper(); + try { + return objectMapper.readValue(jsonFilePath.toFile(), new TypeReference() { + }); + } catch (IOException e) { + System.out.printf("Error while accesing '%s'\n", jsonFilePath); + } + } + + return new TransactionDAO[0]; + } + + + public File getOrCreateWorkingDirectory() { + if (Objects.isNull(cacheService.get("workingDirectory"))) { + final String userHomeAsString = System.getProperty("user.home"); + System.out.printf("Looking for working Directory '.finance-analyser' in user home (%s).\n", userHomeAsString); + Path path = Paths.get(userHomeAsString.concat(File.separator).concat(".finance-analyser")); + boolean exists = Files.exists(path); + if (exists) { + return path.toFile(); + } else { + Path directory = null; + try { + directory = Files.createDirectory(path); + cacheService.put("workingDirectory", directory.toFile()); + return directory.toFile(); + } catch (IOException e) { + System.err.println("Could not create directory in user home.. Permission issue?" + e.getMessage()); + } + throw new IllegalStateException("Could not create working directory. Please fix the permissions."); + } + } else { + return (File) cacheService.get("workingDirectory"); + } + } + + + public void saveConfiguration(final Configuration configuration) { + File workingDirectory = getOrCreateWorkingDirectory(); + Path path = Paths.get(workingDirectory.getPath(), CONFIGURATION_JSON); + if (path.toFile().exists()) { + System.out.println("Configuration file already exists. Overwriting it."); + try { + Files.delete(path); + } catch (IOException e) { + System.out.println("Could not delete existing configuration file." + e.getMessage()); + } + } + ObjectMapper objectMapper = new ObjectMapper(); + try { + objectMapper.writeValue(path.toFile(), configuration); + } catch (IOException e) { + System.err.println("Could not save configuration file." + e.getMessage()); + } + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/ReportService.java b/src/main/java/de/arminwolf/financeanalyzer/service/ReportService.java new file mode 100644 index 0000000..37b426a --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/ReportService.java @@ -0,0 +1,181 @@ +package de.arminwolf.financeanalyzer.service; + +import de.arminwolf.financeanalyzer.conf.Configuration; +import de.arminwolf.financeanalyzer.dao.ReportDAO; +import de.arminwolf.financeanalyzer.dao.TableDataDAO; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.service.usecases.CashFlowService; +import de.arminwolf.financeanalyzer.service.usecases.IncomeService; +import de.arminwolf.financeanalyzer.service.usecases.OtherTransactionService; +import de.arminwolf.financeanalyzer.service.usecases.StandingOrderService; +import de.arminwolf.financeanalyzer.util.DateUtil; +import de.arminwolf.financeanalyzer.util.TransactionDateStringComparator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.ui.Model; + +import java.time.LocalDate; +import java.time.YearMonth; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static de.arminwolf.financeanalyzer.util.Constants.AUSGABEN; +import static de.arminwolf.financeanalyzer.util.Constants.BEGUENSTIGTER; +import static de.arminwolf.financeanalyzer.util.Constants.BETRAG; +import static de.arminwolf.financeanalyzer.util.Constants.DATUM; +import static de.arminwolf.financeanalyzer.util.Constants.EINNAHMEN; +import static de.arminwolf.financeanalyzer.util.Constants.TURNUS; +import static de.arminwolf.financeanalyzer.util.Constants.VERWENDUNGSZWECK; + +@Service +public class ReportService { + + + public static final String EUR = " EUR"; + @Autowired + private IncomeService incomeService; + @Autowired + private CashFlowService cashFlowService; + + @Autowired + private StandingOrderService standingOrderService; + + @Autowired + private OtherTransactionService otherTransactionService; + + @Autowired + private CacheService cacheService; + + private ReportDAO report; + + + public ReportDAO createReport(final TransactionDAO[] response, String month, String iban, final Model model) { + this.report = new ReportDAO(); + System.out.println("LocalDate : " + DateUtil.parseMonth(month)); + int numberOfMonths = DateUtil.monthsBetween(DateUtil.parseMonth(month), LocalDate.now()); + final List filteredIncomeTransactions = getFilteredIncomeTransactions(response, numberOfMonths, iban); + final List filteredExpenseTransactions = getFilteredExpenseTransactions(response, numberOfMonths, iban); + + // Verarbeiten Sie hier die Antwort + ((Configuration) cacheService.get("configuration")).getBankAccounts().stream() + .filter(bankAccount -> bankAccount.getIban().equals(iban)).findFirst() + .ifPresent(bankAccount -> { + model.addAttribute("accountName", bankAccount.getBankAccountName()); + model.addAttribute("iban", iban); + }); + + // Daueraufträge + standingOrderService.setStandingOrder(report, filteredExpenseTransactions); + + // Sonstige Transaktionen + otherTransactionService.setOtherTransaction(report, filteredExpenseTransactions); + + // Cashflow + cashFlowService.setCashFlowChart(report, filteredIncomeTransactions, filteredExpenseTransactions); + + // Einkommen + incomeService.setIncome(report, filteredIncomeTransactions); + + + LocalDate localDate = LocalDate.now().minusMonths(numberOfMonths); + final LocalDate start = DateUtil.getFirstDayOfMonth(localDate); + final LocalDate end = DateUtil.getLastDayOfMonth(localDate); + + model.addAttribute("date", String.format("%s - %s", DateUtil.format(start), DateUtil.format(end))); + model.addAttribute("numberOfMonths", numberOfMonths); + + + model.addAttribute("cashFlow", getCashFlowData()); + model.addAttribute("income", getIncomeData()); + model.addAttribute("standingOrders", getStandingOrdersData()); + model.addAttribute("notStandingOrders", getNotStandingOrdersData()); + + model.addAttribute("incomeExpenseColumnReport", report.getCashFlowChart()); + model.addAttribute("accountBalanceLineChart", report.getAccountBalanceLineChart()); + model.addAttribute("transactionCategories", report.getTransactionCategoriesBubbleChart()); + + return report; + } + + + private TableDataDAO getCashFlowData() { + TableDataDAO cashFlowData = TableDataDAO.TableDataFactory.createTableDataDTO(); + cashFlowData.setHeaders(Arrays.asList("Einnahmen", "Verträge", "Ausgaben (ohne Veträge)", "Ausgaben insgesammt", "Differenz")); + cashFlowData.setRows(List.of( + Arrays.asList( + String.valueOf(report.getIncome()).concat(EUR), + String.valueOf(report.getStandingOrdersAmount()).concat(EUR), + String.valueOf(report.getNotStandingOrdersAmount()).concat(EUR), + String.valueOf(report.getTotalExpense()).concat(EUR), + String.valueOf(report.getDiff()).concat(EUR))) + ); + return cashFlowData; + } + + + private List getFilteredIncomeTransactions(final TransactionDAO[] response, final int numberOfMonths, final String iban) { + return getFilteredTransactions(response, EINNAHMEN, numberOfMonths, iban); + } + + + private List getFilteredExpenseTransactions(final TransactionDAO[] response, final int numberOfMonths, final String iban) { + return getFilteredTransactions(response, AUSGABEN, numberOfMonths, iban); + } + + + private List getFilteredTransactions(final TransactionDAO[] response, final String type, int numberOfMonths, String iban) { + final LocalDate localDate = LocalDate.now().minusMonths(numberOfMonths); + final LocalDate start = LocalDate.of(localDate.getYear(), localDate.getMonth(), 1); + final LocalDate end = YearMonth.of(localDate.getYear(), localDate.getMonth()).atEndOfMonth(); + + return Arrays.stream(response) + .filter(t -> DateUtil.isBetween(t.getBuchungstag(), start, end)) + .filter(t -> t.getReferenzkonto().equals(iban)) + .filter(e -> e.getAnalyseBetrag().equals(type)) + .sorted(new TransactionDateStringComparator()) + .collect(Collectors.toList()); + } + + + + private TableDataDAO getIncomeData() { + TableDataDAO incomeData = TableDataDAO.TableDataFactory.createTableDataDTO(); + incomeData.setHeaders(Arrays.asList(BETRAG, DATUM, BEGUENSTIGTER, VERWENDUNGSZWECK)); + incomeData.setRows(report.getIncomeList().stream() + .map(income -> Arrays.asList( + income.getAmount(), + income.getDate(), + income.getRecipient(), + income.getPurpose())).toList()); + return incomeData; + } + + + private TableDataDAO getNotStandingOrdersData() { + TableDataDAO notStandingOrders = TableDataDAO.TableDataFactory.createTableDataDTO(); + notStandingOrders.setHeaders(Arrays.asList(BETRAG, DATUM, TURNUS, BEGUENSTIGTER, VERWENDUNGSZWECK)); + notStandingOrders.setRows(report.getSortedNotStandingOrders().stream() + .map(income -> Arrays.asList( + income.getAmount(), + income.getDate(), + income.getContractTurnaround(), + income.getRecipient(), + income.getPurpose())).toList()); + return notStandingOrders; + } + + + private TableDataDAO getStandingOrdersData() { + TableDataDAO standingOrders = TableDataDAO.TableDataFactory.createTableDataDTO(); + standingOrders.setHeaders(Arrays.asList(BETRAG, DATUM, TURNUS, BEGUENSTIGTER, VERWENDUNGSZWECK)); + standingOrders.setRows(report.getSortedStandingOrders().stream() + .map(income -> Arrays.asList( + income.getAmount(), + income.getDate(), + income.getContractTurnaround(), + income.getRecipient(), + income.getPurpose())).toList()); + return standingOrders; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/usecases/CashFlowService.java b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/CashFlowService.java new file mode 100644 index 0000000..b713946 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/CashFlowService.java @@ -0,0 +1,67 @@ +package de.arminwolf.financeanalyzer.service.usecases; + +import de.arminwolf.financeanalyzer.dao.ReportDAO; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import org.apache.commons.math3.util.Pair; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.stream.Collectors; + +import static de.arminwolf.financeanalyzer.util.Constants.AUSGABEN; +import static de.arminwolf.financeanalyzer.util.Constants.EINNAHMEN; + +@Service +public class CashFlowService { + + public void setCashFlowChart(final ReportDAO reportDAO, + final List filteredIncomeTransactions, + final List filteredExpenseTransactions) { + Map> expenses = new TreeMap<>(); + Map> income = new TreeMap<>(); + + filteredIncomeTransactions.stream() + .map(TransactionDAO::getAnalyseMonat) + .forEach(month -> { + income.put(month, new ArrayList<>()); + filteredIncomeTransactions.stream() + .filter(t -> t.getAnalyseMonat().equals(month)) + .filter(t -> t.getAnalyseBetrag().equals(EINNAHMEN)) + .forEach(t -> income.get(month).add(t.getBetragAsFloat())); + + }); + + filteredExpenseTransactions.stream() + .map(TransactionDAO::getAnalyseMonat) + .forEach(month -> { + expenses.put(month, new ArrayList<>()); + filteredExpenseTransactions.stream() + .filter(t -> t.getAnalyseMonat().equals(month)) + .filter(t -> t.getAnalyseBetrag().equals(AUSGABEN)) + .forEach(t -> expenses.get(month).add(t.getBetragAsFloat())); + }); + + + + System.out.println("Number of Dataseries. Expenses: " + expenses.size() + ", Income: " + income.size()); + income.values().forEach(System.out::println); + + System.out.println("-------------------"); + reportDAO.setCashFlowChart(expenses, income); + + final List allTransaction = new ArrayList<>(); + allTransaction.addAll(filteredIncomeTransactions); + allTransaction.addAll(filteredExpenseTransactions); + + // Line Chart + reportDAO.setAccountBalanceLineChart(allTransaction.stream() + .map(t -> Pair.create(t.getBuchungstag(), t.getKontostand())) + .collect(Collectors.toList())); + + // Bubble Chart + reportDAO.setTransactionCategoriesBubbleChart(filteredExpenseTransactions); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/usecases/IncomeService.java b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/IncomeService.java new file mode 100644 index 0000000..58af6b3 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/IncomeService.java @@ -0,0 +1,21 @@ +package de.arminwolf.financeanalyzer.service.usecases; + +import de.arminwolf.financeanalyzer.dao.ReportDAO; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +import static de.arminwolf.financeanalyzer.util.Constants.EINNAHMEN; + +@Service +public class IncomeService { + + public void setIncome(final ReportDAO reportDAO, final List filteredTransactions) { + reportDAO.setIncomeList(filteredTransactions.stream() + .filter(e -> e.getAnalyseBetrag().equals(EINNAHMEN)) + .collect(Collectors.toList())); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/usecases/OtherTransactionService.java b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/OtherTransactionService.java new file mode 100644 index 0000000..69c4461 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/OtherTransactionService.java @@ -0,0 +1,23 @@ +package de.arminwolf.financeanalyzer.service.usecases; + +import de.arminwolf.financeanalyzer.dao.ReportDAO; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.dao.model.OutputData; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class OtherTransactionService { + + public void setOtherTransaction(final ReportDAO reportDAO, + final List filteredTransactions) { + + reportDAO.setNotStandingOrders(filteredTransactions.stream() + .filter(t -> !reportDAO.getStandingOrders().contains(new OutputData(t))) + .distinct() + .collect(Collectors.toList())); + + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/service/usecases/StandingOrderService.java b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/StandingOrderService.java new file mode 100644 index 0000000..6f2c5e3 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/service/usecases/StandingOrderService.java @@ -0,0 +1,29 @@ +package de.arminwolf.financeanalyzer.service.usecases; + +import de.arminwolf.financeanalyzer.dao.ReportDAO; +import de.arminwolf.financeanalyzer.dao.TransactionDAO; +import de.arminwolf.financeanalyzer.util.StreamUtil; +import de.arminwolf.financeanalyzer.util.TransactionDateStringReverseComparator; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class StandingOrderService { + + public static final String JA = "ja"; + + + public void setStandingOrder(final ReportDAO reportDAO, final List filteredTransactions) { + + List transactions = filteredTransactions.stream() + .filter(e -> e.getAnalyseVertrag().equals(JA) + || e.getAnalyseUmsatzart().equals("Dauerauftrag") + || e.getAnalyseUmsatzart().equals("Lastschrift")) + .sorted(new TransactionDateStringReverseComparator()) + .toList(); + + List standingOrderTransactions = StreamUtil.findDuplicateInStream(transactions); + reportDAO.setStandingOrders(standingOrderTransactions); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/Constants.java b/src/main/java/de/arminwolf/financeanalyzer/util/Constants.java new file mode 100644 index 0000000..a878a4e --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/Constants.java @@ -0,0 +1,18 @@ +package de.arminwolf.financeanalyzer.util; + +public class Constants { + + public static final String INDEX = "upload"; + public static final String ERROR = "templates/error"; + public static final String REPORTS = "reports"; + + public static final String EINNAHMEN = "Einnahmen"; + public static final String AUSGABEN = "Ausgaben"; + public static final String GEHALT = "Gehalt"; + + public static final String TURNUS = "Turnus"; + public static final String VERWENDUNGSZWECK = "Verwendungszweck"; + public static final String BEGUENSTIGTER = "Begünstigter"; + public static final String DATUM = "Datum"; + public static final String BETRAG = "Betrag"; +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/DateFormatStringComparatorForOrder.java b/src/main/java/de/arminwolf/financeanalyzer/util/DateFormatStringComparatorForOrder.java new file mode 100644 index 0000000..61b4529 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/DateFormatStringComparatorForOrder.java @@ -0,0 +1,9 @@ +package de.arminwolf.financeanalyzer.util; + +import de.arminwolf.financeanalyzer.dao.model.OutputData; + +import java.util.Comparator; + +public interface DateFormatStringComparatorForOrder extends Comparator { + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/DateUtil.java b/src/main/java/de/arminwolf/financeanalyzer/util/DateUtil.java new file mode 100644 index 0000000..f2275f7 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/DateUtil.java @@ -0,0 +1,113 @@ +package de.arminwolf.financeanalyzer.util; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.LocalDate; +import java.time.YearMonth; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +public class DateUtil { + + private final static DateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.GERMAN); + private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy"); + private final static DateTimeFormatter originalFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy"); + private final static Calendar startCalendar = Calendar.getInstance(); + + + public static String format(final LocalDate start) { + return start.format(formatter); + } + + + public static LocalDate getFirstDayOfMonth(final LocalDate localDate) { + return LocalDate.of(localDate.getYear(), localDate.getMonth(), 1); + } + + + public static LocalDate getLastDayOfMonth(final LocalDate localDate) { + return YearMonth.of(localDate.getYear(), localDate.getMonth()).atEndOfMonth(); + } + + + public static boolean isBefore(String date, LocalDate end) { + try { + Date parse = df.parse(date); + Instant instant = parse.toInstant(); + LocalDate localDate = instant.atZone(ZoneId.systemDefault()).toLocalDate(); + + return localDate.isBefore(end); + } catch (ParseException e) { + System.out.println("ERROR: " + date); + return false; + } + } + + + public static boolean isAfter(String date, LocalDate start) { + try { + Date parse = df.parse(date); + Instant instant = parse.toInstant(); + LocalDate localDate = instant.atZone(ZoneId.systemDefault()).toLocalDate(); + + return localDate.isAfter(start); + } catch (ParseException e) { + System.out.println("ERROR: " + date); + e.printStackTrace(System.err); + return false; + } + } + + + public static boolean isBetween(String date, LocalDate start, LocalDate end) { + try { + Date parse = df.parse(date); + Instant instant = parse.toInstant(); + LocalDate localDate = instant.atZone(ZoneId.systemDefault()).toLocalDate(); + + return (localDate.isEqual(end) || localDate.isBefore(end)) && (localDate.isEqual(start) || localDate.isAfter(start)); + } catch (ParseException e) { + System.out.println("ERROR: " + date); + e.printStackTrace(System.err); + return false; + } + } + + + public static LocalDate parse(final String buchungstag) { + return LocalDate.parse(buchungstag, originalFormatter); + } + + + public static LocalDate parseMonth(final String month) { + String[] split = month.split("-"); + return LocalDate.of(Integer.parseInt(split[0]), Integer.parseInt(split[1]), 1); + } + + + public static String prettyPrint(final LocalDate date) { + return date.format(formatter); + } + + public static int monthsBetween(LocalDate startDate, LocalDate endDate) { + if (startDate == null || endDate == null) { + throw new IllegalArgumentException("Both startDate and endDate must be provided"); + } + + startCalendar.setTime(Date.from(startDate.atStartOfDay(ZoneId.systemDefault()).toInstant())); + int startDateTotalMonths = 12 * startCalendar.get(Calendar.YEAR) + startCalendar.get(Calendar.MONTH); + + Calendar endCalendar = Calendar.getInstance(); + endCalendar.setTime(Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant())); + + int endDateTotalMonths = 12 * endCalendar.get(Calendar.YEAR) + + endCalendar.get(Calendar.MONTH); + + return endDateTotalMonths - startDateTotalMonths; + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/NumberUtil.java b/src/main/java/de/arminwolf/financeanalyzer/util/NumberUtil.java new file mode 100644 index 0000000..faa7e7c --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/NumberUtil.java @@ -0,0 +1,16 @@ +package de.arminwolf.financeanalyzer.util; + +import java.util.Objects; + +public class NumberUtil { + + public static Float round(final Float value) { + return round(value, 2); + } + + + public static Float round(final Float value, final int precision) { + return Math.round((Objects.isNull(value) ? 0f : value) * Math.pow(10, precision)) / (float) Math.pow(10, precision); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/OrderDateStringComparator.java b/src/main/java/de/arminwolf/financeanalyzer/util/OrderDateStringComparator.java new file mode 100644 index 0000000..31877a7 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/OrderDateStringComparator.java @@ -0,0 +1,20 @@ +package de.arminwolf.financeanalyzer.util; + +import de.arminwolf.financeanalyzer.dao.model.OutputData; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Comparator; + +public class OrderDateStringComparator implements Comparator { + + @Override + public int compare(final OutputData o1, final OutputData o2) { + SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy"); + try { + return -1 * formatter.parse(o1.getDate()).compareTo(formatter.parse(o2.getDate())); + } catch (ParseException e) { + return -1; + } + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/RandomColorUtil.java b/src/main/java/de/arminwolf/financeanalyzer/util/RandomColorUtil.java new file mode 100644 index 0000000..15878f4 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/RandomColorUtil.java @@ -0,0 +1,17 @@ +package de.arminwolf.financeanalyzer.util; + +import java.util.Random; + +public class RandomColorUtil { + + private static final Random random = new Random(); + + + public static String getRandomColor() { + // create a big random number - maximum is ffffff (hex) = 16777215 (dez) + int nextInt = random.nextInt(0xffffff + 1); + + // format it as hexadecimal string (with hashtag and leading zeros) + return String.format("#%06x", nextInt); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/StreamUtil.java b/src/main/java/de/arminwolf/financeanalyzer/util/StreamUtil.java new file mode 100644 index 0000000..bd3a43e --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/StreamUtil.java @@ -0,0 +1,29 @@ +package de.arminwolf.financeanalyzer.util; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +public class StreamUtil { + + public static List findDuplicateInStream(List list) { + + // Set to store the duplicate elements + Set items = new HashSet<>(); + + // Return the set of duplicate elements + return list.stream() + + // Set.add() returns false + // if the element was + // already present in the set. + // Hence filter such elements + .filter(items::add) + + // Collect duplicate elements + // in the set + .collect(Collectors.toList()); + } + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringComparator.java b/src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringComparator.java new file mode 100644 index 0000000..d931166 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringComparator.java @@ -0,0 +1,22 @@ +package de.arminwolf.financeanalyzer.util; + +import de.arminwolf.financeanalyzer.dao.TransactionDAO; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Comparator; + +public class TransactionDateStringComparator implements Comparator { + + @Override + public int compare(final TransactionDAO o1, final TransactionDAO o2) { + SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy"); + try { + return formatter.parse(o1.getBuchungstag()).compareTo(formatter.parse(o2.getBuchungstag())); + } catch (ParseException e) { + return -1; + } + } + + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringReverseComparator.java b/src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringReverseComparator.java new file mode 100644 index 0000000..59a770f --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/TransactionDateStringReverseComparator.java @@ -0,0 +1,22 @@ +package de.arminwolf.financeanalyzer.util; + +import de.arminwolf.financeanalyzer.dao.TransactionDAO; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Comparator; + +public class TransactionDateStringReverseComparator implements Comparator { + + @Override + public int compare(final TransactionDAO o1, final TransactionDAO o2) { + SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy"); + try { + return -1 * formatter.parse(o1.getBuchungstag()).compareTo(formatter.parse(o2.getBuchungstag())); + } catch (ParseException e) { + return -1; + } + } + + +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/UrlUtil.java b/src/main/java/de/arminwolf/financeanalyzer/util/UrlUtil.java new file mode 100644 index 0000000..7978b7c --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/UrlUtil.java @@ -0,0 +1,12 @@ +package de.arminwolf.financeanalyzer.util; + +import jakarta.servlet.http.HttpServletRequest; + +public class UrlUtil { + + public static String getRelativeUrl(final HttpServletRequest request, final String path) { + String requestURL = request.getRequestURL().toString(); + String servletPath = request.getServletPath(); + return requestURL.substring(0, requestURL.lastIndexOf(servletPath)).concat(path); + } +} diff --git a/src/main/java/de/arminwolf/financeanalyzer/util/XlsxToJsonConverter.java b/src/main/java/de/arminwolf/financeanalyzer/util/XlsxToJsonConverter.java new file mode 100644 index 0000000..e6df161 --- /dev/null +++ b/src/main/java/de/arminwolf/financeanalyzer/util/XlsxToJsonConverter.java @@ -0,0 +1,68 @@ +package de.arminwolf.financeanalyzer.util; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.poi.openxml4j.util.ZipSecureFile; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +public class XlsxToJsonConverter { + + + public static final String JSON_EXTENSION = ".json"; + + + public static List> readXlsx(InputStream inputFile) { + List> data = new ArrayList<>(); + ZipSecureFile.setMinInflateRatio(0.001); + try (XSSFWorkbook workbook = new XSSFWorkbook(inputFile)) { + Sheet sheet = workbook.getSheetAt(0); + Row headerRow = sheet.getRow(0); + int lastColumnNum = headerRow.getLastCellNum(); + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + Row row = sheet.getRow(i); + Map rowData = new HashMap<>(); + for (int j = 0; j < lastColumnNum; j++) { + Cell cell = row.getCell(j); + String cellValue = ""; + if (Objects.nonNull(cell)) { + cellValue = cell.toString(); + } + rowData.put(convert2jsonKey(headerRow.getCell(j).toString()), cellValue); + } + data.add(rowData); + } + } catch (IOException e) { + e.printStackTrace(); + } + return data; + } + + + private static String convert2jsonKey(final String string) { + return string.toLowerCase(Locale.GERMANY).replaceAll(" ", "-"); + } + + + public static Optional writeJson(List> data) { + try (ByteArrayOutputStream fos = new ByteArrayOutputStream()) { + ObjectMapper mapper = new ObjectMapper(); + mapper.writerWithDefaultPrettyPrinter().writeValue(fos, data); + return Optional.of(fos.toString()); + } catch (Exception e) { + return Optional.empty(); + } + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/css/styles.css b/src/main/resources/static/css/styles.css new file mode 100644 index 0000000..54e7533 --- /dev/null +++ b/src/main/resources/static/css/styles.css @@ -0,0 +1,137 @@ +:root { + line-height: 1.6; + font-size: 0.9rem; +} + +body { + font-family: Courier, monospace; + width: auto; + color: #666; /* Helle Textfarbe */ + background-color: #fff; + margin: 0; + padding: 0; + transition: background-color 0.3s ease; /* Beispiel für Übergänge */ +} + +.card-header { + border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; + background-color: #343a40; +} + +.card-header p { + color: #333; +} + +/* Überschriften */ +h1, h2, h3, h4, h5, h6 { + font-weight: bold; + color: #fff; /* Helle Textfarbe für Links und Schaltflächen */ + font-family: Courier, monospace; +} + +a, .btn { + color: #fff; /* Helle Textfarbe für Links und Schaltflächen */ +} + +a:hover, .btn:hover { + background-color: #444; /* Dunklere Hintergrundfarbe beim Hovern über Links und Schaltflächen */ +} + + +/* Texte */ +p, span, label { + line-height: 1.25; + font-family: Courier, monospace; +} + +/* Links */ +a { + color: #007bff; +} + +.red { + color: red; +} + +.green { + color: green; +} + +/* Fehlermeldungen */ +.error { + color: #dc3545; + font-size: 14px; +} + +.content-section { + width: 85%; + margin: 0 auto; + padding: 5em; +} + +hr { + margin-top: 1rem; + margin-bottom: 1rem; + border: 0; + border-top: 1px solid rgba(0, 0, 0, 0.1); +} + +/* Container */ +.container { + margin: 2em auto; + padding: 2em; + background-color: #fff; + box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.3); + font-family: Courier, monospace; +} + +.flex-container { + display: flex; + justify-content: space-between; +} + +ul { + list-style: none; + margin: 0; + padding: 0; + font-family: Courier, monospace; +} +.scrollable-table { + overflow: auto; /* Scrollen aktivieren, wenn der Inhalt überläuft */ +} + +table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; +} +th, td { + padding: 5px; + text-align: right; +} +th { + background-color: #f2f2f2; + color: #333; + font-weight: bold; + text-align: right; +} + +tr:nth-child(even) { + background-color: #f9f9f9; +} + +tr:hover { + background-color: #f5f5f5; +} +/* Definiert die Trennlinie für die Zeile */ +tr.border-row td { + border-top: 1px solid darkgrey; +} + +[data-analysis-value^="-"] { + color: red; +} + +[data-analysis-value$="EUR"]:not([data-analysis-value^="-"]) { + color: green; +} \ No newline at end of file diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html new file mode 100644 index 0000000..93834dd --- /dev/null +++ b/src/main/resources/templates/error/404.html @@ -0,0 +1,22 @@ + + + + + Error 404 - Page not found + + + + + + + +

+
+
+

Error - Page not found

+
+
+
+
+ + diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html new file mode 100644 index 0000000..ebb9942 --- /dev/null +++ b/src/main/resources/templates/error/500.html @@ -0,0 +1,22 @@ + + + + + Error 404 - Page not found + + + + + + + +
+
+
+

Internal Server Error

+
+
+
+
+ + diff --git a/src/main/resources/templates/fragments/body_end_scripts.html b/src/main/resources/templates/fragments/body_end_scripts.html new file mode 100644 index 0000000..5c39f4c --- /dev/null +++ b/src/main/resources/templates/fragments/body_end_scripts.html @@ -0,0 +1,7 @@ +
+ +
diff --git a/src/main/resources/templates/fragments/html_head.html b/src/main/resources/templates/fragments/html_head.html new file mode 100644 index 0000000..8347444 --- /dev/null +++ b/src/main/resources/templates/fragments/html_head.html @@ -0,0 +1,19 @@ + + + + Dashboard + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/navigation.html b/src/main/resources/templates/fragments/navigation.html new file mode 100644 index 0000000..ee81ea6 --- /dev/null +++ b/src/main/resources/templates/fragments/navigation.html @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/page_title.html b/src/main/resources/templates/fragments/page_title.html new file mode 100644 index 0000000..31ce3a6 --- /dev/null +++ b/src/main/resources/templates/fragments/page_title.html @@ -0,0 +1,3 @@ +
+

Title

+
\ No newline at end of file diff --git a/src/main/resources/templates/fragments/table.html b/src/main/resources/templates/fragments/table.html new file mode 100644 index 0000000..cde8b76 --- /dev/null +++ b/src/main/resources/templates/fragments/table.html @@ -0,0 +1,15 @@ + + + + + + + + + + + +
Betrag
\ No newline at end of file diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html new file mode 100644 index 0000000..4e6cb0f --- /dev/null +++ b/src/main/resources/templates/layout.html @@ -0,0 +1,14 @@ + + + + + + + + +
+ + +
+ + diff --git a/src/main/resources/templates/reports.html b/src/main/resources/templates/reports.html new file mode 100644 index 0000000..4fb4b61 --- /dev/null +++ b/src/main/resources/templates/reports.html @@ -0,0 +1,119 @@ + + + +
+
+
+
+
+ Kontodaten +
+
+

+

+

+
+
+
+
+ +
+
+
+
+ Cashflow Analyse +
+
+
+
+
+
+
+ +
+ +
+
+
+ Kontostand Verlauf +
+
+
+
+
+
+ + +
+
+
+ Verteilung Einnahmen und Ausgaben +
+
+
+
+
+
+ , +
+
+
+
+
+ Einkommen +
+ +
+
+
+
+
+
+ +
+
+
+
Verträge
+
+
+
+
+
+
+
+
+
+
Keine Verträge
+
+
+
+
+
+
+ +
+ +
+
+
Kategorien der Ausgaben
+
+
+
+
+
+ +
+ + + +
+ +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/upload.html b/src/main/resources/templates/upload.html new file mode 100644 index 0000000..3ffb385 --- /dev/null +++ b/src/main/resources/templates/upload.html @@ -0,0 +1,50 @@ + + + +
+
+
+
+
+

Bestehnde Daten gefunden:

+
+
+

+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+ Upload +
+
+
+ + +
+
+
+
+
+
+ \ No newline at end of file