From 3e4875645d6f5fb2895792813892631795bb08e6 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 23 Feb 2020 17:36:40 +0100 Subject: [PATCH 01/74] umbau auf maven und hertlbot --- .gitignore | 1 + bot.db | Bin 0 -> 2097152 bytes build.gradle | 39 --- gradle/wrapper/gradle-wrapper.jar | Bin 54706 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 6 - gradlew | 172 ----------- gradlew.bat | 84 ------ pom.xml | 69 +++++ settings.gradle | 1 - .../workshop/chatbot/GettingStartedBot.java | 64 ---- .../hertlhendl/HertlHendlBot.java | 280 ++++++++++++++++++ .../telegrambots/hertlhendl}/WorkshopBot.java | 10 +- src/main/resources/log4j.xml | 261 ++++++++++++++++ src/main/resources/run.sh | 1 + .../hertlhendl}/WorkshopBotTest.java | 2 +- 15 files changed, 618 insertions(+), 372 deletions(-) create mode 100644 bot.db delete mode 100644 build.gradle delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat create mode 100644 pom.xml delete mode 100644 settings.gradle delete mode 100644 src/main/java/ch/fihlon/workshop/chatbot/GettingStartedBot.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java rename src/main/java/{ch/fihlon/workshop/chatbot => de/bigamgamen/java/telegrambots/hertlhendl}/WorkshopBot.java (98%) create mode 100644 src/main/resources/log4j.xml create mode 100644 src/main/resources/run.sh rename src/test/java/{ch/fihlon/workshop/chatbot => de/bigamgamen/java/telegrambots/hertlhendl}/WorkshopBotTest.java (97%) diff --git a/.gitignore b/.gitignore index 3f862b6..bf880e1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /bin /build /out +/target/ diff --git a/bot.db b/bot.db new file mode 100644 index 0000000000000000000000000000000000000000..341806f5460d1062173855d77607406a54663aca GIT binary patch literal 2097152 zcmeI*OKcox0l@L`h9KMJVG75GBb5sk5>iqmNaa?dEf;Q^WU*X1_I7t&<%AsZ zh-gciG_M9wNh!CEBJZwaI~Sx7DhN%GS|^-w?J2QvY-??Yw3o6wJNs}RB??ItiJuSt zyx+`xGxJ;fKYQ~N8-n()j_Qk!?;QEu8}Ve%=l9h&c5IHvhu=9^e|^LE+Htk7|9yO@ zx=K&iWASQtW4-!9x4y3Ue5vF<@51%}xAWca?eYC}fA79|-tYT!zM8Yf+Ss`%ng3dS?3zx-*<`HL$L{2MyOZ;DKa$KpT3y8#0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7csfjbvC z5g)ptGdOtXYuv*lUqAH6^JmV!bN<})#W!b{7H6j~&wsGGw|uO9c5QJrs=OD?&d;rk zzS`O_H(#mmJ^Aa_WOQwLz7n0SL^G?=yKB)}G$m+mTCE>-^d?*4 zL)tFj^32NR=_s1}#l%E$Y^*d^E*)qcwGds67FPC-|E@JviLNYNjm|DDEX*vgL@VbO z=b~#DD^c{*)yi6QxNX0srPccF9z7iv$HHPUESADzIV_Hc#ZzH%qHW)ms4_pZF#l0h zIlff+=gBKG%X9CaoNi9O`PValKeNBJ^y-Jp(Z0XL*S-46rRlfdn{HP>)R<`(-(R0> zX&w_<9d`Zk;@otjGS z|o=R6w7i?-<;F&^hV5q-(d}?6V`lYuI6*B#qTy@jNf&8}NLbA|jYUdrP zuKf7$u1sw%)faRQrt51bufLcd$!3Rhh3!Lw14Ehbk7RNK%?s%qsor1hI^uozWV6{q z(6O~@^o818_10GJO-{Y({S&|c_uhTqOa&d=gN-kw2S+k{azRgPzo$la@5tnS9v=DX zLx=zIQYr}cWWT)i5j(2zj}82w^tf3YU7Fc#fHw*{`iOg`)>`8AbKDv-a2sRPZ!SpZQWz! zaC55tIr2&}+j@|^mdxDvBsqGMEphITtlQ9hmK?f%I^MZ)#>T_p#p1-N$??-uljZU+ zlLH#T|84U66N`Vau~RGgrOB`~6_!qi<*~3_49lgkTn@|QjXiJY>HJc%YV-Lp9j*FM z&>p C7Ex#b literal 0 HcmV?d00001 diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f92bcb2..0000000 --- a/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -/* - * ChatBot Workshop - * Copyright (C) 2018 Marcus Fihlon - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -group 'ch.fihlon.workshop.chatbot' -version '1.0-SNAPSHOT' - -apply plugin: 'java' -apply plugin: 'application' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -mainClassName = 'ch.fihlon.workshop.chatbot.WorkshopBot' - -repositories { - mavenCentral() -} - -dependencies { - compile group: 'org.telegram', name: 'telegrambots', version: '4.3.1' - compile group: 'org.telegram', name: 'telegrambots-abilities', version: '4.3.1' - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'org.mockito', name: 'mockito-core', version: '2.28.2' -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index b90af115e7449af1fa51d7c738a88b383b409731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54706 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -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 - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0b2668f --- /dev/null +++ b/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + de.bigamgamen + java.telegrambots + 1.0.0-SNAPSHOT + + + UTF-8 + 1.8 + 1.8 + + + + + org.telegram + telegrambots + 4.6 + + + org.telegram + telegrambots-abilities + 4.6 + + + org.mockito + mockito-core + 2.28.2 + test + + + junit + junit + 4.11 + test + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + ${basedir}/target/lib + false + true + true + + + + + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index d7a3605..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'java-telegram-workshop' diff --git a/src/main/java/ch/fihlon/workshop/chatbot/GettingStartedBot.java b/src/main/java/ch/fihlon/workshop/chatbot/GettingStartedBot.java deleted file mode 100644 index 33e348a..0000000 --- a/src/main/java/ch/fihlon/workshop/chatbot/GettingStartedBot.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * ChatBot Workshop - * Copyright (C) 2018 Marcus Fihlon - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package ch.fihlon.workshop.chatbot; - -import org.telegram.telegrambots.ApiContextInitializer; -import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.meta.TelegramBotsApi; -import org.telegram.telegrambots.meta.api.methods.send.SendMessage; -import org.telegram.telegrambots.meta.api.objects.Update; -import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; - -public class GettingStartedBot extends TelegramLongPollingBot { - - public static void main(final String[] args) throws TelegramApiRequestException { - ApiContextInitializer.init(); - final TelegramBotsApi api = new TelegramBotsApi(); - final GettingStartedBot bot = new GettingStartedBot(); - api.registerBot(bot); - } - - @Override - public String getBotUsername() { - return "MyWorkshopBot"; - } - - @Override - public String getBotToken() { - return "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - } - - @Override - public void onUpdateReceived(final Update update) { - if (update.hasMessage() && update.getMessage().hasText()) { - final Long chatId = update.getMessage().getChatId(); - final String text = update.getMessage().getText(); - final SendMessage message = new SendMessage() - .setChatId(chatId) - .setText(text); - try { - execute(message); - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - } - } - -} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java new file mode 100644 index 0000000..0b6fc23 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -0,0 +1,280 @@ +/* + * ChatBot Workshop + * Copyright (C) 2018 Marcus Fihlon + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.bigamgamen.java.telegrambots.hertlhendl; + +import static org.telegram.abilitybots.api.objects.Locality.ALL; +import static org.telegram.abilitybots.api.objects.Privacy.PUBLIC; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; + +import org.telegram.abilitybots.api.bot.AbilityBot; +import org.telegram.abilitybots.api.db.DBContext; +import org.telegram.abilitybots.api.db.MapDBContext; +import org.telegram.abilitybots.api.objects.Ability; +import org.telegram.abilitybots.api.sender.MessageSender; +import org.telegram.abilitybots.api.sender.SilentSender; +import org.telegram.telegrambots.ApiContextInitializer; +import org.telegram.telegrambots.meta.TelegramBotsApi; +import org.telegram.telegrambots.meta.api.methods.GetFile; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +import org.telegram.telegrambots.meta.api.methods.send.SendPhoto; +import org.telegram.telegrambots.meta.api.objects.PhotoSize; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; + +import com.google.common.annotations.VisibleForTesting; + +public class HertlHendlBot extends AbilityBot { + + private static String BOT_TOKEN = ""; + private static String BOT_USERNAME = ""; + private static int CREATOR_ID = 929115416; + private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; + + public static void main(String[] args) throws TelegramApiRequestException { + ApiContextInitializer.init(); + final DBContext db = MapDBContext.onlineInstance("bot.db"); + final HertlHendlBot bot = new HertlHendlBot(db); + final TelegramBotsApi api = new TelegramBotsApi(); + api.registerBot(bot); + } + + HertlHendlBot(final DBContext db) { + super(BOT_TOKEN, BOT_USERNAME, db); + } + + @Override + public int creatorId() { + return CREATOR_ID; + } + + private String getFilePath(final PhotoSize photo) { + if (photo.hasFilePath()) { + return photo.getFilePath(); + } + final GetFile getFileMethod = new GetFile(); + getFileMethod.setFileId(photo.getFileId()); + try { + final org.telegram.telegrambots.meta.api.objects.File file = execute(getFileMethod); + return file.getFilePath(); + } catch (final TelegramApiException e) { + e.printStackTrace(); + } + return null; + } + + private File downloadPhoto(final String filePath) { + try { + return downloadFile(filePath); + } catch (final TelegramApiException e) { + e.printStackTrace(); + } + return null; + } + + private void sendPhotoFromUrl(final String url, final Long chatId) { + final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 + sendPhotoRequest.setChatId(chatId); // 2 + sendPhotoRequest.setPhoto(url); // 3 + try { + execute(sendPhotoRequest); // 4 + } catch (final TelegramApiException e) { + e.printStackTrace(); + } + } + + private void sendPhotoFromFileId(final String fileId, final Long chatId) { + final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 + sendPhotoRequest.setChatId(chatId); // 2 + sendPhotoRequest.setPhoto(fileId); // 3 + try { + execute(sendPhotoRequest); // 4 + } catch (final TelegramApiException e) { + e.printStackTrace(); + } + } + + private void sendPhotoFromUpload(final String filePath, final Long chatId) { + final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 + sendPhotoRequest.setChatId(chatId); // 2 + sendPhotoRequest.setPhoto(new File(filePath)); // 3 + try { + execute(sendPhotoRequest); // 4 + } catch (final TelegramApiException e) { + e.printStackTrace(); + } + } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showHelp() { + return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText("/preise\n" + + "/preiseFoto\n" + + "/standorte\n" + + "/keyboard"); + silent.execute(message); + }).build(); + } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability sendKeyboard() { + return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC) + .action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText("Enjoy this wonderful keyboard!"); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = new ArrayList<>(); + + // row 1 + KeyboardRow row = new KeyboardRow(); + row.add("/preise"); + row.add("/preiseFoto"); + row.add("/standorte"); + keyboard.add(row); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + + silent.execute(message); + }).build(); + } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showPreise() { + return Ability.builder().name("preise").info("Preisliste").locality(ALL).privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText( + "1/2 Hähnchen 3,80€\n" + + "Schenkel 2,00€\n" + + "Brezel 0,80€\n" + + "Salat 1,50€\n"); + silent.execute(message); + }).build(); + } + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showPreiseFoto() { + return Ability + .builder() + .name("preiseFoto") + .info("send Preisfoto") + .locality(ALL) + .privacy(PUBLIC) + .action(context -> sendPhotoFromUpload("src/main/resources/chatbot.jpg", context.chatId())) + .build(); + } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showStandorte() { + return Ability.builder().name("standorte").info("Standorte Weiden").locality(ALL).privacy(PUBLIC) + .action(context -> sendPhotoFromUpload(makingScreenshotOfHertlHomepage(), context.chatId())).build(); + } + + private String makingScreenshotOfHertlHomepage() { + ProcessBuilder processBuilder = new ProcessBuilder(); + + + String hertlTimeStampFileName = "hertl_standorte" + + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd__HH-mm-ss-SSS")) + ".png"; + // Run a shell script + // processBuilder.command("path/to/hello.sh"); + + // -- Windows -- + + // Run a command + // processBuilder.command("cmd.exe", "/c", "dir C:\\Users\\mkyong"); + + // Run a bat file + // processBuilder.command("C:\\Users\\mkyong\\hello.bat"); + + try { + + + // -- Linux -- + + // Run a shell command + processBuilder.command("bash", "-c", "docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " + + hertlTimeStampFileName + " 1920px 2000 1"); + + Process process = processBuilder.start(); + + StringBuilder output = new StringBuilder(); + + BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + + String line; + while ((line = reader.readLine()) != null) { + output.append(line + "\n"); + } + + int exitVal = process.waitFor(); + if (exitVal == 0) { + System.out.println("Success!"); + System.out.println(output); + return hertlTimeStampFileName; + } else { + // abnormal... + } + + } catch (IOException e) { + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + return ""; + + } + +// @SuppressWarnings({"unused", "WeakerAccess"}) +// public Ability sayNo() { +// return Ability.builder() +// .name(DEFAULT) +// .privacy(PUBLIC) +// .locality(ALL) +// .action(context -> silent.send("Sorry, I have no answer for you today.", context.chatId())) +// .build(); +// } + + @VisibleForTesting + void setSender(final MessageSender sender) { + this.sender = sender; + } + + @VisibleForTesting + void setSilent(final SilentSender silent) { + this.silent = silent; + } + +} diff --git a/src/main/java/ch/fihlon/workshop/chatbot/WorkshopBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java similarity index 98% rename from src/main/java/ch/fihlon/workshop/chatbot/WorkshopBot.java rename to src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java index ec58f43..d07936e 100644 --- a/src/main/java/ch/fihlon/workshop/chatbot/WorkshopBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package ch.fihlon.workshop.chatbot; +package de.bigamgamen.java.telegrambots.hertlhendl; import com.google.common.annotations.VisibleForTesting; import org.telegram.abilitybots.api.bot.AbilityBot; @@ -55,9 +55,9 @@ public class WorkshopBot extends AbilityBot { - private static String BOT_TOKEN = "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - private static String BOT_USERNAME = "MyWorkshopBot"; - private static int CREATOR_ID = 1234567890; + private static String BOT_TOKEN = ""; + private static String BOT_USERNAME = ""; + private static int CREATOR_ID = 929115416; public static void main(String[] args) throws TelegramApiRequestException { ApiContextInitializer.init(); @@ -76,7 +76,7 @@ public int creatorId() { return CREATOR_ID; } - @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability sayHelloWorld() { return Ability .builder() diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml new file mode 100644 index 0000000..0041f6d --- /dev/null +++ b/src/main/resources/log4j.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/run.sh b/src/main/resources/run.sh new file mode 100644 index 0000000..09a8852 --- /dev/null +++ b/src/main/resources/run.sh @@ -0,0 +1 @@ +java -cp java.telegrambots-1.0.0-SNAPSHOT.jar;./lib/*;./ de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot \ No newline at end of file diff --git a/src/test/java/ch/fihlon/workshop/chatbot/WorkshopBotTest.java b/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java similarity index 97% rename from src/test/java/ch/fihlon/workshop/chatbot/WorkshopBotTest.java rename to src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java index 531e9de..a7d7be1 100644 --- a/src/test/java/ch/fihlon/workshop/chatbot/WorkshopBotTest.java +++ b/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package ch.fihlon.workshop.chatbot; +package de.bigamgamen.java.telegrambots.hertlhendl; import org.junit.After; import org.junit.Before; From 71dbe4e5efe47d60f1acd352c093d753e70d4561 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 23 Feb 2020 19:26:18 +0100 Subject: [PATCH 02/74] Usernames dynamisch setzt bar --- .../hertlhendl/HertlHendlBot.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 0b6fc23..91957a2 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -52,21 +52,24 @@ public class HertlHendlBot extends AbilityBot { - private static String BOT_TOKEN = ""; - private static String BOT_USERNAME = ""; + private final static String BOT_TOKEN = ""; + private final static String BOT_USERNAME = ""; private static int CREATOR_ID = 929115416; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; public static void main(String[] args) throws TelegramApiRequestException { ApiContextInitializer.init(); final DBContext db = MapDBContext.onlineInstance("bot.db"); - final HertlHendlBot bot = new HertlHendlBot(db); + String token = args[0] != null ? args[0] : BOT_TOKEN; + String username = args[1] != null ? args[1] : BOT_USERNAME; + final HertlHendlBot bot = new HertlHendlBot(db,token,username); final TelegramBotsApi api = new TelegramBotsApi(); api.registerBot(bot); + } - HertlHendlBot(final DBContext db) { - super(BOT_TOKEN, BOT_USERNAME, db); + HertlHendlBot(final DBContext db, String botToken, String botUsername) { + super(botToken, botUsername, db); } @Override @@ -223,10 +226,11 @@ private String makingScreenshotOfHertlHomepage() { // -- Linux -- - + String command = "docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " + + hertlTimeStampFileName + " 1920px 2000 1"; + System.out.println(command); // Run a shell command - processBuilder.command("bash", "-c", "docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " - + hertlTimeStampFileName + " 1920px 2000 1"); + processBuilder.command("cmd.exe", "-c", command); Process process = processBuilder.start(); From 767ccf9fa0e293abcccede127762aace1e91c573 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 23 Feb 2020 20:14:23 +0100 Subject: [PATCH 03/74] run und docker command auch linux umgestellt. --- .../bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java | 2 +- src/main/resources/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 91957a2..543934c 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -230,7 +230,7 @@ private String makingScreenshotOfHertlHomepage() { + hertlTimeStampFileName + " 1920px 2000 1"; System.out.println(command); // Run a shell command - processBuilder.command("cmd.exe", "-c", command); + processBuilder.command("bash", "-c", command); Process process = processBuilder.start(); diff --git a/src/main/resources/run.sh b/src/main/resources/run.sh index 09a8852..596e5bb 100644 --- a/src/main/resources/run.sh +++ b/src/main/resources/run.sh @@ -1 +1 @@ -java -cp java.telegrambots-1.0.0-SNAPSHOT.jar;./lib/*;./ de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot \ No newline at end of file +java -cp java.telegrambots-1.0.0-SNAPSHOT.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot \ No newline at end of file From d76fafa3a42fbeefb02800cb92df7288d4d2b424 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 23 Feb 2020 21:14:02 +0100 Subject: [PATCH 04/74] output optimiert. --- .../java/telegrambots/hertlhendl/HertlHendlBot.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 543934c..cecda95 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -226,13 +226,15 @@ private String makingScreenshotOfHertlHomepage() { // -- Linux -- - String command = "docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " - + hertlTimeStampFileName + " 1920px 2000 1"; + String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " + + hertlTimeStampFileName + " 1500px 2000 1"; System.out.println(command); // Run a shell command processBuilder.command("bash", "-c", command); + Process process = processBuilder.start(); + System.out.println("Docker gestartet"); StringBuilder output = new StringBuilder(); @@ -242,14 +244,15 @@ private String makingScreenshotOfHertlHomepage() { while ((line = reader.readLine()) != null) { output.append(line + "\n"); } - + int exitVal = process.waitFor(); + System.out.println("exitvalue: "+exitVal); if (exitVal == 0) { System.out.println("Success!"); System.out.println(output); return hertlTimeStampFileName; } else { - // abnormal... + return null; } } catch (IOException e) { From 712f2bdfe833e10f29d915bf309b103f046f760d Mon Sep 17 00:00:00 2001 From: AM <> Date: Wed, 11 Mar 2020 21:51:42 +0100 Subject: [PATCH 05/74] preiseFoto hinzugefuegt --- pom.xml | 5 + .../hertlhendl/HertlHendlBot.java | 133 +++++++++++++----- src/main/resources/hendl_preise.jpg | Bin 0 -> 206115 bytes 3 files changed, 102 insertions(+), 36 deletions(-) create mode 100644 src/main/resources/hendl_preise.jpg diff --git a/pom.xml b/pom.xml index 0b2668f..9c74c72 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,11 @@ telegrambots-abilities 4.6 + + + + + org.mockito mockito-core diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index cecda95..ac90185 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -25,12 +25,15 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + import org.telegram.abilitybots.api.bot.AbilityBot; import org.telegram.abilitybots.api.db.DBContext; import org.telegram.abilitybots.api.db.MapDBContext; @@ -47,7 +50,16 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; - +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; + +import com.gargoylesoftware.htmlunit.BrowserVersion; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlAnchor; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.google.common.annotations.VisibleForTesting; public class HertlHendlBot extends AbilityBot { @@ -57,19 +69,23 @@ public class HertlHendlBot extends AbilityBot { private static int CREATOR_ID = 929115416; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; - public static void main(String[] args) throws TelegramApiRequestException { + public static void main(String[] args) + throws TelegramApiRequestException, ParserConfigurationException, SAXException, IOException { + ApiContextInitializer.init(); final DBContext db = MapDBContext.onlineInstance("bot.db"); String token = args[0] != null ? args[0] : BOT_TOKEN; String username = args[1] != null ? args[1] : BOT_USERNAME; - final HertlHendlBot bot = new HertlHendlBot(db,token,username); + final HertlHendlBot bot = new HertlHendlBot(db, token, username); final TelegramBotsApi api = new TelegramBotsApi(); api.registerBot(bot); - + } - HertlHendlBot(final DBContext db, String botToken, String botUsername) { + HertlHendlBot(final DBContext db, String botToken, String botUsername) + throws ParserConfigurationException, SAXException, IOException { super(botToken, botUsername, db); +// parseStandorteXML(); } @Override @@ -139,10 +155,7 @@ public Ability showHelp() { return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText("/preise\n" - + "/preiseFoto\n" - + "/standorte\n" - + "/keyboard"); + message.setText("/preise\n" + "/preiseFoto\n" + "/standorteFoto\n" + "/keyboard"); silent.execute(message); }).build(); } @@ -162,7 +175,7 @@ public Ability sendKeyboard() { KeyboardRow row = new KeyboardRow(); row.add("/preise"); row.add("/preiseFoto"); - row.add("/standorte"); + row.add("/standorteFoto"); keyboard.add(row); // activate the keyboard @@ -179,37 +192,32 @@ public Ability showPreise() { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); message.setText( - "1/2 Hähnchen 3,80€\n" - + "Schenkel 2,00€\n" - + "Brezel 0,80€\n" - + "Salat 1,50€\n"); + "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" + "Salat 1,50€\n"); silent.execute(message); }).build(); } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability showPreiseFoto() { - return Ability - .builder() - .name("preiseFoto") - .info("send Preisfoto") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> sendPhotoFromUpload("src/main/resources/chatbot.jpg", context.chatId())) - .build(); - } @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showStandorte() { - return Ability.builder().name("standorte").info("Standorte Weiden").locality(ALL).privacy(PUBLIC) + public Ability showPreiseFoto() { + return Ability.builder().name("preiseFoto").info("send Preisfoto").locality(ALL).privacy(PUBLIC) + .action(context -> sendPhotoFromUpload("src/main/resources/hendl_preise.jpg", context.chatId())).build(); } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showstandorteFoto() { + return Ability.builder().name("standorteFoto").info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) .action(context -> sendPhotoFromUpload(makingScreenshotOfHertlHomepage(), context.chatId())).build(); } + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showstandorteWeiden() { + return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC) + .action(context -> sendPhotoFromUpload("", context.chatId())).build(); + } + private String makingScreenshotOfHertlHomepage() { ProcessBuilder processBuilder = new ProcessBuilder(); - - String hertlTimeStampFileName = "hertl_standorte" + String hertlTimeStampFileName = "hertl_standorteFoto" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd__HH-mm-ss-SSS")) + ".png"; // Run a shell script // processBuilder.command("path/to/hello.sh"); @@ -223,15 +231,13 @@ private String makingScreenshotOfHertlHomepage() { // processBuilder.command("C:\\Users\\mkyong\\hello.bat"); try { - - + // -- Linux -- String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " + hertlTimeStampFileName + " 1500px 2000 1"; System.out.println(command); // Run a shell command processBuilder.command("bash", "-c", command); - Process process = processBuilder.start(); System.out.println("Docker gestartet"); @@ -244,9 +250,9 @@ private String makingScreenshotOfHertlHomepage() { while ((line = reader.readLine()) != null) { output.append(line + "\n"); } - + int exitVal = process.waitFor(); - System.out.println("exitvalue: "+exitVal); + System.out.println("exitvalue: " + exitVal); if (exitVal == 0) { System.out.println("Success!"); System.out.println(output); @@ -284,4 +290,59 @@ void setSilent(final SilentSender silent) { this.silent = silent; } + private String formatStandorte(List standorte) { + String alle = ""; + for (String standort : standorte) { + alle += standort; + } + + return alle; + } + +// private List parseStandorteXML() throws ParserConfigurationException, SAXException, IOException { +// // Initialize a list of employees +// List employees = new ArrayList(); +// String employee = null; +// +// DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); +// DocumentBuilder builder = factory.newDocumentBuilder(); +// Document document = builder.parse(loadHertlUrl()); +//// Document document = builder.parse(HERTL_URL); +// document.getDocumentElement().normalize(); +// NodeList nList = document.getElementsByTagName("searchresult"); +// for (int temp = 0; temp < nList.getLength(); temp++) { +// Node node = nList.item(temp); +// if (node.getNodeType() == Node.ELEMENT_NODE) { +// Element eElement = (Element) node; +// // Create new Employee Object +//// employee = new Employee(); +//// employee.setId(Integer.parseInt(eElement.getAttribute("id"))); +//// employee.setFirstName(eElement.getElementsByTagName("firstName").item(0).getTextContent()); +//// employee.setLastName(eElement.getElementsByTagName("lastName").item(0).getTextContent()); +//// employee.setLocation(eElement.getElementsByTagName("location").item(0).getTextContent()); +// +// // Add Employee to list +// employees.add(employee); +// } +// } +// return employees; +// } + +// private String loadHertlUrl() throws IOException { +// +// +// try { +// WebClient webClient = new WebClient(BrowserVersion.FIREFOX_68); +// HtmlPage page = webClient.getPage(HERTL_URL); +// webClient.getOptions().setJavaScriptEnabled(true); +// webClient.waitForBackgroundJavaScript(3000); +// List teams = (List) page.getByXPath(""); +// System.out.println(); +// } catch (IOException ex ) { +// ex.printStackTrace(); +// } +// +// return "works"; +// } + } diff --git a/src/main/resources/hendl_preise.jpg b/src/main/resources/hendl_preise.jpg new file mode 100644 index 0000000000000000000000000000000000000000..642d71d670fcf8b8dd27efeaeaa121837359cee2 GIT binary patch literal 206115 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 Date: Wed, 11 Mar 2020 22:04:07 +0100 Subject: [PATCH 06/74] unnoetige Imports entfernt --- .../java/telegrambots/hertlhendl/HertlHendlBot.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index ac90185..711ca9e 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -30,8 +30,6 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.telegram.abilitybots.api.bot.AbilityBot; @@ -50,16 +48,8 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import com.gargoylesoftware.htmlunit.BrowserVersion; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.google.common.annotations.VisibleForTesting; public class HertlHendlBot extends AbilityBot { From 5bca282ccd9766398329df51d91b5d78d3e8a3ed Mon Sep 17 00:00:00 2001 From: AM <> Date: Wed, 11 Mar 2020 22:32:29 +0100 Subject: [PATCH 07/74] preisefot gefixt. --- .../telegrambots/hertlhendl/HertlHendlBot.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 711ca9e..729dcee 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -140,12 +140,13 @@ private void sendPhotoFromUpload(final String filePath, final Long chatId) { } } + @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showHelp() { return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText("/preise\n" + "/preiseFoto\n" + "/standorteFoto\n" + "/keyboard"); + message.setText("/preise\n" + "/preisefoto\n" + "/standorteFoto\n" + "/keyboard"); silent.execute(message); }).build(); } @@ -164,7 +165,7 @@ public Ability sendKeyboard() { // row 1 KeyboardRow row = new KeyboardRow(); row.add("/preise"); - row.add("/preiseFoto"); + row.add("/preisefoto"); row.add("/standorteFoto"); keyboard.add(row); @@ -189,8 +190,17 @@ public Ability showPreise() { @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showPreiseFoto() { - return Ability.builder().name("preiseFoto").info("send Preisfoto").locality(ALL).privacy(PUBLIC) - .action(context -> sendPhotoFromUpload("src/main/resources/hendl_preise.jpg", context.chatId())).build(); } + return Ability + .builder() + .name("preisefoto") + .info("send Preisfoto") + .locality(ALL) + .privacy(PUBLIC) + .action(context -> + sendPhotoFromUpload("src/main/resources/hendl_preise.jpg" + , context.chatId())) + .build(); + } @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showstandorteFoto() { From 524dc815ac8307657ee5cdb0cf71c8934760e059 Mon Sep 17 00:00:00 2001 From: AM <> Date: Wed, 11 Mar 2020 22:39:40 +0100 Subject: [PATCH 08/74] Alle befehle lowercase --- .../java/telegrambots/hertlhendl/HertlHendlBot.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 729dcee..d84de7c 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -146,7 +146,7 @@ public Ability showHelp() { return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText("/preise\n" + "/preisefoto\n" + "/standorteFoto\n" + "/keyboard"); + message.setText("/preise\n" + "/preisefoto\n" + "/standortefoto\n" + "/keyboard"); silent.execute(message); }).build(); } @@ -166,7 +166,7 @@ public Ability sendKeyboard() { KeyboardRow row = new KeyboardRow(); row.add("/preise"); row.add("/preisefoto"); - row.add("/standorteFoto"); + row.add("/standortefoto"); keyboard.add(row); // activate the keyboard @@ -204,7 +204,7 @@ public Ability showPreiseFoto() { @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showstandorteFoto() { - return Ability.builder().name("standorteFoto").info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) + return Ability.builder().name("standortefoto").info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) .action(context -> sendPhotoFromUpload(makingScreenshotOfHertlHomepage(), context.chatId())).build(); } From 454ac1eb654bb22aa7391963c4cc424b3be1d0ea Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 11 Oct 2020 11:59:02 +0200 Subject: [PATCH 09/74] Logging aktiviert Preise akutalisiert --- pom.xml | 33 ++++++++++++++--- .../hertlhendl/HertlHendlBot.java | 35 +++++++++++++------ 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 9c74c72..8913e37 100644 --- a/pom.xml +++ b/pom.xml @@ -26,17 +26,40 @@ telegrambots-abilities 4.6 - - - - - + + + + + org.mockito mockito-core 2.28.2 test + + org.slf4j + slf4j-api + 1.7.30 + + + org.slf4j + slf4j-simple + 1.7.30 + + + + org.apache.logging.log4j + log4j-api + 2.13.0 + + + + + org.apache.logging.log4j + log4j-core + 2.13.0 + junit junit diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index d84de7c..b274d5f 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -32,6 +32,8 @@ import javax.xml.parsers.ParserConfigurationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.telegram.abilitybots.api.bot.AbilityBot; import org.telegram.abilitybots.api.db.DBContext; import org.telegram.abilitybots.api.db.MapDBContext; @@ -54,6 +56,18 @@ public class HertlHendlBot extends AbilityBot { + + private static final String ABILTY_NAME_STANDORTEFOTO = "standortefoto"; + private static final String ABILTY_NAME_PREISEFOTO = "preisefoto"; + private static final String ABILTY_NAME_PREISE = "preise"; + private static final String KEY_PRE_SYMBOL = "/"; + private static final String KEY_STANDORTEFOTO = KEY_PRE_SYMBOL+ABILTY_NAME_STANDORTEFOTO; + private static final String KEY_PREISEFOTO = KEY_PRE_SYMBOL+ABILTY_NAME_PREISEFOTO; + private static final String KEY_PREISE = KEY_PRE_SYMBOL+ABILTY_NAME_PREISE; + + private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" + "Salat 1,50€\n"; + private static final String HENDL_PREISE_JPG = "src/main/resources/hendl_preise.jpg"; + private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; private final static String BOT_USERNAME = ""; private static int CREATOR_ID = 929115416; @@ -61,7 +75,7 @@ public class HertlHendlBot extends AbilityBot { public static void main(String[] args) throws TelegramApiRequestException, ParserConfigurationException, SAXException, IOException { - + LOG.info("HertlHendlBot starting"); ApiContextInitializer.init(); final DBContext db = MapDBContext.onlineInstance("bot.db"); String token = args[0] != null ? args[0] : BOT_TOKEN; @@ -69,7 +83,7 @@ public static void main(String[] args) final HertlHendlBot bot = new HertlHendlBot(db, token, username); final TelegramBotsApi api = new TelegramBotsApi(); api.registerBot(bot); - + LOG.info("HertlHendlBot successfull started"); } HertlHendlBot(final DBContext db, String botToken, String botUsername) @@ -143,6 +157,7 @@ private void sendPhotoFromUpload(final String filePath, final Long chatId) { @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showHelp() { + return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); @@ -164,9 +179,9 @@ public Ability sendKeyboard() { // row 1 KeyboardRow row = new KeyboardRow(); - row.add("/preise"); - row.add("/preisefoto"); - row.add("/standortefoto"); + row.add(KEY_PREISE); + row.add(KEY_PREISEFOTO); + row.add(KEY_STANDORTEFOTO); keyboard.add(row); // activate the keyboard @@ -179,11 +194,11 @@ public Ability sendKeyboard() { @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showPreise() { - return Ability.builder().name("preise").info("Preisliste").locality(ALL).privacy(PUBLIC).action(context -> { + return Ability.builder().name(ABILTY_NAME_PREISE).info("Preisliste").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); message.setText( - "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" + "Salat 1,50€\n"); + PRICE_AS_TEXT); silent.execute(message); }).build(); } @@ -192,19 +207,19 @@ public Ability showPreise() { public Ability showPreiseFoto() { return Ability .builder() - .name("preisefoto") + .name(ABILTY_NAME_PREISEFOTO) .info("send Preisfoto") .locality(ALL) .privacy(PUBLIC) .action(context -> - sendPhotoFromUpload("src/main/resources/hendl_preise.jpg" + sendPhotoFromUpload(HENDL_PREISE_JPG , context.chatId())) .build(); } @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showstandorteFoto() { - return Ability.builder().name("standortefoto").info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) + return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) .action(context -> sendPhotoFromUpload(makingScreenshotOfHertlHomepage(), context.chatId())).build(); } From 424611b3e171fd582f1504d95f6bab29caba4166 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 11 Oct 2020 12:57:13 +0200 Subject: [PATCH 10/74] Nun mit Photo delete --- .../java/telegrambots/hertlhendl/HertlHendlBot.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index b274d5f..9da0cc3 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -220,7 +220,7 @@ public Ability showPreiseFoto() { @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showstandorteFoto() { return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) - .action(context -> sendPhotoFromUpload(makingScreenshotOfHertlHomepage(), context.chatId())).build(); + .action(context -> makeScreenshotSenditDeleteit(context.chatId())).build(); } @SuppressWarnings({ "unused", "WeakerAccess" }) @@ -228,6 +228,14 @@ public Ability showstandorteWeiden() { return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC) .action(context -> sendPhotoFromUpload("", context.chatId())).build(); } + + private void makeScreenshotSenditDeleteit(Long chatId) + { + String fileName = makingScreenshotOfHertlHomepage(); + sendPhotoFromUpload(fileName, chatId); + File fileToDelete = new File(fileName); + fileToDelete.delete(); + } private String makingScreenshotOfHertlHomepage() { ProcessBuilder processBuilder = new ProcessBuilder(); From c5868f0a7098e456dd73437c01edceb0139045b7 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 11 Oct 2020 13:08:43 +0200 Subject: [PATCH 11/74] photopfad auf jar only umgestellt. --- .../bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 9da0cc3..0680612 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -66,7 +66,7 @@ public class HertlHendlBot extends AbilityBot { private static final String KEY_PREISE = KEY_PRE_SYMBOL+ABILTY_NAME_PREISE; private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" + "Salat 1,50€\n"; - private static final String HENDL_PREISE_JPG = "src/main/resources/hendl_preise.jpg"; + private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; private final static String BOT_USERNAME = ""; From 68645073688ff1cc2c7d91541867f55def8fe6c4 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 11 Oct 2020 13:22:54 +0200 Subject: [PATCH 12/74] photopfad nun dynamischer --- .../de/bigamgamen/java/helper/IOHelper.java | 83 +++++++++++++++++++ .../hertlhendl/HertlHendlBot.java | 13 ++- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/bigamgamen/java/helper/IOHelper.java diff --git a/src/main/java/de/bigamgamen/java/helper/IOHelper.java b/src/main/java/de/bigamgamen/java/helper/IOHelper.java new file mode 100644 index 0000000..a2e4bee --- /dev/null +++ b/src/main/java/de/bigamgamen/java/helper/IOHelper.java @@ -0,0 +1,83 @@ +package de.bigamgamen.java.helper; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +public class IOHelper { + /** + * Searches for a resource in the application's classpath and the + * filesystem. + *

+ * If the resource is found an {@link InputStream} is returned to read from + * the resource.
+ * If no resource is found an {@link FileNotFoundException} is thrown. + * + * @param relativePath + * The relative path of the resource, e.g. 'res/pics/splash.png' + * @return An {@link InputStream} to read from the resource + * @throws IOException + * if an IO-error occurs + * @throws FileNotFoundException + * if the resource cannot be found + * @since 3.1 + */ + public static InputStream findResource(String relativePath) throws IOException, + FileNotFoundException + { + relativePath = relativePath.replace('\\','/'); + + ClassLoader classLoader = IOHelper.class.getClassLoader(); + InputStream in = classLoader.getResourceAsStream(relativePath); + if(in == null) + { + if(relativePath.startsWith("/")) + { + in = classLoader.getResourceAsStream(relativePath.substring(1)); + } + else + { + in = classLoader.getResourceAsStream("/" + relativePath); + } + } + if(in != null) + { + return in; + } + + File f = new File(relativePath).getAbsoluteFile(); + if(f.exists()) + { + return new FileInputStream(f); + } + + String projectHome = System.getProperty("project.home",null); + if(projectHome != null) + { + StringBuilder path = new StringBuilder(); + if(projectHome.endsWith("/")) + { + path.append(projectHome,0,projectHome.length() - 1); + } + else + { + path.append(projectHome); + } + if(!relativePath.startsWith("/")) + { + path.append("/"); + } + path.append(relativePath); + + f = new File(path.toString()).getAbsoluteFile(); + if(f.exists()) + { + return new FileInputStream(f); + } + } + + throw new FileNotFoundException(relativePath); + } +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 0680612..e7d8f7a 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -23,6 +23,7 @@ import java.io.BufferedReader; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; import java.time.LocalDateTime; @@ -54,6 +55,8 @@ import com.google.common.annotations.VisibleForTesting; +import de.bigamgamen.java.helper.IOHelper; + public class HertlHendlBot extends AbilityBot { @@ -146,7 +149,15 @@ private void sendPhotoFromFileId(final String fileId, final Long chatId) { private void sendPhotoFromUpload(final String filePath, final Long chatId) { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(new File(filePath)); // 3 + try { + sendPhotoRequest.setPhoto(filePath, IOHelper.findResource(filePath)); + } catch (FileNotFoundException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } // 3 try { execute(sendPhotoRequest); // 4 } catch (final TelegramApiException e) { From b4eca41cc7c568788c192ecc696e64d4f86b8bac Mon Sep 17 00:00:00 2001 From: AM <> Date: Sat, 12 Dec 2020 22:24:39 +0100 Subject: [PATCH 13/74] microstream InitialComitt anlegen von Bestellungen. --- .gitignore | 1 + herthaehnchen_bot | Bin 0 -> 2097152 bytes pom.xml | 19 ++ .../hertlhendl/HertlHendlBot.java | 192 ++++++++++-------- .../hertlhendl/dal/HertlBotRootDao.java | 75 +++++++ .../hertlhendl/domain/HertlBotArtikel.java | 35 ++++ .../hertlhendl/domain/HertlBotBestellung.java | 51 +++++ .../hertlhendl/domain/HertlBotPosition.java | 5 + .../hertlhendl/domain/HertlBotRoot.java | 22 ++ .../hertlhendl/domain/HertlBotUser.java | 41 ++++ 10 files changed, 354 insertions(+), 87 deletions(-) create mode 100644 herthaehnchen_bot create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java diff --git a/.gitignore b/.gitignore index bf880e1..7592502 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /build /out /target/ +microStream.db/ diff --git a/herthaehnchen_bot b/herthaehnchen_bot new file mode 100644 index 0000000000000000000000000000000000000000..549f163057f5867ce8b5b9f32e7b757cf0818783 GIT binary patch literal 2097152 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 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5)$ HpTNHWfD~1y literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 8913e37..654a9e3 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,13 @@ 1.8 + + + microstream-releases + https://repo.microstream.one/repository/maven-public/ + + + org.telegram @@ -26,6 +33,18 @@ telegrambots-abilities 4.6 + + + one.microstream + storage.embedded + 04.00.00-MS-GA + + + one.microstream + storage.embedded.configuration + 04.00.00-MS-GA + + diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index e7d8f7a..fb38c16 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -26,9 +26,12 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; +import java.net.URISyntaxException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.xml.parsers.ParserConfigurationException; @@ -37,7 +40,6 @@ import org.slf4j.LoggerFactory; import org.telegram.abilitybots.api.bot.AbilityBot; import org.telegram.abilitybots.api.db.DBContext; -import org.telegram.abilitybots.api.db.MapDBContext; import org.telegram.abilitybots.api.objects.Ability; import org.telegram.abilitybots.api.sender.MessageSender; import org.telegram.abilitybots.api.sender.SilentSender; @@ -56,43 +58,51 @@ import com.google.common.annotations.VisibleForTesting; import de.bigamgamen.java.helper.IOHelper; +import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; public class HertlHendlBot extends AbilityBot { - + private static final String ABILTY_NAME_KEYBOARD = "keyboard"; private static final String ABILTY_NAME_STANDORTEFOTO = "standortefoto"; private static final String ABILTY_NAME_PREISEFOTO = "preisefoto"; private static final String ABILTY_NAME_PREISE = "preise"; + private static final String ABILTY_NAME_BESTELLUNGEN = "bestellungen"; + private static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; + private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; + private static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; + private static final List abilities = Arrays.asList(ABILTY_NAME_KEYBOARD,ABILTY_NAME_STANDORTEFOTO, ABILTY_NAME_PREISEFOTO, + ABILTY_NAME_PREISE, ABILTY_NAME_BESTELLUNGEN, ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, + ABILTY_NAME_OFFENE_BESTELLUNG); private static final String KEY_PRE_SYMBOL = "/"; - private static final String KEY_STANDORTEFOTO = KEY_PRE_SYMBOL+ABILTY_NAME_STANDORTEFOTO; - private static final String KEY_PREISEFOTO = KEY_PRE_SYMBOL+ABILTY_NAME_PREISEFOTO; - private static final String KEY_PREISE = KEY_PRE_SYMBOL+ABILTY_NAME_PREISE; - - private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" + "Salat 1,50€\n"; + + private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" + + "Salat 1,50€\n"; private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; private final static String BOT_USERNAME = ""; private static int CREATOR_ID = 929115416; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; + private static HertlBotRootDao hertlBotDao; - public static void main(String[] args) - throws TelegramApiRequestException, ParserConfigurationException, SAXException, IOException { + public static void main(String[] args) throws TelegramApiRequestException, ParserConfigurationException, + SAXException, IOException, URISyntaxException { LOG.info("HertlHendlBot starting"); ApiContextInitializer.init(); - final DBContext db = MapDBContext.onlineInstance("bot.db"); +// final DBContext db = MapDBContext.onlineInstance("bot.db"); String token = args[0] != null ? args[0] : BOT_TOKEN; String username = args[1] != null ? args[1] : BOT_USERNAME; - final HertlHendlBot bot = new HertlHendlBot(db, token, username); + final HertlHendlBot bot = new HertlHendlBot(token, username); final TelegramBotsApi api = new TelegramBotsApi(); api.registerBot(bot); LOG.info("HertlHendlBot successfull started"); } - HertlHendlBot(final DBContext db, String botToken, String botUsername) - throws ParserConfigurationException, SAXException, IOException { - super(botToken, botUsername, db); -// parseStandorteXML(); + public HertlHendlBot(String botToken, String botUsername) + throws ParserConfigurationException, SAXException, IOException, URISyntaxException { + super(botToken, botUsername); + hertlBotDao = new HertlBotRootDao(); } @Override @@ -165,18 +175,54 @@ private void sendPhotoFromUpload(final String filePath, final Long chatId) { } } - @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showHelp() { - + return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText("/preise\n" + "/preisefoto\n" + "/standortefoto\n" + "/keyboard"); + message.setText(createAbilityListForHelp()); silent.execute(message); }).build(); } +// @SuppressWarnings({ "unused", "WeakerAccess" }) +// public Ability showBestellungen() { +// +// return Ability.builder().name(ABILTY_NAME_BESTELLUNGEN).info("shows bestellungen").locality(ALL).privacy(PUBLIC) +// .action(context -> { +// final SendMessage message = new SendMessage(); +// message.setChatId(context.chatId()); +// message.setText( +// createKeyForAbility(ability) + "\n" + KEY_NEUE_BESTELLUNGEN + "\n" + KEY_OFFENE_BESTELLUNG + "\n"); +// silent.execute(message); +// }).build(); +// } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showMyBestellungen() { + + return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN).info("Zeigt die eigenen Bestellungen").locality(ALL) + .privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(loadAndShowMyBestellungen(context.chatId())); + silent.execute(message); + }).build(); + } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability createNewBestellung() { + + return Ability.builder().name(ABILTY_NAME_NEUE_BESTELLUNG).info("Erstellt eine neue Bestellung").locality(ALL) + .privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(createAndShowNewBestellung(context.chatId())); + silent.execute(message); + }).build(); + } + @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability sendKeyboard() { return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC) @@ -190,9 +236,9 @@ public Ability sendKeyboard() { // row 1 KeyboardRow row = new KeyboardRow(); - row.add(KEY_PREISE); - row.add(KEY_PREISEFOTO); - row.add(KEY_STANDORTEFOTO); + row.add(createKeyForAbility(ABILTY_NAME_PREISE)); + row.add(createKeyForAbility(ABILTY_NAME_PREISEFOTO)); + row.add(createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); keyboard.add(row); // activate the keyboard @@ -205,33 +251,25 @@ public Ability sendKeyboard() { @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showPreise() { - return Ability.builder().name(ABILTY_NAME_PREISE).info("Preisliste").locality(ALL).privacy(PUBLIC).action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText( - PRICE_AS_TEXT); - silent.execute(message); - }).build(); + return Ability.builder().name(ABILTY_NAME_PREISE).info("Preisliste").locality(ALL).privacy(PUBLIC) + .action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(PRICE_AS_TEXT); + silent.execute(message); + }).build(); } @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showPreiseFoto() { - return Ability - .builder() - .name(ABILTY_NAME_PREISEFOTO) - .info("send Preisfoto") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> - sendPhotoFromUpload(HENDL_PREISE_JPG - , context.chatId())) - .build(); + return Ability.builder().name(ABILTY_NAME_PREISEFOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) + .action(context -> sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); } @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showstandorteFoto() { - return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL).privacy(PUBLIC) - .action(context -> makeScreenshotSenditDeleteit(context.chatId())).build(); + return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL) + .privacy(PUBLIC).action(context -> makeScreenshotSenditDeleteit(context.chatId())).build(); } @SuppressWarnings({ "unused", "WeakerAccess" }) @@ -239,9 +277,8 @@ public Ability showstandorteWeiden() { return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC) .action(context -> sendPhotoFromUpload("", context.chatId())).build(); } - - private void makeScreenshotSenditDeleteit(Long chatId) - { + + private void makeScreenshotSenditDeleteit(Long chatId) { String fileName = makingScreenshotOfHertlHomepage(); sendPhotoFromUpload(fileName, chatId); File fileToDelete = new File(fileName); @@ -333,50 +370,31 @@ private String formatStandorte(List standorte) { return alle; } -// private List parseStandorteXML() throws ParserConfigurationException, SAXException, IOException { -// // Initialize a list of employees -// List employees = new ArrayList(); -// String employee = null; -// -// DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); -// DocumentBuilder builder = factory.newDocumentBuilder(); -// Document document = builder.parse(loadHertlUrl()); -//// Document document = builder.parse(HERTL_URL); -// document.getDocumentElement().normalize(); -// NodeList nList = document.getElementsByTagName("searchresult"); -// for (int temp = 0; temp < nList.getLength(); temp++) { -// Node node = nList.item(temp); -// if (node.getNodeType() == Node.ELEMENT_NODE) { -// Element eElement = (Element) node; -// // Create new Employee Object -//// employee = new Employee(); -//// employee.setId(Integer.parseInt(eElement.getAttribute("id"))); -//// employee.setFirstName(eElement.getElementsByTagName("firstName").item(0).getTextContent()); -//// employee.setLastName(eElement.getElementsByTagName("lastName").item(0).getTextContent()); -//// employee.setLocation(eElement.getElementsByTagName("location").item(0).getTextContent()); -// -// // Add Employee to list -// employees.add(employee); -// } -// } -// return employees; -// } + public String loadAndShowMyBestellungen(Long chatId) { -// private String loadHertlUrl() throws IOException { -// -// -// try { -// WebClient webClient = new WebClient(BrowserVersion.FIREFOX_68); -// HtmlPage page = webClient.getPage(HERTL_URL); -// webClient.getOptions().setJavaScriptEnabled(true); -// webClient.waitForBackgroundJavaScript(3000); -// List teams = (List) page.getByXPath(""); -// System.out.println(); -// } catch (IOException ex ) { -// ex.printStackTrace(); -// } -// -// return "works"; -// } + StringBuilder sb = new StringBuilder("Ihre Bestellungen:"+System.lineSeparator()); + HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() + .forEach(bestellung -> sb.append(bestellung.toString() + "\n")); + return sb.toString(); + } + + public String createAndShowNewBestellung(Long chatId) { + + HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); + + return bestellung.toString(); + } + + private String createAbilityListForHelp() + { + StringBuilder sb = new StringBuilder(); + abilities.forEach(ability -> sb.append(createKeyForAbility(ability)+System.lineSeparator())); + return sb.toString(); + } + + private String createKeyForAbility(String ability) + { + return KEY_PRE_SYMBOL+ability; + } } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java new file mode 100644 index 0000000..b8af928 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -0,0 +1,75 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.dal; + +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.Optional; + +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotRoot; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser; +import one.microstream.storage.types.EmbeddedStorage; +import one.microstream.storage.types.EmbeddedStorageManager; + +public class HertlBotRootDao +{ + private final Path DEFAULT_PATH; + + // Initialize a storage manager ("the database") with purely defaults. + private final EmbeddedStorageManager storageManager; + + public HertlBotRootDao() throws URISyntaxException { + DEFAULT_PATH = Paths.get("microStream.db"); + storageManager = EmbeddedStorage.start(DEFAULT_PATH); + } + + public HertlBotRoot getRoot() { + HertlBotRoot root = (HertlBotRoot) this.storageManager.root(); + if(root == null) + { + root = new HertlBotRoot(); + this.storageManager.setRoot(root); + this.storageManager.storeRoot(); + } + return root; + } + + public HertlBotUser loadUser(Long chatId) { + + Optional userOpt = getRoot() + .getUsers() + .stream() + .filter(user -> user.getChatId().equals(chatId)).findFirst(); + + if(userOpt.isPresent()) + { + return userOpt.get(); + } + + HertlBotUser user = new HertlBotUser( + chatId); + getRoot() + .getUsers() + .add(user); + storageManager.storeRoot(); + return user; + } + + public HertlBotBestellung createNewBestellungForUser(Long chatId) + { + HertlBotUser user = this.loadUser(chatId); + HertlBotBestellung bestellung = new HertlBotBestellung(user, Collections.emptyList()); + user.getBestellungen().add(bestellung); + this.storageManager.storeRoot(); + + return bestellung; + + } + public void shutDown() { + + this.storageManager.shutdown(); + } + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java new file mode 100644 index 0000000..22ca402 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java @@ -0,0 +1,35 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +import java.math.BigInteger; + +public class HertlBotArtikel { + private String name; + private BigInteger priceInCent; + + public HertlBotArtikel() { + + } + + public HertlBotArtikel(String name, BigInteger priceInCent) { + super(); + this.name = name; + this.priceInCent = priceInCent; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public BigInteger getPriceInCent() { + return priceInCent; + } + + public void setPriceInCent(BigInteger priceInCent) { + this.priceInCent = priceInCent; + } + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java new file mode 100644 index 0000000..08245ab --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java @@ -0,0 +1,51 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; + +public class HertlBotBestellung { + + private LocalDate bestellDatum; + private HertlBotUser user; + private List positionen; + + public HertlBotBestellung() { + + } + + public HertlBotBestellung(HertlBotUser user, List positionen) { + this.bestellDatum = LocalDate.now(); + this.user = user; + this.positionen = positionen; + } + + @Override + public String toString() { + return this.bestellDatum.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")); + } + + public HertlBotUser getUser() { + return user; + } + public void setUser(HertlBotUser user) { + this.user = user; + } + public List getPositionen() { + return positionen; + } + public void setPositionen(List positionen) { + this.positionen = positionen; + } + + public LocalDate getBestellDatum() { + return bestellDatum; + } + + public void setBestellDatum(LocalDate bestellDatum) { + this.bestellDatum = bestellDatum; + } + + + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java new file mode 100644 index 0000000..09f0d77 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java @@ -0,0 +1,5 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +public class HertlBotPosition { + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java new file mode 100644 index 0000000..ef84b6d --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java @@ -0,0 +1,22 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +import java.util.HashSet; +import java.util.Set; + +public class HertlBotRoot { + private Set users = new HashSet<>(); + + public HertlBotRoot() + { + + } + + public Set getUsers() { + return users; + } + + public void setUsers(Set users) { + this.users = users; + } + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java new file mode 100644 index 0000000..1e23550 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java @@ -0,0 +1,41 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class HertlBotUser { + + private Long chatId; + private List bestellungen = new ArrayList<>(); + + public HertlBotUser() { + + } + + public boolean isRightUser(Long chatId) + { + return this.chatId.equals(chatId); + } + + public HertlBotUser(Long chatId) { + this.chatId = chatId; + } + + public List getBestellungen() { + return bestellungen; + } + + public void setBestellungen(List bestellungen) { + this.bestellungen = bestellungen; + } + + public void setChatId(Long chatId) { + this.chatId = chatId; + } + + public Long getChatId() { + return chatId; + } + +} From 3e7874d823386b17e4ad4c226d2ae1df329f1ec1 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 13 Dec 2020 12:02:47 +0100 Subject: [PATCH 14/74] mircostream open bestellung --- WORKSHOP.adoc | 2 +- pom.xml | 10 +- .../bigamgamen/java/helper/Pricehelper.java | 13 ++ .../hertlhendl/HertlHendlBot.java | 113 +++++++++++++----- .../hertlhendl/dal/HertlBotRootDao.java | 14 ++- .../hertlhendl/domain/HertlBotBestellung.java | 33 ++++- .../hertlhendl/domain/HertlBotPosition.java | 31 +++++ .../hertlhendl/domain/HertlBotUser.java | 13 +- .../hertlhendl/WorkshopBotTest.java | 2 +- 9 files changed, 184 insertions(+), 47 deletions(-) create mode 100644 src/main/java/de/bigamgamen/java/helper/Pricehelper.java diff --git a/WORKSHOP.adoc b/WORKSHOP.adoc index a86dbb6..b05af5c 100644 --- a/WORKSHOP.adoc +++ b/WORKSHOP.adoc @@ -655,7 +655,7 @@ public Ability add() { return Ability .builder() .name("add") - .info("adds to numbers") + .info("adds two numbers") .locality(ALL) .privacy(PUBLIC) .input(2) diff --git a/pom.xml b/pom.xml index 654a9e3..33ab644 100644 --- a/pom.xml +++ b/pom.xml @@ -26,12 +26,12 @@ org.telegram telegrambots - 4.6 + 4.9.2 org.telegram telegrambots-abilities - 4.6 + 4.9.2 @@ -44,7 +44,11 @@ storage.embedded.configuration 04.00.00-MS-GA - + + org.apache.commons + commons-lang3 + 3.11 + diff --git a/src/main/java/de/bigamgamen/java/helper/Pricehelper.java b/src/main/java/de/bigamgamen/java/helper/Pricehelper.java new file mode 100644 index 0000000..af030f9 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/helper/Pricehelper.java @@ -0,0 +1,13 @@ +package de.bigamgamen.java.helper; + +import java.math.BigInteger; + +public class Pricehelper { + private Pricehelper() { + + } + + public static String getPriceAsEuroString(BigInteger priceInCent) { + return priceInCent.doubleValue() / 100 + "€"; + } +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index fb38c16..e80e945 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -31,15 +31,15 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; +import java.util.Map; import javax.xml.parsers.ParserConfigurationException; +import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.telegram.abilitybots.api.bot.AbilityBot; -import org.telegram.abilitybots.api.db.DBContext; import org.telegram.abilitybots.api.objects.Ability; import org.telegram.abilitybots.api.sender.MessageSender; import org.telegram.abilitybots.api.sender.SilentSender; @@ -53,6 +53,7 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.BotSession; import org.xml.sax.SAXException; import com.google.common.annotations.VisibleForTesting; @@ -67,13 +68,14 @@ public class HertlHendlBot extends AbilityBot { private static final String ABILTY_NAME_STANDORTEFOTO = "standortefoto"; private static final String ABILTY_NAME_PREISEFOTO = "preisefoto"; private static final String ABILTY_NAME_PREISE = "preise"; + private static final String ABILTY_NAME_BESTELLUNG = "bestellung"; private static final String ABILTY_NAME_BESTELLUNGEN = "bestellungen"; private static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; private static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; - private static final List abilities = Arrays.asList(ABILTY_NAME_KEYBOARD,ABILTY_NAME_STANDORTEFOTO, ABILTY_NAME_PREISEFOTO, - ABILTY_NAME_PREISE, ABILTY_NAME_BESTELLUNGEN, ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, - ABILTY_NAME_OFFENE_BESTELLUNG); + private static final List abilities = Arrays.asList(ABILTY_NAME_KEYBOARD, ABILTY_NAME_STANDORTEFOTO, + ABILTY_NAME_PREISEFOTO, ABILTY_NAME_PREISE, ABILTY_NAME_BESTELLUNGEN, ABILTY_NAME_BESTELLUNG, + ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, ABILTY_NAME_OFFENE_BESTELLUNG); private static final String KEY_PRE_SYMBOL = "/"; private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" @@ -103,6 +105,7 @@ public HertlHendlBot(String botToken, String botUsername) throws ParserConfigurationException, SAXException, IOException, URISyntaxException { super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); + } @Override @@ -124,7 +127,7 @@ private String getFilePath(final PhotoSize photo) { } return null; } - + private File downloadPhoto(final String filePath) { try { return downloadFile(filePath); @@ -186,25 +189,36 @@ public Ability showHelp() { }).build(); } -// @SuppressWarnings({ "unused", "WeakerAccess" }) -// public Ability showBestellungen() { -// -// return Ability.builder().name(ABILTY_NAME_BESTELLUNGEN).info("shows bestellungen").locality(ALL).privacy(PUBLIC) -// .action(context -> { -// final SendMessage message = new SendMessage(); -// message.setChatId(context.chatId()); -// message.setText( -// createKeyForAbility(ability) + "\n" + KEY_NEUE_BESTELLUNGEN + "\n" + KEY_OFFENE_BESTELLUNG + "\n"); -// silent.execute(message); -// }).build(); -// } + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showBestellung() { + + return Ability + .builder() + .name(ABILTY_NAME_BESTELLUNG) + .info("zeigt eine bestimmte Bestellung") + .locality(ALL) + .privacy(PUBLIC) + .input(1) + .action(context -> { + int bestellId = Integer.parseInt(context.firstArg()); + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(loadAndShowBestellung(context.chatId(), bestellId)); + silent.execute(message); + }).build(); + } @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showMyBestellungen() { - return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN).info("Zeigt die eigenen Bestellungen").locality(ALL) - .privacy(PUBLIC).action(context -> { - final SendMessage message = new SendMessage(); + return Ability + .builder() + .name(ABILTY_NAME_MY_BESTELLUNGEN) + .info("Zeigt die eigenen Bestellungen") + .locality(ALL) + .privacy(PUBLIC) + .action(context -> { + final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); message.setText(loadAndShowMyBestellungen(context.chatId())); silent.execute(message); @@ -277,6 +291,24 @@ public Ability showstandorteWeiden() { return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC) .action(context -> sendPhotoFromUpload("", context.chatId())).build(); } + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability add() { + return Ability + .builder() + .name("add") + .info("adds to numbers") + .locality(ALL) + .privacy(PUBLIC) + .input(2) + .action(context -> { + final int a = Integer.parseInt(context.firstArg()); + final int b = Integer.parseInt(context.secondArg()); + final int sum = a + b; + silent.send(String.format("The sum of %d and %d is %d", a, b, sum), context.chatId()); + }) + .build(); + } private void makeScreenshotSenditDeleteit(Long chatId) { String fileName = makingScreenshotOfHertlHomepage(); @@ -370,11 +402,16 @@ private String formatStandorte(List standorte) { return alle; } + private String loadAndShowBestellung(Long chatId, int bestellId) { + HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + return bestellung.toString(); + } + public String loadAndShowMyBestellungen(Long chatId) { - StringBuilder sb = new StringBuilder("Ihre Bestellungen:"+System.lineSeparator()); + StringBuilder sb = new StringBuilder("Ihre Bestellungen:" + System.lineSeparator()); HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() - .forEach(bestellung -> sb.append(bestellung.toString() + "\n")); + .forEach(bestellung -> sb.append(createBestellungLink(bestellung))); return sb.toString(); } @@ -382,19 +419,31 @@ public String createAndShowNewBestellung(Long chatId) { HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); - return bestellung.toString(); + return createBestellungLink(bestellung); } - - private String createAbilityListForHelp() - { + + private String createAbilityListForHelp() { StringBuilder sb = new StringBuilder(); - abilities.forEach(ability -> sb.append(createKeyForAbility(ability)+System.lineSeparator())); + abilities.forEach(ability -> sb.append(createKeyForAbility(ability) + System.lineSeparator())); return sb.toString(); } - - private String createKeyForAbility(String ability) - { - return KEY_PRE_SYMBOL+ability; + + private String createKeyForAbility(String ability) { + return KEY_PRE_SYMBOL + ability; + } + + private String createBestellungLink(HertlBotBestellung bestellung) { + return createKeyForAbility(ABILTY_NAME_BESTELLUNG)+" " + Integer.toString(bestellung.getIndex()) + + System.lineSeparator(); } +// private int getIndexFromBestellungAbilityStr(String bestellungAbilityStr) { +// String bestellIndex = bestellungAbilityStr.replace(ABILTY_NAME_BESTELLUNG, "").trim(); +// if (NumberUtils.isDigits(bestellIndex)) { +// return Integer.parseInt(bestellIndex); +// } +// +// throw new RuntimeException(bestellIndex + " is not a Number"); +// } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index b8af928..b05db08 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -4,6 +4,7 @@ import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Collections; import java.util.Optional; @@ -36,6 +37,12 @@ public HertlBotRoot getRoot() { return root; } + public HertlBotBestellung loadBestellung(Long chatId, int bestellId) { + HertlBotUser user = loadUser(chatId); + + return user.getBestellungen().stream().filter(bestellung -> bestellung.getIndex() == bestellId).findFirst().get(); + } + public HertlBotUser loadUser(Long chatId) { Optional userOpt = getRoot() @@ -60,9 +67,10 @@ public HertlBotUser loadUser(Long chatId) { public HertlBotBestellung createNewBestellungForUser(Long chatId) { HertlBotUser user = this.loadUser(chatId); - HertlBotBestellung bestellung = new HertlBotBestellung(user, Collections.emptyList()); - user.getBestellungen().add(bestellung); - this.storageManager.storeRoot(); + HertlBotBestellung bestellung = new HertlBotBestellung(user, new ArrayList<>()); + user.addBestellung(bestellung); + this.storageManager.store(bestellung); + this.storageManager.store(user); return bestellung; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java index 08245ab..1813826 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java @@ -1,11 +1,17 @@ package de.bigamgamen.java.telegrambots.hertlhendl.domain; +import java.math.BigInteger; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.List; +import de.bigamgamen.java.helper.Pricehelper; + public class HertlBotBestellung { + private static final String BESTELLUNG_TITLE = "Ihre Bestellung:"; + private static final String DD_MM_YYYY = "dd-MM-yyyy"; + private int index; private LocalDate bestellDatum; private HertlBotUser user; private List positionen; @@ -20,11 +26,26 @@ public HertlBotBestellung(HertlBotUser user, List positionen) this.positionen = positionen; } + + public String getBestellDatumFormated() { + return this.bestellDatum.format(DateTimeFormatter.ofPattern(DD_MM_YYYY)); + } + @Override - public String toString() { - return this.bestellDatum.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")); + public String toString() { + StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE); + sb.append("Vom: "+getBestellDatumFormated()+System.lineSeparator()); + this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); + sb.append("Summe: "+ getSumme()); + return sb.toString(); } + private String getSumme() { + BigInteger summe = new BigInteger("0"); + this.positionen.forEach(pos -> summe.add(pos.getPositionPrice())); + return Pricehelper.getPriceAsEuroString(summe); + } + public HertlBotUser getUser() { return user; } @@ -45,6 +66,14 @@ public LocalDate getBestellDatum() { public void setBestellDatum(LocalDate bestellDatum) { this.bestellDatum = bestellDatum; } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java index 09f0d77..4ee06b0 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java @@ -1,5 +1,36 @@ package de.bigamgamen.java.telegrambots.hertlhendl.domain; +import java.math.BigInteger; + public class HertlBotPosition { + private BigInteger menge; + private HertlBotArtikel artikel; + + public HertlBotPosition() { + + } + + public BigInteger getPositionPrice () + { + return artikel.getPriceInCent().multiply(menge); + } + + public BigInteger getMenge() { + return menge; + } + + public void setMenge(BigInteger menge) { + this.menge = menge; + } + + public HertlBotArtikel getArtikel() { + return artikel; + } + + public void setArtikel(HertlBotArtikel artikel) { + this.artikel = artikel; + } + + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java index 1e23550..63b5a96 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java @@ -13,6 +13,13 @@ public HertlBotUser() { } + public synchronized void addBestellung(HertlBotBestellung bestellung) + { + bestellung.setUser(this); + this.bestellungen.add(bestellung); + bestellung.setIndex(this.bestellungen.indexOf(bestellung)); + } + public boolean isRightUser(Long chatId) { return this.chatId.equals(chatId); @@ -23,11 +30,7 @@ public HertlBotUser(Long chatId) { } public List getBestellungen() { - return bestellungen; - } - - public void setBestellungen(List bestellungen) { - this.bestellungen = bestellungen; + return new ArrayList<>(bestellungen); } public void setChatId(Long chatId) { diff --git a/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java b/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java index a7d7be1..5b1c0ca 100644 --- a/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java +++ b/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java @@ -56,7 +56,7 @@ public void setUp() { public void sayHelloWorld() throws TelegramApiException { final Update mockedUpdate = mock(Update.class); final User user = new User(USER_ID, "Foo", false, "Bar", "foobar42", "en"); - final MessageContext context = MessageContext.newContext(mockedUpdate, user, CHAT_ID); + final MessageContext context = MessageContext.newContext(mockedUpdate, user, CHAT_ID, bot, null); bot.sayHelloWorld().action().accept(context); From 7b6c82edd1bc51565f23cbd568e85cc3ec7ad98e Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 13 Dec 2020 12:22:14 +0100 Subject: [PATCH 15/74] =?UTF-8?q?mircostream=20Keybord=20f=C3=BCr=20Bestel?= =?UTF-8?q?lungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hertlhendl/HertlHendlBot.java | 41 ++++++++++++++++++- .../hertlhendl/dal/HertlBotRootDao.java | 2 + .../hertlhendl/domain/HertlBotBestellung.java | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index e80e945..6720053 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -71,10 +71,11 @@ public class HertlHendlBot extends AbilityBot { private static final String ABILTY_NAME_BESTELLUNG = "bestellung"; private static final String ABILTY_NAME_BESTELLUNGEN = "bestellungen"; private static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; + private static final String ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD = "mybestellungenkeyboard"; private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; private static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; private static final List abilities = Arrays.asList(ABILTY_NAME_KEYBOARD, ABILTY_NAME_STANDORTEFOTO, - ABILTY_NAME_PREISEFOTO, ABILTY_NAME_PREISE, ABILTY_NAME_BESTELLUNGEN, ABILTY_NAME_BESTELLUNG, + ABILTY_NAME_PREISEFOTO, ABILTY_NAME_PREISE, ABILTY_NAME_BESTELLUNGEN,ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD, ABILTY_NAME_BESTELLUNG, ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, ABILTY_NAME_OFFENE_BESTELLUNG); private static final String KEY_PRE_SYMBOL = "/"; @@ -221,6 +222,32 @@ public Ability showMyBestellungen() { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); message.setText(loadAndShowMyBestellungen(context.chatId())); + + silent.execute(message); + }).build(); + } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showMyBestellungenKeyBoard() { + + return Ability + .builder() + .name(ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD) + .info("Zeigt die eigenen Bestellungen als keyboard") + .locality(ALL) + .privacy(PUBLIC) + .action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText("Öffne die Bestellungen über die Tastatur"); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = loadAndShowMyBestellungenAsKeyBoard(context.chatId()); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + silent.execute(message); }).build(); } @@ -414,6 +441,18 @@ public String loadAndShowMyBestellungen(Long chatId) { .forEach(bestellung -> sb.append(createBestellungLink(bestellung))); return sb.toString(); } + + public List loadAndShowMyBestellungenAsKeyBoard(Long chatId) { + List keyboard = new ArrayList<>(); + KeyboardRow row = new KeyboardRow(); + + HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() + .forEach(bestellung -> row.add(createBestellungLink(bestellung))); + + keyboard.add(row); + + return keyboard; + } public String createAndShowNewBestellung(Long chatId) { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index b05db08..95fc549 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -72,6 +72,8 @@ public HertlBotBestellung createNewBestellungForUser(Long chatId) this.storageManager.store(bestellung); this.storageManager.store(user); + this.storageManager.storeRoot(); + return bestellung; } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java index 1813826..bf71aeb 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java @@ -33,7 +33,7 @@ public String getBestellDatumFormated() { @Override public String toString() { - StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE); + StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); sb.append("Vom: "+getBestellDatumFormated()+System.lineSeparator()); this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); sb.append("Summe: "+ getSumme()); From 0302b2f7aeefba3a96a720568c4a211573e55ebe Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 13 Dec 2020 13:44:23 +0100 Subject: [PATCH 16/74] mircostream Storage auf recommend System umgestellt. --- .../hertlhendl/dal/HertlBotRootDao.java | 101 +++++++++--------- .../hertlhendl/domain/HertlBotArtikels.java | 68 ++++++++++++ .../hertlhendl/domain/HertlBotRoot.java | 9 +- .../hertlhendl/domain/HertlBotUser.java | 7 +- .../hertlhendl/domain/HertlBotUsers.java | 69 ++++++++++++ .../hertlhendl/init/InitArtikels.java | 12 +++ 6 files changed, 208 insertions(+), 58 deletions(-) create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index 95fc549..995312d 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -1,84 +1,81 @@ package de.bigamgamen.java.telegrambots.hertlhendl.dal; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collections; import java.util.Optional; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotRoot; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser; -import one.microstream.storage.types.EmbeddedStorage; +import one.microstream.storage.configuration.Configuration; +import one.microstream.storage.types.EmbeddedStorageFoundation; import one.microstream.storage.types.EmbeddedStorageManager; -public class HertlBotRootDao -{ - private final Path DEFAULT_PATH; - - // Initialize a storage manager ("the database") with purely defaults. - private final EmbeddedStorageManager storageManager; +public class HertlBotRootDao { + + private final static EmbeddedStorageManager storageManager = createStorageManager(); + + public HertlBotRootDao() { - public HertlBotRootDao() throws URISyntaxException { - DEFAULT_PATH = Paths.get("microStream.db"); - storageManager = EmbeddedStorage.start(DEFAULT_PATH); } - public HertlBotRoot getRoot() { - HertlBotRoot root = (HertlBotRoot) this.storageManager.root(); - if(root == null) - { - root = new HertlBotRoot(); - this.storageManager.setRoot(root); - this.storageManager.storeRoot(); + private static EmbeddedStorageManager createStorageManager() { + final Configuration configuration = Configuration.Default(); + configuration.setBaseDirectory(Paths.get("data", "storage").toString()); + configuration.setChannelCount(2); + + final EmbeddedStorageFoundation foundation = configuration.createEmbeddedStorageFoundation(); + + final EmbeddedStorageManager storageManager = foundation.createEmbeddedStorageManager().start(); + + if (storageManager.root() == null) { + final HertlBotRoot root = new HertlBotRoot(); + storageManager.setRoot(root); + storageManager.storeRoot(); + } - return root; + + return storageManager; + } + + public static EmbeddedStorageManager storageManager() { + return storageManager; + } + + public HertlBotRoot root() { + return (HertlBotRoot) storageManager().root(); } - + public HertlBotBestellung loadBestellung(Long chatId, int bestellId) { HertlBotUser user = loadUser(chatId); - - return user.getBestellungen().stream().filter(bestellung -> bestellung.getIndex() == bestellId).findFirst().get(); + + return user.getBestellungen().stream().filter(bestellung -> bestellung.getIndex() == bestellId).findFirst() + .get(); } - + public HertlBotUser loadUser(Long chatId) { - - Optional userOpt = getRoot() - .getUsers() - .stream() - .filter(user -> user.getChatId().equals(chatId)).findFirst(); - - if(userOpt.isPresent()) - { + + Optional userOpt = root().users().ofId(chatId); + + if (userOpt.isPresent()) { return userOpt.get(); } - - HertlBotUser user = new HertlBotUser( - chatId); - getRoot() - .getUsers() - .add(user); - storageManager.storeRoot(); + + HertlBotUser user = new HertlBotUser(chatId); + root().users().add(user, storageManager()); return user; } - - public HertlBotBestellung createNewBestellungForUser(Long chatId) - { + + public HertlBotBestellung createNewBestellungForUser(Long chatId) { HertlBotUser user = this.loadUser(chatId); HertlBotBestellung bestellung = new HertlBotBestellung(user, new ArrayList<>()); - user.addBestellung(bestellung); - this.storageManager.store(bestellung); - this.storageManager.store(user); - - this.storageManager.storeRoot(); - + user.addBestellung(bestellung, this.storageManager); + return bestellung; - } + public void shutDown() { - + this.storageManager.shutdown(); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java new file mode 100644 index 0000000..2aaa60a --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java @@ -0,0 +1,68 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import one.microstream.persistence.types.Persister; + +public class HertlBotArtikels { + + private final Map artikels = new HashMap<>(); + + public HertlBotArtikels() { + super(); + } + + + + public void add( + final HertlBotArtikel artikel, + final Persister persister + ) + { + this.artikels.put(artikel.getName(), artikel); + persister.store(this.artikels); + } + + public void addAll(final Collection HertlBotArtikels) + { + this.addAll(HertlBotArtikels, HertlBotRootDao.storageManager()); + } + + public void addAll( + final Collection artikels, + final Persister persister + ) + { + this.artikels.putAll( + artikels.stream().collect( + Collectors.toMap(HertlBotArtikel::getName, Function.identity()) + ) + ); + persister.store(this.artikels); + } + + public int HertlBotArtikelCount() + { + return this.artikels.size(); + } + + public List all() + { + return new ArrayList<>(this.artikels.values()); + } + + public HertlBotArtikel ofId(final String artikelName) + { + return this.artikels.get(artikelName); + } + + + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java index ef84b6d..6caf651 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java @@ -4,19 +4,20 @@ import java.util.Set; public class HertlBotRoot { - private Set users = new HashSet<>(); + private HertlBotUsers users = new HertlBotUsers(); + private HertlBotArtikels artikels = new HertlBotArtikels(); public HertlBotRoot() { } - public Set getUsers() { + public HertlBotUsers users() { return users; } - public void setUsers(Set users) { - this.users = users; + public HertlBotArtikels artikels() { + return artikels; } } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java index 63b5a96..9a314ff 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java @@ -1,9 +1,10 @@ package de.bigamgamen.java.telegrambots.hertlhendl.domain; import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import one.microstream.persistence.types.Persister; + public class HertlBotUser { private Long chatId; @@ -13,11 +14,13 @@ public HertlBotUser() { } - public synchronized void addBestellung(HertlBotBestellung bestellung) + public synchronized void addBestellung(HertlBotBestellung bestellung, final Persister persister) { bestellung.setUser(this); this.bestellungen.add(bestellung); + persister.store(bestellungen); bestellung.setIndex(this.bestellungen.indexOf(bestellung)); + persister.store(bestellung); } public boolean isRightUser(Long chatId) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java new file mode 100644 index 0000000..2efe04f --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java @@ -0,0 +1,69 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.domain; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import java.util.Optional; + +import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import one.microstream.persistence.types.Persister; + +public class HertlBotUsers { + + private final Map users = new HashMap<>(); + + public HertlBotUsers() { + super(); + } + + + public void add( + final HertlBotUser HertlBotUser, + final Persister persister + ) + { + this.users.put(HertlBotUser.getChatId(), HertlBotUser); + persister.store(this.users); + } + + public void addAll(final Collection HertlBotUsers) + { + this.addAll(HertlBotUsers, HertlBotRootDao.storageManager()); + } + + public void addAll( + final Collection users, + final Persister persister + ) + { + this.users.putAll( + users.stream().collect( + Collectors.toMap(HertlBotUser::getChatId, Function.identity()) + ) + ); + persister.store(this.users); + } + + public int HertlBotUserCount() + { + return this.users.size(); + } + + public List all() + { + return new ArrayList<>(this.users.values()); + } + + public Optional ofId(final long chatId) + { + return Optional.of(this.users.get(chatId)); + } + + + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java new file mode 100644 index 0000000..7c3a4b1 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java @@ -0,0 +1,12 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.init; + +import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; + +public class InitArtikels { + + public InitArtikels(HertlBotRootDao dao) + { +// dao.getRoot(); + } + +} From 53f6523ef46afcb5bb0d3c41f1bf88f234ed4ce0 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 13 Dec 2020 13:51:03 +0100 Subject: [PATCH 17/74] mircostream Userladder geifxt. --- .gitignore | 1 + .../java/telegrambots/hertlhendl/domain/HertlBotUser.java | 3 +-- .../java/telegrambots/hertlhendl/domain/HertlBotUsers.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7592502..fa9a473 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /out /target/ microStream.db/ +data/ diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java index 9a314ff..b76f800 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java @@ -18,9 +18,8 @@ public synchronized void addBestellung(HertlBotBestellung bestellung, final Pers { bestellung.setUser(this); this.bestellungen.add(bestellung); - persister.store(bestellungen); bestellung.setIndex(this.bestellungen.indexOf(bestellung)); - persister.store(bestellung); + persister.store(bestellungen); } public boolean isRightUser(Long chatId) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java index 2efe04f..48e7233 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUsers.java @@ -61,7 +61,7 @@ public List all() public Optional ofId(final long chatId) { - return Optional.of(this.users.get(chatId)); + return Optional.ofNullable(this.users.get(chatId)); } From 05ed24a7d25650d31082741fb584ba4bb0a9cd39 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 13 Dec 2020 14:11:57 +0100 Subject: [PATCH 18/74] =?UTF-8?q?mircostream=20Artikel=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigamgamen/java/helper/Pricehelper.java | 3 +- .../hertlhendl/HertlHendlBot.java | 65 ++++++++----------- .../hertlhendl/dal/HertlBotRootDao.java | 1 - .../hertlhendl/domain/HertlBotArtikel.java | 7 ++ .../hertlhendl/init/InitArtikels.java | 22 ++++++- 5 files changed, 57 insertions(+), 41 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/helper/Pricehelper.java b/src/main/java/de/bigamgamen/java/helper/Pricehelper.java index af030f9..ddc0eec 100644 --- a/src/main/java/de/bigamgamen/java/helper/Pricehelper.java +++ b/src/main/java/de/bigamgamen/java/helper/Pricehelper.java @@ -1,6 +1,7 @@ package de.bigamgamen.java.helper; import java.math.BigInteger; +import java.text.NumberFormat; public class Pricehelper { private Pricehelper() { @@ -8,6 +9,6 @@ private Pricehelper() { } public static String getPriceAsEuroString(BigInteger priceInCent) { - return priceInCent.doubleValue() / 100 + "€"; + return NumberFormat.getCurrencyInstance().format(priceInCent.doubleValue() / 100); } } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 6720053..4d568b8 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -61,6 +61,7 @@ import de.bigamgamen.java.helper.IOHelper; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; +import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArtikels; public class HertlHendlBot extends AbilityBot { @@ -70,12 +71,13 @@ public class HertlHendlBot extends AbilityBot { private static final String ABILTY_NAME_PREISE = "preise"; private static final String ABILTY_NAME_BESTELLUNG = "bestellung"; private static final String ABILTY_NAME_BESTELLUNGEN = "bestellungen"; + private static final String ABILTY_NAME_ARTIKEL = "artikel"; private static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; private static final String ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD = "mybestellungenkeyboard"; private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; private static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; private static final List abilities = Arrays.asList(ABILTY_NAME_KEYBOARD, ABILTY_NAME_STANDORTEFOTO, - ABILTY_NAME_PREISEFOTO, ABILTY_NAME_PREISE, ABILTY_NAME_BESTELLUNGEN,ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD, ABILTY_NAME_BESTELLUNG, + ABILTY_NAME_PREISEFOTO, ABILTY_NAME_PREISE,ABILTY_NAME_ARTIKEL, ABILTY_NAME_BESTELLUNGEN,ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD, ABILTY_NAME_BESTELLUNG, ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, ABILTY_NAME_OFFENE_BESTELLUNG); private static final String KEY_PRE_SYMBOL = "/"; @@ -106,7 +108,7 @@ public HertlHendlBot(String botToken, String botUsername) throws ParserConfigurationException, SAXException, IOException, URISyntaxException { super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); - + InitArtikels.initArtikels(hertlBotDao); } @Override @@ -208,6 +210,29 @@ public Ability showBestellung() { silent.execute(message); }).build(); } + + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability showArtikel() { + + return Ability + .builder() + .name(ABILTY_NAME_ARTIKEL) + .info("Listet alle Artikel auf") + .locality(ALL) + .privacy(PUBLIC) + .action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(loadAndShowAllArtikel()); + silent.execute(message); + }).build(); + } + + private String loadAndShowAllArtikel() { + StringBuilder sb = new StringBuilder(); + hertlBotDao.root().artikels().all().forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); + return sb.toString(); + } @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showMyBestellungen() { @@ -319,23 +344,6 @@ public Ability showstandorteWeiden() { .action(context -> sendPhotoFromUpload("", context.chatId())).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability add() { - return Ability - .builder() - .name("add") - .info("adds to numbers") - .locality(ALL) - .privacy(PUBLIC) - .input(2) - .action(context -> { - final int a = Integer.parseInt(context.firstArg()); - final int b = Integer.parseInt(context.secondArg()); - final int sum = a + b; - silent.send(String.format("The sum of %d and %d is %d", a, b, sum), context.chatId()); - }) - .build(); - } private void makeScreenshotSenditDeleteit(Long chatId) { String fileName = makingScreenshotOfHertlHomepage(); @@ -400,16 +408,6 @@ private String makingScreenshotOfHertlHomepage() { } -// @SuppressWarnings({"unused", "WeakerAccess"}) -// public Ability sayNo() { -// return Ability.builder() -// .name(DEFAULT) -// .privacy(PUBLIC) -// .locality(ALL) -// .action(context -> silent.send("Sorry, I have no answer for you today.", context.chatId())) -// .build(); -// } - @VisibleForTesting void setSender(final MessageSender sender) { this.sender = sender; @@ -476,13 +474,6 @@ private String createBestellungLink(HertlBotBestellung bestellung) { + System.lineSeparator(); } -// private int getIndexFromBestellungAbilityStr(String bestellungAbilityStr) { -// String bestellIndex = bestellungAbilityStr.replace(ABILTY_NAME_BESTELLUNG, "").trim(); -// if (NumberUtils.isDigits(bestellIndex)) { -// return Integer.parseInt(bestellIndex); -// } -// -// throw new RuntimeException(bestellIndex + " is not a Number"); -// } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index 995312d..cf4abdf 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -32,7 +32,6 @@ private static EmbeddedStorageManager createStorageManager() { final HertlBotRoot root = new HertlBotRoot(); storageManager.setRoot(root); storageManager.storeRoot(); - } return storageManager; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java index 22ca402..5013979 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java @@ -2,6 +2,8 @@ import java.math.BigInteger; +import de.bigamgamen.java.helper.Pricehelper; + public class HertlBotArtikel { private String name; private BigInteger priceInCent; @@ -15,6 +17,11 @@ public HertlBotArtikel(String name, BigInteger priceInCent) { this.name = name; this.priceInCent = priceInCent; } + + @Override + public String toString() { + return this.name + ": " + Pricehelper.getPriceAsEuroString(priceInCent); + } public String getName() { return name; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java index 7c3a4b1..fad6fc8 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java @@ -1,12 +1,30 @@ package de.bigamgamen.java.telegrambots.hertlhendl.init; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; public class InitArtikels { - public InitArtikels(HertlBotRootDao dao) + private InitArtikels() { + + } + + public synchronized static void initArtikels(HertlBotRootDao dao) { -// dao.getRoot(); + List artikelList= new ArrayList<>(); + + artikelList.add(new HertlBotArtikel("1/2 Hähnchen", BigInteger.valueOf(380L))); + artikelList.add(new HertlBotArtikel("Schenkel", BigInteger.valueOf(200L))); + artikelList.add(new HertlBotArtikel("Krautsalat", BigInteger.valueOf(150L))); + artikelList.add(new HertlBotArtikel("Brezel klein", BigInteger.valueOf(80L))); + artikelList.add(new HertlBotArtikel("Brezel groß", BigInteger.valueOf(160L))); + + dao.root().artikels().addAll(artikelList); + } } From 5c4e75b6ce743cae0b240d4d204b49b5d2f4fad3 Mon Sep 17 00:00:00 2001 From: AM <> Date: Sun, 13 Dec 2020 22:38:02 +0100 Subject: [PATCH 19/74] mircostream Artikel werden mit initialisiert. --- .../hertlhendl/HertlHendlBot.java | 41 ++++++++++++++++--- .../hertlhendl/domain/HertlBotArtikel.java | 8 +++- .../hertlhendl/init/InitArtikels.java | 10 ++--- 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 4d568b8..0f0e347 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -60,6 +60,7 @@ import de.bigamgamen.java.helper.IOHelper; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArtikels; @@ -72,6 +73,7 @@ public class HertlHendlBot extends AbilityBot { private static final String ABILTY_NAME_BESTELLUNG = "bestellung"; private static final String ABILTY_NAME_BESTELLUNGEN = "bestellungen"; private static final String ABILTY_NAME_ARTIKEL = "artikel"; + private static final String ABILTY_NAME_ADD_POSITION = "addposition"; private static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; private static final String ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD = "mybestellungenkeyboard"; private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; @@ -206,7 +208,15 @@ public Ability showBestellung() { int bestellId = Integer.parseInt(context.firstArg()); final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText(loadAndShowBestellung(context.chatId(), bestellId)); + message.setText("Füge Positionen zu deiner Bestellung hinzu"); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + silent.execute(message); }).build(); } @@ -228,11 +238,7 @@ public Ability showArtikel() { }).build(); } - private String loadAndShowAllArtikel() { - StringBuilder sb = new StringBuilder(); - hertlBotDao.root().artikels().all().forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); - return sb.toString(); - } + @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showMyBestellungen() { @@ -474,6 +480,29 @@ private String createBestellungLink(HertlBotBestellung bestellung) { + System.lineSeparator(); } + private String loadAndShowAllArtikel() { + StringBuilder sb = new StringBuilder(); + hertlBotDao.root().artikels().all().forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); + return sb.toString(); + } + + private List loadAndShowAllArtikelForBestellung(Long chatId, Integer bestellungId) { + List keyboard = new ArrayList<>(); + KeyboardRow row = new KeyboardRow(); + + hertlBotDao.root().artikels().all().forEach(artikel -> row.add(createAddPositiontoBestellungLink(artikel, bestellungId)) ); + + + keyboard.add(row); + + return keyboard; + } + + private String createAddPositiontoBestellungLink(HertlBotArtikel artikel, Integer bestellungId) { + return createKeyForAbility(ABILTY_NAME_ADD_POSITION)+" " + artikel.getName() + " " + bestellungId + + System.lineSeparator(); + } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java index 5013979..8b67b2f 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java @@ -5,6 +5,7 @@ import de.bigamgamen.java.helper.Pricehelper; public class HertlBotArtikel { + private int id; private String name; private BigInteger priceInCent; @@ -12,8 +13,9 @@ public HertlBotArtikel() { } - public HertlBotArtikel(String name, BigInteger priceInCent) { + public HertlBotArtikel(int id, String name, BigInteger priceInCent) { super(); + this.id = id; this.name = name; this.priceInCent = priceInCent; } @@ -39,4 +41,8 @@ public void setPriceInCent(BigInteger priceInCent) { this.priceInCent = priceInCent; } + public int getId() { + return id; + } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java index fad6fc8..7e29f0b 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java @@ -17,11 +17,11 @@ public synchronized static void initArtikels(HertlBotRootDao dao) { List artikelList= new ArrayList<>(); - artikelList.add(new HertlBotArtikel("1/2 Hähnchen", BigInteger.valueOf(380L))); - artikelList.add(new HertlBotArtikel("Schenkel", BigInteger.valueOf(200L))); - artikelList.add(new HertlBotArtikel("Krautsalat", BigInteger.valueOf(150L))); - artikelList.add(new HertlBotArtikel("Brezel klein", BigInteger.valueOf(80L))); - artikelList.add(new HertlBotArtikel("Brezel groß", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArtikel(1,"1/2 Hähnchen", BigInteger.valueOf(380L))); + artikelList.add(new HertlBotArtikel(2,"Schenkel", BigInteger.valueOf(200L))); + artikelList.add(new HertlBotArtikel(3,"Krautsalat", BigInteger.valueOf(150L))); + artikelList.add(new HertlBotArtikel(4,"Brezel klein", BigInteger.valueOf(80L))); + artikelList.add(new HertlBotArtikel(5,"Brezel groß", BigInteger.valueOf(160L))); dao.root().artikels().addAll(artikelList); From 365f03f3d9a0c2d54f5dfd8cc638f21bd10986d0 Mon Sep 17 00:00:00 2001 From: AM <> Date: Wed, 6 Jan 2021 21:20:23 +0100 Subject: [PATCH 20/74] Positionen add angefangen. --- .../hertlhendl/HertlHendlBot.java | 47 ++++++++++++++++--- .../hertlhendl/domain/HertlBotArtikels.java | 10 ++-- .../hertlhendl/domain/HertlBotBestellung.java | 7 +++ .../hertlhendl/domain/HertlBotPosition.java | 21 +++++---- .../hertlhendl/domain/HertlBotRoot.java | 3 -- 5 files changed, 64 insertions(+), 24 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 0f0e347..25448ff 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -26,17 +26,18 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; +import java.math.BigInteger; import java.net.URISyntaxException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; +import javax.swing.text.Position; +import javax.validation.constraints.PositiveOrZero; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.telegram.abilitybots.api.bot.AbilityBot; @@ -53,15 +54,16 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.meta.generics.BotSession; import org.xml.sax.SAXException; import com.google.common.annotations.VisibleForTesting; +import com.google.common.math.BigIntegerMath; import de.bigamgamen.java.helper.IOHelper; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotPosition; import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArtikels; public class HertlHendlBot extends AbilityBot { @@ -221,6 +223,38 @@ public Ability showBestellung() { }).build(); } + @SuppressWarnings({ "unused", "WeakerAccess" }) + public Ability addPositionToBestellung() { + + return Ability + .builder() + .name(ABILTY_NAME_ADD_POSITION) + .info("Fügt zu einer Bestellung eine neue Position hinzu") + .locality(ALL) + .privacy(PUBLIC) + .input(2) + .action(context -> { + Long chatId = context.chatId(); + int artikelId = Integer.parseInt(context.firstArg()); + int bestellId = Integer.parseInt(context.secondArg()); + + HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + HertlBotArtikel artikel = hertlBotDao.root().artikels().ofId(artikelId); + + HertlBotPosition position = new HertlBotPosition(BigInteger.ONE,artikel); + + bestellung.addPosition(position, HertlBotRootDao.storageManager()); + + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(artikel.getName() + " wurde " + position.getMenge() + "-mal zu deiner Bestellung hinzugefügt"); + + + + silent.execute(message); + }).build(); + } + @SuppressWarnings({ "unused", "WeakerAccess" }) public Ability showArtikel() { @@ -490,7 +524,7 @@ private List loadAndShowAllArtikelForBestellung(Long chatId, Intege List keyboard = new ArrayList<>(); KeyboardRow row = new KeyboardRow(); - hertlBotDao.root().artikels().all().forEach(artikel -> row.add(createAddPositiontoBestellungLink(artikel, bestellungId)) ); + hertlBotDao.root().artikels().all().forEach(artikel -> row.add(createAddPositionToBestellungLink(artikel, bestellungId)) ); keyboard.add(row); @@ -498,9 +532,8 @@ private List loadAndShowAllArtikelForBestellung(Long chatId, Intege return keyboard; } - private String createAddPositiontoBestellungLink(HertlBotArtikel artikel, Integer bestellungId) { - return createKeyForAbility(ABILTY_NAME_ADD_POSITION)+" " + artikel.getName() + " " + bestellungId - + System.lineSeparator(); + private String createAddPositionToBestellungLink(HertlBotArtikel artikel, Integer bestellungId) { + return createKeyForAbility(ABILTY_NAME_ADD_POSITION)+ " " + artikel.getId()+ " " + bestellungId + " " + artikel.getName() + System.lineSeparator(); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java index 2aaa60a..b2941bd 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java @@ -13,7 +13,7 @@ public class HertlBotArtikels { - private final Map artikels = new HashMap<>(); + private final Map artikels = new HashMap<>(); public HertlBotArtikels() { super(); @@ -26,7 +26,7 @@ public void add( final Persister persister ) { - this.artikels.put(artikel.getName(), artikel); + this.artikels.put(artikel.getId(), artikel); persister.store(this.artikels); } @@ -42,7 +42,7 @@ public void addAll( { this.artikels.putAll( artikels.stream().collect( - Collectors.toMap(HertlBotArtikel::getName, Function.identity()) + Collectors.toMap(HertlBotArtikel::getId, Function.identity()) ) ); persister.store(this.artikels); @@ -58,9 +58,9 @@ public List all() return new ArrayList<>(this.artikels.values()); } - public HertlBotArtikel ofId(final String artikelName) + public HertlBotArtikel ofId(final Integer artikelId) { - return this.artikels.get(artikelName); + return this.artikels.get(artikelId); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java index bf71aeb..812cc56 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java @@ -6,6 +6,7 @@ import java.util.List; import de.bigamgamen.java.helper.Pricehelper; +import one.microstream.persistence.types.Persister; public class HertlBotBestellung { @@ -26,6 +27,12 @@ public HertlBotBestellung(HertlBotUser user, List positionen) this.positionen = positionen; } + public synchronized void addPosition(HertlBotPosition position, final Persister persister) + { + positionen.add(position); + persister.store(positionen); + } + public String getBestellDatumFormated() { return this.bestellDatum.format(DateTimeFormatter.ofPattern(DD_MM_YYYY)); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java index 4ee06b0..4e4498b 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java @@ -4,17 +4,22 @@ public class HertlBotPosition { private BigInteger menge; - private HertlBotArtikel artikel; - + private HertlBotArtikel artikel; + public HertlBotPosition() { - + } - - public BigInteger getPositionPrice () - { + + public HertlBotPosition(BigInteger menge, HertlBotArtikel artikel) { + this.menge = menge; + this.artikel = artikel; + + } + + public BigInteger getPositionPrice() { return artikel.getPriceInCent().multiply(menge); } - + public BigInteger getMenge() { return menge; } @@ -31,6 +36,4 @@ public void setArtikel(HertlBotArtikel artikel) { this.artikel = artikel; } - - } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java index 6caf651..31f447f 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java @@ -1,8 +1,5 @@ package de.bigamgamen.java.telegrambots.hertlhendl.domain; -import java.util.HashSet; -import java.util.Set; - public class HertlBotRoot { private HertlBotUsers users = new HertlBotUsers(); private HertlBotArtikels artikels = new HertlBotArtikels(); From d14118de18a0b89d4b4c04134221fb2914fa6ba7 Mon Sep 17 00:00:00 2001 From: AM <> Date: Thu, 7 Jan 2021 22:21:41 +0100 Subject: [PATCH 21/74] =?UTF-8?q?Positionen=20hinzuf=C3=BCgen=20abgeschlos?= =?UTF-8?q?sen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../telegrambots/hertlhendl/HertlHendlBot.java | 15 ++++++++------- .../hertlhendl/domain/HertlBotBestellung.java | 10 +++++++--- .../hertlhendl/domain/HertlBotPosition.java | 7 ++++++- .../hertlhendl/init/InitArtikels.java | 8 ++++---- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 25448ff..4b85aff 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -208,9 +208,13 @@ public Ability showBestellung() { .input(1) .action(context -> { int bestellId = Integer.parseInt(context.firstArg()); + Long chatId = context.chatId(); + HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText("Füge Positionen zu deiner Bestellung hinzu"); + message.setChatId(chatId); + String messageText = bestellung.toString() + System.lineSeparator() + "Füge Positionen zu deiner Bestellung hinzu"; + + message.setText(messageText); final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); final List keyboard = loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); @@ -232,7 +236,7 @@ public Ability addPositionToBestellung() { .info("Fügt zu einer Bestellung eine neue Position hinzu") .locality(ALL) .privacy(PUBLIC) - .input(2) + .input(3) .action(context -> { Long chatId = context.chatId(); int artikelId = Integer.parseInt(context.firstArg()); @@ -249,8 +253,6 @@ public Ability addPositionToBestellung() { message.setChatId(context.chatId()); message.setText(artikel.getName() + " wurde " + position.getMenge() + "-mal zu deiner Bestellung hinzugefügt"); - - silent.execute(message); }).build(); } @@ -526,14 +528,13 @@ private List loadAndShowAllArtikelForBestellung(Long chatId, Intege hertlBotDao.root().artikels().all().forEach(artikel -> row.add(createAddPositionToBestellungLink(artikel, bestellungId)) ); - keyboard.add(row); return keyboard; } private String createAddPositionToBestellungLink(HertlBotArtikel artikel, Integer bestellungId) { - return createKeyForAbility(ABILTY_NAME_ADD_POSITION)+ " " + artikel.getId()+ " " + bestellungId + " " + artikel.getName() + System.lineSeparator(); + return createKeyForAbility(ABILTY_NAME_ADD_POSITION)+ " " + artikel.getId()+ " " + bestellungId + " \"" + artikel.getName() +"\""+ System.lineSeparator(); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java index 812cc56..7e86ced 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java @@ -29,7 +29,8 @@ public HertlBotBestellung(HertlBotUser user, List positionen) public synchronized void addPosition(HertlBotPosition position, final Persister persister) { - positionen.add(position); + positionen.add(position); + persister.store(position); persister.store(positionen); } @@ -48,8 +49,11 @@ public String toString() { } private String getSumme() { - BigInteger summe = new BigInteger("0"); - this.positionen.forEach(pos -> summe.add(pos.getPositionPrice())); + BigInteger summe = new BigInteger("0"); + for(HertlBotPosition pos : positionen) + { + summe = summe.add(pos.getPositionPrice()); + } return Pricehelper.getPriceAsEuroString(summe); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java index 4e4498b..a0740fa 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java @@ -13,7 +13,12 @@ public HertlBotPosition() { public HertlBotPosition(BigInteger menge, HertlBotArtikel artikel) { this.menge = menge; this.artikel = artikel; - + } + + @Override + public String toString() { + String positionString = menge + "-mal "+ artikel.getName(); + return positionString; } public BigInteger getPositionPrice() { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java index 7e29f0b..ada7e16 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java @@ -17,11 +17,11 @@ public synchronized static void initArtikels(HertlBotRootDao dao) { List artikelList= new ArrayList<>(); - artikelList.add(new HertlBotArtikel(1,"1/2 Hähnchen", BigInteger.valueOf(380L))); - artikelList.add(new HertlBotArtikel(2,"Schenkel", BigInteger.valueOf(200L))); + artikelList.add(new HertlBotArtikel(1,"1/2-Hähnchen", BigInteger.valueOf(380L))); + artikelList.add(new HertlBotArtikel(2,"Hähnchen-Schenkel", BigInteger.valueOf(200L))); artikelList.add(new HertlBotArtikel(3,"Krautsalat", BigInteger.valueOf(150L))); - artikelList.add(new HertlBotArtikel(4,"Brezel klein", BigInteger.valueOf(80L))); - artikelList.add(new HertlBotArtikel(5,"Brezel groß", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArtikel(4,"Brezel-klein", BigInteger.valueOf(80L))); + artikelList.add(new HertlBotArtikel(5,"Brezel-groß", BigInteger.valueOf(160L))); dao.root().artikels().addAll(artikelList); From 88199d94f32e574c5ebbd18cb693167189f206c1 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Thu, 18 Feb 2021 06:15:07 +0100 Subject: [PATCH 22/74] Merge Conflicts --- LICENSE.adoc | 671 --------------- README.adoc | 8 +- WORKSHOP.adoc | 801 ------------------ herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../hertlhendl/HertlHendlBot.java | 661 +++++++++------ .../hertlhendl/domain/HertlBotBestellung.java | 33 +- .../hertlhendl/domain/HertlBotPosition.java | 25 +- .../hertlhendl/init/InitArtikels.java | 4 +- 8 files changed, 422 insertions(+), 1781 deletions(-) delete mode 100644 LICENSE.adoc delete mode 100644 WORKSHOP.adoc diff --git a/LICENSE.adoc b/LICENSE.adoc deleted file mode 100644 index a4d3799..0000000 --- a/LICENSE.adoc +++ /dev/null @@ -1,671 +0,0 @@ -[[gnu-affero-general-public-license]] -==== GNU AFFERO GENERAL PUBLIC LICENSE - -Version 3, 19 November 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. https://fsf.org/ - -Everyone is permitted to copy and distribute verbatim copies of this -license document, but changing it is not allowed. - -[[preamble]] -==== Preamble - -The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed to -take away your freedom to share and change the works. By contrast, our -General Public Licenses are intended to guarantee your freedom to share -and change all versions of a program–to make sure it remains free -software for all its users. - -When we speak of free software, we are referring to freedom, not price. -Our General Public Licenses are designed to make sure that you have the -freedom to distribute copies of free software (and charge for them if -you wish), that you receive source code or can get it if you want it, -that you can change the software or use pieces of it in new free -programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights with -two steps: (1) assert copyright on the software, and (2) offer you this -License which gives you legal permission to copy, distribute and/or -modify the software. - -A secondary benefit of defending all users’ freedom is that improvements -made in alternate versions of the program, if they receive widespread -use, become available for other developers to incorporate. Many -developers of free software are heartened and encouraged by the -resulting cooperation. However, in the case of software used on network -servers, this result may fail to come about. The GNU General Public -License permits making a modified version and letting the public access -it on a server without ever releasing its source code to the public. - -The GNU Affero General Public License is designed specifically to ensure -that, in such cases, the modified source code becomes available to the -community. It requires the operator of a network server to provide the -source code of the modified version running there to the users of that -server. Therefore, public use of a modified version, on a publicly -accessible server, gives the public access to the source code of the -modified version. - -An older license, called the Affero General Public License and published -by Affero, was designed to accomplish similar goals. This is a different -license, not a version of the Affero GPL, but Affero has released a new -version of the Affero GPL which permits relicensing under this license. - -The precise terms and conditions for copying, distribution and -modification follow. - -[[terms-and-conditions]] -==== TERMS AND CONDITIONS - -[[definitions.]] -===== 0. Definitions. - -``This License'' refers to version 3 of the GNU Affero General Public -License. - -``Copyright'' also means copyright-like laws that apply to other kinds -of works, such as semiconductor masks. - -``The Program'' refers to any copyrightable work licensed under this -License. Each licensee is addressed as ``you''. ``Licensees'' and -``recipients'' may be individuals or organizations. - -To ``modify'' a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a ``modified version'' of the -earlier work or a work ``based on'' the earlier work. - -A ``covered work'' means either the unmodified Program or a work based -on the Program. - -To ``propagate'' a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To ``convey'' a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays ``Appropriate Legal Notices'' to -the extent that it includes a convenient and prominently visible feature -that (1) displays an appropriate copyright notice, and (2) tells the -user that there is no warranty for the work (except to the extent that -warranties are provided), that licensees may convey the work under this -License, and how to view a copy of this License. If the interface -presents a list of user commands or options, such as a menu, a prominent -item in the list meets this criterion. - -[[source-code.]] -===== 1. Source Code. - -The ``source code'' for a work means the preferred form of the work for -making modifications to it. ``Object code'' means any non-source form of -a work. - -A ``Standard Interface'' means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that is -widely used among developers working in that language. - -The ``System Libraries'' of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that Major -Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A ``Major -Component'', in this context, means a major essential component (kernel, -window system, and so on) of the specific operating system (if any) on -which the executable work runs, or a compiler used to produce the work, -or an object code interpreter used to run it. - -The ``Corresponding Source'' for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work’s System -Libraries, or general-purpose tools or generally available free programs -which are used unmodified in performing those activities but which are -not part of the work. For example, Corresponding Source includes -interface definition files associated with source files for the work, -and the source code for shared libraries and dynamically linked -subprograms that the work is specifically designed to require, such as -by intimate data communication or control flow between those subprograms -and other parts of the work. - -The Corresponding Source need not include anything that users can -regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same -work. - -[[basic-permissions.]] -===== 2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, -without conditions so long as your license otherwise remains in force. -You may convey covered works to others for the sole purpose of having -them make modifications exclusively for you, or provide you with -facilities for running those works, provided that you comply with the -terms of this License in conveying all material for which you do not -control copyright. Those thus making or running the covered works for -you must do so exclusively on your behalf, under your direction and -control, on terms that prohibit them from making any copies of your -copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the -conditions stated below. Sublicensing is not allowed; section 10 makes -it unnecessary. - -[[protecting-users-legal-rights-from-anti-circumvention-law.]] -===== 3. Protecting Users’ Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article 11 -of the WIPO copyright treaty adopted on 20 December 1996, or similar -laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to the -covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work’s -users, your or third parties’ legal rights to forbid circumvention of -technological measures. - -[[conveying-verbatim-copies.]] -===== 4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program’s source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; keep -intact all notices stating that this License and any non-permissive -terms added in accord with section 7 apply to the code; keep intact all -notices of the absence of any warranty; and give all recipients a copy -of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and -you may offer support or warranty protection for a fee. - -[[conveying-modified-source-versions.]] -===== 5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the terms -of section 4, provided that you also meet all of these conditions: - -* a. The work must carry prominent notices stating that you modified -it, and giving a relevant date. -* a. The work must carry prominent notices stating that it is released -under this License and any conditions added under section 7. This -requirement modifies the requirement in section 4 to ``keep intact all -notices''. -* a. You must license the entire work, as a whole, under this License -to anyone who comes into possession of a copy. This License will -therefore apply, along with any applicable section 7 additional terms, -to the whole of the work, and all its parts, regardless of how they are -packaged. This License gives no permission to license the work in any -other way, but it does not invalidate such permission if you have -separately received it. -* a. If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your work need -not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, and -which are not combined with it such as to form a larger program, in or -on a volume of a storage or distribution medium, is called an -``aggregate'' if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation’s users -beyond what the individual works permit. Inclusion of a covered work in -an aggregate does not cause this License to apply to the other parts of -the aggregate. - -[[conveying-non-source-forms.]] -===== 6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms of -sections 4 and 5, provided that you also convey the machine-readable -Corresponding Source under the terms of this License, in one of these -ways: - -* a. Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium customarily used -for software interchange. -* a. Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a written -offer, valid for at least three years and valid for as long as you offer -spare parts or customer support for that product model, to give anyone -who possesses the object code either (1) a copy of the Corresponding -Source for all the software in the product that is covered by this -License, on a durable physical medium customarily used for software -interchange, for a price no more than your reasonable cost of physically -performing this conveying of source, or (2) access to copy the -Corresponding Source from a network server at no charge. -* a. Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This alternative is -allowed only occasionally and noncommercially, and only if you received -the object code with such an offer, in accord with subsection 6b. -* a. Convey the object code by offering access from a designated place -(gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to copy -the object code is a network server, the Corresponding Source may be on -a different server (operated by you or a third party) that supports -equivalent copying facilities, provided you maintain clear directions -next to the object code saying where to find the Corresponding Source. -Regardless of what server hosts the Corresponding Source, you remain -obligated to ensure that it is available for as long as needed to -satisfy these requirements. -* a. Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding Source of -the work are being offered to the general public at no charge under -subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be included -in conveying the object code work. - -A ``User Product'' is either (1) a ``consumer product'', which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for -incorporation into a dwelling. In determining whether a product is a -consumer product, doubtful cases shall be resolved in favor of coverage. -For a particular product received by a particular user, ``normally -used'' refers to a typical or common use of that class of product, -regardless of the status of the particular user or of the way in which -the particular user actually uses, or expects or is expected to use, the -product. A product is a consumer product regardless of whether the -product has substantial commercial, industrial or non-consumer uses, -unless such uses represent the only significant mode of use of the -product. - -``Installation Information'' for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product -from a modified version of its Corresponding Source. The information -must suffice to ensure that the continued functioning of the modified -object code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied by -the Installation Information. But this requirement does not apply if -neither you nor any third party retains the ability to install modified -object code on the User Product (for example, the work has been -installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in -accord with this section must be in a format that is publicly documented -(and with an implementation available to the public in source code -form), and must require no special password or key for unpacking, -reading or copying. - -[[additional-terms.]] -===== 7. Additional Terms. - -``Additional permissions'' are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by this -License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove -any additional permissions from that copy, or from any part of it. -(Additional permissions may be written to require their own removal in -certain cases when you modify the work.) You may place additional -permissions on material, added by you to a covered work, for which you -have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders -of that material) supplement the terms of this License with terms: - -* a. Disclaiming warranty or limiting liability differently from the -terms of sections 15 and 16 of this License; or -* a. Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal Notices -displayed by works containing it; or -* a. Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or -* a. Limiting the use for publicity purposes of names of licensors or -authors of the material; or -* a. Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or -* a. Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of it) -with contractual assumptions of liability to the recipient, for any -liability that these contractual assumptions directly impose on those -licensors and authors. - -All other non-permissive additional terms are considered ``further -restrictions'' within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains a -further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms of -that license document, provided that the further restriction does not -survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must -place, in the relevant source files, a statement of the additional terms -that apply to those files, or a notice indicating where to find the -applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; the above -requirements apply either way. - -[[termination.]] -===== 8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your license -from a particular copyright holder is reinstated (a) provisionally, -unless and until the copyright holder explicitly and finally terminates -your license, and (b) permanently, if the copyright holder fails to -notify you of the violation by some reasonable means prior to 60 days -after the cessation. - -Moreover, your license from a particular copyright holder is reinstated -permanently if the copyright holder notifies you of the violation by -some reasonable means, this is the first time you have received notice -of violation of this License (for any work) from that copyright holder, -and you cure the violation prior to 30 days after your receipt of the -notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -[[acceptance-not-required-for-having-copies.]] -===== 9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or run a -copy of the Program. Ancillary propagation of a covered work occurring -solely as a consequence of using peer-to-peer transmission to receive a -copy likewise does not require acceptance. However, nothing other than -this License grants you permission to propagate or modify any covered -work. These actions infringe copyright if you do not accept this -License. Therefore, by modifying or propagating a covered work, you -indicate your acceptance of this License to do so. - -[[automatic-licensing-of-downstream-recipients.]] -===== 10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An ``entity transaction'' is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered work -results from an entity transaction, each party to that transaction who -receives a copy of the work also receives whatever licenses to the work -the party’s predecessor in interest had or could give under the previous -paragraph, plus a right to possession of the Corresponding Source of the -work from the predecessor in interest, if the predecessor has it or can -get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may not -impose a license fee, royalty, or other charge for exercise of rights -granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that any -patent claim is infringed by making, using, selling, offering for sale, -or importing the Program or any portion of it. - -[[patents.]] -===== 11. Patents. - -A ``contributor'' is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The work -thus licensed is called the contributor’s ``contributor version''. - -A contributor’s ``essential patent claims'' are all patent claims owned -or controlled by the contributor, whether already acquired or hereafter -acquired, that would be infringed by some manner, permitted by this -License, of making, using, or selling its contributor version, but do -not include claims that would be infringed only as a consequence of -further modification of the contributor version. For purposes of this -definition, ``control'' includes the right to grant patent sublicenses -in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor’s essential patent claims, to make, -use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a ``patent license'' is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To ``grant'' such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and -the Corresponding Source of the work is not available for anyone to -copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. ``Knowingly relying'' means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient’s use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify or -convey a specific copy of the covered work, then the patent license you -grant is automatically extended to all recipients of the covered work -and works based on it. - -A patent license is ``discriminatory'' if it does not include within the -scope of its coverage, prohibits the exercise of, or is conditioned on -the non-exercise of one or more of the rights that are specifically -granted under this License. You may not convey a covered work if you are -a party to an arrangement with a third party that is in the business of -distributing software, under which you make payment to the third party -based on the extent of your activity of conveying the work, and under -which the third party grants, to any of the parties who would receive -the covered work from you, a discriminatory patent license (a) in -connection with copies of the covered work conveyed by you (or copies -made from those copies), or (b) primarily for and in connection with -specific products or compilations that contain the covered work, unless -you entered into that arrangement, or that patent license was granted, -prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any -implied license or other defenses to infringement that may otherwise be -available to you under applicable patent law. - -[[no-surrender-of-others-freedom.]] -===== 12. No Surrender of Others’ Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not convey it at all. For example, if you agree to terms that -obligate you to collect a royalty for further conveying from those to -whom you convey the Program, the only way you could satisfy both those -terms and this License would be to refrain entirely from conveying the -Program. - -[[remote-network-interaction-use-with-the-gnu-general-public-license.]] -===== 13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - -Notwithstanding any other provision of this License, you have permission -to link or combine any covered work with a work licensed under version 3 -of the GNU General Public License into a single combined work, and to -convey the resulting work. The terms of this License will continue to -apply to the part which is the covered work, but the work with which it -is combined will remain governed by version 3 of the GNU General Public -License. - -[[revised-versions-of-this-license.]] -===== 14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies that a certain numbered version of the GNU Affero General -Public License ``or any later version'' applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the GNU -Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions -of the GNU Affero General Public License can be used, that proxy’s -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different permissions. -However, no additional obligations are imposed on any author or -copyright holder as a result of your choosing to follow a later version. - -[[disclaimer-of-warranty.]] -===== 15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF -THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -[[limitation-of-liability.]] -===== 16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR -CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT -NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES -SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE -WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN -ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -[[interpretation-of-sections-15-and-16.]] -===== 17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided above -cannot be given local legal effect according to their terms, reviewing -courts shall apply local law that most closely approximates an absolute -waiver of all civil liability in connection with the Program, unless a -warranty or assumption of liability accompanies a copy of the Program in -return for a fee. - -END OF TERMS AND CONDITIONS - -[[how-to-apply-these-terms-to-your-new-programs]] -==== How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively state -the exclusion of warranty; and each file should have at least the -``copyright'' line and a pointer to where the full notice is found. - -.... - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -.... - -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a ``Source'' link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - -You should also get your employer (if you work as a programmer) or -school, if any, to sign a ``copyright disclaimer'' for the program, if -necessary. For more information on this, and how to apply and follow the -GNU AGPL, see https://www.gnu.org/licenses/. diff --git a/README.adoc b/README.adoc index e1a9890..eac4c20 100644 --- a/README.adoc +++ b/README.adoc @@ -1,14 +1,10 @@ -= Java & Telegram ChatBot Workshop += Telegram ChatBot For Order things in Small Groups ifdef::env-github[:outfilesuffix: .adoc] -image:https://travis-ci.org/chatbot-workshop/java-telegram-workshop.svg?branch=master["Build Status", link="https://travis-ci.org/chatbot-workshop/java-telegram-workshop"] -image:https://img.shields.io/badge/gitmoji-%20😜%20😍-FFDD67.svg["gitmoji", link="https://gitmoji.carloscuesta.me"] - -*This repository is part of the chat bot workshop with https://www.fihlon.ch/[Marcus Fihlon].* == Copyright and Licensing -Copyright (C) 2018 Marcus Fihlon +Copyright (C) 2018 Arne Meier This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/WORKSHOP.adoc b/WORKSHOP.adoc deleted file mode 100644 index b05af5c..0000000 --- a/WORKSHOP.adoc +++ /dev/null @@ -1,801 +0,0 @@ -= Java & Telegram ChatBot Workshop - -Copyright (c) 2018 https://www.fihlon.ch/[Marcus Fihlon] - -== Prerequesites - -- Java 8 -- Java IDE -- You should be familiar with your IDE -- You need your own Telegram account -- You need Telegram installed on your mobile or desktop - -== Register - -Use Telegram to talk to the `BotFather` to register a new bot. Write down your bot username and your bot token. - -== Project setup - -For this workshop we use gradle. Please create a new gradle project using your IDE. I highly recommend to use the gradle application plugin to easily start you bot from the command line: - -```groovy -apply plugin: 'application' -mainClassName = 'ch.fihlon.workshop.chatbot.WorkshopBot' -``` - -Of course, you may have to modify the `mainClassName` according your package structure and bot name. To run your bot (while you follow this workshop), just run the following command on your commandline: - -```bash -./gradlew run -``` - -On Windows, you may have to replace `/` by `\`. - -== Getting started - -=== Dependencies - -To use the Telegram Bot API, please add the following dependency: - -```groovy -compile group: 'org.telegram', name: 'telegrambots', version: '4.3.1' -``` - -=== Create a bot class - -Create a class `GettingStartedBot` that extends `TelegramLongPollingBot` and add empty methods to satisfy the class contract: - -```java -public class GettingStartedBot extends TelegramLongPollingBot { - - @Override - public String getBotUsername() { - return null; - } - - @Override - public String getBotToken() { - return null; - } - - @Override - public void onUpdateReceived(final Update update) { - } - -} -``` - -=== Bot username - -The first method must return the username of your bot you wrote down while you registered your bot: - -```java -@Override -public String getBotUsername() { - return "MyWorkshopBot"; -} -``` - -=== Bot token - -As you might imagine, the second method has to return the token of your bot. The token is needed for identification, like a password, so keep it private and *do not* commit it to any registry: - -```java -@Override -public String getBotToken() { - return "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -} -``` - -=== React on a message - -In the third method you write your code which will be executed when your bot receives a message. For our first example we will just send the same message back to the sender: - -```java -@Override -public void onUpdateReceived(final Update update) { - if (update.hasMessage() && update.getMessage().hasText()) { - final Long chatId = update.getMessage().getChatId(); - final String text = update.getMessage().getText(); - final SendMessage message = new SendMessage() - .setChatId(chatId) - .setText(text); - try { - execute(message); - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - } -} -``` - -This example should be quite easy to understand. First, we check if we have a message and it is a text message. Then we extract two values: - -. The `chatId`, which identifies a chat. We need this id, to send the answer to the correct person. Every chat has a unique id. We could save this id for later use and reply at any time. But here, we reply immediately. -. The text. This is just the text of the message, the bot received. - -To send an answer, we have to create a `SendMessage` method and set the `chatId` and the text, which should be send. Then we `excute` this method, which will send the message. Of course, there can happen a lot of errors (servers down, network failures etc), so have to do really good error handling like in the example above. - -=== Start your bot - -For our simple example, we just a good old `main` method. The start needs four steps: - -. We need a Telegram API context -. We need an instance of the Telegram API -. We need an instance of our bot -. We need to register our bot instance at Telegram - -```java -public static void main(final String[] args) throws TelegramApiRequestException { - ApiContextInitializer.init(); // 1 - final TelegramBotsApi api = new TelegramBotsApi(); // 2 - final GettingStartedBot bot = new GettingStartedBot(); // 3 - api.registerBot(bot); // 4 -} -``` - -=== Play with your bot - -Now, start your bot by running your `main` method. - -_Congratulations!_ - -== Thinking in Abilities - -// TODO describe the ability feature of the Telegram Bot API - -=== Dependencies - -To use the Telegram Bot Ability API, please add the following dependency: - -```groovy -compile group: 'org.telegram', name: 'telegrambots-abilities', version: '4.3.1' -``` - -=== Create a bot class - -Create a class `WorkshopBot` that extends `AbilityBot` and add a no argument constructor and empty methods to satisfy the class contract: - -```java -public class WorkshopBot extends AbilityBot { - - WorkshopBot() { - super(null, null); - } - - @Override - public int creatorId() { - return 0; - } -} -``` - -=== Bot token and username - -The easy part: Add the token and username of your bot as constants to your class and specify them in the super constructor call: - -```java -public class WorkshopBot extends AbilityBot { - - private static String BOT_TOKEN = "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - private static String BOT_USERNAME = "MyWorkshopBot"; - - WorkshopBot() { - super(BOT_TOKEN, BOT_USERNAME); - } - - … -} -``` - -=== Your Telegram ID - -AbilityBot forces a single implementation of creator ID. This ID corresponds to you, the bot developer. The bot needs to know its master since it has sensitive commands that only the master can use. So, if your Telegram ID Is 123456789, then add the following method: - -```java -private static int CREATOR_ID = 1234567890; - -@Override -public int creatorId() { - return CREATOR_ID; -} -``` - -If you do not know your Telegram ID, just start a chat to the `userinfobot`. - -=== Say hello - -Should be easy: Let's say hello. For creating an ability, we use the builder pattern: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability sayHelloWorld() { - return Ability - .builder() - .name("hello") // 1 - .info("says hello world") // 2 - .locality(ALL) // 3 - .privacy(PUBLIC) // 4 - .action(context -> silent.send("Hello world!", context.chatId())) // 5 - .build(); -} -``` - -. the name of the command -. a description of the command -. the location of the command (`ALL`, `USER`, `GROUP`) -. the privacy setting (`PUBLIC`, `GROUP_ADMIN`, `ADMIN`, `CREATOR`) -. the action to be executed - -=== Start your bot - -To start the ability bot we need to do exactly the same as with the bot, we created before: - -. We need a Telegram API context -. We need an instance of the Telegram API -. We need an instance of our bot -. We need to register our bot instance at Telegram - -```java -public static void main(final String[] args) throws TelegramApiRequestException { - ApiContextInitializer.init(); // 1 - final TelegramBotsApi api = new TelegramBotsApi(); // 2 - final WorkshopBot bot = new WorkshopBot(); // 3 - api.registerBot(bot); // 4 -} -``` - -=== Play with your bot - -Now, start your bot by running your `main` method and send the `/hello` command to your bot. - -_Congratulations!_ - -Wait! Since you've implemented an ability bot, you get factory abilities as well. Try: - -* `/commands` – Prints all commands supported by the bot. - This will essentially print `hello - says hello world`. Yes! This is the information we supplied to the ability. The bot prints the commands in the format accepted by `BotFather`. So, whenever you change, add or remove commands, you can simply send `/commands` to your bot and forward that message to `BotFather`. -* `/claim` – Claims this bot -* `/backup` – returns a backup of the bot database -* `/recover` – recovers the database -* `/promote @username` – promotes user to bot admin -* `/demote @username` – demotes bot admin to user -* `/ban @username` – bans the user from accessing your bot commands and features -* `/unban @username` – lifts the ban from the user - -== Replies - -A reply is AbilityBot's swiss army knife. It comes in two variants and is able to handle all possible use cases. - -=== Standalon Reply - -Standalone replies do not need abilities. Lets add one to our bot: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Reply replyToPhoto() { - return Reply.of( - update -> silent.send("Nice pic!", getChatId(update)), - Flag.PHOTO); -} -``` - -As you can see, you just provide a lambda function which consumes the update. In addition to the required lambda function, replies can have optional predicates. In our example we let the bot know, that we only want to reply to images. Take a look at the `Flag` enum. - -Wow, that was easy! How easy would it be to implement a `VoxxedDaysBucharestBot`, where you can send pictures which are automatically uploaded to a Google Drive (or similar) share? If you are a nerd and finish this workshop early, try to implement it… - -=== Ability Reply and own Predicates - -In exactly the same manner, you are able to attach replies to abilities. This way you can localize replies that relate to the same ability. - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability sayHi() { - return Ability - .builder() - .name("hi") - .info("says hi") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - final String firstName = context.user().getFirstName(); - silent.send("Hi, " + firstName, context.chatId()); - }) - .reply( - update -> silent.send("Wow, nice name!", update.getMessage().getChatId()), - TEXT, - update -> update.getMessage().getText().startsWith("/hi"), - isMarcus() - ) - .build(); -} - -private Predicate isMarcus() { - return update -> update.getMessage().getFrom().getFirstName().equalsIgnoreCase("Marcus"); -} -``` - -In this example you can see how easy it is to create and use your own predicates. Using predicates, you can implement all checks, so your logic keeps clean and can focus on action. - -== Database Handling - -If you use the ability bot, you have an integrated database. To persist the data, a file with the name of your bot is created in the working directory (depending on your IDE, usually project root folder). - -=== Persistent Counter - -Let's use it to implement a simple counter: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability counter() { - return Ability.builder() - .name("count") - .info("increments a counter per user") - .privacy(PUBLIC) - .locality(ALL) - .action(context -> { - final Map counterMap = db.getMap("COUNTERS"); - final int userId = context.user().getId(); - final Integer counter = counterMap.compute( - String.valueOf(userId), (id, count) -> count == null ? 1 : ++count); - final String message = String.format("%s, your count is now %d!", - context.user().getUserName(), counter); - silent.send(message, context.chatId()); - }) - .build(); -} -``` - -As you can see, the interface to the database is just a simple map. Cool, we can now implement actions that need persistence. - -=== Automatic Contacts - -The ability bot automatically stores basic user information of every user, who contacted your bot. So we have some kind of an automatically contact list. We can access this list very easy: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability contacts() { - return Ability.builder() - .name("contacts") - .info("lists all users who contacted this bot") - .privacy(PUBLIC) - .locality(ALL) - .action(context -> { - final Map usersMap = db.getMap("USERS"); - final String users = usersMap.values().stream().map(User::getUserName).collect(joining(", ")); - final String message = "The following users already contacted me: " + users; - silent.send(message, context.chatId()); - }) - .build(); -} -``` - -== Photos - -=== Receiving Photos - -The process of receiving a photo is not very intuitive. Maybe it will be improved in the future. Anyway, let's try to get the photo out of the message and store it to the filesystem. - -From Telegram we do not get the photo directly. Instead, we get a list of `PhotoSize` objects. A list? Yeas, the photo will be available in different sizes. If the sender sends a photo from his mobile device, it will be displayed in the chat history as a thumbnail. That's why one photo will end up in a list of `PhotoSize` objects. In our case, we want the original photo in the original size, so we sort that list by size and take the biggest one. - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Reply savePhoto() { - return Reply.of( - update -> { - final List photos = update.getMessage().getPhoto(); - final PhotoSize photoSize = photos.stream() - .max(Comparator.comparing(PhotoSize::getFileSize)) - .orElse(null); - if (photoSize != null) { - // TODO download the photo - silent.send("Yeah, I got it!", getChatId(update)); - } else { - silent.send("Houston, we have a problem!", getChatId(update)); - } - }, - Flag.PHOTO); - } -``` - -So far, so good. but there is still no photo, just a `PhotoSize` object. We have to actively download the photo in that size, we want, to reduce network traffic and server load. But to download a photo, we first need to get the file path of the photo. Sometimes photos already have a file path, sometimes not – then we have to ask Telegram for it. This is how we do that: - -```java -private String getFilePath(final PhotoSize photo) { - if (photo.hasFilePath()) { - return photo.getFilePath(); - } - final GetFile getFileMethod = new GetFile(); - getFileMethod.setFileId(photo.getFileId()); - try { - final org.telegram.telegrambots.meta.api.objects.File file = execute(getFileMethod); - return file.getFilePath(); - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - return null; -} -``` - -Be careful to use the correct `File` object! - -Using the file path we are now able to download the photo from Telegram. Luckily, this task is very easy: - -```java -private File downloadPhoto(final String filePath) { - try { - return downloadFile(filePath); - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - return null; -} -``` - -With these two helper methods we can now finish our `savePhoto` method: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Reply savePhoto() { - return Reply.of( - update -> { - final List photos = update.getMessage().getPhoto(); - final PhotoSize photoSize = photos.stream() - .max(Comparator.comparing(PhotoSize::getFileSize)) - .orElse(null); - if (photoSize != null) { - final String filePath = getFilePath(photoSize); - final File file = downloadPhoto(filePath); - System.out.println("Temporary file: " + file); - silent.send("Yeah, I got it!", getChatId(update)); - } else { - silent.send("Houston, we have a problem!", getChatId(update)); - } - }, - Flag.PHOTO); -} -``` - -Uff, done! Try it and send a photo to your bot! On the console you can see the temporary file on the bot host. Now you can easily continue and move it everywhere you like or implement some filter magic and send the photo back to the user. - -=== Sending Photos - -Compared to receiving a photo it is very easy to send a photo. There are three ways to do send a photo and all the three ways have the following four steps in common: - -. Create send method -. Set destination chat id -. Set the photo -. Send the photo - -==== Send Photo from URL - -In this example we implement a `/logo` command which will, difficult to guess, send a logo: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability sendLogo() { - return Ability - .builder() - .name("logo") - .info("send the logo") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> sendPhotoFromUrl("https://avatars3.githubusercontent.com/u/13538066?s=200&v=4", context.chatId())) - .build(); -} - -private void sendPhotoFromUrl(final String url, final Long chatId) { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(url); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { - e.printStackTrace(); - } -} -``` - -==== Send Photo from File ID - -This is especially useful, if your bot receives a photo and wants to forward it. The file id is on the `PhotoSize` object and the bot does not need to download the photo before it forwards (sends) the photo another user. - -To test this, we extend our previously written `savePhoto` method that it sends the received photo back to the sender by using the file id of the photo. First, the implementation of the `sendPhotoFromFileId`: - -```java -private void sendPhotoFromFileId(final String fileId, final Long chatId) { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(fileId); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { - e.printStackTrace(); - } -} -``` - -Here you can see the modified `savePhoto` method, we just added one line: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Reply savePhoto() { - return Reply.of( - update -> { - final List photos = update.getMessage().getPhoto(); - final PhotoSize photoSize = photos.stream() - .max(Comparator.comparing(PhotoSize::getFileSize)) - .orElse(null); - if (photoSize != null) { - final String filePath = getFilePath(photoSize); - final File file = downloadPhoto(filePath); - System.out.println("Temporary file: " + file); - silent.send("Yeah, I got it!", getChatId(update)); - sendPhotoFromFileId(photoSize.getFileId(), getChatId(update)); // here - } else { - silent.send("Houston, we have a problem!", getChatId(update)); - } - }, - Flag.PHOTO); -} -``` - -==== Upload and send a Photo - -This is so easy, you just need to specify a `File` object! The photo will be uploaded to Telegram and send to the user: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability sendIcon() { - return Ability - .builder() - .name("icon") - .info("send the icon") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> sendPhotoFromUpload("src/main/resources/chatbot.jpg", context.chatId())) - .build(); -} - -private void sendPhotoFromUpload(final String filePath, final Long chatId) { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(new File(filePath)); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { - e.printStackTrace(); - } -} -``` - -== Custom Keyboard (Buttons) - -To create a custom keyboard, we have to follow these four steps: - -. Create a `ReplyKeyboardMarkup` object -. Create the keyboard as a list of keyboard rows -. Add buttons to each row -. Activate the keyboard - -In the following example we create a custom keyboard with two rows and three buttons on each row. If the user presses one of these buttons, the text will be send to the bot. - -In our example we want to provide buttons for the actions of our bot so we use the command as button text: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability sendKeyboard() { - return Ability - .builder() - .name("keyboard") - .info("send a custom keyboard") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText("Enjoy this wonderful keyboard!"); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = new ArrayList<>(); - - // row 1 - KeyboardRow row = new KeyboardRow(); - row.add("/hello"); - row.add("/hi"); - row.add("/count"); - keyboard.add(row); - - // row 2 - row = new KeyboardRow(); - row.add("/contacts"); - row.add("/logo"); - row.add("/icon"); - keyboard.add(row); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - silent.execute(message); - }) - .build(); -} -``` - -== Formatted Messages - -To send formatted messages, you can use Markdown syntax. As of today, Telegram supports only a small subset of markdown. To activate Markdown support for a message, use `sendMd(…)` instead of just `send(…)`. - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability format() { - return Ability - .builder() - .name("format") - .info("formats the message") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - silent.sendMd("You can make text *bold* or _italic_.", context.chatId()); - silent.sendMd("`This is code.`", context.chatId()); - silent.sendMd("```\nThis\nis\nmulti\nline\ncode.\n```", context.chatId()); - }) - .build(); -} -``` - -== Arguments - -Commands can have arguments. Usually arguments are separated by whitespace. You can, of course, get the message and parse the arguments yourself. But with the ability bot you can easily access the arguments: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability add() { - return Ability - .builder() - .name("add") - .info("adds two numbers") - .locality(ALL) - .privacy(PUBLIC) - .input(2) - .action(context -> { - final int a = Integer.parseInt(context.firstArg()); - final int b = Integer.parseInt(context.secondArg()); - final int sum = a + b; - silent.send(String.format("The sum of %d and %d is %d", a, b, sum), context.chatId()); - }) - .build(); -} -``` - -To automatically create error messages if the use has not specified the correct amount of arguments, you can configure the number of required arguments like in the example above: `.input(2)` - -== Default Abilities - -You can answer to non-command messages, too. That's what default abilities are for. Just specify an ability with the `DEFAULT` constant as command: - -```java -@SuppressWarnings({"unused", "WeakerAccess"}) -public Ability sayNo() { - return Ability.builder() - .name(DEFAULT) - .privacy(PUBLIC) - .locality(ALL) - .action(context -> silent.send("Sorry, I have no answer for you today.", context.chatId())) - .build(); -} -``` - -== Testing - -=== Dependencies - -Better late than never – let's talk about testing. For testing our bot we need the help of a mocking library. Please add the following dependencies to your project: - -```groovy -testCompile group: 'junit', name: 'junit', version: '4.12' -testCompile group: 'org.mockito', name: 'mockito-core', version: '2.28.2' -``` - -=== Prepare your Bot - -In some of our abilities we use a database connection. We need to add an additional constructor to be able to inject a database for the tests: - -```java -@VisibleForTesting -WorkshopBot(final DBContext db) { - super(BOT_TOKEN, BOT_USERNAME, db); -} -``` - -To prevent that the live system of Telegram is used, we need to inject mocks for the `MessageSender` and `SilentSender`. To be able to do this, we add the following two methods to our bot: - -```java -@VisibleForTesting -void setSender(final MessageSender sender) { - this.sender = sender; -} - -@VisibleForTesting -void setSilent(final SilentSender silent) { - this.silent = silent; -} -``` - -=== Prepare the Test - -. In some of our abilities we use a database connection. For the tests we create a separate database instance which will be deleted on JVM shutdown automatically. -. We create an instance of our bot and inject our test database into it. -. We need to mock the sender to prevent the use of the live Telegram API. -. We inject the sender into our bot. -. We create and inject the silent object into our bot. - - -```java -public class WorkshopBotTest { - - private WorkshopBot bot; - private DBContext db; - private MessageSender sender; - - @Before - public void setUp() { - db = MapDBContext.offlineInstance("test"); // 1 - bot = new WorkshopBot(db); // 2 - sender = mock(MessageSender.class); // 3 - bot.setSender(sender); // 4 - bot.setSilent(new SilentSender(sender)); // 5 - } - - @After - public void tearDown() { - db.clear(); - } - -} -``` - -=== Simple Test - -First, we take a very simple test case: Our "Hello World" example. The test for this ability would be: - -```java -private static final int USER_ID = 12345; -private static final long CHAT_ID = 12345L; - -@Test -public void sayHelloWorld() throws TelegramApiException { - final Update mockedUpdate = mock(Update.class); - final User user = new User(USER_ID, "Foo", false, "Bar", "foobar42", "en"); - final MessageContext context = MessageContext.newContext(mockedUpdate, user, CHAT_ID); - - bot.sayHelloWorld().action().accept(context); - - final SendMessage message = new SendMessage(); - message.setChatId(CHAT_ID); - message.setText("Hello world!"); - verify(sender, times(1)).execute(message); -} -``` - -In the first code block we mock the `Update` class, which is used by the context object. Then we create an `EndUser` for our test case and create a new context object with all needed information. - -The one line in the middle block executes our bot ability. - -The last block does the assertions. In this example we check, that the message was send exactly once to the correct chat. Therefore we need a message object with the text and chat id for the `verify` method of Mockito. - -== Additional Exercises - -. Instead of adding just text to the `KeyboardRow` object, try to use `KeyboardButton` objects. -. Add a button to send the users phone number to the bot. -. Add a button to send the current location of the user to the bot. -. Reply to the phone number and location with a confirmation message. -. In addition to using the `ReplyKeyboardMarkup`, take a look at `ReplyKeyboardHide`, `ForceReply` and `InlineKeyboardMarkup` and try to use them. -. Extend the `/add` command to accept an unlimited number of numbers. -. Write tests for all abilities of your bot. -. Refactor your bot into smaller classes (create smaller bots which focus on one topic) -. Tell the `BotFather` which commands are accepted by your bot. -. Refactor your bot to always inject a database. Specify the name of the database file. -. Refactor your bot to remove the hard coded username and token to avoid to accidentally commit them. -. Provide feedback to me about this workshop. diff --git a/herthaehnchen_bot b/herthaehnchen_bot index 549f163057f5867ce8b5b9f32e7b757cf0818783..edd9977d17472932998d1480e608099825a00bee 100644 GIT binary patch delta 845 zcmaLV&r9227zgmAwN|UHuWq&em~%JL{Sh7o&%1fqd4GYI(Yy>Pc=87l+@=;i2|2WT zTcaRC>tQR?ZJK!SG6~Hi4TLtPsm$A+Cc#5v7x?fcd7k&-Nr)f_ynt2`pwkY)Sv!rzsU*o*o^^^Ho z@>B7%;-~E;34f$CO(~B;D2%#L1a+e*>Os9IhWb!H8bHrvO5;UArXjL25X-pRg?mDO zaQ%(c@uy;`d{$PkOTW|`MJ=kzUZq~EC{^Rup=|q!VzcIeeF+sqZwQ-#x^CFsS$Q{5 zgTIzx!>J9L0~bwbf{;o5w@FpcXm+PV%QtYmAzPgr+yR{yxw3Ta-Qy-5hP0X-aOVVH zwyHI%3V^G?_!g`&3}>Q1f~E0 delta 223 zcmXBMI|{;35QX7;ukn#+9w?$<<4Oc8!NRTB+6Z?@kv1VHZox97NF`!go1<%R1+Ku8 zIPf#g%xA6DmZj6hDR`@9qVUpgr6=uPKC}EGvtqL~<<;Dd*=|1my#6OjIp^lZ`<4gm z>bRDq7R?OnFo$(nkM-Grxy)ljHex;ts#?Ok%^~YbOqBXDBmpUq0x6IJDUbpwkOC=? R0x6IJDUgDMg)Jeg{SRdTSM>k@ diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 4b85aff..130cd1c 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -33,9 +33,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; -import javax.swing.text.Position; -import javax.validation.constraints.PositiveOrZero; import javax.xml.parsers.ParserConfigurationException; import org.slf4j.Logger; @@ -57,7 +57,6 @@ import org.xml.sax.SAXException; import com.google.common.annotations.VisibleForTesting; -import com.google.common.math.BigIntegerMath; import de.bigamgamen.java.helper.IOHelper; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; @@ -66,8 +65,10 @@ import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotPosition; import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArtikels; -public class HertlHendlBot extends AbilityBot { +public class HertlHendlBot extends AbilityBot +{ + private static final String ABILTY_NAME_KEYBOARD = "keyboard"; private static final String ABILTY_NAME_STANDORTEFOTO = "standortefoto"; private static final String ABILTY_NAME_PREISEFOTO = "preisefoto"; @@ -80,13 +81,24 @@ public class HertlHendlBot extends AbilityBot { private static final String ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD = "mybestellungenkeyboard"; private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; private static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; - private static final List abilities = Arrays.asList(ABILTY_NAME_KEYBOARD, ABILTY_NAME_STANDORTEFOTO, - ABILTY_NAME_PREISEFOTO, ABILTY_NAME_PREISE,ABILTY_NAME_ARTIKEL, ABILTY_NAME_BESTELLUNGEN,ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD, ABILTY_NAME_BESTELLUNG, - ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, ABILTY_NAME_OFFENE_BESTELLUNG); + private static final List abilities = Arrays.asList( + ABILTY_NAME_KEYBOARD, + ABILTY_NAME_STANDORTEFOTO, + ABILTY_NAME_PREISEFOTO, + ABILTY_NAME_PREISE, + ABILTY_NAME_ARTIKEL, + ABILTY_NAME_BESTELLUNGEN, + ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD, + ABILTY_NAME_BESTELLUNG, + ABILTY_NAME_MY_BESTELLUNGEN, + ABILTY_NAME_NEUE_BESTELLUNG, + ABILTY_NAME_OFFENE_BESTELLUNG); private static final String KEY_PRE_SYMBOL = "/"; - - private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + "Schenkel 2,00€\n" + "Brezel 0,80€\n" - + "Salat 1,50€\n"; + + private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" + + "Schenkel 2,00€\n" + + "Brezel 0,80€\n" + + "Salat 1,50€\n"; private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; @@ -94,105 +106,136 @@ public class HertlHendlBot extends AbilityBot { private static int CREATOR_ID = 929115416; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; private static HertlBotRootDao hertlBotDao; - - public static void main(String[] args) throws TelegramApiRequestException, ParserConfigurationException, - SAXException, IOException, URISyntaxException { + + public static void main(final String[] args) throws TelegramApiRequestException, ParserConfigurationException, + SAXException, IOException, URISyntaxException + { LOG.info("HertlHendlBot starting"); ApiContextInitializer.init(); -// final DBContext db = MapDBContext.onlineInstance("bot.db"); - String token = args[0] != null ? args[0] : BOT_TOKEN; - String username = args[1] != null ? args[1] : BOT_USERNAME; + // final DBContext db = MapDBContext.onlineInstance("bot.db"); + final String token = args[0] != null ? args[0] : BOT_TOKEN; + final String username = args[1] != null ? args[1] : BOT_USERNAME; final HertlHendlBot bot = new HertlHendlBot(token, username); final TelegramBotsApi api = new TelegramBotsApi(); api.registerBot(bot); LOG.info("HertlHendlBot successfull started"); } - - public HertlHendlBot(String botToken, String botUsername) - throws ParserConfigurationException, SAXException, IOException, URISyntaxException { + + public HertlHendlBot(final String botToken, final String botUsername) + throws ParserConfigurationException, SAXException, IOException, URISyntaxException + { super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); InitArtikels.initArtikels(hertlBotDao); } - + @Override - public int creatorId() { + public int creatorId() + { return CREATOR_ID; } - - private String getFilePath(final PhotoSize photo) { - if (photo.hasFilePath()) { + + private String getFilePath(final PhotoSize photo) + { + if(photo.hasFilePath()) + { return photo.getFilePath(); } final GetFile getFileMethod = new GetFile(); getFileMethod.setFileId(photo.getFileId()); - try { - final org.telegram.telegrambots.meta.api.objects.File file = execute(getFileMethod); + try + { + final org.telegram.telegrambots.meta.api.objects.File file = this.execute(getFileMethod); return file.getFilePath(); - } catch (final TelegramApiException e) { + } + catch(final TelegramApiException e) + { e.printStackTrace(); } return null; } - private File downloadPhoto(final String filePath) { - try { - return downloadFile(filePath); - } catch (final TelegramApiException e) { + private File downloadPhoto(final String filePath) + { + try + { + return this.downloadFile(filePath); + } + catch(final TelegramApiException e) + { e.printStackTrace(); } return null; } - - private void sendPhotoFromUrl(final String url, final Long chatId) { + + private void sendPhotoFromUrl(final String url, final Long chatId) + { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 sendPhotoRequest.setChatId(chatId); // 2 sendPhotoRequest.setPhoto(url); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { + try + { + this.execute(sendPhotoRequest); // 4 + } + catch(final TelegramApiException e) + { e.printStackTrace(); } } - - private void sendPhotoFromFileId(final String fileId, final Long chatId) { + + private void sendPhotoFromFileId(final String fileId, final Long chatId) + { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 sendPhotoRequest.setChatId(chatId); // 2 sendPhotoRequest.setPhoto(fileId); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { + try + { + this.execute(sendPhotoRequest); // 4 + } + catch(final TelegramApiException e) + { e.printStackTrace(); } } - - private void sendPhotoFromUpload(final String filePath, final Long chatId) { + + private void sendPhotoFromUpload(final String filePath, final Long chatId) + { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 sendPhotoRequest.setChatId(chatId); // 2 - try { + try + { sendPhotoRequest.setPhoto(filePath, IOHelper.findResource(filePath)); - } catch (FileNotFoundException e1) { + } + catch(final FileNotFoundException e1) + { // TODO Auto-generated catch block e1.printStackTrace(); - } catch (IOException e1) { + } + catch(final IOException e1) + { // TODO Auto-generated catch block e1.printStackTrace(); } // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { + try + { + this.execute(sendPhotoRequest); // 4 + } + catch(final TelegramApiException e) + { e.printStackTrace(); } } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showHelp() { - - return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showHelp() + { + + return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText(createAbilityListForHelp()); - silent.execute(message); + message.setText(this.createAbilityListForHelp()); + this.silent.execute(message); }).build(); } @@ -207,53 +250,23 @@ public Ability showBestellung() { .privacy(PUBLIC) .input(1) .action(context -> { - int bestellId = Integer.parseInt(context.firstArg()); - Long chatId = context.chatId(); - HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); - final SendMessage message = new SendMessage(); + final int bestellId = Integer.parseInt(context.firstArg()); + final Long chatId = context.chatId(); + final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final SendMessage message = new SendMessage(); message.setChatId(chatId); - String messageText = bestellung.toString() + System.lineSeparator() + "Füge Positionen zu deiner Bestellung hinzu"; + final String messageText = bestellung.toString() + System.lineSeparator() + "Füge Positionen zu deiner Bestellung hinzu"; message.setText(messageText); final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); + final List keyboard = this.loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); message.setReplyMarkup(keyboardMarkup); - silent.execute(message); - }).build(); - } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability addPositionToBestellung() { - - return Ability - .builder() - .name(ABILTY_NAME_ADD_POSITION) - .info("Fügt zu einer Bestellung eine neue Position hinzu") - .locality(ALL) - .privacy(PUBLIC) - .input(3) - .action(context -> { - Long chatId = context.chatId(); - int artikelId = Integer.parseInt(context.firstArg()); - int bestellId = Integer.parseInt(context.secondArg()); - - HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); - HertlBotArtikel artikel = hertlBotDao.root().artikels().ofId(artikelId); - - HertlBotPosition position = new HertlBotPosition(BigInteger.ONE,artikel); - - bestellung.addPosition(position, HertlBotRootDao.storageManager()); - - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText(artikel.getName() + " wurde " + position.getMenge() + "-mal zu deiner Bestellung hinzugefügt"); - - silent.execute(message); + this.silent.execute(message); }).build(); } @@ -267,276 +280,362 @@ public Ability showArtikel() { .locality(ALL) .privacy(PUBLIC) .action(context -> { - final SendMessage message = new SendMessage(); + final SendMessage message = new SendMessage(); message.setChatId(context.chatId()); - message.setText(loadAndShowAllArtikel()); - silent.execute(message); + message.setText(this.loadAndShowAllArtikel()); + this.silent.execute(message); }).build(); } - - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showMyBestellungen() { - - return Ability - .builder() - .name(ABILTY_NAME_MY_BESTELLUNGEN) - .info("Zeigt die eigenen Bestellungen") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText(loadAndShowMyBestellungen(context.chatId())); + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showMyBestellungen() + { + + return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN).info("Zeigt die eigenen Bestellungen").locality( + ALL).privacy(PUBLIC).action(context -> + { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(this.loadAndShowMyBestellungen(context.chatId())); - silent.execute(message); - }).build(); + this.silent.execute(message); + }).build(); } - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showMyBestellungenKeyBoard() { - - return Ability - .builder() - .name(ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD) - .info("Zeigt die eigenen Bestellungen als keyboard") + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showMyBestellungenKeyBoard() + { + + return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD).info( + "Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> + { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText("Öffne die Bestellungen über die Tastatur: "); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = this.loadAndShowMyBestellungenAsKeyBoard(context.chatId()); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + }).build(); + } + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability createNewBestellung() + { + + return Ability.builder().name(ABILTY_NAME_NEUE_BESTELLUNG).info("Erstellt eine neue Bestellung").locality( + ALL).privacy(PUBLIC).action(context -> + { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(this.createAndShowNewBestellung(context.chatId())); + this.silent.execute(message); + }).build(); + } + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability addPositionToBestellung() + { + + return Ability.builder() + .name(ABILTY_NAME_ADD_POSITION) + .info("Fügt eine Position zu einer Bestellung hinzu") .locality(ALL) .privacy(PUBLIC) - .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText("Öffne die Bestellungen über die Tastatur"); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = loadAndShowMyBestellungenAsKeyBoard(context.chatId()); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - silent.execute(message); - }).build(); + .input(2) + .action(context -> + { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(this.createPositionForBestellung(context.firstArg(), context.chatId(), Integer.valueOf(context.secondArg()))); + this.silent.execute(message); + }).build(); } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability createNewBestellung() { - - return Ability.builder().name(ABILTY_NAME_NEUE_BESTELLUNG).info("Erstellt eine neue Bestellung").locality(ALL) - .privacy(PUBLIC).action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText(createAndShowNewBestellung(context.chatId())); - silent.execute(message); - }).build(); - } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability sendKeyboard() { - return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC) - .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText("Enjoy this wonderful keyboard!"); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = new ArrayList<>(); - - // row 1 - KeyboardRow row = new KeyboardRow(); - row.add(createKeyForAbility(ABILTY_NAME_PREISE)); - row.add(createKeyForAbility(ABILTY_NAME_PREISEFOTO)); - row.add(createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); - keyboard.add(row); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - silent.execute(message); - }).build(); + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability sendKeyboard() + { + return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC).action( + context -> + { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText("Enjoy this wonderful keyboard!"); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = new ArrayList<>(); + + // row 1 + final KeyboardRow row = new KeyboardRow(); + row.add(this.createKeyForAbility(ABILTY_NAME_PREISE)); + row.add(this.createKeyForAbility(ABILTY_NAME_PREISEFOTO)); + row.add(this.createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); + keyboard.add(row); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + }).build(); } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showPreise() { - return Ability.builder().name(ABILTY_NAME_PREISE).info("Preisliste").locality(ALL).privacy(PUBLIC) - .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText(PRICE_AS_TEXT); - silent.execute(message); - }).build(); + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showPreise() + { + return Ability.builder().name(ABILTY_NAME_PREISE).info("Preisliste").locality(ALL).privacy(PUBLIC).action( + context -> + { + final SendMessage message = new SendMessage(); + message.setChatId(context.chatId()); + message.setText(PRICE_AS_TEXT); + this.silent.execute(message); + }).build(); } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showPreiseFoto() { - return Ability.builder().name(ABILTY_NAME_PREISEFOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) - .action(context -> sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showPreiseFoto() + { + return Ability.builder().name(ABILTY_NAME_PREISEFOTO).info("send Preisfoto").locality(ALL).privacy( + PUBLIC).action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showstandorteFoto() { - return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL) - .privacy(PUBLIC).action(context -> makeScreenshotSenditDeleteit(context.chatId())).build(); + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showstandorteFoto() + { + return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL).privacy( + PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); } - - @SuppressWarnings({ "unused", "WeakerAccess" }) - public Ability showstandorteWeiden() { - return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC) - .action(context -> sendPhotoFromUpload("", context.chatId())).build(); + + @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showstandorteWeiden() + { + return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC).action( + context -> this.sendPhotoFromUpload("", context.chatId())).build(); } - - private void makeScreenshotSenditDeleteit(Long chatId) { - String fileName = makingScreenshotOfHertlHomepage(); - sendPhotoFromUpload(fileName, chatId); - File fileToDelete = new File(fileName); + private void makeScreenshotSenditDeleteit(final Long chatId) + { + final String fileName = this.makingScreenshotOfHertlHomepage(); + this.sendPhotoFromUpload(fileName, chatId); + final File fileToDelete = new File(fileName); fileToDelete.delete(); } - - private String makingScreenshotOfHertlHomepage() { - ProcessBuilder processBuilder = new ProcessBuilder(); - - String hertlTimeStampFileName = "hertl_standorteFoto" - + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd__HH-mm-ss-SSS")) + ".png"; + + private String makingScreenshotOfHertlHomepage() + { + final ProcessBuilder processBuilder = new ProcessBuilder(); + + final String hertlTimeStampFileName = "hertl_standorteFoto" + + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd__HH-mm-ss-SSS")) + + ".png"; // Run a shell script // processBuilder.command("path/to/hello.sh"); - + // -- Windows -- - + // Run a command // processBuilder.command("cmd.exe", "/c", "dir C:\\Users\\mkyong"); - + // Run a bat file // processBuilder.command("C:\\Users\\mkyong\\hello.bat"); - - try { - + + try + { + // -- Linux -- - String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " - + hertlTimeStampFileName + " 1500px 2000 1"; + final String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + + HERTL_URL + + " " + + hertlTimeStampFileName + + " 1500px 2000 1"; System.out.println(command); // Run a shell command processBuilder.command("bash", "-c", command); - - Process process = processBuilder.start(); + + final Process process = processBuilder.start(); System.out.println("Docker gestartet"); - - StringBuilder output = new StringBuilder(); - - BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); - + + final StringBuilder output = new StringBuilder(); + + final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line; - while ((line = reader.readLine()) != null) { + while((line = reader.readLine()) != null) + { output.append(line + "\n"); } - - int exitVal = process.waitFor(); + + final int exitVal = process.waitFor(); System.out.println("exitvalue: " + exitVal); - if (exitVal == 0) { + if(exitVal == 0) + { System.out.println("Success!"); System.out.println(output); return hertlTimeStampFileName; - } else { + } + else + { return null; } - - } catch (IOException e) { + + } + catch(final IOException e) + { e.printStackTrace(); - } catch (InterruptedException e) { + } + catch(final InterruptedException e) + { e.printStackTrace(); } return ""; - + } - + @VisibleForTesting - void setSender(final MessageSender sender) { + void setSender(final MessageSender sender) + { this.sender = sender; } - + @VisibleForTesting - void setSilent(final SilentSender silent) { + void setSilent(final SilentSender silent) + { this.silent = silent; } - - private String formatStandorte(List standorte) { + + private String createPositionForBestellung( + final String artikelName, + final Long chatId, + final Integer bestellungId) + { + final HertlBotArtikel artikel = hertlBotDao.root().artikels().ofName(artikelName); + final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellungId); + final Predicate positionAlreadyExist = + position -> position.getArtikel().getName().equals(artikel.getName()); + + HertlBotPosition position; + + final Optional positionOpt = + bestellung.getPositionen().stream().filter(positionAlreadyExist).findFirst(); + if(positionOpt.isPresent()) + { + position = positionOpt.get(); + position.getMenge().add( + BigInteger.valueOf(1L)); + hertlBotDao.storageManager().store(position); + } + else + { + position = new HertlBotPosition(); + position.setArtikel(artikel); + bestellung.addPosition(position, HertlBotRootDao.storageManager()); + } + + return this.loadAndShowBestellung(chatId, bestellungId); + + } + + private String formatStandorte(final List standorte) + { String alle = ""; - for (String standort : standorte) { + for(final String standort : standorte) + { alle += standort; } - + return alle; } - - private String loadAndShowBestellung(Long chatId, int bestellId) { - HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + + private String loadAndShowBestellung(final Long chatId, final int bestellId) + { + final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); return bestellung.toString(); } - - public String loadAndShowMyBestellungen(Long chatId) { - - StringBuilder sb = new StringBuilder("Ihre Bestellungen:" + System.lineSeparator()); - HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() - .forEach(bestellung -> sb.append(createBestellungLink(bestellung))); + + public String loadAndShowMyBestellungen(final Long chatId) + { + + final StringBuilder sb = new StringBuilder("Ihre Bestellungen:" + System.lineSeparator()); + HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen().forEach( + bestellung -> sb.append(this.createBestellungLink(bestellung))); return sb.toString(); } - public List loadAndShowMyBestellungenAsKeyBoard(Long chatId) { - List keyboard = new ArrayList<>(); - KeyboardRow row = new KeyboardRow(); + public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) + { + final List keyboard = new ArrayList<>(); + final KeyboardRow row = new KeyboardRow(); - HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() - .forEach(bestellung -> row.add(createBestellungLink(bestellung))); + HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen().forEach( + bestellung -> row.add(this.createBestellungLink(bestellung))); keyboard.add(row); return keyboard; } - - public String createAndShowNewBestellung(Long chatId) { - - HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); - - return createBestellungLink(bestellung); + + public String createAndShowNewBestellung(final Long chatId) + { + + final HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); + + return this.createBestellungLink(bestellung); } - - private String createAbilityListForHelp() { - StringBuilder sb = new StringBuilder(); - abilities.forEach(ability -> sb.append(createKeyForAbility(ability) + System.lineSeparator())); + + private String createAbilityListForHelp() + { + final StringBuilder sb = new StringBuilder(); + abilities.forEach(ability -> sb.append(this.createKeyForAbility(ability) + System.lineSeparator())); return sb.toString(); } - - private String createKeyForAbility(String ability) { + + private String createKeyForAbility(final String ability) + { return KEY_PRE_SYMBOL + ability; } - - private String createBestellungLink(HertlBotBestellung bestellung) { - return createKeyForAbility(ABILTY_NAME_BESTELLUNG)+" " + Integer.toString(bestellung.getIndex()) - + System.lineSeparator(); + + private String createBestellungLink(final HertlBotBestellung bestellung) + { + return this.createKeyForAbility(ABILTY_NAME_BESTELLUNG) + + " " + + Integer.toString(bestellung.getIndex()) + + System.lineSeparator(); } - - private String loadAndShowAllArtikel() { - StringBuilder sb = new StringBuilder(); - hertlBotDao.root().artikels().all().forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); + + private String loadAndShowAllArtikel() + { + final StringBuilder sb = new StringBuilder(); + hertlBotDao.root().artikels().all().forEach( + artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); return sb.toString(); } - private List loadAndShowAllArtikelForBestellung(Long chatId, Integer bestellungId) { - List keyboard = new ArrayList<>(); - KeyboardRow row = new KeyboardRow(); + private List loadAndShowAllArtikelForBestellung(final Long chatId, final Integer bestellungId) + { + final List keyboard = new ArrayList<>(); + final KeyboardRow row = new KeyboardRow(); - hertlBotDao.root().artikels().all().forEach(artikel -> row.add(createAddPositionToBestellungLink(artikel, bestellungId)) ); + hertlBotDao.root().artikels().all().forEach(artikel -> row.add(this.createAddPositiontoBestellungLink(artikel, bestellungId)) ); keyboard.add(row); return keyboard; } - private String createAddPositionToBestellungLink(HertlBotArtikel artikel, Integer bestellungId) { - return createKeyForAbility(ABILTY_NAME_ADD_POSITION)+ " " + artikel.getId()+ " " + bestellungId + " \"" + artikel.getName() +"\""+ System.lineSeparator(); + private String createAddPositiontoBestellungLink(final HertlBotArtikel artikel, final Integer bestellungId) + { + return this.createKeyForAbility(ABILTY_NAME_ADD_POSITION) + + " " + + artikel.getName() + + " " + + bestellungId + + System.lineSeparator(); } - - } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java index 7e86ced..baa9193 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java @@ -14,14 +14,14 @@ public class HertlBotBestellung { private static final String DD_MM_YYYY = "dd-MM-yyyy"; private int index; private LocalDate bestellDatum; - private HertlBotUser user; + private HertlBotUser user; private List positionen; public HertlBotBestellung() { } - public HertlBotBestellung(HertlBotUser user, List positionen) { + public HertlBotBestellung(final HertlBotUser user, final List positionen) { this.bestellDatum = LocalDate.now(); this.user = user; this.positionen = positionen; @@ -35,16 +35,16 @@ public synchronized void addPosition(HertlBotPosition position, final Persister } - public String getBestellDatumFormated() { + public String getBestellDatumFormated() { return this.bestellDatum.format(DateTimeFormatter.ofPattern(DD_MM_YYYY)); } @Override public String toString() { - StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); - sb.append("Vom: "+getBestellDatumFormated()+System.lineSeparator()); + final StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); + sb.append(" Vom: "+this.getBestellDatumFormated()+System.lineSeparator()); this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); - sb.append("Summe: "+ getSumme()); + sb.append("Summe: "+ this.getSumme()); return sb.toString(); } @@ -56,33 +56,38 @@ private String getSumme() { } return Pricehelper.getPriceAsEuroString(summe); } + + private void sumToBigInteger(BigInteger addingTo, final BigInteger addition) + { + addingTo = addingTo.add(addition); + } public HertlBotUser getUser() { - return user; + return this.user; } - public void setUser(HertlBotUser user) { + public void setUser(final HertlBotUser user) { this.user = user; } public List getPositionen() { - return positionen; + return this.positionen; } - public void setPositionen(List positionen) { + public void setPositionen(final List positionen) { this.positionen = positionen; } public LocalDate getBestellDatum() { - return bestellDatum; + return this.bestellDatum; } - public void setBestellDatum(LocalDate bestellDatum) { + public void setBestellDatum(final LocalDate bestellDatum) { this.bestellDatum = bestellDatum; } public int getIndex() { - return index; + return this.index; } - public void setIndex(int index) { + public void setIndex(final int index) { this.index = index; } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java index a0740fa..16a6725 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java @@ -3,9 +3,10 @@ import java.math.BigInteger; public class HertlBotPosition { - private BigInteger menge; + private BigInteger menge = BigInteger.valueOf(1L); private HertlBotArtikel artikel; - + private HertlBotBestellung bestelllung; + public HertlBotPosition() { } @@ -26,19 +27,31 @@ public BigInteger getPositionPrice() { } public BigInteger getMenge() { - return menge; + return this.menge; } - public void setMenge(BigInteger menge) { + public void setMenge(final BigInteger menge) { this.menge = menge; } public HertlBotArtikel getArtikel() { - return artikel; + return this.artikel; } - public void setArtikel(HertlBotArtikel artikel) { + public void setArtikel(final HertlBotArtikel artikel) { this.artikel = artikel; } + public HertlBotBestellung getBestelllung() + { + return this.bestelllung; + } + + public void setBestelllung(final HertlBotBestellung bestelllung) + { + this.bestelllung = bestelllung; + } + + + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java index ada7e16..971d105 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java @@ -13,9 +13,9 @@ private InitArtikels() { } - public synchronized static void initArtikels(HertlBotRootDao dao) + public synchronized static void initArtikels(final HertlBotRootDao dao) { - List artikelList= new ArrayList<>(); + final List artikelList= new ArrayList<>(); artikelList.add(new HertlBotArtikel(1,"1/2-Hähnchen", BigInteger.valueOf(380L))); artikelList.add(new HertlBotArtikel(2,"Hähnchen-Schenkel", BigInteger.valueOf(200L))); From 35fe442d3f3401cd7d4908f32c1143d120cca201 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Thu, 18 Feb 2021 06:31:09 +0100 Subject: [PATCH 23/74] Change to OfName --- bot.db | Bin 2097152 -> 0 bytes herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../hertlhendl/HertlHendlBot.java | 2 +- .../telegrambots/hertlhendl/WorkshopBot.java | 353 ------------------ .../hertlhendl/domain/HertlBotArtikels.java | 10 +- .../hertlhendl/WorkshopBotTest.java | 74 ---- 6 files changed, 6 insertions(+), 433 deletions(-) delete mode 100644 bot.db delete mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java delete mode 100644 src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java diff --git a/bot.db b/bot.db deleted file mode 100644 index 341806f5460d1062173855d77607406a54663aca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2097152 zcmeI*OKcox0l@L`h9KMJVG75GBb5sk5>iqmNaa?dEf;Q^WU*X1_I7t&<%AsZ zh-gciG_M9wNh!CEBJZwaI~Sx7DhN%GS|^-w?J2QvY-??Yw3o6wJNs}RB??ItiJuSt zyx+`xGxJ;fKYQ~N8-n()j_Qk!?;QEu8}Ve%=l9h&c5IHvhu=9^e|^LE+Htk7|9yO@ zx=K&iWASQtW4-!9x4y3Ue5vF<@51%}xAWca?eYC}fA79|-tYT!zM8Yf+Ss`%ng3dS?3zx-*<`HL$L{2MyOZ;DKa$KpT3y8#0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7csfjbvC z5g)ptGdOtXYuv*lUqAH6^JmV!bN<})#W!b{7H6j~&wsGGw|uO9c5QJrs=OD?&d;rk zzS`O_H(#mmJ^Aa_WOQwLz7n0SL^G?=yKB)}G$m+mTCE>-^d?*4 zL)tFj^32NR=_s1}#l%E$Y^*d^E*)qcwGds67FPC-|E@JviLNYNjm|DDEX*vgL@VbO z=b~#DD^c{*)yi6QxNX0srPccF9z7iv$HHPUESADzIV_Hc#ZzH%qHW)ms4_pZF#l0h zIlff+=gBKG%X9CaoNi9O`PValKeNBJ^y-Jp(Z0XL*S-46rRlfdn{HP>)R<`(-(R0> zX&w_<9d`Zk;@otjGS z|o=R6w7i?-<;F&^hV5q-(d}?6V`lYuI6*B#qTy@jNf&8}NLbA|jYUdrP zuKf7$u1sw%)faRQrt51bufLcd$!3Rhh3!Lw14Ehbk7RNK%?s%qsor1hI^uozWV6{q z(6O~@^o818_10GJO-{Y({S&|c_uhTqOa&d=gN-kw2S+k{azRgPzo$la@5tnS9v=DX zLx=zIQYr}cWWT)i5j(2zj}82w^tf3YU7Fc#fHw*{`iOg`)>`8AbKDv-a2sRPZ!SpZQWz! zaC55tIr2&}+j@|^mdxDvBsqGMEphITtlQ9hmK?f%I^MZ)#>T_p#p1-N$??-uljZU+ zlLH#T|84U66N`Vau~RGgrOB`~6_!qi<*~3_49lgkTn@|QjXiJY>HJc%YV-Lp9j*FM z&>p C7Ex#b diff --git a/herthaehnchen_bot b/herthaehnchen_bot index edd9977d17472932998d1480e608099825a00bee..a0a3d1c435226ecdf192431724f7cbe4b58589d0 100644 GIT binary patch delta 652 zcmX}oO>5LZ7zgmoB;91QFL^eLZs|!BLGWbjxd(d@yofI!z_+_t5D&g&xE4WZ@t~~qAb9X3f`Z^D5dYa74E*w+$vn?Yk|ar30*?=er++)uMGL!| zM{e`Z*L1*t`i<&|`zR$go{fW-7=PpOFFoMP_u}uLr%kx|ovO6EmflJ3KXAE2)6TBV zV>TCUuGqX_^Qz6&Sq4XKE;)y)eLC9CFWS6j^Onsun<;yZ`g0Vy&ZVl6lwCM8%h(rT<~BHYT!cvbqJvWO=v;elp=bY=!sxV3Qo^45?(mK zdpV99u!p)7muu!`jX3AqNm>dWvgsmjJMvVW=DGI*MK$)niN8YGmKhSQuyCUo<|bET zqvhWYJ(D+D)H6j)Cs>#d&B&Ns@9oRo2A!2pW9s>v<@=8xJ{`y_9vzp9P5KgUjI=g+ zQRuP!%Q(bn>6*u(jN3E3VRjorQk)V7tfxoAXq`Xs7ZU+(q0;i zjC!c69y^sJv(03WQ7?*>mL9~5m)iaT^(crh$>1N*g9D#@na4clWjxO#9$Iag=jXJ1 zf&D#bKcL1;(7Ro!nbls-a;tf=NiksC zW3bMCx4@AL7F;0zcg8M0C>li#)I?**LM>z?2aO{aO`y~03_2@2?zztgV#ohN{{k@5 B4Iuyk diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 130cd1c..d79e192 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -1,6 +1,6 @@ /* * ChatBot Workshop - * Copyright (C) 2018 Marcus Fihlon + * Copyright (C) 2020 Arne Meier * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java deleted file mode 100644 index d07936e..0000000 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBot.java +++ /dev/null @@ -1,353 +0,0 @@ -/* - * ChatBot Workshop - * Copyright (C) 2018 Marcus Fihlon - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package de.bigamgamen.java.telegrambots.hertlhendl; - -import com.google.common.annotations.VisibleForTesting; -import org.telegram.abilitybots.api.bot.AbilityBot; -import org.telegram.abilitybots.api.db.DBContext; -import org.telegram.abilitybots.api.db.MapDBContext; -import org.telegram.abilitybots.api.objects.Ability; -import org.telegram.abilitybots.api.objects.Flag; -import org.telegram.abilitybots.api.objects.Reply; -import org.telegram.abilitybots.api.sender.MessageSender; -import org.telegram.abilitybots.api.sender.SilentSender; -import org.telegram.telegrambots.ApiContextInitializer; -import org.telegram.telegrambots.meta.TelegramBotsApi; -import org.telegram.telegrambots.meta.api.methods.GetFile; -import org.telegram.telegrambots.meta.api.methods.send.SendMessage; -import org.telegram.telegrambots.meta.api.methods.send.SendPhoto; -import org.telegram.telegrambots.meta.api.objects.PhotoSize; -import org.telegram.telegrambots.meta.api.objects.Update; -import org.telegram.telegrambots.meta.api.objects.User; -import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; -import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; -import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; - -import java.io.File; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.function.Predicate; - -import static java.util.stream.Collectors.joining; -import static org.telegram.abilitybots.api.objects.Flag.TEXT; -import static org.telegram.abilitybots.api.objects.Locality.ALL; -import static org.telegram.abilitybots.api.objects.Privacy.PUBLIC; -import static org.telegram.abilitybots.api.util.AbilityUtils.getChatId; - -public class WorkshopBot extends AbilityBot { - - private static String BOT_TOKEN = ""; - private static String BOT_USERNAME = ""; - private static int CREATOR_ID = 929115416; - - public static void main(String[] args) throws TelegramApiRequestException { - ApiContextInitializer.init(); - final DBContext db = MapDBContext.onlineInstance("bot.db"); - final WorkshopBot bot = new WorkshopBot(db); - final TelegramBotsApi api = new TelegramBotsApi(); - api.registerBot(bot); - } - - WorkshopBot(final DBContext db) { - super(BOT_TOKEN, BOT_USERNAME, db); - } - - @Override - public int creatorId() { - return CREATOR_ID; - } - - - public Ability sayHelloWorld() { - return Ability - .builder() - .name("hello") - .info("says hello world") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> silent.send("Hello world", context.chatId())) - .build(); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Reply replyToPhoto() { - return Reply.of( - update -> silent.send("Nice pic!", getChatId(update)), - Flag.PHOTO); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability sayHi() { - return Ability - .builder() - .name("hi") - .info("says hi") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - final String firstName = context.user().getFirstName(); - silent.send("Hi, " + firstName, context.chatId()); - }) - .reply( - update -> silent.send("Wow, nice name!", update.getMessage().getChatId()), - TEXT, - update -> update.getMessage().getText().startsWith("/hi"), - isMarcus() - ) - .build(); - } - - private Predicate isMarcus() { - return update -> update.getMessage().getFrom().getFirstName().equalsIgnoreCase("Marcus"); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability counter() { - return Ability.builder() - .name("count") - .info("increments a counter per user") - .privacy(PUBLIC) - .locality(ALL) - .action(context -> { - final Map counterMap = db.getMap("COUNTERS"); - final int userId = context.user().getId(); - final Integer counter = counterMap.compute( - String.valueOf(userId), (id, count) -> count == null ? 1 : ++count); - final String message = String.format("%s, your count is now %d!", - context.user().getUserName(), counter); - silent.send(message, context.chatId()); - }) - .build(); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability contacts() { - return Ability.builder() - .name("contacts") - .info("lists all users who contacted this bot") - .privacy(PUBLIC) - .locality(ALL) - .action(context -> { - final Map usersMap = db.getMap("USERS"); - final String users = usersMap.values().stream().map(User::getUserName).collect(joining(", ")); - final String message = "The following users already contacted me: " + users; - silent.send(message, context.chatId()); - }) - .build(); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Reply savePhoto() { - return Reply.of( - update -> { - final List photos = update.getMessage().getPhoto(); - final PhotoSize photoSize = photos.stream() - .max(Comparator.comparing(PhotoSize::getFileSize)) - .orElse(null); - if (photoSize != null) { - final String filePath = getFilePath(photoSize); - final File file = downloadPhoto(filePath); - System.out.println("Temporary file: " + file); - silent.send("Yeah, I got it!", getChatId(update)); - sendPhotoFromFileId(photoSize.getFileId(), getChatId(update)); - } else { - silent.send("Houston, we have a problem!", getChatId(update)); - } - }, - Flag.PHOTO); - } - - private String getFilePath(final PhotoSize photo) { - if (photo.hasFilePath()) { - return photo.getFilePath(); - } - final GetFile getFileMethod = new GetFile(); - getFileMethod.setFileId(photo.getFileId()); - try { - final org.telegram.telegrambots.meta.api.objects.File file = execute(getFileMethod); - return file.getFilePath(); - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - return null; - } - - private File downloadPhoto(final String filePath) { - try { - return downloadFile(filePath); - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - return null; - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability sendLogo() { - return Ability - .builder() - .name("logo") - .info("send the logo") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> sendPhotoFromUrl("https://avatars3.githubusercontent.com/u/13538066?s=200&v=4", context.chatId())) - .build(); - } - - private void sendPhotoFromUrl(final String url, final Long chatId) { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(url); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - } - - private void sendPhotoFromFileId(final String fileId, final Long chatId) { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(fileId); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability sendIcon() { - return Ability - .builder() - .name("icon") - .info("send the icon") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> sendPhotoFromUpload("src/main/resources/chatbot.jpg", context.chatId())) - .build(); - } - - private void sendPhotoFromUpload(final String filePath, final Long chatId) { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(new File(filePath)); // 3 - try { - execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { - e.printStackTrace(); - } - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability sendKeyboard() { - return Ability - .builder() - .name("keyboard") - .info("send a custom keyboard") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); - message.setText("Enjoy this wonderful keyboard!"); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = new ArrayList<>(); - - // row 1 - KeyboardRow row = new KeyboardRow(); - row.add("/hello"); - row.add("/hi"); - row.add("/count"); - keyboard.add(row); - - // row 2 - row = new KeyboardRow(); - row.add("/contacts"); - row.add("/logo"); - row.add("/icon"); - keyboard.add(row); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - silent.execute(message); - }) - .build(); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability format() { - return Ability - .builder() - .name("format") - .info("formats the message") - .locality(ALL) - .privacy(PUBLIC) - .action(context -> { - silent.sendMd("You can make text *bold* or _italic_.", context.chatId()); - silent.sendMd("`This is code.`", context.chatId()); - silent.sendMd("```\nThis\nis\nmulti\nline\ncode.\n```", context.chatId()); - }) - .build(); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability add() { - return Ability - .builder() - .name("add") - .info("adds to numbers") - .locality(ALL) - .privacy(PUBLIC) - .input(2) - .action(context -> { - final int a = Integer.parseInt(context.firstArg()); - final int b = Integer.parseInt(context.secondArg()); - final int sum = a + b; - silent.send(String.format("The sum of %d and %d is %d", a, b, sum), context.chatId()); - }) - .build(); - } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability sayNo() { - return Ability.builder() - .name(DEFAULT) - .privacy(PUBLIC) - .locality(ALL) - .action(context -> silent.send("Sorry, I have no answer for you today.", context.chatId())) - .build(); - } - - @VisibleForTesting - void setSender(final MessageSender sender) { - this.sender = sender; - } - - @VisibleForTesting - void setSilent(final SilentSender silent) { - this.silent = silent; - } - -} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java index b2941bd..9551308 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java @@ -13,7 +13,7 @@ public class HertlBotArtikels { - private final Map artikels = new HashMap<>(); + private final Map artikels = new HashMap<>(); public HertlBotArtikels() { super(); @@ -26,7 +26,7 @@ public void add( final Persister persister ) { - this.artikels.put(artikel.getId(), artikel); + this.artikels.put(artikel.getName(), artikel); persister.store(this.artikels); } @@ -42,7 +42,7 @@ public void addAll( { this.artikels.putAll( artikels.stream().collect( - Collectors.toMap(HertlBotArtikel::getId, Function.identity()) + Collectors.toMap(HertlBotArtikel::getName, Function.identity()) ) ); persister.store(this.artikels); @@ -58,9 +58,9 @@ public List all() return new ArrayList<>(this.artikels.values()); } - public HertlBotArtikel ofId(final Integer artikelId) + public HertlBotArtikel ofName(final String artikelName) { - return this.artikels.get(artikelId); + return this.artikels.get(artikelName); } diff --git a/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java b/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java deleted file mode 100644 index 5b1c0ca..0000000 --- a/src/test/java/de/bigamgamen/java/telegrambots/hertlhendl/WorkshopBotTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * ChatBot Workshop - * Copyright (C) 2018 Marcus Fihlon - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package de.bigamgamen.java.telegrambots.hertlhendl; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.telegram.abilitybots.api.db.DBContext; -import org.telegram.abilitybots.api.db.MapDBContext; -import org.telegram.abilitybots.api.objects.MessageContext; -import org.telegram.abilitybots.api.sender.MessageSender; -import org.telegram.abilitybots.api.sender.SilentSender; -import org.telegram.telegrambots.meta.api.methods.send.SendMessage; -import org.telegram.telegrambots.meta.api.objects.Update; -import org.telegram.telegrambots.meta.api.objects.User; -import org.telegram.telegrambots.meta.exceptions.TelegramApiException; - -import static org.mockito.Mockito.*; - -public class WorkshopBotTest { - - private static final int USER_ID = 1337; - private static final long CHAT_ID = 1337L; - - private WorkshopBot bot; - private DBContext db; - private MessageSender sender; - - @Before - public void setUp() { - // Offline instance will get deleted at JVM shutdown - db = MapDBContext.offlineInstance("test"); - bot = new WorkshopBot(db); - sender = mock(MessageSender.class); - bot.setSender(sender); - bot.setSilent(new SilentSender(sender)); - } - - @Test - public void sayHelloWorld() throws TelegramApiException { - final Update mockedUpdate = mock(Update.class); - final User user = new User(USER_ID, "Foo", false, "Bar", "foobar42", "en"); - final MessageContext context = MessageContext.newContext(mockedUpdate, user, CHAT_ID, bot, null); - - bot.sayHelloWorld().action().accept(context); - - final SendMessage message = new SendMessage(); - message.setChatId(CHAT_ID); - message.setText("Hello world"); - verify(sender, times(1)).execute(message); - } - - @After - public void tearDown() { - db.clear(); - } - -} From 5e3d595a2360e1d05b37dd69839d57c700132125 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 24 Feb 2021 21:19:44 +0100 Subject: [PATCH 24/74] update to telrambot 5.0 --- herthaehnchen_bot | Bin 2097152 -> 2097152 bytes pom.xml | 5 +- .../hertlhendl/HertlHendlBot.java | 69 +++++------------- 3 files changed, 23 insertions(+), 51 deletions(-) diff --git a/herthaehnchen_bot b/herthaehnchen_bot index a0a3d1c435226ecdf192431724f7cbe4b58589d0..3a63601eafb2be64d76c0440488087c08b6dae57 100644 GIT binary patch delta 229 zcmWN=ISztA7zR+rU2qu%5!`R$A-n-Cl^x|oO^6g;gqX}QIzJXhd*cnPJ%I=Cd&v_* zFoAL_nyzJ8+}-aJktTv+1*=%YIySJ0Eo`HW4tB7MJxWCXaca$?dmO)hPg?i+q3&d7 zrIa*E>l?j2{$ch}8(kQEDCBr_>S3`lI4{QkxuiF;{b=~qK6~& Uaf|_mIKe5-aE=Sg!{z4t2Z|D42LJ#7 delta 230 zcmWN=OAf(690%YT)T8wnO0}M`a1MuX1A7a*E+-{vD&h_f(4^BD{j=c)PGIcC_>2HNOg6IUTF-8 1.8 1.8 + 5.0.1.1 @@ -26,12 +27,12 @@ org.telegram telegrambots - 4.9.2 + ${telegram.bot.version} org.telegram telegrambots-abilities - 4.9.2 + ${telegram.bot.version} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index d79e192..2b5a3df 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -44,16 +44,17 @@ import org.telegram.abilitybots.api.objects.Ability; import org.telegram.abilitybots.api.sender.MessageSender; import org.telegram.abilitybots.api.sender.SilentSender; -import org.telegram.telegrambots.ApiContextInitializer; import org.telegram.telegrambots.meta.TelegramBotsApi; import org.telegram.telegrambots.meta.api.methods.GetFile; import org.telegram.telegrambots.meta.api.methods.send.SendMessage; import org.telegram.telegrambots.meta.api.methods.send.SendPhoto; +import org.telegram.telegrambots.meta.api.objects.InputFile; import org.telegram.telegrambots.meta.api.objects.PhotoSize; import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; import org.xml.sax.SAXException; import com.google.common.annotations.VisibleForTesting; @@ -107,16 +108,16 @@ public class HertlHendlBot extends AbilityBot private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; private static HertlBotRootDao hertlBotDao; - public static void main(final String[] args) throws TelegramApiRequestException, ParserConfigurationException, - SAXException, IOException, URISyntaxException + public static void main(final String[] args) throws ParserConfigurationException, + SAXException, IOException, URISyntaxException, TelegramApiException { LOG.info("HertlHendlBot starting"); - ApiContextInitializer.init(); + // final DBContext db = MapDBContext.onlineInstance("bot.db"); final String token = args[0] != null ? args[0] : BOT_TOKEN; final String username = args[1] != null ? args[1] : BOT_USERNAME; final HertlHendlBot bot = new HertlHendlBot(token, username); - final TelegramBotsApi api = new TelegramBotsApi(); + TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class); api.registerBot(bot); LOG.info("HertlHendlBot successfull started"); } @@ -137,7 +138,7 @@ public int creatorId() private String getFilePath(final PhotoSize photo) { - if(photo.hasFilePath()) + if(photo.getFilePath() != null) { return photo.getFilePath(); } @@ -167,44 +168,14 @@ private File downloadPhoto(final String filePath) } return null; } - - private void sendPhotoFromUrl(final String url, final Long chatId) - { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(url); // 3 - try - { - this.execute(sendPhotoRequest); // 4 - } - catch(final TelegramApiException e) - { - e.printStackTrace(); - } - } - - private void sendPhotoFromFileId(final String fileId, final Long chatId) - { - final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 - sendPhotoRequest.setPhoto(fileId); // 3 - try - { - this.execute(sendPhotoRequest); // 4 - } - catch(final TelegramApiException e) - { - e.printStackTrace(); - } - } - - private void sendPhotoFromUpload(final String filePath, final Long chatId) + + private void sendPhotoFromUpload(final String filePath, final Long chatId) { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 - sendPhotoRequest.setChatId(chatId); // 2 + sendPhotoRequest.setChatId(Long.toString(chatId)); // 2 try { - sendPhotoRequest.setPhoto(filePath, IOHelper.findResource(filePath)); + sendPhotoRequest.setPhoto(new InputFile(IOHelper.findResource(filePath), filePath)); } catch(final FileNotFoundException e1) { @@ -233,7 +204,7 @@ public Ability showHelp() return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText(this.createAbilityListForHelp()); this.silent.execute(message); }).build(); @@ -254,7 +225,7 @@ public Ability showBestellung() { final Long chatId = context.chatId(); final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); final SendMessage message = new SendMessage(); - message.setChatId(chatId); + message.setChatId(Long.toString(context.chatId())); final String messageText = bestellung.toString() + System.lineSeparator() + "Füge Positionen zu deiner Bestellung hinzu"; message.setText(messageText); @@ -281,7 +252,7 @@ public Ability showArtikel() { .privacy(PUBLIC) .action(context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText(this.loadAndShowAllArtikel()); this.silent.execute(message); }).build(); @@ -295,7 +266,7 @@ public Ability showMyBestellungen() ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText(this.loadAndShowMyBestellungen(context.chatId())); this.silent.execute(message); @@ -310,7 +281,7 @@ public Ability showMyBestellungenKeyBoard() "Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText("Öffne die Bestellungen über die Tastatur: "); final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); @@ -332,7 +303,7 @@ public Ability createNewBestellung() ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText(this.createAndShowNewBestellung(context.chatId())); this.silent.execute(message); }).build(); @@ -351,7 +322,7 @@ public Ability addPositionToBestellung() .action(context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText(this.createPositionForBestellung(context.firstArg(), context.chatId(), Integer.valueOf(context.secondArg()))); this.silent.execute(message); }).build(); @@ -364,7 +335,7 @@ public Ability sendKeyboard() context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText("Enjoy this wonderful keyboard!"); final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); @@ -392,7 +363,7 @@ public Ability showPreise() context -> { final SendMessage message = new SendMessage(); - message.setChatId(context.chatId()); + message.setChatId(Long.toString(context.chatId())); message.setText(PRICE_AS_TEXT); this.silent.execute(message); }).build(); From b7222c5c227ee985071bdb141649ae2a8e04c870 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 24 Feb 2021 21:25:50 +0100 Subject: [PATCH 25/74] Change Licence --- LICENSE | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.adoc | 21 ++++++++++---------- 2 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a2fecaf --- /dev/null +++ b/LICENSE @@ -0,0 +1,56 @@ + + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + You must give any other recipients of the Work or Derivative Works a copy of this License; and + You must cause any modified files to carry prominent notices stating that You changed the files; and + You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/README.adoc b/README.adoc index eac4c20..483ba1b 100644 --- a/README.adoc +++ b/README.adoc @@ -4,19 +4,18 @@ ifdef::env-github[:outfilesuffix: .adoc] == Copyright and Licensing -Copyright (C) 2018 Arne Meier +Copyright (C) 2020 Arne Meier -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +Licensed 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 -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. + http://www.apache.org/licenses/LICENSE-2.0 -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . +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. See the <> file for details. From 193949376cb2aa538a95c78e340d6c63ae9e63a4 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 24 Feb 2021 21:27:40 +0100 Subject: [PATCH 26/74] Update LICENSE.adoc --- LICENSE => LICENSE.adoc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE => LICENSE.adoc (100%) diff --git a/LICENSE b/LICENSE.adoc similarity index 100% rename from LICENSE rename to LICENSE.adoc From 9aa14c8a930538a2c691d010f03222a43eac3f72 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 24 Feb 2021 22:06:39 +0100 Subject: [PATCH 27/74] CleAning up the code --- .../hertlhendl/HertlHendlBot.java | 65 +------------------ .../hertlhendl/dal/HertlBotRootDao.java | 4 +- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 2b5a3df..5a3522d 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -53,7 +53,6 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; import org.xml.sax.SAXException; @@ -96,10 +95,6 @@ public class HertlHendlBot extends AbilityBot ABILTY_NAME_OFFENE_BESTELLUNG); private static final String KEY_PRE_SYMBOL = "/"; - private static final String PRICE_AS_TEXT = "1/2 Hähnchen 3,80€\n" - + "Schenkel 2,00€\n" - + "Brezel 0,80€\n" - + "Salat 1,50€\n"; private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; @@ -135,39 +130,7 @@ public int creatorId() { return CREATOR_ID; } - - private String getFilePath(final PhotoSize photo) - { - if(photo.getFilePath() != null) - { - return photo.getFilePath(); - } - final GetFile getFileMethod = new GetFile(); - getFileMethod.setFileId(photo.getFileId()); - try - { - final org.telegram.telegrambots.meta.api.objects.File file = this.execute(getFileMethod); - return file.getFilePath(); - } - catch(final TelegramApiException e) - { - e.printStackTrace(); - } - return null; - } - - private File downloadPhoto(final String filePath) - { - try - { - return this.downloadFile(filePath); - } - catch(final TelegramApiException e) - { - e.printStackTrace(); - } - return null; - } + private void sendPhotoFromUpload(final String filePath, final Long chatId) { @@ -355,19 +318,7 @@ public Ability sendKeyboard() this.silent.execute(message); }).build(); } - - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability showPreise() - { - return Ability.builder().name(ABILTY_NAME_PREISE).info("Preisliste").locality(ALL).privacy(PUBLIC).action( - context -> - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(PRICE_AS_TEXT); - this.silent.execute(message); - }).build(); - } + @SuppressWarnings({"unused", "WeakerAccess"}) public Ability showPreiseFoto() @@ -511,17 +462,7 @@ private String createPositionForBestellung( return this.loadAndShowBestellung(chatId, bestellungId); } - - private String formatStandorte(final List standorte) - { - String alle = ""; - for(final String standort : standorte) - { - alle += standort; - } - - return alle; - } + private String loadAndShowBestellung(final Long chatId, final int bestellId) { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index cf4abdf..aaae2f7 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -68,14 +68,14 @@ public HertlBotUser loadUser(Long chatId) { public HertlBotBestellung createNewBestellungForUser(Long chatId) { HertlBotUser user = this.loadUser(chatId); HertlBotBestellung bestellung = new HertlBotBestellung(user, new ArrayList<>()); - user.addBestellung(bestellung, this.storageManager); + user.addBestellung(bestellung, storageManager); return bestellung; } public void shutDown() { - this.storageManager.shutdown(); + storageManager.shutdown(); } } From d6585b87705586670f8dfdb8e57a6db0452e8e41 Mon Sep 17 00:00:00 2001 From: AM Date: Thu, 25 Feb 2021 21:14:48 +0100 Subject: [PATCH 28/74] Code cleaning --- herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../hertlhendl/HertlHendlBot.java | 70 +++++++++--------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/herthaehnchen_bot b/herthaehnchen_bot index 3a63601eafb2be64d76c0440488087c08b6dae57..67cba5b3f296119103346e0a8b5f00aa225364b2 100644 GIT binary patch delta 206 zcmWN>%MF4+6a~^~X`%XTo{;K%t**o@KYlJg>RS`FA utz&U=%JoA - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowMyBestellungen(context.chatId())); - - this.silent.execute(message); - }).build(); - } + +// public Ability showMyBestellungen() +// { +// +// return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN).info("Zeigt die eigenen Bestellungen").locality( +// ALL).privacy(PUBLIC).action(context -> +// { +// final SendMessage message = new SendMessage(); +// message.setChatId(Long.toString(context.chatId())); +// message.setText(this.loadAndShowMyBestellungen(context.chatId())); +// +// this.silent.execute(message); +// }).build(); +// } - @SuppressWarnings({"unused", "WeakerAccess"}) + public Ability showMyBestellungenKeyBoard() { @@ -258,7 +254,6 @@ public Ability showMyBestellungenKeyBoard() }).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) public Ability createNewBestellung() { @@ -272,7 +267,6 @@ public Ability createNewBestellung() }).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) public Ability addPositionToBestellung() { @@ -291,7 +285,6 @@ public Ability addPositionToBestellung() }).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) public Ability sendKeyboard() { return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC).action( @@ -304,42 +297,45 @@ public Ability sendKeyboard() final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); final List keyboard = new ArrayList<>(); + // row 1 final KeyboardRow row = new KeyboardRow(); - row.add(this.createKeyForAbility(ABILTY_NAME_PREISE)); row.add(this.createKeyForAbility(ABILTY_NAME_PREISEFOTO)); row.add(this.createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); keyboard.add(row); + + + // activate the keyboard keyboardMarkup.setKeyboard(keyboard); message.setReplyMarkup(keyboardMarkup); + + + this.silent.execute(message); }).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) public Ability showPreiseFoto() { return Ability.builder().name(ABILTY_NAME_PREISEFOTO).info("send Preisfoto").locality(ALL).privacy( PUBLIC).action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) public Ability showstandorteFoto() { return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL).privacy( PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); } - @SuppressWarnings({"unused", "WeakerAccess"}) - public Ability showstandorteWeiden() - { - return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC).action( - context -> this.sendPhotoFromUpload("", context.chatId())).build(); - } +// public Ability showstandorteWeiden() +// { +// return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC).action( +// context -> this.sendPhotoFromUpload("", context.chatId())).build(); +// } private void makeScreenshotSenditDeleteit(final Long chatId) { From 0b27d9657d6ef39a50f24df8151669936fca1307 Mon Sep 17 00:00:00 2001 From: AM Date: Fri, 26 Feb 2021 11:56:22 +0100 Subject: [PATCH 29/74] KeyBoardMethods moved in own class --- .../hertlhendl/HertlHendlBot.java | 95 +++++-------------- .../builder/TelegramKeyBoardBuilder.java | 73 ++++++++++++++ 2 files changed, 97 insertions(+), 71 deletions(-) create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index eb4be2d..da26ea9 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -48,10 +48,7 @@ import org.telegram.telegrambots.meta.api.methods.send.SendMessage; import org.telegram.telegrambots.meta.api.methods.send.SendPhoto; import org.telegram.telegrambots.meta.api.objects.InputFile; -import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; -import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton; -import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardButton; import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; @@ -60,6 +57,7 @@ import com.google.common.annotations.VisibleForTesting; import de.bigamgamen.java.helper.IOHelper; +import de.bigamgamen.java.telegrambots.hertlhendl.builder.TelegramKeyBoardBuilder; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; @@ -70,16 +68,16 @@ public class HertlHendlBot extends AbilityBot { - private static final String ABILTY_NAME_KEYBOARD = "keyboard"; - private static final String ABILTY_NAME_STANDORTEFOTO = "standortefoto"; - private static final String ABILTY_NAME_PREISEFOTO = "preisefoto"; - private static final String ABILTY_NAME_BESTELLUNG = "bestellung"; - private static final String ABILTY_NAME_ARTIKEL = "artikel"; - private static final String ABILTY_NAME_ADD_POSITION = "addposition"; - private static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; - private static final String ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD = "mybestellungenkeyboard"; - private static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; - private static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; + public static final String ABILTY_NAME_KEYBOARD = "keyboard"; + public static final String ABILTY_NAME_STANDORTEFOTO = "standortefoto"; + public static final String ABILTY_NAME_PREISEFOTO = "preisefoto"; + public static final String ABILTY_NAME_BESTELLUNG = "bestellung"; + public static final String ABILTY_NAME_ARTIKEL = "artikel"; + public static final String ABILTY_NAME_ADD_POSITION = "addposition"; + public static final String ABILTY_NAME_MY_BESTELLUNGEN = "mybestellungen"; + public static final String ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD = "mybestellungenkeyboard"; + public static final String ABILTY_NAME_NEUE_BESTELLUNG = "neuebestellung"; + public static final String ABILTY_NAME_OFFENE_BESTELLUNG = "offnenebestellungen"; private static final List abilities = Arrays.asList( ABILTY_NAME_KEYBOARD, ABILTY_NAME_STANDORTEFOTO, @@ -90,7 +88,7 @@ public class HertlHendlBot extends AbilityBot ABILTY_NAME_MY_BESTELLUNGEN, ABILTY_NAME_NEUE_BESTELLUNG, ABILTY_NAME_OFFENE_BESTELLUNG); - private static final String KEY_PRE_SYMBOL = "/"; + private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); @@ -100,6 +98,8 @@ public class HertlHendlBot extends AbilityBot private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; private static HertlBotRootDao hertlBotDao; + private final TelegramKeyBoardBuilder keyBoardBuilder; + public static void main(final String[] args) throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException { @@ -120,6 +120,7 @@ public HertlHendlBot(final String botToken, final String botUsername) super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); InitArtikels.initArtikels(hertlBotDao); + this.keyBoardBuilder = new TelegramKeyBoardBuilder(hertlBotDao); } @Override @@ -164,7 +165,7 @@ public Ability showHelp() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.createAbilityListForHelp()); + message.setText(keyBoardBuilder.createAbilityListForHelp(abilities)); this.silent.execute(message); }).build(); } @@ -244,7 +245,7 @@ public Ability showMyBestellungenKeyBoard() message.setText("Öffne die Bestellungen über die Tastatur: "); final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = this.loadAndShowMyBestellungenAsKeyBoard(context.chatId()); + final List keyboard = keyBoardBuilder.loadAndShowMyBestellungenAsKeyBoard(context.chatId()); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); @@ -262,7 +263,7 @@ public Ability createNewBestellung() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.createAndShowNewBestellung(context.chatId())); + message.setText(keyBoardBuilder.createAndShowNewBestellung(context.chatId())); this.silent.execute(message); }).build(); } @@ -300,8 +301,8 @@ public Ability sendKeyboard() // row 1 final KeyboardRow row = new KeyboardRow(); - row.add(this.createKeyForAbility(ABILTY_NAME_PREISEFOTO)); - row.add(this.createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); + row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_PREISEFOTO)); + row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); keyboard.add(row); @@ -446,7 +447,7 @@ private String createPositionForBestellung( position = positionOpt.get(); position.getMenge().add( BigInteger.valueOf(1L)); - hertlBotDao.storageManager().store(position); + HertlBotRootDao.storageManager().store(position); } else { @@ -471,50 +472,10 @@ public String loadAndShowMyBestellungen(final Long chatId) final StringBuilder sb = new StringBuilder("Ihre Bestellungen:" + System.lineSeparator()); HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen().forEach( - bestellung -> sb.append(this.createBestellungLink(bestellung))); + bestellung -> sb.append(keyBoardBuilder.createBestellungLink(bestellung))); return sb.toString(); } - public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) - { - final List keyboard = new ArrayList<>(); - final KeyboardRow row = new KeyboardRow(); - - HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen().forEach( - bestellung -> row.add(this.createBestellungLink(bestellung))); - - keyboard.add(row); - - return keyboard; - } - - public String createAndShowNewBestellung(final Long chatId) - { - - final HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); - - return this.createBestellungLink(bestellung); - } - - private String createAbilityListForHelp() - { - final StringBuilder sb = new StringBuilder(); - abilities.forEach(ability -> sb.append(this.createKeyForAbility(ability) + System.lineSeparator())); - return sb.toString(); - } - - private String createKeyForAbility(final String ability) - { - return KEY_PRE_SYMBOL + ability; - } - - private String createBestellungLink(final HertlBotBestellung bestellung) - { - return this.createKeyForAbility(ABILTY_NAME_BESTELLUNG) - + " " - + Integer.toString(bestellung.getIndex()) - + System.lineSeparator(); - } private String loadAndShowAllArtikel() { @@ -529,21 +490,13 @@ private List loadAndShowAllArtikelForBestellung(final Long chatId, final List keyboard = new ArrayList<>(); final KeyboardRow row = new KeyboardRow(); - hertlBotDao.root().artikels().all().forEach(artikel -> row.add(this.createAddPositiontoBestellungLink(artikel, bestellungId)) ); + hertlBotDao.root().artikels().all().forEach(artikel -> row.add(keyBoardBuilder.createAddPositiontoBestellungLink(artikel, bestellungId)) ); keyboard.add(row); return keyboard; } - private String createAddPositiontoBestellungLink(final HertlBotArtikel artikel, final Integer bestellungId) - { - return this.createKeyForAbility(ABILTY_NAME_ADD_POSITION) - + " " - + artikel.getName() - + " " - + bestellungId - + System.lineSeparator(); - } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java new file mode 100644 index 0000000..21f584b --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -0,0 +1,73 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.builder; + +import java.util.ArrayList; +import java.util.List; + +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; + +import de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot; +import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; + +public class TelegramKeyBoardBuilder { + + private static final String KEY_PRE_SYMBOL = "/"; + + private final HertlBotRootDao hertlBotDao; + + public TelegramKeyBoardBuilder(HertlBotRootDao hertlBotDao) { + this.hertlBotDao = hertlBotDao; + } + + public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) + { + final List keyboard = new ArrayList<>(); + final KeyboardRow row = new KeyboardRow(); + + hertlBotDao.loadUser(chatId).getBestellungen().forEach( + bestellung -> row.add(this.createBestellungLink(bestellung))); + + keyboard.add(row); + + return keyboard; + } + + public String createAndShowNewBestellung(final Long chatId) + { + + final HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); + + return this.createBestellungLink(bestellung); + } + + public String createBestellungLink(final HertlBotBestellung bestellung) + { + return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_BESTELLUNG) + + " " + + Integer.toString(bestellung.getIndex()) + + System.lineSeparator(); + } + + public String createAddPositiontoBestellungLink(final HertlBotArtikel artikel, final Integer bestellungId) + { + return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ADD_POSITION) + + " " + + artikel.getName() + + " " + + bestellungId + + System.lineSeparator(); + } + + public String createAbilityListForHelp(List abilities) + { + final StringBuilder sb = new StringBuilder(); + abilities.forEach(ability -> sb.append(this.createKeyForAbility(ability) + System.lineSeparator())); + return sb.toString(); + } + + public String createKeyForAbility(final String ability) + { + return KEY_PRE_SYMBOL + ability; + } +} From f257308b107c7d58b8da57907e263a2e416f4a42 Mon Sep 17 00:00:00 2001 From: AM Date: Sat, 27 Feb 2021 07:51:21 +0100 Subject: [PATCH 30/74] Keyboardbuilder position with addCount postion button with builder --- herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../hertlhendl/HertlHendlBot.java | 18 +--- .../builder/TelegramKeyBoardBuilder.java | 87 +++++++++++------- 3 files changed, 56 insertions(+), 49 deletions(-) diff --git a/herthaehnchen_bot b/herthaehnchen_bot index 67cba5b3f296119103346e0a8b5f00aa225364b2..86c61657057a7150db637b5433e1692af83e8ff6 100644 GIT binary patch delta 318 zcmZo@Xkcsr;t8VCr$ag!KtMpY5==8NrhsXM(-S8jY!v5YWZ(wL%Iu!#;J9((js|v7 zu;QS}0gVL$jLShBsYMJSU^T(b2OHZDHZlS+6A&{4F$)m00x=s9vjZ^)5OV@C7Z7s; zF%J;)0x{qAgN^(f8@D$y3&@La;}=k4WMy&8Nv)W!At2z%!s?o_WqPTAfHp?~5CH9B wn7&#-AXpY8zPbU#hl2%R7BdG^H_-WW_!walYn0qXj#22o1C5(6G~P}C08-dz5C8xG delta 206 zcmW;Ey9vTz6o%o%c!}4&64tsyf=+K5F2N3i<)uW$i(@HGcs zzUJ^a=R!x<#j4(Zga4(=s@)(ww!3*3rMIl8cK71x2I>DLK9qYq=iV;fLh4XNUFuPv z1{BkfMl_}gO=;G6OKK}WHg7CS*I6#R2ue_b5|p3>B`84&N>G9ll%ND9OK$e~*z5EI D8 keyboard = this.loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); + final List keyboard = keyBoardBuilder.loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); @@ -445,8 +445,8 @@ private String createPositionForBestellung( if(positionOpt.isPresent()) { position = positionOpt.get(); - position.getMenge().add( - BigInteger.valueOf(1L)); + position.setMenge(position.getMenge().add( + BigInteger.valueOf(1L))); HertlBotRootDao.storageManager().store(position); } else @@ -485,17 +485,7 @@ private String loadAndShowAllArtikel() return sb.toString(); } - private List loadAndShowAllArtikelForBestellung(final Long chatId, final Integer bestellungId) - { - final List keyboard = new ArrayList<>(); - final KeyboardRow row = new KeyboardRow(); - - hertlBotDao.root().artikels().all().forEach(artikel -> row.add(keyBoardBuilder.createAddPositiontoBestellungLink(artikel, bestellungId)) ); - - keyboard.add(row); - - return keyboard; - } + diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 21f584b..4cbc270 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -11,63 +11,80 @@ import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; public class TelegramKeyBoardBuilder { - + + private static final int MAX_BUTTON_PER_ROW = 1; + private static final String KEY_PRE_SYMBOL = "/"; - + private final HertlBotRootDao hertlBotDao; - + public TelegramKeyBoardBuilder(HertlBotRootDao hertlBotDao) { this.hertlBotDao = hertlBotDao; } + + public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) { + final List keyboard = new ArrayList<>(); + + hertlBotDao.loadUser(chatId).getBestellungen() + .forEach(bestellung -> addButtonToKeyBoard(keyboard, this.createBestellungLink(bestellung))); + + return keyboard; + } - public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) + public List loadAndShowAllArtikelForBestellung(final Long chatId, final Integer bestellungId) { final List keyboard = new ArrayList<>(); - final KeyboardRow row = new KeyboardRow(); + + + hertlBotDao.root().artikels().all().forEach(artikel -> addButtonToKeyBoard(keyboard,createAddPositiontoBestellungLink(artikel, bestellungId)) ); - hertlBotDao.loadUser(chatId).getBestellungen().forEach( - bestellung -> row.add(this.createBestellungLink(bestellung))); - keyboard.add(row); return keyboard; } - - public String createAndShowNewBestellung(final Long chatId) - { - + + private void addButtonToKeyBoard(List keyboard, String buttonString) { + KeyboardRow rowToUse = null; + + for (KeyboardRow row : keyboard) { + if (row.size() < MAX_BUTTON_PER_ROW) { + rowToUse = row; + } + } + + if (rowToUse == null) { + rowToUse = new KeyboardRow(); + keyboard.add(rowToUse); + } + + rowToUse.add(buttonString); + + } + + public String createAndShowNewBestellung(final Long chatId) { + final HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); - + return this.createBestellungLink(bestellung); } - - public String createBestellungLink(final HertlBotBestellung bestellung) - { - return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_BESTELLUNG) - + " " - + Integer.toString(bestellung.getIndex()) - + System.lineSeparator(); + + public String createBestellungLink(final HertlBotBestellung bestellung) { + return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_BESTELLUNG) + " " + + Integer.toString(bestellung.getIndex()) + System.lineSeparator(); } - - public String createAddPositiontoBestellungLink(final HertlBotArtikel artikel, final Integer bestellungId) - { - return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ADD_POSITION) - + " " - + artikel.getName() - + " " - + bestellungId - + System.lineSeparator(); + + public String createAddPositiontoBestellungLink(final HertlBotArtikel artikel, final Integer bestellungId) { + return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ADD_POSITION) + " " + artikel.getName() + " " + + bestellungId + System.lineSeparator(); } - - public String createAbilityListForHelp(List abilities) - { + + public String createAbilityListForHelp(List abilities) { final StringBuilder sb = new StringBuilder(); abilities.forEach(ability -> sb.append(this.createKeyForAbility(ability) + System.lineSeparator())); return sb.toString(); } - - public String createKeyForAbility(final String ability) - { + + public String createKeyForAbility(final String ability) { return KEY_PRE_SYMBOL + ability; } } From 21addbf0a3be6eae9a46c3ef476e5a156fe2f3e7 Mon Sep 17 00:00:00 2001 From: AM Date: Sat, 27 Feb 2021 07:55:45 +0100 Subject: [PATCH 31/74] Update TelegramKeyBoardBuilder.java --- .../hertlhendl/builder/TelegramKeyBoardBuilder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 4cbc270..c6f0935 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -87,4 +87,9 @@ public String createAbilityListForHelp(List abilities) { public String createKeyForAbility(final String ability) { return KEY_PRE_SYMBOL + ability; } + + private void addClearButtonBestellung(List keyboard, HertlBotBestellung bestellung) + { + + } } From bb437bc60bf5248c0e4388f72259e7c38cd5c46a Mon Sep 17 00:00:00 2001 From: AM Date: Sat, 27 Feb 2021 17:11:34 +0100 Subject: [PATCH 32/74] Rename to englisch --- herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../hertlhendl/HertlHendlBot.java | 473 +++++++----------- .../builder/TelegramKeyBoardBuilder.java | 43 +- .../hertlhendl/dal/HertlBotRootDao.java | 8 +- ...tlBotArtikel.java => HertlBotArticle.java} | 6 +- ...BotArtikels.java => HertlBotArticles.java} | 18 +- ...lBotBestellung.java => HertlBotOrder.java} | 6 +- .../hertlhendl/domain/HertlBotPosition.java | 14 +- .../hertlhendl/domain/HertlBotRoot.java | 4 +- .../hertlhendl/domain/HertlBotUser.java | 6 +- .../{InitArtikels.java => InitArticles.java} | 18 +- 11 files changed, 251 insertions(+), 345 deletions(-) rename src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/{HertlBotArtikel.java => HertlBotArticle.java} (85%) rename src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/{HertlBotArtikels.java => HertlBotArticles.java} (69%) rename src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/{HertlBotBestellung.java => HertlBotOrder.java} (93%) rename src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/{InitArtikels.java => InitArticles.java} (54%) diff --git a/herthaehnchen_bot b/herthaehnchen_bot index 86c61657057a7150db637b5433e1692af83e8ff6..36c6c1617e58f4c4b80052661d6001dd13f2a0c5 100644 GIT binary patch delta 285 zcmW;GKT1PE5XbSXQD0t+W`ps6BX|W*V3|rVH;4zYv~$M@L2P`y!V^fUz-BkQlLy{F z5VoJ%{$2*Y%oJ06j4{ff_oEAY{o86rpU*eDrN*0m`CXKWPKx;|@>jo#E9Rx+aIEiDcM+Y7>veR@SEu?#M2wOI2azJB&0ON9ygw!I25U~2-=7Wvx2OAlIm-G)Xw{F<7T}eWqg^_c|=1n`dZQHtS>-6=K0w1>V z3#c)&vN-0XR!r9r5b$JSb abilities = Arrays.asList( - ABILTY_NAME_KEYBOARD, - ABILTY_NAME_STANDORTEFOTO, - ABILTY_NAME_PREISEFOTO, - ABILTY_NAME_ARTIKEL, - ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD, - ABILTY_NAME_BESTELLUNG, - ABILTY_NAME_MY_BESTELLUNGEN, - ABILTY_NAME_NEUE_BESTELLUNG, - ABILTY_NAME_OFFENE_BESTELLUNG); - - +// ABILTY_NAME_KEYBOARD, + ABILTY_NAME_LOCATION_PHOTO, ABILTY_NAME_PRICES_PHOTO, ABILTY_NAME_ITEM, ABILTY_NAME_LIST_MY_ORDERS, + ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, ABILTY_NAME_NEW_ORDER, ABILTY_NAME_OPEN_ORDERS); + private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; @@ -97,72 +89,57 @@ public class HertlHendlBot extends AbilityBot private static int CREATOR_ID = 929115416; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; private static HertlBotRootDao hertlBotDao; - + private final TelegramKeyBoardBuilder keyBoardBuilder; - - public static void main(final String[] args) throws ParserConfigurationException, - SAXException, IOException, URISyntaxException, TelegramApiException - { + + public static void main(final String[] args) + throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException { LOG.info("HertlHendlBot starting"); // final DBContext db = MapDBContext.onlineInstance("bot.db"); final String token = args[0] != null ? args[0] : BOT_TOKEN; final String username = args[1] != null ? args[1] : BOT_USERNAME; final HertlHendlBot bot = new HertlHendlBot(token, username); - TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class); + TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class); api.registerBot(bot); LOG.info("HertlHendlBot successfull started"); } - + public HertlHendlBot(final String botToken, final String botUsername) - throws ParserConfigurationException, SAXException, IOException, URISyntaxException - { + throws ParserConfigurationException, SAXException, IOException, URISyntaxException { super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); - InitArtikels.initArtikels(hertlBotDao); + InitArticles.initArtikels(hertlBotDao); this.keyBoardBuilder = new TelegramKeyBoardBuilder(hertlBotDao); } - + @Override - public int creatorId() - { + public int creatorId() { return CREATOR_ID; } - - private void sendPhotoFromUpload(final String filePath, final Long chatId) - { + private void sendPhotoFromUpload(final String filePath, final Long chatId) { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 sendPhotoRequest.setChatId(Long.toString(chatId)); // 2 - try - { + try { sendPhotoRequest.setPhoto(new InputFile(IOHelper.findResource(filePath), filePath)); - } - catch(final FileNotFoundException e1) - { + } catch (final FileNotFoundException e1) { // TODO Auto-generated catch block e1.printStackTrace(); - } - catch(final IOException e1) - { + } catch (final IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } // 3 - try - { + try { this.execute(sendPhotoRequest); // 4 - } - catch(final TelegramApiException e) - { + } catch (final TelegramApiException e) { e.printStackTrace(); } } - public Ability showHelp() - { - - return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> - { + public Ability showHelp() { + + return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(keyBoardBuilder.createAbilityListForHelp(abilities)); @@ -170,46 +147,35 @@ public Ability showHelp() }).build(); } - public Ability showBestellung() { - return Ability - .builder() - .name(ABILTY_NAME_BESTELLUNG) - .info("zeigt eine bestimmte Bestellung") - .locality(ALL) - .privacy(PUBLIC) - .input(1) - .action(context -> { + return Ability.builder().name(ABILTY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) + .privacy(PUBLIC).input(1).action(context -> { final int bestellId = Integer.parseInt(context.firstArg()); final Long chatId = context.chatId(); - final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - final String messageText = bestellung.toString() + System.lineSeparator() + "Füge Positionen zu deiner Bestellung hinzu"; - + final String messageText = bestellung.toString() + System.lineSeparator() + + "Füge Positionen zu deiner Bestellung hinzu"; + message.setText(messageText); - + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = keyBoardBuilder.loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); + final List keyboard = keyBoardBuilder + .loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); message.setReplyMarkup(keyboardMarkup); - + this.silent.execute(message); }).build(); } - public Ability showArtikel() { - return Ability - .builder() - .name(ABILTY_NAME_ARTIKEL) - .info("Listet alle Artikel auf") - .locality(ALL) - .privacy(PUBLIC) + return Ability.builder().name(ABILTY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) .action(context -> { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -217,276 +183,209 @@ public Ability showArtikel() { this.silent.execute(message); }).build(); } - - -// public Ability showMyBestellungen() -// { -// -// return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN).info("Zeigt die eigenen Bestellungen").locality( -// ALL).privacy(PUBLIC).action(context -> -// { -// final SendMessage message = new SendMessage(); -// message.setChatId(Long.toString(context.chatId())); -// message.setText(this.loadAndShowMyBestellungen(context.chatId())); -// -// this.silent.execute(message); -// }).build(); -// } - - - public Ability showMyBestellungenKeyBoard() - { - - return Ability.builder().name(ABILTY_NAME_MY_BESTELLUNGEN_KEYBOARD).info( - "Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText("Öffne die Bestellungen über die Tastatur: "); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = keyBoardBuilder.loadAndShowMyBestellungenAsKeyBoard(context.chatId()); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - this.silent.execute(message); - }).build(); + + public Ability showMyBestellungen() { + + return Ability.builder().name(ABILTY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) + .privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(this.loadAndShowMyBestellungen(context.chatId())); + final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); + message.setReplyMarkup(keyboardMarkup); + this.silent.execute(message); + }).build(); + } + + public Ability showMyBestellungenKeyBoard() { + + return Ability.builder().name(ABILTY_NAME_MY_ORDERS_AS_KEYBOARD) + .info("Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText("Öffne die Bestellungen über die Tastatur: "); + + final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); + message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + }).build(); } - - public Ability createNewBestellung() - { - - return Ability.builder().name(ABILTY_NAME_NEUE_BESTELLUNG).info("Erstellt eine neue Bestellung").locality( - ALL).privacy(PUBLIC).action(context -> - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(keyBoardBuilder.createAndShowNewBestellung(context.chatId())); - this.silent.execute(message); - }).build(); + + public Ability createNewBestellung() { + + return Ability.builder().name(ABILTY_NAME_NEW_ORDER).info("Erstellt eine neue Bestellung").locality(ALL) + .privacy(PUBLIC).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(keyBoardBuilder.createAndShowNewBestellung(context.chatId())); + this.silent.execute(message); + }).build(); } - - public Ability addPositionToBestellung() - { - - return Ability.builder() - .name(ABILTY_NAME_ADD_POSITION) - .info("Fügt eine Position zu einer Bestellung hinzu") - .locality(ALL) - .privacy(PUBLIC) - .input(2) - .action(context -> - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(this.createPositionForBestellung(context.firstArg(), context.chatId(), Integer.valueOf(context.secondArg()))); - this.silent.execute(message); - }).build(); + + public Ability addPositionToBestellung() { + + return Ability.builder().name(ABILTY_NAME_ADD_POSITION).info("Fügt eine Position zu einer Bestellung hinzu") + .locality(ALL).privacy(PUBLIC).input(2).action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(this.createPositionForBestellung(context.firstArg(), context.chatId(), + Integer.valueOf(context.secondArg()))); + this.silent.execute(message); + }).build(); } - - public Ability sendKeyboard() - { - return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC).action( - context -> - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText("Enjoy this wonderful keyboard!"); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = new ArrayList<>(); - - - // row 1 - final KeyboardRow row = new KeyboardRow(); - row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_PREISEFOTO)); - row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_STANDORTEFOTO)); - keyboard.add(row); - - - - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - - - - this.silent.execute(message); - }).build(); + + public Ability sendKeyboard() { + return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC) + .action(context -> { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText("Enjoy this wonderful keyboard!"); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = new ArrayList<>(); + + // row 1 + final KeyboardRow row = new KeyboardRow(); + row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_PRICES_PHOTO)); + row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_LOCATION_PHOTO)); + keyboard.add(row); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + }).build(); } - - public Ability showPreiseFoto() - { - return Ability.builder().name(ABILTY_NAME_PREISEFOTO).info("send Preisfoto").locality(ALL).privacy( - PUBLIC).action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); + public Ability showPreiseFoto() { + return Ability.builder().name(ABILTY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) + .action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); } - - public Ability showstandorteFoto() - { - return Ability.builder().name(ABILTY_NAME_STANDORTEFOTO).info("standorteFoto Weiden").locality(ALL).privacy( - PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); + + public Ability showstandorteFoto() { + return Ability.builder().name(ABILTY_NAME_LOCATION_PHOTO).info("standorteFoto Weiden").locality(ALL) + .privacy(PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); } - -// public Ability showstandorteWeiden() -// { -// return Ability.builder().name("standorte").info("standorte Weiden").locality(ALL).privacy(PUBLIC).action( -// context -> this.sendPhotoFromUpload("", context.chatId())).build(); -// } - - private void makeScreenshotSenditDeleteit(final Long chatId) - { + + private void makeScreenshotSenditDeleteit(final Long chatId) { final String fileName = this.makingScreenshotOfHertlHomepage(); this.sendPhotoFromUpload(fileName, chatId); final File fileToDelete = new File(fileName); fileToDelete.delete(); } - - private String makingScreenshotOfHertlHomepage() - { + + private String makingScreenshotOfHertlHomepage() { final ProcessBuilder processBuilder = new ProcessBuilder(); - + final String hertlTimeStampFileName = "hertl_standorteFoto" - + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd__HH-mm-ss-SSS")) - + ".png"; + + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd__HH-mm-ss-SSS")) + ".png"; // Run a shell script // processBuilder.command("path/to/hello.sh"); - + // -- Windows -- - + // Run a command // processBuilder.command("cmd.exe", "/c", "dir C:\\Users\\mkyong"); - + // Run a bat file // processBuilder.command("C:\\Users\\mkyong\\hello.bat"); - - try - { - + + try { + // -- Linux -- - final String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " - + HERTL_URL - + " " - + hertlTimeStampFileName - + " 1500px 2000 1"; + final String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " + + hertlTimeStampFileName + " 1500px 2000 1"; System.out.println(command); // Run a shell command processBuilder.command("bash", "-c", command); - + final Process process = processBuilder.start(); System.out.println("Docker gestartet"); - + final StringBuilder output = new StringBuilder(); - + final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); - + String line; - while((line = reader.readLine()) != null) - { + while ((line = reader.readLine()) != null) { output.append(line + "\n"); } - + final int exitVal = process.waitFor(); System.out.println("exitvalue: " + exitVal); - if(exitVal == 0) - { + if (exitVal == 0) { System.out.println("Success!"); System.out.println(output); return hertlTimeStampFileName; - } - else - { + } else { return null; } - - } - catch(final IOException e) - { + + } catch (final IOException e) { e.printStackTrace(); - } - catch(final InterruptedException e) - { + } catch (final InterruptedException e) { e.printStackTrace(); } return ""; - + } - + @VisibleForTesting - void setSender(final MessageSender sender) - { + void setSender(final MessageSender sender) { this.sender = sender; } - + @VisibleForTesting - void setSilent(final SilentSender silent) - { + void setSilent(final SilentSender silent) { this.silent = silent; } - - private String createPositionForBestellung( - final String artikelName, - final Long chatId, - final Integer bestellungId) - { - final HertlBotArtikel artikel = hertlBotDao.root().artikels().ofName(artikelName); - final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellungId); - final Predicate positionAlreadyExist = - position -> position.getArtikel().getName().equals(artikel.getName()); - + + private String createPositionForBestellung(final String artikelName, final Long chatId, + final Integer bestellungId) { + final HertlBotArticle artikel = hertlBotDao.root().artikels().ofName(artikelName); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellungId); + final Predicate positionAlreadyExist = position -> position.getArtikel().getName() + .equals(artikel.getName()); + HertlBotPosition position; - - final Optional positionOpt = - bestellung.getPositionen().stream().filter(positionAlreadyExist).findFirst(); - if(positionOpt.isPresent()) - { + + final Optional positionOpt = bestellung.getPositionen().stream().filter(positionAlreadyExist) + .findFirst(); + if (positionOpt.isPresent()) { position = positionOpt.get(); - position.setMenge(position.getMenge().add( - BigInteger.valueOf(1L))); + position.setMenge(position.getMenge().add(BigInteger.valueOf(1L))); HertlBotRootDao.storageManager().store(position); - } - else - { + } else { position = new HertlBotPosition(); position.setArtikel(artikel); bestellung.addPosition(position, HertlBotRootDao.storageManager()); } - + return this.loadAndShowBestellung(chatId, bestellungId); - + } - - private String loadAndShowBestellung(final Long chatId, final int bestellId) - { - final HertlBotBestellung bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + private String loadAndShowBestellung(final Long chatId, final int bestellId) { + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); return bestellung.toString(); } - - public String loadAndShowMyBestellungen(final Long chatId) - { - - final StringBuilder sb = new StringBuilder("Ihre Bestellungen:" + System.lineSeparator()); - HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen().forEach( - bestellung -> sb.append(keyBoardBuilder.createBestellungLink(bestellung))); + + public String loadAndShowMyBestellungen(final Long chatId) { + final StringBuilder sb = new StringBuilder( + "Ihre Bestellungen:" + System.lineSeparator() + System.lineSeparator()); + HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() + .forEach(bestellung -> sb.append(loadAndShowBestellung(chatId, bestellung.getIndex())) + .append(System.lineSeparator() + System.lineSeparator())); return sb.toString(); } - - - private String loadAndShowAllArtikel() - { + + private String loadAndShowAllArtikel() { final StringBuilder sb = new StringBuilder(); - hertlBotDao.root().artikels().all().forEach( - artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); + hertlBotDao.root().artikels().all() + .forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); return sb.toString(); } - - - - - + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index c6f0935..74427e3 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -3,12 +3,14 @@ import java.util.ArrayList; import java.util.List; +import org.telegram.abilitybots.api.objects.MessageContext; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; -import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; -import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; public class TelegramKeyBoardBuilder { @@ -30,16 +32,13 @@ public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) return keyboard; } - - public List loadAndShowAllArtikelForBestellung(final Long chatId, final Integer bestellungId) - { + + public List loadAndShowAllArtikelForBestellung(final Long chatId, final Integer bestellungId) { final List keyboard = new ArrayList<>(); - - - hertlBotDao.root().artikels().all().forEach(artikel -> addButtonToKeyBoard(keyboard,createAddPositiontoBestellungLink(artikel, bestellungId)) ); - - - + + hertlBotDao.root().artikels().all().forEach( + artikel -> addButtonToKeyBoard(keyboard, createAddPositiontoBestellungLink(artikel, bestellungId))); + return keyboard; } @@ -63,17 +62,17 @@ private void addButtonToKeyBoard(List keyboard, String buttonString public String createAndShowNewBestellung(final Long chatId) { - final HertlBotBestellung bestellung = hertlBotDao.createNewBestellungForUser(chatId); + final HertlBotOrder bestellung = hertlBotDao.createNewBestellungForUser(chatId); return this.createBestellungLink(bestellung); } - public String createBestellungLink(final HertlBotBestellung bestellung) { - return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_BESTELLUNG) + " " - + Integer.toString(bestellung.getIndex()) + System.lineSeparator(); + public String createBestellungLink(final HertlBotOrder bestellung) { + return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ORDER) + " " + Integer.toString(bestellung.getIndex()) + + System.lineSeparator(); } - public String createAddPositiontoBestellungLink(final HertlBotArtikel artikel, final Integer bestellungId) { + public String createAddPositiontoBestellungLink(final HertlBotArticle artikel, final Integer bestellungId) { return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ADD_POSITION) + " " + artikel.getName() + " " + bestellungId + System.lineSeparator(); } @@ -87,9 +86,17 @@ public String createAbilityListForHelp(List abilities) { public String createKeyForAbility(final String ability) { return KEY_PRE_SYMBOL + ability; } + + private void addClearButtonBestellung(List keyboard, HertlBotOrder bestellung) { + + } - private void addClearButtonBestellung(List keyboard, HertlBotBestellung bestellung) - { + public ReplyKeyboardMarkup buildOrderMarkup(MessageContext context) { + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = this.loadAndShowMyBestellungenAsKeyBoard(context.chatId()); + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + return keyboardMarkup; } } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index aaae2f7..87aaa2a 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Optional; -import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotBestellung; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotRoot; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser; import one.microstream.storage.configuration.Configuration; @@ -45,7 +45,7 @@ public HertlBotRoot root() { return (HertlBotRoot) storageManager().root(); } - public HertlBotBestellung loadBestellung(Long chatId, int bestellId) { + public HertlBotOrder loadBestellung(Long chatId, int bestellId) { HertlBotUser user = loadUser(chatId); return user.getBestellungen().stream().filter(bestellung -> bestellung.getIndex() == bestellId).findFirst() @@ -65,9 +65,9 @@ public HertlBotUser loadUser(Long chatId) { return user; } - public HertlBotBestellung createNewBestellungForUser(Long chatId) { + public HertlBotOrder createNewBestellungForUser(Long chatId) { HertlBotUser user = this.loadUser(chatId); - HertlBotBestellung bestellung = new HertlBotBestellung(user, new ArrayList<>()); + HertlBotOrder bestellung = new HertlBotOrder(user, new ArrayList<>()); user.addBestellung(bestellung, storageManager); return bestellung; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticle.java similarity index 85% rename from src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java rename to src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticle.java index 8b67b2f..c64741d 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikel.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticle.java @@ -4,16 +4,16 @@ import de.bigamgamen.java.helper.Pricehelper; -public class HertlBotArtikel { +public class HertlBotArticle { private int id; private String name; private BigInteger priceInCent; - public HertlBotArtikel() { + public HertlBotArticle() { } - public HertlBotArtikel(int id, String name, BigInteger priceInCent) { + public HertlBotArticle(int id, String name, BigInteger priceInCent) { super(); this.id = id; this.name = name; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java similarity index 69% rename from src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java rename to src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java index 9551308..81abf53 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java @@ -11,18 +11,18 @@ import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import one.microstream.persistence.types.Persister; -public class HertlBotArtikels { +public class HertlBotArticles { - private final Map artikels = new HashMap<>(); + private final Map artikels = new HashMap<>(); - public HertlBotArtikels() { + public HertlBotArticles() { super(); } public void add( - final HertlBotArtikel artikel, + final HertlBotArticle artikel, final Persister persister ) { @@ -30,19 +30,19 @@ public void add( persister.store(this.artikels); } - public void addAll(final Collection HertlBotArtikels) + public void addAll(final Collection HertlBotArtikels) { this.addAll(HertlBotArtikels, HertlBotRootDao.storageManager()); } public void addAll( - final Collection artikels, + final Collection artikels, final Persister persister ) { this.artikels.putAll( artikels.stream().collect( - Collectors.toMap(HertlBotArtikel::getName, Function.identity()) + Collectors.toMap(HertlBotArticle::getName, Function.identity()) ) ); persister.store(this.artikels); @@ -53,12 +53,12 @@ public int HertlBotArtikelCount() return this.artikels.size(); } - public List all() + public List all() { return new ArrayList<>(this.artikels.values()); } - public HertlBotArtikel ofName(final String artikelName) + public HertlBotArticle ofName(final String artikelName) { return this.artikels.get(artikelName); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java similarity index 93% rename from src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java rename to src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java index baa9193..8be2931 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotBestellung.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java @@ -8,7 +8,7 @@ import de.bigamgamen.java.helper.Pricehelper; import one.microstream.persistence.types.Persister; -public class HertlBotBestellung { +public class HertlBotOrder { private static final String BESTELLUNG_TITLE = "Ihre Bestellung:"; private static final String DD_MM_YYYY = "dd-MM-yyyy"; @@ -17,11 +17,11 @@ public class HertlBotBestellung { private HertlBotUser user; private List positionen; - public HertlBotBestellung() { + public HertlBotOrder() { } - public HertlBotBestellung(final HertlBotUser user, final List positionen) { + public HertlBotOrder(final HertlBotUser user, final List positionen) { this.bestellDatum = LocalDate.now(); this.user = user; this.positionen = positionen; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java index 16a6725..454335f 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotPosition.java @@ -4,14 +4,14 @@ public class HertlBotPosition { private BigInteger menge = BigInteger.valueOf(1L); - private HertlBotArtikel artikel; - private HertlBotBestellung bestelllung; + private HertlBotArticle artikel; + private HertlBotOrder bestelllung; public HertlBotPosition() { } - public HertlBotPosition(BigInteger menge, HertlBotArtikel artikel) { + public HertlBotPosition(BigInteger menge, HertlBotArticle artikel) { this.menge = menge; this.artikel = artikel; } @@ -34,20 +34,20 @@ public void setMenge(final BigInteger menge) { this.menge = menge; } - public HertlBotArtikel getArtikel() { + public HertlBotArticle getArtikel() { return this.artikel; } - public void setArtikel(final HertlBotArtikel artikel) { + public void setArtikel(final HertlBotArticle artikel) { this.artikel = artikel; } - public HertlBotBestellung getBestelllung() + public HertlBotOrder getBestelllung() { return this.bestelllung; } - public void setBestelllung(final HertlBotBestellung bestelllung) + public void setBestelllung(final HertlBotOrder bestelllung) { this.bestelllung = bestelllung; } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java index 31f447f..9ac398e 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotRoot.java @@ -2,7 +2,7 @@ public class HertlBotRoot { private HertlBotUsers users = new HertlBotUsers(); - private HertlBotArtikels artikels = new HertlBotArtikels(); + private HertlBotArticles artikels = new HertlBotArticles(); public HertlBotRoot() { @@ -13,7 +13,7 @@ public HertlBotUsers users() { return users; } - public HertlBotArtikels artikels() { + public HertlBotArticles artikels() { return artikels; } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java index b76f800..ac8ee61 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java @@ -8,13 +8,13 @@ public class HertlBotUser { private Long chatId; - private List bestellungen = new ArrayList<>(); + private List bestellungen = new ArrayList<>(); public HertlBotUser() { } - public synchronized void addBestellung(HertlBotBestellung bestellung, final Persister persister) + public synchronized void addBestellung(HertlBotOrder bestellung, final Persister persister) { bestellung.setUser(this); this.bestellungen.add(bestellung); @@ -31,7 +31,7 @@ public HertlBotUser(Long chatId) { this.chatId = chatId; } - public List getBestellungen() { + public List getBestellungen() { return new ArrayList<>(bestellungen); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java similarity index 54% rename from src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java rename to src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index 971d105..6088541 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArtikels.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -5,23 +5,23 @@ import java.util.List; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; -import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArtikel; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; -public class InitArtikels { +public class InitArticles { - private InitArtikels() { + private InitArticles() { } public synchronized static void initArtikels(final HertlBotRootDao dao) { - final List artikelList= new ArrayList<>(); + final List artikelList= new ArrayList<>(); - artikelList.add(new HertlBotArtikel(1,"1/2-Hähnchen", BigInteger.valueOf(380L))); - artikelList.add(new HertlBotArtikel(2,"Hähnchen-Schenkel", BigInteger.valueOf(200L))); - artikelList.add(new HertlBotArtikel(3,"Krautsalat", BigInteger.valueOf(150L))); - artikelList.add(new HertlBotArtikel(4,"Brezel-klein", BigInteger.valueOf(80L))); - artikelList.add(new HertlBotArtikel(5,"Brezel-groß", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArticle(1,"1/2-Hähnchen", BigInteger.valueOf(380L))); + artikelList.add(new HertlBotArticle(2,"Hähnchen-Schenkel", BigInteger.valueOf(200L))); + artikelList.add(new HertlBotArticle(3,"Krautsalat", BigInteger.valueOf(150L))); + artikelList.add(new HertlBotArticle(4,"Brezel-klein", BigInteger.valueOf(80L))); + artikelList.add(new HertlBotArticle(5,"Brezel-groß", BigInteger.valueOf(160L))); dao.root().artikels().addAll(artikelList); From b5f6caa9fa5406c01d265c498f43475063af8264 Mon Sep 17 00:00:00 2001 From: AM Date: Sat, 27 Feb 2021 17:16:24 +0100 Subject: [PATCH 33/74] Rename to English --- .../hertlhendl/HertlHendlBot.java | 38 +++++++++---------- .../builder/TelegramKeyBoardBuilder.java | 20 +++++----- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index dd4d466..5550246 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -147,7 +147,7 @@ public Ability showHelp() { }).build(); } - public Ability showBestellung() { + public Ability showOrder() { return Ability.builder().name(ABILTY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) .privacy(PUBLIC).input(1).action(context -> { @@ -163,7 +163,7 @@ public Ability showBestellung() { final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); final List keyboard = keyBoardBuilder - .loadAndShowAllArtikelForBestellung(context.chatId(), bestellId); + .loadAndShowAllArticleForOrder(context.chatId(), bestellId); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); @@ -173,31 +173,31 @@ public Ability showBestellung() { }).build(); } - public Ability showArtikel() { + public Ability showArticle() { return Ability.builder().name(ABILTY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) .action(context -> { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowAllArtikel()); + message.setText(this.loadAndShowAllArticle()); this.silent.execute(message); }).build(); } - public Ability showMyBestellungen() { + public Ability showMyOrders() { return Ability.builder().name(ABILTY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) .privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowMyBestellungen(context.chatId())); + message.setText(this.loadAndShowMyOrder(context.chatId())); final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); message.setReplyMarkup(keyboardMarkup); this.silent.execute(message); }).build(); } - public Ability showMyBestellungenKeyBoard() { + public Ability showMyOrderKeyBoard() { return Ability.builder().name(ABILTY_NAME_MY_ORDERS_AS_KEYBOARD) .info("Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> { @@ -212,24 +212,24 @@ public Ability showMyBestellungenKeyBoard() { }).build(); } - public Ability createNewBestellung() { + public Ability createNewOrder() { return Ability.builder().name(ABILTY_NAME_NEW_ORDER).info("Erstellt eine neue Bestellung").locality(ALL) .privacy(PUBLIC).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(keyBoardBuilder.createAndShowNewBestellung(context.chatId())); + message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId())); this.silent.execute(message); }).build(); } - public Ability addPositionToBestellung() { + public Ability addPositionToOrder() { return Ability.builder().name(ABILTY_NAME_ADD_POSITION).info("Fügt eine Position zu einer Bestellung hinzu") .locality(ALL).privacy(PUBLIC).input(2).action(context -> { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.createPositionForBestellung(context.firstArg(), context.chatId(), + message.setText(this.createPositionForOrder(context.firstArg(), context.chatId(), Integer.valueOf(context.secondArg()))); this.silent.execute(message); }).build(); @@ -259,12 +259,12 @@ public Ability sendKeyboard() { }).build(); } - public Ability showPreiseFoto() { + public Ability showPricePhoto() { return Ability.builder().name(ABILTY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) .action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); } - public Ability showstandorteFoto() { + public Ability showLocationPhoto() { return Ability.builder().name(ABILTY_NAME_LOCATION_PHOTO).info("standorteFoto Weiden").locality(ALL) .privacy(PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); } @@ -342,7 +342,7 @@ void setSilent(final SilentSender silent) { this.silent = silent; } - private String createPositionForBestellung(final String artikelName, final Long chatId, + private String createPositionForOrder(final String artikelName, final Long chatId, final Integer bestellungId) { final HertlBotArticle artikel = hertlBotDao.root().artikels().ofName(artikelName); final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellungId); @@ -363,25 +363,25 @@ private String createPositionForBestellung(final String artikelName, final Long bestellung.addPosition(position, HertlBotRootDao.storageManager()); } - return this.loadAndShowBestellung(chatId, bestellungId); + return this.loadAndShowOrder(chatId, bestellungId); } - private String loadAndShowBestellung(final Long chatId, final int bestellId) { + private String loadAndShowOrder(final Long chatId, final int bestellId) { final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); return bestellung.toString(); } - public String loadAndShowMyBestellungen(final Long chatId) { + public String loadAndShowMyOrder(final Long chatId) { final StringBuilder sb = new StringBuilder( "Ihre Bestellungen:" + System.lineSeparator() + System.lineSeparator()); HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() - .forEach(bestellung -> sb.append(loadAndShowBestellung(chatId, bestellung.getIndex())) + .forEach(bestellung -> sb.append(loadAndShowOrder(chatId, bestellung.getIndex())) .append(System.lineSeparator() + System.lineSeparator())); return sb.toString(); } - private String loadAndShowAllArtikel() { + private String loadAndShowAllArticle() { final StringBuilder sb = new StringBuilder(); hertlBotDao.root().artikels().all() .forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 74427e3..055590c 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -24,20 +24,20 @@ public TelegramKeyBoardBuilder(HertlBotRootDao hertlBotDao) { this.hertlBotDao = hertlBotDao; } - public List loadAndShowMyBestellungenAsKeyBoard(final Long chatId) { + public List loadAndShowMyOrdersAsKeyBoard(final Long chatId) { final List keyboard = new ArrayList<>(); hertlBotDao.loadUser(chatId).getBestellungen() - .forEach(bestellung -> addButtonToKeyBoard(keyboard, this.createBestellungLink(bestellung))); + .forEach(bestellung -> addButtonToKeyBoard(keyboard, this.createOrderLink(bestellung))); return keyboard; } - public List loadAndShowAllArtikelForBestellung(final Long chatId, final Integer bestellungId) { + public List loadAndShowAllArticleForOrder(final Long chatId, final Integer bestellungId) { final List keyboard = new ArrayList<>(); hertlBotDao.root().artikels().all().forEach( - artikel -> addButtonToKeyBoard(keyboard, createAddPositiontoBestellungLink(artikel, bestellungId))); + artikel -> addButtonToKeyBoard(keyboard, createAddPositiontoOrderLink(artikel, bestellungId))); return keyboard; } @@ -60,19 +60,19 @@ private void addButtonToKeyBoard(List keyboard, String buttonString } - public String createAndShowNewBestellung(final Long chatId) { + public String createAndShowNewOrder(final Long chatId) { final HertlBotOrder bestellung = hertlBotDao.createNewBestellungForUser(chatId); - return this.createBestellungLink(bestellung); + return this.createOrderLink(bestellung); } - public String createBestellungLink(final HertlBotOrder bestellung) { + public String createOrderLink(final HertlBotOrder bestellung) { return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ORDER) + " " + Integer.toString(bestellung.getIndex()) + System.lineSeparator(); } - public String createAddPositiontoBestellungLink(final HertlBotArticle artikel, final Integer bestellungId) { + public String createAddPositiontoOrderLink(final HertlBotArticle artikel, final Integer bestellungId) { return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ADD_POSITION) + " " + artikel.getName() + " " + bestellungId + System.lineSeparator(); } @@ -87,13 +87,13 @@ public String createKeyForAbility(final String ability) { return KEY_PRE_SYMBOL + ability; } - private void addClearButtonBestellung(List keyboard, HertlBotOrder bestellung) { + private void addClearButtonOrder(List keyboard, HertlBotOrder bestellung) { } public ReplyKeyboardMarkup buildOrderMarkup(MessageContext context) { final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = this.loadAndShowMyBestellungenAsKeyBoard(context.chatId()); + final List keyboard = this.loadAndShowMyOrdersAsKeyBoard(context.chatId()); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); From 7747e2d903b9d4ea0946d941db25e45993504c64 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Mon, 1 Mar 2021 22:02:36 +0100 Subject: [PATCH 34/74] rights and roles subcommit --- config/formatter.xml | 390 ++++++++++++++++++ .../hertlhendl/HertlHendlBot.java | 146 ++++--- .../hertlhendl/api/RightController.java | 13 + .../hertlhendl/api/RoleController.java | 15 + .../controller/HertlRightController.java | 21 + .../controller/HertlRoleController.java | 40 ++ 6 files changed, 577 insertions(+), 48 deletions(-) create mode 100644 config/formatter.xml create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java diff --git a/config/formatter.xml b/config/formatter.xml new file mode 100644 index 0000000..7b3a115 --- /dev/null +++ b/config/formatter.xml @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 5550246..d32b1c7 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -58,14 +58,18 @@ import com.google.common.annotations.VisibleForTesting; import de.bigamgamen.java.helper.IOHelper; +import de.bigamgamen.java.telegrambots.hertlhendl.api.RightController; +import de.bigamgamen.java.telegrambots.hertlhendl.api.RoleController; import de.bigamgamen.java.telegrambots.hertlhendl.builder.TelegramKeyBoardBuilder; +import de.bigamgamen.java.telegrambots.hertlhendl.controller.HertlRightController; import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotPosition; import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArticles; -public class HertlHendlBot extends AbilityBot { +public class HertlHendlBot extends AbilityBot +{ // public static final String ABILTY_NAME_KEYBOARD = "keyboard"; public static final String ABILTY_NAME_LOCATION_PHOTO = "standortefoto"; @@ -76,24 +80,27 @@ public class HertlHendlBot extends AbilityBot { public static final String ABILTY_NAME_LIST_MY_ORDERS = "bestellungenauflistung"; public static final String ABILTY_NAME_MY_ORDERS_AS_KEYBOARD = "bestellungenkeyboard"; public static final String ABILTY_NAME_NEW_ORDER = "neuebestellung"; - public static final String ABILTY_NAME_OPEN_ORDERS = "offnenebestellungen"; + public static final String ABILTY_NAME_MY_OPEN_ORDERS = "meineoffnenebestellungen"; + public static final String ABILTY_NAME_ADMIN_OPEN_ORDERS = "offnenebestellungen"; private static final List abilities = Arrays.asList( -// ABILTY_NAME_KEYBOARD, ABILTY_NAME_LOCATION_PHOTO, ABILTY_NAME_PRICES_PHOTO, ABILTY_NAME_ITEM, ABILTY_NAME_LIST_MY_ORDERS, - ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, ABILTY_NAME_NEW_ORDER, ABILTY_NAME_OPEN_ORDERS); + ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, ABILTY_NAME_NEW_ORDER, ABILTY_NAME_MY_OPEN_ORDERS); private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; private final static String BOT_USERNAME = ""; - private static int CREATOR_ID = 929115416; + private static Integer CREATOR_ID = 929115416; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; private static HertlBotRootDao hertlBotDao; private final TelegramKeyBoardBuilder keyBoardBuilder; + private final RightController rightController; + private RoleController roleController; public static void main(final String[] args) - throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException { + throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException + { LOG.info("HertlHendlBot starting"); // final DBContext db = MapDBContext.onlineInstance("bot.db"); @@ -106,40 +113,51 @@ public static void main(final String[] args) } public HertlHendlBot(final String botToken, final String botUsername) - throws ParserConfigurationException, SAXException, IOException, URISyntaxException { + throws ParserConfigurationException, SAXException, IOException, URISyntaxException + { super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); InitArticles.initArtikels(hertlBotDao); this.keyBoardBuilder = new TelegramKeyBoardBuilder(hertlBotDao); + this.rightController = new HertlRightController(CREATOR_ID); } @Override - public int creatorId() { + public int creatorId() + { return CREATOR_ID; } - private void sendPhotoFromUpload(final String filePath, final Long chatId) { + private void sendPhotoFromUpload(final String filePath, final Long chatId) + { final SendPhoto sendPhotoRequest = new SendPhoto(); // 1 sendPhotoRequest.setChatId(Long.toString(chatId)); // 2 - try { + try + { sendPhotoRequest.setPhoto(new InputFile(IOHelper.findResource(filePath), filePath)); - } catch (final FileNotFoundException e1) { + } catch (final FileNotFoundException e1) + { // TODO Auto-generated catch block e1.printStackTrace(); - } catch (final IOException e1) { + } catch (final IOException e1) + { // TODO Auto-generated catch block e1.printStackTrace(); } // 3 - try { + try + { this.execute(sendPhotoRequest); // 4 - } catch (final TelegramApiException e) { + } catch (final TelegramApiException e) + { e.printStackTrace(); } } - public Ability showHelp() { + public Ability showHelp() + { - return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> { + return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(keyBoardBuilder.createAbilityListForHelp(abilities)); @@ -147,10 +165,12 @@ public Ability showHelp() { }).build(); } - public Ability showOrder() { + public Ability showOrder() + { return Ability.builder().name(ABILTY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) - .privacy(PUBLIC).input(1).action(context -> { + .privacy(PUBLIC).input(1).action(context -> + { final int bestellId = Integer.parseInt(context.firstArg()); final Long chatId = context.chatId(); final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); @@ -173,10 +193,12 @@ public Ability showOrder() { }).build(); } - public Ability showArticle() { + public Ability showArticle() + { return Ability.builder().name(ABILTY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) - .action(context -> { + .action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(this.loadAndShowAllArticle()); @@ -184,10 +206,12 @@ public Ability showArticle() { }).build(); } - public Ability showMyOrders() { + public Ability showMyOrders() + { return Ability.builder().name(ABILTY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) - .privacy(PUBLIC).action(context -> { + .privacy(PUBLIC).action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(this.loadAndShowMyOrder(context.chatId())); @@ -197,10 +221,12 @@ public Ability showMyOrders() { }).build(); } - public Ability showMyOrderKeyBoard() { + public Ability showMyOrderKeyBoard() + { return Ability.builder().name(ABILTY_NAME_MY_ORDERS_AS_KEYBOARD) - .info("Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> { + .info("Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText("Öffne die Bestellungen über die Tastatur: "); @@ -212,10 +238,12 @@ public Ability showMyOrderKeyBoard() { }).build(); } - public Ability createNewOrder() { + public Ability createNewOrder() + { return Ability.builder().name(ABILTY_NAME_NEW_ORDER).info("Erstellt eine neue Bestellung").locality(ALL) - .privacy(PUBLIC).action(context -> { + .privacy(PUBLIC).action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId())); @@ -223,10 +251,12 @@ public Ability createNewOrder() { }).build(); } - public Ability addPositionToOrder() { + public Ability addPositionToOrder() + { return Ability.builder().name(ABILTY_NAME_ADD_POSITION).info("Fügt eine Position zu einer Bestellung hinzu") - .locality(ALL).privacy(PUBLIC).input(2).action(context -> { + .locality(ALL).privacy(PUBLIC).input(2).action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(this.createPositionForOrder(context.firstArg(), context.chatId(), @@ -235,9 +265,11 @@ public Ability addPositionToOrder() { }).build(); } - public Ability sendKeyboard() { + public Ability sendKeyboard() + { return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC) - .action(context -> { + .action(context -> + { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText("Enjoy this wonderful keyboard!"); @@ -259,24 +291,28 @@ public Ability sendKeyboard() { }).build(); } - public Ability showPricePhoto() { + public Ability showPricePhoto() + { return Ability.builder().name(ABILTY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) .action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); } - public Ability showLocationPhoto() { + public Ability showLocationPhoto() + { return Ability.builder().name(ABILTY_NAME_LOCATION_PHOTO).info("standorteFoto Weiden").locality(ALL) .privacy(PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); } - private void makeScreenshotSenditDeleteit(final Long chatId) { + private void makeScreenshotSenditDeleteit(final Long chatId) + { final String fileName = this.makingScreenshotOfHertlHomepage(); this.sendPhotoFromUpload(fileName, chatId); final File fileToDelete = new File(fileName); fileToDelete.delete(); } - private String makingScreenshotOfHertlHomepage() { + private String makingScreenshotOfHertlHomepage() + { final ProcessBuilder processBuilder = new ProcessBuilder(); final String hertlTimeStampFileName = "hertl_standorteFoto" @@ -292,7 +328,8 @@ private String makingScreenshotOfHertlHomepage() { // Run a bat file // processBuilder.command("C:\\Users\\mkyong\\hello.bat"); - try { + try + { // -- Linux -- final String command = "sudo docker run --rm -v $PWD:/srv lifenz/docker-screenshot " + HERTL_URL + " " @@ -309,23 +346,28 @@ private String makingScreenshotOfHertlHomepage() { final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); String line; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) + { output.append(line + "\n"); } final int exitVal = process.waitFor(); System.out.println("exitvalue: " + exitVal); - if (exitVal == 0) { + if (exitVal == 0) + { System.out.println("Success!"); System.out.println(output); return hertlTimeStampFileName; - } else { + } else + { return null; } - } catch (final IOException e) { + } catch (final IOException e) + { e.printStackTrace(); - } catch (final InterruptedException e) { + } catch (final InterruptedException e) + { e.printStackTrace(); } return ""; @@ -333,17 +375,20 @@ private String makingScreenshotOfHertlHomepage() { } @VisibleForTesting - void setSender(final MessageSender sender) { + void setSender(final MessageSender sender) + { this.sender = sender; } @VisibleForTesting - void setSilent(final SilentSender silent) { + void setSilent(final SilentSender silent) + { this.silent = silent; } private String createPositionForOrder(final String artikelName, final Long chatId, - final Integer bestellungId) { + final Integer bestellungId) + { final HertlBotArticle artikel = hertlBotDao.root().artikels().ofName(artikelName); final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellungId); final Predicate positionAlreadyExist = position -> position.getArtikel().getName() @@ -353,11 +398,13 @@ private String createPositionForOrder(final String artikelName, final Long chatI final Optional positionOpt = bestellung.getPositionen().stream().filter(positionAlreadyExist) .findFirst(); - if (positionOpt.isPresent()) { + if (positionOpt.isPresent()) + { position = positionOpt.get(); position.setMenge(position.getMenge().add(BigInteger.valueOf(1L))); HertlBotRootDao.storageManager().store(position); - } else { + } else + { position = new HertlBotPosition(); position.setArtikel(artikel); bestellung.addPosition(position, HertlBotRootDao.storageManager()); @@ -367,12 +414,14 @@ private String createPositionForOrder(final String artikelName, final Long chatI } - private String loadAndShowOrder(final Long chatId, final int bestellId) { + private String loadAndShowOrder(final Long chatId, final int bestellId) + { final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); return bestellung.toString(); } - public String loadAndShowMyOrder(final Long chatId) { + public String loadAndShowMyOrder(final Long chatId) + { final StringBuilder sb = new StringBuilder( "Ihre Bestellungen:" + System.lineSeparator() + System.lineSeparator()); HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() @@ -381,7 +430,8 @@ public String loadAndShowMyOrder(final Long chatId) { return sb.toString(); } - private String loadAndShowAllArticle() { + private String loadAndShowAllArticle() + { final StringBuilder sb = new StringBuilder(); hertlBotDao.root().artikels().all() .forEach(artikel -> sb.append(artikel.toString()).append(System.lineSeparator())); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java new file mode 100644 index 0000000..e247793 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java @@ -0,0 +1,13 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.api; + +import org.telegram.telegrambots.meta.api.objects.User; + +public interface RightController { + + /** + * Checks if the User is the Admin + * @param user + * @return + */ + public boolean isAdmin(User user); +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java new file mode 100644 index 0000000..7e1065f --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java @@ -0,0 +1,15 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.api; + +import java.util.List; + +import org.telegram.telegrambots.meta.api.objects.User; + +public interface RoleController { + + /** + * Get the KeyboardShortcuts which this User can use. + * @param user + * @return + */ + public List getKeyBoardShortcutsForUser(User user); +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java new file mode 100644 index 0000000..df10824 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java @@ -0,0 +1,21 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.controller; + +import org.telegram.telegrambots.meta.api.objects.User; + +import de.bigamgamen.java.telegrambots.hertlhendl.api.RightController; + +public class HertlRightController implements RightController{ + + private final Integer id; + + + public HertlRightController(Integer idAdmin) { + this.id = idAdmin; + } + + @Override + public boolean isAdmin(User user) { + return user.getId().equals(id); + } + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java new file mode 100644 index 0000000..e8eadb8 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -0,0 +1,40 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.controller; + +import java.util.Arrays; +import java.util.List; + +import org.telegram.telegrambots.meta.api.objects.User; + +import de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot; +import de.bigamgamen.java.telegrambots.hertlhendl.api.RightController; +import de.bigamgamen.java.telegrambots.hertlhendl.api.RoleController; + +public class HertlRoleController implements RoleController { + + private static List ADMIN_SET = Arrays.asList(HertlHendlBot.ABILTY_NAME_LOCATION_PHOTO, + HertlHendlBot.ABILTY_NAME_PRICES_PHOTO, HertlHendlBot.ABILTY_NAME_ITEM, + HertlHendlBot.ABILTY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, + HertlHendlBot.ABILTY_NAME_NEW_ORDER, HertlHendlBot.ABILTY_NAME_MY_OPEN_ORDERS,HertlHendlBot.ABILTY_NAME_ADMIN_OPEN_ORDERS); + private static List USER_SET = Arrays.asList(HertlHendlBot.ABILTY_NAME_LOCATION_PHOTO, + HertlHendlBot.ABILTY_NAME_PRICES_PHOTO, HertlHendlBot.ABILTY_NAME_ITEM, + HertlHendlBot.ABILTY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, + HertlHendlBot.ABILTY_NAME_NEW_ORDER, HertlHendlBot.ABILTY_NAME_MY_OPEN_ORDERS); + + private final User user; + private final RightController rightController; + + public HertlRoleController(User user) { + this.user = user; + this.rightController = new HertlRightController( user.getId()); + } + + @Override + public List getKeyBoardShortcutsForUser(User user) { + if (rightController.isAdmin(user)) { + return ADMIN_SET; + } else { + return USER_SET; + } + } + +} From 71f04494cabe106905da30d58c7622dd845e29f0 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sun, 7 Mar 2021 10:34:03 +0100 Subject: [PATCH 35/74] BotMain clean up --- herthaehnchen_bot.wal.0 | Bin 0 -> 447 bytes .../hertlhendl/HertlHendlBot.java | 63 +++++++----------- .../api/RightAndRoleController.java | 30 +++++++++ .../hertlhendl/api/RightController.java | 13 ---- 4 files changed, 54 insertions(+), 52 deletions(-) create mode 100644 herthaehnchen_bot.wal.0 create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightAndRoleController.java delete mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java diff --git a/herthaehnchen_bot.wal.0 b/herthaehnchen_bot.wal.0 new file mode 100644 index 0000000000000000000000000000000000000000..0c84d6dc4134319b12e0f553d8b08ca98cf13b4c GIT binary patch literal 447 zcmY+AKT88a5XI+C0tqT;6m1mz1eaE@N-QMd5>T2*4TkX!g{k@sj@L}xi-b|$F8x*vHicm>lkYS=oZ*+--(LoOl z35cYDh&tGIg&mD*DZ1}=A3q*^D1|WHCcGgi-%!FzZD20!kUps}!jno(2!@2Og|O&U zTS($6V?$vRwI&Jb12_aPgwj4$+O&wXgYrMXwo#NP?!Qmtade#2TPcMyb getKeyBoardShortcutsForUser(User user); + + /** + * Checks if the user can use the Ability + * @param ability + * @param user + * @return + */ + public Boolean canUseAbility(User user, String ability); +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java deleted file mode 100644 index e247793..0000000 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.bigamgamen.java.telegrambots.hertlhendl.api; - -import org.telegram.telegrambots.meta.api.objects.User; - -public interface RightController { - - /** - * Checks if the User is the Admin - * @param user - * @return - */ - public boolean isAdmin(User user); -} From a1364475d2ce1042ca547fae16cf4abf24be1ce8 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sun, 7 Mar 2021 11:10:59 +0100 Subject: [PATCH 36/74] Rights implemented --- herthaehnchen_bot.wal.0 | Bin 447 -> 0 bytes .../hertlhendl/HertlHendlBot.java | 235 ++++++++++-------- .../api/RightAndRoleController.java | 30 --- .../hertlhendl/api/RightController.java | 16 ++ .../hertlhendl/api/RoleController.java | 10 +- .../builder/TelegramKeyBoardBuilder.java | 4 +- .../controller/HertlRightController.java | 10 +- .../controller/HertlRoleController.java | 47 ++-- 8 files changed, 197 insertions(+), 155 deletions(-) delete mode 100644 herthaehnchen_bot.wal.0 delete mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightAndRoleController.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java diff --git a/herthaehnchen_bot.wal.0 b/herthaehnchen_bot.wal.0 deleted file mode 100644 index 0c84d6dc4134319b12e0f553d8b08ca98cf13b4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmY+AKT88a5XI+C0tqT;6m1mz1eaE@N-QMd5>T2*4TkX!g{k@sj@L}xi-b|$F8x*vHicm>lkYS=oZ*+--(LoOl z35cYDh&tGIg&mD*DZ1}=A3q*^D1|WHCcGgi-%!FzZD20!kUps}!jno(2!@2Og|O&U zTS($6V?$vRwI&Jb12_aPgwj4$+O&wXgYrMXwo#NP?!Qmtade#2TPcMyb abilities = Arrays.asList( - ABILTY_NAME_LOCATION_PHOTO, ABILTY_NAME_PRICES_PHOTO, ABILTY_NAME_ITEM, ABILTY_NAME_LIST_MY_ORDERS, - ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, ABILTY_NAME_NEW_ORDER, ABILTY_NAME_MY_OPEN_ORDERS); + public static final String ABILITY_NAME_HELP = "help"; + public static final String ABILITY_NAME_LOCATION_PHOTO = "standortefoto"; + public static final String ABILITY_NAME_PRICES_PHOTO = "preisefoto"; + public static final String ABILITY_NAME_ORDER = "bestellung"; + public static final String ABILITY_NAME_ITEM = "artikel"; + public static final String ABILITY_NAME_ADD_POSITION = "addposition"; + public static final String ABILITY_NAME_LIST_MY_ORDERS = "bestellungenauflistung"; + public static final String ABILITY_NAME_MY_ORDERS_AS_KEYBOARD = "bestellungenkeyboard"; + public static final String ABILITY_NAME_NEW_ORDER = "neuebestellung"; + public static final String ABILITY_NAME_MY_OPEN_ORDERS = "meineoffnenebestellungen"; + public static final String ABILITY_NAME_ADMIN_OPEN_ORDERS = "adminoffnenebestellungen"; private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); @@ -96,7 +95,7 @@ public class HertlHendlBot extends AbilityBot private final TelegramKeyBoardBuilder keyBoardBuilder; private final RightController rightController; - private RoleController roleController; + private RoleController roleController; public static void main(final String[] args) throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException @@ -106,7 +105,7 @@ public static void main(final String[] args) final String token = args[0] != null ? args[0] : BOT_TOKEN; final String username = args[1] != null ? args[1] : BOT_USERNAME; final Long adminId = args[2] != null ? Long.parseLong(args[2]) : ADMIN_ID; - final HertlHendlBot bot = new HertlHendlBot(token, username,adminId); + final HertlHendlBot bot = new HertlHendlBot(token, username, adminId); TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class); api.registerBot(bot); LOG.info("HertlHendlBot successfull started"); @@ -120,6 +119,7 @@ public HertlHendlBot(final String botToken, final String botUsername, final Long InitArticles.initArtikels(hertlBotDao); this.keyBoardBuilder = new TelegramKeyBoardBuilder(hertlBotDao); this.rightController = new HertlRightController(adminId); + this.roleController = new HertlRoleController(rightController); } @Override @@ -128,116 +128,137 @@ public int creatorId() return CREATOR_ID; } - public Ability showHelp() { - return Ability.builder().name("help").info("shows help").locality(ALL).privacy(PUBLIC).action(context -> - { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(keyBoardBuilder.createAbilityListForHelp(abilities)); - this.silent.execute(message); - }).build(); + return Ability.builder().name(ABILITY_NAME_HELP).info("shows help").locality(ALL).privacy(PUBLIC) + .action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(keyBoardBuilder.createAbilityListForHelp(roleController.getAbilitiesForUser(context.user()))); + this.silent.execute(message); + } + }).build(); } public Ability showOrder() { - return Ability.builder().name(ABILTY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) + return Ability.builder().name(ABILITY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) .privacy(PUBLIC).input(1).action(context -> { - final int bestellId = Integer.parseInt(context.firstArg()); - final Long chatId = context.chatId(); - final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - final String messageText = bestellung.toString() + System.lineSeparator() - + "Füge Positionen zu deiner Bestellung hinzu"; - - message.setText(messageText); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = keyBoardBuilder - .loadAndShowAllArticleForOrder(context.chatId(), bestellId); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - this.silent.execute(message); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final int bestellId = Integer.parseInt(context.firstArg()); + final Long chatId = context.chatId(); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + final String messageText = bestellung.toString() + System.lineSeparator() + + "Füge Positionen zu deiner Bestellung hinzu"; + + message.setText(messageText); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = keyBoardBuilder + .loadAndShowAllArticleForOrder(context.chatId(), bestellId); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + } }).build(); } public Ability showArticle() { - return Ability.builder().name(ABILTY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) + return Ability.builder().name(ABILITY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowAllArticle()); - this.silent.execute(message); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(this.loadAndShowAllArticle()); + this.silent.execute(message); + } }).build(); } public Ability showMyOrders() { - return Ability.builder().name(ABILTY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) + return Ability.builder().name(ABILITY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) .privacy(PUBLIC).action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowMyOrder(context.chatId())); - final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); - message.setReplyMarkup(keyboardMarkup); - this.silent.execute(message); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(this.loadAndShowMyOrder(context.chatId())); + final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); + message.setReplyMarkup(keyboardMarkup); + this.silent.execute(message); + } }).build(); } public Ability showMyOrderKeyBoard() { - return Ability.builder().name(ABILTY_NAME_MY_ORDERS_AS_KEYBOARD) + return Ability.builder().name(ABILITY_NAME_MY_ORDERS_AS_KEYBOARD) .info("Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText("Öffne die Bestellungen über die Tastatur: "); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText("Öffne die Bestellungen über die Tastatur: "); - final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); - message.setReplyMarkup(keyboardMarkup); + final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); + message.setReplyMarkup(keyboardMarkup); - this.silent.execute(message); + this.silent.execute(message); + } }).build(); } public Ability createNewOrder() { - return Ability.builder().name(ABILTY_NAME_NEW_ORDER).info("Erstellt eine neue Bestellung").locality(ALL) + return Ability.builder().name(ABILITY_NAME_NEW_ORDER).info("Erstellt eine neue Bestellung").locality(ALL) .privacy(PUBLIC).action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId())); - this.silent.execute(message); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId())); + this.silent.execute(message); + } }).build(); } public Ability addPositionToOrder() { - return Ability.builder().name(ABILTY_NAME_ADD_POSITION).info("Fügt eine Position zu einer Bestellung hinzu") + return Ability.builder().name(ABILITY_NAME_ADD_POSITION).info("Fügt eine Position zu einer Bestellung hinzu") .locality(ALL).privacy(PUBLIC).input(2).action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText(this.createPositionForOrder(context.firstArg(), context.chatId(), - Integer.valueOf(context.secondArg()))); - this.silent.execute(message); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(this.createPositionForOrder(context.firstArg(), context.chatId(), + Integer.valueOf(context.secondArg()))); + this.silent.execute(message); + } }).build(); } @@ -246,37 +267,52 @@ public Ability sendKeyboard() return Ability.builder().name("keyboard").info("send a custom keyboard").locality(ALL).privacy(PUBLIC) .action(context -> { - final SendMessage message = new SendMessage(); - message.setChatId(Long.toString(context.chatId())); - message.setText("Enjoy this wonderful keyboard!"); - - final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = new ArrayList<>(); - - // row 1 - final KeyboardRow row = new KeyboardRow(); - row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_PRICES_PHOTO)); - row.add(keyBoardBuilder.createKeyForAbility(ABILTY_NAME_LOCATION_PHOTO)); - keyboard.add(row); - - // activate the keyboard - keyboardMarkup.setKeyboard(keyboard); - message.setReplyMarkup(keyboardMarkup); - - this.silent.execute(message); + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText("Enjoy this wonderful keyboard!"); + + final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); + final List keyboard = new ArrayList<>(); + + // row 1 + final KeyboardRow row = new KeyboardRow(); + row.add(keyBoardBuilder.createKeyForAbility(ABILITY_NAME_PRICES_PHOTO)); + row.add(keyBoardBuilder.createKeyForAbility(ABILITY_NAME_LOCATION_PHOTO)); + keyboard.add(row); + + // activate the keyboard + keyboardMarkup.setKeyboard(keyboard); + message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + } }).build(); } public Ability showPricePhoto() { - return Ability.builder().name(ABILTY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) - .action(context -> this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId())).build(); + return Ability.builder().name(ABILITY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) + .action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId()); + } + }).build(); } public Ability showLocationPhoto() { - return Ability.builder().name(ABILTY_NAME_LOCATION_PHOTO).info("standorteFoto Weiden").locality(ALL) - .privacy(PUBLIC).action(context -> this.makeScreenshotSenditDeleteit(context.chatId())).build(); + return Ability.builder().name(ABILITY_NAME_LOCATION_PHOTO).info("standorteFoto Weiden").locality(ALL) + .privacy(PUBLIC).action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + { + this.makeScreenshotSenditDeleteit(context.chatId()); + } + }).build(); } private void makeScreenshotSenditDeleteit(final Long chatId) @@ -286,7 +322,6 @@ private void makeScreenshotSenditDeleteit(final Long chatId) final File fileToDelete = new File(fileName); fileToDelete.delete(); } - private void sendPhotoFromUpload(final String filePath, final Long chatId) { @@ -297,13 +332,13 @@ private void sendPhotoFromUpload(final String filePath, final Long chatId) sendPhotoRequest.setPhoto(new InputFile(IOHelper.findResource(filePath), filePath)); } catch (final Exception e1) { - LOG.error("Fehler beim schicken des Photos:{}",e1); - } + LOG.error("Fehler beim schicken des Photos:{}", e1); + } } /** - * Make an Screenshot of the Hmepage with docker. - * Works only on Linux + * Make an Screenshot of the Hmepage with docker. Works only on Linux + * * @return Fullqualified Filename to load from Hdd. */ private String makingScreenshotOfHertlHomepage() diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightAndRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightAndRoleController.java deleted file mode 100644 index 4bfdec4..0000000 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightAndRoleController.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.bigamgamen.java.telegrambots.hertlhendl.api; - -import java.util.List; - -import org.telegram.telegrambots.meta.api.objects.User; - -public interface RightAndRoleController { - - /** - * Checks if the User is the Admin - * @param user - * @return - */ - public boolean isAdmin(User user); - - /** - * Get the KeyboardShortcuts which this User can use. - * @param user - * @return - */ - public List getKeyBoardShortcutsForUser(User user); - - /** - * Checks if the user can use the Ability - * @param ability - * @param user - * @return - */ - public Boolean canUseAbility(User user, String ability); -} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java new file mode 100644 index 0000000..11910b3 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RightController.java @@ -0,0 +1,16 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.api; + +import java.util.List; + +import org.telegram.telegrambots.meta.api.objects.User; + +public interface RightController { + + /** + * Checks if the User is the Admin + * @param user + * @return + */ + public boolean isAdmin(User user); + +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java index 7e1065f..3c025a6 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/api/RoleController.java @@ -11,5 +11,13 @@ public interface RoleController { * @param user * @return */ - public List getKeyBoardShortcutsForUser(User user); + public List getAbilitiesForUser(User user); + + /** + * Checks if the user can use the Ability + * @param ability + * @param user + * @return + */ + public Boolean canUseAbility(User user, String ability); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 055590c..d96e432 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -68,12 +68,12 @@ public String createAndShowNewOrder(final Long chatId) { } public String createOrderLink(final HertlBotOrder bestellung) { - return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ORDER) + " " + Integer.toString(bestellung.getIndex()) + return this.createKeyForAbility(HertlHendlBot.ABILITY_NAME_ORDER) + " " + Integer.toString(bestellung.getIndex()) + System.lineSeparator(); } public String createAddPositiontoOrderLink(final HertlBotArticle artikel, final Integer bestellungId) { - return this.createKeyForAbility(HertlHendlBot.ABILTY_NAME_ADD_POSITION) + " " + artikel.getName() + " " + return this.createKeyForAbility(HertlHendlBot.ABILITY_NAME_ADD_POSITION) + " " + artikel.getName() + " " + bestellungId + System.lineSeparator(); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java index df10824..bad5e90 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java @@ -6,16 +6,18 @@ public class HertlRightController implements RightController{ - private final Integer id; + private final Long adminId; - public HertlRightController(Integer idAdmin) { - this.id = idAdmin; + public HertlRightController(Long adminId) { + this.adminId = adminId; } + @Override public boolean isAdmin(User user) { - return user.getId().equals(id); + return Long.valueOf(user.getId()).equals(this.adminId); } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java index e8eadb8..90bce57 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -5,36 +5,47 @@ import org.telegram.telegrambots.meta.api.objects.User; -import de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot; +import de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot; import de.bigamgamen.java.telegrambots.hertlhendl.api.RightController; import de.bigamgamen.java.telegrambots.hertlhendl.api.RoleController; -public class HertlRoleController implements RoleController { +public class HertlRoleController implements RoleController +{ - private static List ADMIN_SET = Arrays.asList(HertlHendlBot.ABILTY_NAME_LOCATION_PHOTO, - HertlHendlBot.ABILTY_NAME_PRICES_PHOTO, HertlHendlBot.ABILTY_NAME_ITEM, - HertlHendlBot.ABILTY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, - HertlHendlBot.ABILTY_NAME_NEW_ORDER, HertlHendlBot.ABILTY_NAME_MY_OPEN_ORDERS,HertlHendlBot.ABILTY_NAME_ADMIN_OPEN_ORDERS); - private static List USER_SET = Arrays.asList(HertlHendlBot.ABILTY_NAME_LOCATION_PHOTO, - HertlHendlBot.ABILTY_NAME_PRICES_PHOTO, HertlHendlBot.ABILTY_NAME_ITEM, - HertlHendlBot.ABILTY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILTY_NAME_MY_ORDERS_AS_KEYBOARD, - HertlHendlBot.ABILTY_NAME_NEW_ORDER, HertlHendlBot.ABILTY_NAME_MY_OPEN_ORDERS); + private static List ADMIN_SET = Arrays.asList(HertlHendlBot.ABILITY_NAME_HELP,HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, + HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, + HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, + HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, + HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS); + private static List USER_SET = Arrays.asList(HertlHendlBot.ABILITY_NAME_HELP,HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, + HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, + HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, + HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS); - private final User user; - private final RightController rightController; + private RightController rigthController; - public HertlRoleController(User user) { - this.user = user; - this.rightController = new HertlRightController( user.getId()); + public HertlRoleController(RightController rigthController) + { + this.rigthController = rigthController; } @Override - public List getKeyBoardShortcutsForUser(User user) { - if (rightController.isAdmin(user)) { + public List getAbilitiesForUser(User user) + { + if (rigthController.isAdmin(user)) + { return ADMIN_SET; - } else { + } else + { return USER_SET; } } + @Override + public Boolean canUseAbility(User user, String ability) + { + List roles = getAbilitiesForUser(user); + return roles.contains(ability); + } + } From 3d5f8ba525945f1f52f23a9efd4eb457c4c64a6b Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sun, 7 Mar 2021 22:01:00 +0100 Subject: [PATCH 37/74] order close implementetd --- .../hertlhendl/HertlHendlBot.java | 39 ++++++++++++++++++- .../builder/TelegramKeyBoardBuilder.java | 5 +++ .../controller/HertlRoleController.java | 4 +- .../hertlhendl/domain/HertlBotOrder.java | 14 ++++++- .../hertlhendl/init/InitArticles.java | 32 ++++++++------- 5 files changed, 75 insertions(+), 19 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index c2e3424..32d5800 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -83,6 +83,10 @@ public class HertlHendlBot extends AbilityBot public static final String ABILITY_NAME_NEW_ORDER = "neuebestellung"; public static final String ABILITY_NAME_MY_OPEN_ORDERS = "meineoffnenebestellungen"; public static final String ABILITY_NAME_ADMIN_OPEN_ORDERS = "adminoffnenebestellungen"; + public static final String ABILITY_NAME_CLOSE_ORDER = "closeorder"; + + private static final String MESSAGE_CLOSE_ALREADY_SUCCESSFULL = "Die Bestellung wurde erfolgreich abgeschlossen."; + private static final String MESSAGE_CLOSE_ALREADY_CLOSED = "Die Bestellung ist bereits abgeschlossen."; private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); @@ -138,7 +142,8 @@ public Ability showHelp() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(keyBoardBuilder.createAbilityListForHelp(roleController.getAbilitiesForUser(context.user()))); + message.setText(keyBoardBuilder + .createAbilityListForHelp(roleController.getAbilitiesForUser(context.user()))); this.silent.execute(message); } }).build(); @@ -291,6 +296,38 @@ public Ability sendKeyboard() }).build(); } + public Ability closeOrder() + { + + return Ability.builder().name(ABILITY_NAME_CLOSE_ORDER).info("Schließt die Bestellung ab.").locality(ALL) + .privacy(PUBLIC) + .input(1) + .action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_CLOSE_ORDER)) + { + final int bestellId = Integer.parseInt(context.firstArg()); + final Long chatId = context.chatId(); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + + if (bestellung.isClosed()) + { + + message.setText(MESSAGE_CLOSE_ALREADY_CLOSED); + } else + { + bestellung.setClosed(true); + HertlBotRootDao.storageManager().store(bestellung); + message.setText(MESSAGE_CLOSE_ALREADY_SUCCESSFULL); + } + + this.silent.execute(message); + } + }).build(); + } + public Ability showPricePhoto() { return Ability.builder().name(ABILITY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index d96e432..1b66f76 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -5,6 +5,7 @@ import org.telegram.abilitybots.api.objects.MessageContext; import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardButton; import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot; @@ -39,6 +40,10 @@ public List loadAndShowAllArticleForOrder(final Long chatId, final hertlBotDao.root().artikels().all().forEach( artikel -> addButtonToKeyBoard(keyboard, createAddPositiontoOrderLink(artikel, bestellungId))); + KeyboardRow row = new KeyboardRow(); + row.add(new KeyboardButton(createKeyForAbility(HertlHendlBot.ABILITY_NAME_CLOSE_ORDER+" "+bestellungId))); + keyboard.add(row); + return keyboard; } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java index 90bce57..eb500b9 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -16,11 +16,11 @@ public class HertlRoleController implements RoleController HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, - HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS); + HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_CLOSE_ORDER); private static List USER_SET = Arrays.asList(HertlHendlBot.ABILITY_NAME_HELP,HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, - HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS); + HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_CLOSE_ORDER); private RightController rigthController; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java index 8be2931..175f7f5 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java @@ -10,12 +10,14 @@ public class HertlBotOrder { + private static final String BESTELLUNG_CLOSED = "GESCHLOSSEN"; private static final String BESTELLUNG_TITLE = "Ihre Bestellung:"; private static final String DD_MM_YYYY = "dd-MM-yyyy"; private int index; private LocalDate bestellDatum; private HertlBotUser user; private List positionen; + private Boolean closed = false; public HertlBotOrder() { @@ -42,7 +44,7 @@ public String getBestellDatumFormated() { @Override public String toString() { final StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); - sb.append(" Vom: "+this.getBestellDatumFormated()+System.lineSeparator()); + sb.append(" Vom: "+this.getBestellDatumFormated()+ "." + (isClosed() ? BESTELLUNG_CLOSED:"")+System.lineSeparator()); this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); sb.append("Summe: "+ this.getSumme()); return sb.toString(); @@ -90,6 +92,16 @@ public int getIndex() { public void setIndex(final int index) { this.index = index; } + + public Boolean isClosed() + { + return closed; + } + + public void setClosed(Boolean closed) + { + this.closed = closed; + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index 6088541..70dfcf7 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -6,25 +6,27 @@ import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser; + +public class InitArticles +{ + + private InitArticles() + { -public class InitArticles { - - private InitArticles() { - } - + public synchronized static void initArtikels(final HertlBotRootDao dao) { - final List artikelList= new ArrayList<>(); - - artikelList.add(new HertlBotArticle(1,"1/2-Hähnchen", BigInteger.valueOf(380L))); - artikelList.add(new HertlBotArticle(2,"Hähnchen-Schenkel", BigInteger.valueOf(200L))); - artikelList.add(new HertlBotArticle(3,"Krautsalat", BigInteger.valueOf(150L))); - artikelList.add(new HertlBotArticle(4,"Brezel-klein", BigInteger.valueOf(80L))); - artikelList.add(new HertlBotArticle(5,"Brezel-groß", BigInteger.valueOf(160L))); - + final List artikelList = new ArrayList<>(); + + artikelList.add(new HertlBotArticle(1, "1/2-Hähnchen", BigInteger.valueOf(380L))); + artikelList.add(new HertlBotArticle(2, "Hähnchen-Schenkel", BigInteger.valueOf(200L))); + artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(150L))); + artikelList.add(new HertlBotArticle(4, "Brezel-klein", BigInteger.valueOf(80L))); + artikelList.add(new HertlBotArticle(5, "Brezel-groß", BigInteger.valueOf(160L))); + dao.root().artikels().addAll(artikelList); - } - + } From 0193b2d80ac77aac9062758863b0684ef869f463 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Mon, 8 Mar 2021 22:09:13 +0100 Subject: [PATCH 38/74] order committed --- herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../hertlhendl/HertlHendlBot.java | 53 ++++++++++++++++ .../builder/TelegramKeyBoardBuilder.java | 2 +- .../controller/HertlRoleController.java | 4 +- .../hertlhendl/dal/HertlBotRootDao.java | 57 ++++++++++++++---- .../hertlhendl/domain/HertlBotOrder.java | 15 ++++- 6 files changed, 115 insertions(+), 16 deletions(-) diff --git a/herthaehnchen_bot b/herthaehnchen_bot index 36c6c1617e58f4c4b80052661d6001dd13f2a0c5..82625a29044606d52da0bd6828246cb3dd372782 100644 GIT binary patch delta 315 zcmZo@Xkcsr;t8VCr$ag!KtMpY5==8NrhsXM(-S8jY!v5YWZ(wL%Iu!#;J9((js|v7 zu;QS}0gVL$jB7z0sYMJSU^T(b2OHZDHZlS+6A&{4F$)m00x=s9vjZ^)5OV@C7Z7s; zF%J;)0x{qAgN^(f8@D$y3&@La;}=k4WM>ObOv=nlovtAu;K?GZ*Dz^%seph1b3sAD v^tA#4fwCZ>)eS(45nutB$;`pj4Rre)K1P_#8YvFH0~9*$K;z~Mjkgm3%7150 delta 206 zcmW;Ey9vTz6o%o%c!}4&64tsyH2X(JY~a09DXos@=VKx0E`k!2padl-K?zDwf)bRV1SKdz$&#BrKK45O E03Huky8r+H diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 32d5800..cf17dc8 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -84,9 +84,12 @@ public class HertlHendlBot extends AbilityBot public static final String ABILITY_NAME_MY_OPEN_ORDERS = "meineoffnenebestellungen"; public static final String ABILITY_NAME_ADMIN_OPEN_ORDERS = "adminoffnenebestellungen"; public static final String ABILITY_NAME_CLOSE_ORDER = "closeorder"; + public static final String ABILITY_NAME_COMMIT_ORDER = "commitorder"; private static final String MESSAGE_CLOSE_ALREADY_SUCCESSFULL = "Die Bestellung wurde erfolgreich abgeschlossen."; private static final String MESSAGE_CLOSE_ALREADY_CLOSED = "Die Bestellung ist bereits abgeschlossen."; + private static final String MESSAGE_ALREADY_COMMITED = "Die Bestellung wurde bereits bestätigt"; + private static final String MESSAGE_COMMIT_SUCCESSFULL = "Die Bestellung wurde erfolgreich bestätigt"; private static final String HENDL_PREISE_JPG = "hendl_preise.jpg"; private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); @@ -213,6 +216,24 @@ public Ability showMyOrders() } }).build(); } + + public Ability showAdminOpenOrders() + { + + return Ability.builder().name(ABILITY_NAME_ADMIN_OPEN_ORDERS).info("Zeigt die offenen Bestellungen").locality(ALL) + .privacy(PUBLIC).action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_ADMIN_OPEN_ORDERS)) + { + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + message.setText(this.loadAndShowMyOrder(context.chatId())); + final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); + message.setReplyMarkup(keyboardMarkup); + this.silent.execute(message); + } + }).build(); + } public Ability showMyOrderKeyBoard() { @@ -327,6 +348,38 @@ public Ability closeOrder() } }).build(); } + + public Ability commitOrder() + { + + return Ability.builder().name(ABILITY_NAME_COMMIT_ORDER).info("Bestätigt die Bestellung.").locality(ALL) + .privacy(PUBLIC) + .input(1) + .action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_COMMIT_ORDER)) + { + final int bestellId = Integer.parseInt(context.firstArg()); + final Long chatId = context.chatId(); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final SendMessage message = new SendMessage(); + message.setChatId(Long.toString(context.chatId())); + + if (bestellung.isCommited()) + { + + message.setText(MESSAGE_ALREADY_COMMITED); + } else + { + bestellung.setCommited(true); + HertlBotRootDao.storageManager().store(bestellung); + message.setText(MESSAGE_COMMIT_SUCCESSFULL); + } + + this.silent.execute(message); + } + }).build(); + } public Ability showPricePhoto() { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 1b66f76..8ec9cb6 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -41,7 +41,7 @@ public List loadAndShowAllArticleForOrder(final Long chatId, final artikel -> addButtonToKeyBoard(keyboard, createAddPositiontoOrderLink(artikel, bestellungId))); KeyboardRow row = new KeyboardRow(); - row.add(new KeyboardButton(createKeyForAbility(HertlHendlBot.ABILITY_NAME_CLOSE_ORDER+" "+bestellungId))); + row.add(new KeyboardButton(createKeyForAbility(HertlHendlBot.ABILITY_NAME_COMMIT_ORDER+" "+bestellungId))); keyboard.add(row); return keyboard; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java index eb500b9..1294aca 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -16,11 +16,11 @@ public class HertlRoleController implements RoleController HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, - HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_CLOSE_ORDER); + HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); private static List USER_SET = Arrays.asList(HertlHendlBot.ABILITY_NAME_HELP,HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, - HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_CLOSE_ORDER); + HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); private RightController rigthController; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index 87aaa2a..b291bdd 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -1,8 +1,13 @@ package de.bigamgamen.java.telegrambots.hertlhendl.dal; import java.nio.file.Paths; +import java.time.LocalDate; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collectors; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotRoot; @@ -11,15 +16,29 @@ import one.microstream.storage.types.EmbeddedStorageFoundation; import one.microstream.storage.types.EmbeddedStorageManager; -public class HertlBotRootDao { +public class HertlBotRootDao +{ private final static EmbeddedStorageManager storageManager = createStorageManager(); - public HertlBotRootDao() { + private Predicate openOrderUntilToday = new Predicate() + { + @Override + public boolean test(HertlBotOrder t) + { + LocalDate now = LocalDate.now(); + LocalDate orderDate = t.getBestellDatum(); + return (orderDate.isBefore(now) || orderDate.equals(now)) && !t.isClosed() && t.isCommited(); + } + }; + + public HertlBotRootDao() + { } - private static EmbeddedStorageManager createStorageManager() { + private static EmbeddedStorageManager createStorageManager() + { final Configuration configuration = Configuration.Default(); configuration.setBaseDirectory(Paths.get("data", "storage").toString()); configuration.setChannelCount(2); @@ -28,7 +47,8 @@ private static EmbeddedStorageManager createStorageManager() { final EmbeddedStorageManager storageManager = foundation.createEmbeddedStorageManager().start(); - if (storageManager.root() == null) { + if (storageManager.root() == null) + { final HertlBotRoot root = new HertlBotRoot(); storageManager.setRoot(root); storageManager.storeRoot(); @@ -37,26 +57,31 @@ private static EmbeddedStorageManager createStorageManager() { return storageManager; } - public static EmbeddedStorageManager storageManager() { + public static EmbeddedStorageManager storageManager() + { return storageManager; } - public HertlBotRoot root() { + public HertlBotRoot root() + { return (HertlBotRoot) storageManager().root(); } - public HertlBotOrder loadBestellung(Long chatId, int bestellId) { + public HertlBotOrder loadBestellung(Long chatId, int bestellId) + { HertlBotUser user = loadUser(chatId); return user.getBestellungen().stream().filter(bestellung -> bestellung.getIndex() == bestellId).findFirst() .get(); } - public HertlBotUser loadUser(Long chatId) { + public HertlBotUser loadUser(Long chatId) + { Optional userOpt = root().users().ofId(chatId); - if (userOpt.isPresent()) { + if (userOpt.isPresent()) + { return userOpt.get(); } @@ -65,7 +90,8 @@ public HertlBotUser loadUser(Long chatId) { return user; } - public HertlBotOrder createNewBestellungForUser(Long chatId) { + public HertlBotOrder createNewBestellungForUser(Long chatId) + { HertlBotUser user = this.loadUser(chatId); HertlBotOrder bestellung = new HertlBotOrder(user, new ArrayList<>()); user.addBestellung(bestellung, storageManager); @@ -73,7 +99,16 @@ public HertlBotOrder createNewBestellungForUser(Long chatId) { return bestellung; } - public void shutDown() { + public List loadOpenOrdersForToday() + { + List orders = new ArrayList<>(); + root().users().all().forEach(user -> orders + .addAll(user.getBestellungen().stream().filter(openOrderUntilToday).collect(Collectors.toList()))); + return orders; + } + + public void shutDown() + { storageManager.shutdown(); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java index 175f7f5..05e7cc0 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java @@ -10,13 +10,14 @@ public class HertlBotOrder { - private static final String BESTELLUNG_CLOSED = "GESCHLOSSEN"; + private static final String BESTELLUNG_COMMITED = "BESTÄTIGT"; private static final String BESTELLUNG_TITLE = "Ihre Bestellung:"; private static final String DD_MM_YYYY = "dd-MM-yyyy"; private int index; private LocalDate bestellDatum; private HertlBotUser user; private List positionen; + private Boolean commited = false; private Boolean closed = false; public HertlBotOrder() { @@ -44,7 +45,7 @@ public String getBestellDatumFormated() { @Override public String toString() { final StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); - sb.append(" Vom: "+this.getBestellDatumFormated()+ "." + (isClosed() ? BESTELLUNG_CLOSED:"")+System.lineSeparator()); + sb.append(" Vom: "+this.getBestellDatumFormated()+ "." + (isCommited() ? BESTELLUNG_COMMITED:"")+System.lineSeparator()); this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); sb.append("Summe: "+ this.getSumme()); return sb.toString(); @@ -103,6 +104,16 @@ public void setClosed(Boolean closed) this.closed = closed; } + public Boolean isCommited() + { + return this.commited; + } + + public void setCommited(Boolean commited) + { + this.commited = commited; + } + } From b2046870cf5aedbc9854bf67b180e0483eb1ebfb Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Tue, 9 Mar 2021 21:33:44 +0100 Subject: [PATCH 39/74] add username to orderuser --- .../hertlhendl/HertlHendlBot.java | 56 +++++++------------ .../builder/TelegramKeyBoardBuilder.java | 11 ++-- .../hertlhendl/dal/HertlBotRootDao.java | 13 ++--- .../hertlhendl/domain/HertlBotOrder.java | 7 +-- .../hertlhendl/domain/HertlBotUser.java | 20 +++++-- .../hertlhendl/helper/OrderHelper.java | 53 ++++++++++++++++++ .../hertlhendl/helper/TelegramHelper.java | 20 +++++++ .../hertlhendl/init/InitArticles.java | 1 - 8 files changed, 121 insertions(+), 60 deletions(-) create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java create mode 100644 src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/TelegramHelper.java diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index cf17dc8..2b70cef 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -23,7 +23,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; import java.math.BigInteger; @@ -31,7 +30,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -42,7 +40,6 @@ import org.slf4j.LoggerFactory; import org.telegram.abilitybots.api.bot.AbilityBot; import org.telegram.abilitybots.api.objects.Ability; -import org.telegram.abilitybots.api.objects.MessageContext; import org.telegram.abilitybots.api.sender.MessageSender; import org.telegram.abilitybots.api.sender.SilentSender; import org.telegram.telegrambots.meta.TelegramBotsApi; @@ -67,6 +64,8 @@ import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotPosition; +import de.bigamgamen.java.telegrambots.hertlhendl.helper.OrderHelper; +import de.bigamgamen.java.telegrambots.hertlhendl.helper.TelegramHelper; import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArticles; public class HertlHendlBot extends AbilityBot @@ -162,7 +161,7 @@ public Ability showOrder() { final int bestellId = Integer.parseInt(context.firstArg()); final Long chatId = context.chatId(); - final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, TelegramHelper.getTotalUserName(context.user()), bestellId); final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); final String messageText = bestellung.toString() + System.lineSeparator() @@ -209,7 +208,7 @@ public Ability showMyOrders() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowMyOrder(context.chatId())); + message.setText(this.loadAndShowMyOrder(context.chatId(), TelegramHelper.getTotalUserName(context.user()))); final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); message.setReplyMarkup(keyboardMarkup); this.silent.execute(message); @@ -227,7 +226,7 @@ public Ability showAdminOpenOrders() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowMyOrder(context.chatId())); + message.setText(this.loadAndShowMyOrder(context.chatId(), TelegramHelper.getTotalUserName(context.user()))); final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); message.setReplyMarkup(keyboardMarkup); this.silent.execute(message); @@ -265,7 +264,7 @@ public Ability createNewOrder() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId())); + message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId(), TelegramHelper.getTotalUserName(context.user()))); this.silent.execute(message); } }).build(); @@ -281,7 +280,7 @@ public Ability addPositionToOrder() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.createPositionForOrder(context.firstArg(), context.chatId(), + message.setText(this.createPositionForOrder(context.firstArg(), context.chatId(), TelegramHelper.getTotalUserName(context.user()), Integer.valueOf(context.secondArg()))); this.silent.execute(message); } @@ -329,7 +328,7 @@ public Ability closeOrder() { final int bestellId = Integer.parseInt(context.firstArg()); final Long chatId = context.chatId(); - final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, TelegramHelper.getTotalUserName(context.user()), bestellId); final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -361,7 +360,7 @@ public Ability commitOrder() { final int bestellId = Integer.parseInt(context.firstArg()); final Long chatId = context.chatId(); - final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, TelegramHelper.getTotalUserName(context.user()), bestellId); final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -496,46 +495,31 @@ void setSilent(final SilentSender silent) this.silent = silent; } - private String createPositionForOrder(final String artikelName, final Long chatId, + private String createPositionForOrder(final String artikelName, final Long chatId, String userName, final Integer bestellungId) { final HertlBotArticle artikel = hertlBotDao.root().artikels().ofName(artikelName); - final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellungId); - final Predicate positionAlreadyExist = position -> position.getArtikel().getName() - .equals(artikel.getName()); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, userName, bestellungId); + OrderHelper.addArticleToOrder(artikel,BigInteger.valueOf(1L), bestellung); - HertlBotPosition position; - - final Optional positionOpt = bestellung.getPositionen().stream().filter(positionAlreadyExist) - .findFirst(); - if (positionOpt.isPresent()) - { - position = positionOpt.get(); - position.setMenge(position.getMenge().add(BigInteger.valueOf(1L))); - HertlBotRootDao.storageManager().store(position); - } else - { - position = new HertlBotPosition(); - position.setArtikel(artikel); - bestellung.addPosition(position, HertlBotRootDao.storageManager()); - } - - return this.loadAndShowOrder(chatId, bestellungId); + return this.loadAndShowOrder(chatId,userName, bestellungId); } - private String loadAndShowOrder(final Long chatId, final int bestellId) + + + private String loadAndShowOrder(final Long chatId, String userName, final int bestellId) { - final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, bestellId); + final HertlBotOrder bestellung = hertlBotDao.loadBestellung(chatId, userName, bestellId); return bestellung.toString(); } - public String loadAndShowMyOrder(final Long chatId) + public String loadAndShowMyOrder(final Long chatId ,String userName) { final StringBuilder sb = new StringBuilder( "Ihre Bestellungen:" + System.lineSeparator() + System.lineSeparator()); - HertlHendlBot.hertlBotDao.loadUser(chatId).getBestellungen() - .forEach(bestellung -> sb.append(loadAndShowOrder(chatId, bestellung.getIndex())) + HertlHendlBot.hertlBotDao.loadUser(chatId, userName).getBestellungen() + .forEach(bestellung -> sb.append(loadAndShowOrder(chatId, userName, bestellung.getIndex())) .append(System.lineSeparator() + System.lineSeparator())); return sb.toString(); } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 8ec9cb6..4ae0c08 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -12,6 +12,7 @@ import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; +import de.bigamgamen.java.telegrambots.hertlhendl.helper.TelegramHelper; public class TelegramKeyBoardBuilder { @@ -25,10 +26,10 @@ public TelegramKeyBoardBuilder(HertlBotRootDao hertlBotDao) { this.hertlBotDao = hertlBotDao; } - public List loadAndShowMyOrdersAsKeyBoard(final Long chatId) { + public List loadAndShowMyOrdersAsKeyBoard(final Long chatId, String userName) { final List keyboard = new ArrayList<>(); - hertlBotDao.loadUser(chatId).getBestellungen() + hertlBotDao.loadUser(chatId,userName).getBestellungen() .forEach(bestellung -> addButtonToKeyBoard(keyboard, this.createOrderLink(bestellung))); return keyboard; @@ -65,9 +66,9 @@ private void addButtonToKeyBoard(List keyboard, String buttonString } - public String createAndShowNewOrder(final Long chatId) { + public String createAndShowNewOrder(final Long chatId, String userName) { - final HertlBotOrder bestellung = hertlBotDao.createNewBestellungForUser(chatId); + final HertlBotOrder bestellung = hertlBotDao.createNewBestellungForUser(chatId, userName); return this.createOrderLink(bestellung); } @@ -98,7 +99,7 @@ private void addClearButtonOrder(List keyboard, HertlBotOrder beste public ReplyKeyboardMarkup buildOrderMarkup(MessageContext context) { final ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup(); - final List keyboard = this.loadAndShowMyOrdersAsKeyBoard(context.chatId()); + final List keyboard = this.loadAndShowMyOrdersAsKeyBoard(context.chatId(), TelegramHelper.getTotalUserName(context.user())); // activate the keyboard keyboardMarkup.setKeyboard(keyboard); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index b291bdd..d281e3b 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -3,7 +3,6 @@ import java.nio.file.Paths; import java.time.LocalDate; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -67,15 +66,15 @@ public HertlBotRoot root() return (HertlBotRoot) storageManager().root(); } - public HertlBotOrder loadBestellung(Long chatId, int bestellId) + public HertlBotOrder loadBestellung(Long chatId, String userName, int bestellId) { - HertlBotUser user = loadUser(chatId); + HertlBotUser user = loadUser(chatId,userName); return user.getBestellungen().stream().filter(bestellung -> bestellung.getIndex() == bestellId).findFirst() .get(); } - public HertlBotUser loadUser(Long chatId) + public HertlBotUser loadUser(Long chatId, String userName) { Optional userOpt = root().users().ofId(chatId); @@ -85,14 +84,14 @@ public HertlBotUser loadUser(Long chatId) return userOpt.get(); } - HertlBotUser user = new HertlBotUser(chatId); + HertlBotUser user = new HertlBotUser(chatId,userName); root().users().add(user, storageManager()); return user; } - public HertlBotOrder createNewBestellungForUser(Long chatId) + public HertlBotOrder createNewBestellungForUser(Long chatId, String userName) { - HertlBotUser user = this.loadUser(chatId); + HertlBotUser user = this.loadUser(chatId,userName); HertlBotOrder bestellung = new HertlBotOrder(user, new ArrayList<>()); user.addBestellung(bestellung, storageManager); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java index 05e7cc0..86f2991 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java @@ -45,7 +45,7 @@ public String getBestellDatumFormated() { @Override public String toString() { final StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); - sb.append(" Vom: "+this.getBestellDatumFormated()+ "." + (isCommited() ? BESTELLUNG_COMMITED:"")+System.lineSeparator()); + sb.append(" Für: " + this.getUser().getUserName()).append(" Vom: " + this.getBestellDatumFormated() + "." + (isCommited() ? BESTELLUNG_COMMITED:"") + System.lineSeparator()); this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); sb.append("Summe: "+ this.getSumme()); return sb.toString(); @@ -59,11 +59,6 @@ private String getSumme() { } return Pricehelper.getPriceAsEuroString(summe); } - - private void sumToBigInteger(BigInteger addingTo, final BigInteger addition) - { - addingTo = addingTo.add(addition); - } public HertlBotUser getUser() { return this.user; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java index ac8ee61..0e411b0 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotUser.java @@ -8,10 +8,12 @@ public class HertlBotUser { private Long chatId; + private String userName; private List bestellungen = new ArrayList<>(); - public HertlBotUser() { - + public HertlBotUser(Long chatId, String userName) { + this.chatId = chatId; + this.userName = userName; } public synchronized void addBestellung(HertlBotOrder bestellung, final Persister persister) @@ -27,9 +29,7 @@ public boolean isRightUser(Long chatId) return this.chatId.equals(chatId); } - public HertlBotUser(Long chatId) { - this.chatId = chatId; - } + public List getBestellungen() { return new ArrayList<>(bestellungen); @@ -43,4 +43,14 @@ public Long getChatId() { return chatId; } + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java new file mode 100644 index 0000000..559e5a2 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java @@ -0,0 +1,53 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.helper; + +import java.math.BigInteger; +import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; + +import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotPosition; +import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser; + +public class OrderHelper +{ + private OrderHelper () + { + + } + + public static HertlBotOrder getTotalOrder(List orderList) + { + HertlBotOrder totalOrder = new HertlBotOrder(); + HertlBotUser totalUser = new HertlBotUser(1L,"Gesamtbestellung"); + + totalOrder.setUser(totalUser); + orderList.forEach(order -> order.getPositionen().forEach(position -> addArticleToOrder(position.getArtikel(), position.getMenge(), totalOrder))); + + return totalOrder; + } + + public static void addArticleToOrder(final HertlBotArticle artikel, BigInteger amount, final HertlBotOrder bestellung) + { + final Predicate positionAlreadyExist = position -> position.getArtikel().getName() + .equals(artikel.getName()); + + HertlBotPosition position; + + final Optional positionOpt = bestellung.getPositionen().stream().filter(positionAlreadyExist) + .findFirst(); + if (positionOpt.isPresent()) + { + position = positionOpt.get(); + position.setMenge(position.getMenge().add(amount)); + HertlBotRootDao.storageManager().store(position); + } else + { + position = new HertlBotPosition(); + position.setArtikel(artikel); + bestellung.addPosition(position, HertlBotRootDao.storageManager()); + } + } +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/TelegramHelper.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/TelegramHelper.java new file mode 100644 index 0000000..df52606 --- /dev/null +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/TelegramHelper.java @@ -0,0 +1,20 @@ +package de.bigamgamen.java.telegrambots.hertlhendl.helper; + +import org.telegram.telegrambots.meta.api.objects.User; + +public class TelegramHelper +{ + private TelegramHelper() + { + + } + + public static String getTotalUserName(User user) + { + return + (user.getFirstName() != null ? user.getFirstName() : "") + +" " + + (user.getLastName() != null ? user.getLastName() : "") + +"(" + (user.getUserName() != null ? user.getUserName() : "") +")"; + } +} diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index 70dfcf7..ac4aa82 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -6,7 +6,6 @@ import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; -import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotUser; public class InitArticles { From dc0bb5f8cc5c1552fa7662be7b9812033f30b2eb Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Tue, 9 Mar 2021 21:52:28 +0100 Subject: [PATCH 40/74] Admin TotalOrder --- .../java/telegrambots/hertlhendl/HertlHendlBot.java | 2 +- .../hertlhendl/dal/HertlBotRootDao.java | 13 +++++-------- .../hertlhendl/domain/HertlBotOrder.java | 3 ++- .../telegrambots/hertlhendl/helper/OrderHelper.java | 2 ++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 2b70cef..1aca0f3 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -226,7 +226,7 @@ public Ability showAdminOpenOrders() { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - message.setText(this.loadAndShowMyOrder(context.chatId(), TelegramHelper.getTotalUserName(context.user()))); + message.setText(OrderHelper.getTotalOrder(hertlBotDao.loadOpenOrdersForToday()).toString()); final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); message.setReplyMarkup(keyboardMarkup); this.silent.execute(message); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index d281e3b..66e1d5b 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -20,16 +20,13 @@ public class HertlBotRootDao private final static EmbeddedStorageManager storageManager = createStorageManager(); - private Predicate openOrderUntilToday = new Predicate() - { - @Override - public boolean test(HertlBotOrder t) + private Predicate openOrderUntilToday = order -> { LocalDate now = LocalDate.now(); - LocalDate orderDate = t.getBestellDatum(); - return (orderDate.isBefore(now) || orderDate.equals(now)) && !t.isClosed() && t.isCommited(); - } - }; + LocalDate orderDate = order.getBestellDatum(); + return (orderDate.isBefore(now) || orderDate.equals(now)) && !order.isClosed() && order.isCommited(); + }; + public HertlBotRootDao() { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java index 86f2991..6d03036 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java @@ -3,6 +3,7 @@ import java.math.BigInteger; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.List; import de.bigamgamen.java.helper.Pricehelper; @@ -16,7 +17,7 @@ public class HertlBotOrder { private int index; private LocalDate bestellDatum; private HertlBotUser user; - private List positionen; + private List positionen = new ArrayList<>(); private Boolean commited = false; private Boolean closed = false; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java index 559e5a2..ef14a6c 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java @@ -1,6 +1,7 @@ package de.bigamgamen.java.telegrambots.hertlhendl.helper; import java.math.BigInteger; +import java.time.LocalDate; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -24,6 +25,7 @@ public static HertlBotOrder getTotalOrder(List orderList) HertlBotUser totalUser = new HertlBotUser(1L,"Gesamtbestellung"); totalOrder.setUser(totalUser); + totalOrder.setBestellDatum(LocalDate.now()); orderList.forEach(order -> order.getPositionen().forEach(position -> addArticleToOrder(position.getArtikel(), position.getMenge(), totalOrder))); return totalOrder; From c2d012fc2d3871e9f50760f8c8c05ce5b5652740 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Tue, 9 Mar 2021 22:43:38 +0100 Subject: [PATCH 41/74] fix creaor id, add description howto --- README.adoc | 10 ++++++++++ pom.xml | 2 +- .../telegrambots/hertlhendl/HertlHendlBot.java | 15 ++++++++------- .../controller/HertlRightController.java | 6 +++--- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index 483ba1b..651e66f 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,16 @@ = Telegram ChatBot For Order things in Small Groups ifdef::env-github[:outfilesuffix: .adoc] +How to use: +Create your Ownbot : +https://github.com/chatbot-workshop/java-telegram-workshop/blob/master/WORKSHOP.adoc + +Start the Bot like this. +java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot TOKEN bot_name CREATOR_ID + +Or test it with this bot: +@herthaehnchen_bot + == Copyright and Licensing diff --git a/pom.xml b/pom.xml index 35dab3a..cf70cd7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ de.bigamgamen java.telegrambots - 1.0.0-SNAPSHOT + 0.9-FINAL UTF-8 diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 1aca0f3..a0a87fa 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -94,14 +94,14 @@ public class HertlHendlBot extends AbilityBot private final static Logger LOG = LoggerFactory.getLogger(HertlHendlBot.class); private final static String BOT_TOKEN = ""; private final static String BOT_USERNAME = ""; - private final static Long ADMIN_ID = 0L; - private static Integer CREATOR_ID = 929115416; + private static Integer CREATOR_ID = 0; private static String HERTL_URL = "https://hertel-haehnchen.de/standplatzsuche?search=92637"; private static HertlBotRootDao hertlBotDao; private final TelegramKeyBoardBuilder keyBoardBuilder; private final RightController rightController; private RoleController roleController; + private final Integer creatorId; public static void main(final String[] args) throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException @@ -110,28 +110,29 @@ public static void main(final String[] args) final String token = args[0] != null ? args[0] : BOT_TOKEN; final String username = args[1] != null ? args[1] : BOT_USERNAME; - final Long adminId = args[2] != null ? Long.parseLong(args[2]) : ADMIN_ID; - final HertlHendlBot bot = new HertlHendlBot(token, username, adminId); + final Integer creatorId = args[2] != null ? Integer.valueOf(args[2]) : CREATOR_ID; + final HertlHendlBot bot = new HertlHendlBot(token, username, creatorId); TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class); api.registerBot(bot); LOG.info("HertlHendlBot successfull started"); } - public HertlHendlBot(final String botToken, final String botUsername, final Long adminId) + public HertlHendlBot(final String botToken, final String botUsername, Integer creatorId) throws ParserConfigurationException, SAXException, IOException, URISyntaxException { super(botToken, botUsername); hertlBotDao = new HertlBotRootDao(); InitArticles.initArtikels(hertlBotDao); this.keyBoardBuilder = new TelegramKeyBoardBuilder(hertlBotDao); - this.rightController = new HertlRightController(adminId); + this.rightController = new HertlRightController(creatorId); this.roleController = new HertlRoleController(rightController); + this.creatorId = creatorId; } @Override public int creatorId() { - return CREATOR_ID; + return this.creatorId; } public Ability showHelp() diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java index bad5e90..356cfde 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRightController.java @@ -6,17 +6,17 @@ public class HertlRightController implements RightController{ - private final Long adminId; + private final Integer adminId; - public HertlRightController(Long adminId) { + public HertlRightController(Integer adminId) { this.adminId = adminId; } @Override public boolean isAdmin(User user) { - return Long.valueOf(user.getId()).equals(this.adminId); + return user.getId().equals(this.adminId); } From 8545c38e4ee5557a84aa7b939bb00dd4a8521053 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 10 Mar 2021 06:23:35 +0100 Subject: [PATCH 42/74] Fixes Rights sending Photo --- .../hertlhendl/HertlHendlBot.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index a0a87fa..68066e2 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -31,8 +31,6 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import java.util.Optional; -import java.util.function.Predicate; import javax.xml.parsers.ParserConfigurationException; @@ -63,7 +61,6 @@ import de.bigamgamen.java.telegrambots.hertlhendl.dal.HertlBotRootDao; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotArticle; import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotOrder; -import de.bigamgamen.java.telegrambots.hertlhendl.domain.HertlBotPosition; import de.bigamgamen.java.telegrambots.hertlhendl.helper.OrderHelper; import de.bigamgamen.java.telegrambots.hertlhendl.helper.TelegramHelper; import de.bigamgamen.java.telegrambots.hertlhendl.init.InitArticles; @@ -158,7 +155,7 @@ public Ability showOrder() return Ability.builder().name(ABILITY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) .privacy(PUBLIC).input(1).action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_ORDER)) { final int bestellId = Integer.parseInt(context.firstArg()); final Long chatId = context.chatId(); @@ -189,7 +186,7 @@ public Ability showArticle() return Ability.builder().name(ABILITY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) .action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_ITEM)) { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -205,7 +202,7 @@ public Ability showMyOrders() return Ability.builder().name(ABILITY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) .privacy(PUBLIC).action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_LIST_MY_ORDERS)) { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -241,7 +238,7 @@ public Ability showMyOrderKeyBoard() return Ability.builder().name(ABILITY_NAME_MY_ORDERS_AS_KEYBOARD) .info("Zeigt die eigenen Bestellungen als keyboard").locality(ALL).privacy(PUBLIC).action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_MY_ORDERS_AS_KEYBOARD)) { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -261,7 +258,7 @@ public Ability createNewOrder() return Ability.builder().name(ABILITY_NAME_NEW_ORDER).info("Erstellt eine neue Bestellung").locality(ALL) .privacy(PUBLIC).action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_NEW_ORDER)) { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -277,7 +274,7 @@ public Ability addPositionToOrder() return Ability.builder().name(ABILITY_NAME_ADD_POSITION).info("Fügt eine Position zu einer Bestellung hinzu") .locality(ALL).privacy(PUBLIC).input(2).action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_ADD_POSITION)) { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); @@ -386,7 +383,7 @@ public Ability showPricePhoto() return Ability.builder().name(ABILITY_NAME_PRICES_PHOTO).info("send Preisfoto").locality(ALL).privacy(PUBLIC) .action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_PRICES_PHOTO)) { this.sendPhotoFromUpload(HENDL_PREISE_JPG, context.chatId()); } @@ -398,7 +395,7 @@ public Ability showLocationPhoto() return Ability.builder().name(ABILITY_NAME_LOCATION_PHOTO).info("standorteFoto Weiden").locality(ALL) .privacy(PUBLIC).action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_HELP)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_LOCATION_PHOTO)) { this.makeScreenshotSenditDeleteit(context.chatId()); } @@ -424,6 +421,15 @@ private void sendPhotoFromUpload(final String filePath, final Long chatId) { LOG.error("Fehler beim schicken des Photos:{}", e1); } + + try + { + this.execute(sendPhotoRequest); // 4 + } + catch(final TelegramApiException e) + { + e.printStackTrace(); + } } /** From 4be57c8812f8d04808701df235595818581196ce Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 10 Mar 2021 06:42:27 +0100 Subject: [PATCH 43/74] Rights and Readme --- README.adoc | 41 ++++++++++++++++-- .../hertlhendl/HertlHendlBot.java | 6 +-- .../controller/HertlRoleController.java | 34 +++++++++++---- .../channel_0_1_2021-03-10_06-37-54_237.bak | Bin 0 -> 8109 bytes 4 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 storage/backup/deleted/channel_0/channel_0_1_2021-03-10_06-37-54_237.bak diff --git a/README.adoc b/README.adoc index 651e66f..be9b99b 100644 --- a/README.adoc +++ b/README.adoc @@ -1,15 +1,48 @@ = Telegram ChatBot For Order things in Small Groups ifdef::env-github[:outfilesuffix: .adoc] -How to use: +Developer how to use: + Create your Ownbot : -https://github.com/chatbot-workshop/java-telegram-workshop/blob/master/WORKSHOP.adoc + https://github.com/chatbot-workshop/java-telegram-workshop/blob/master/WORKSHOP.adoc Start the Bot like this. -java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot TOKEN bot_name CREATOR_ID + + java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot TOKEN bot_name CREATOR_ID Or test it with this bot: -@herthaehnchen_bot + @herthaehnchen_bot + + +User how to use: + +type + /help +and choose an command. + +Usecase: Make an order: + + /neuebestellung + /bestellungenkeyboard + +choose a Button + + /bestellung 0 + +add article to order with Buttons + + /addposition 1/2-Hähnchen 0 + /addposition Krautsalat 0 + +Commit your order + + /commitorder 0 + + +Admin how to use: + + /adminoffnenebestellungen + == Copyright and Licensing diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index 68066e2..f090ecd 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -72,7 +72,7 @@ public class HertlHendlBot extends AbilityBot public static final String ABILITY_NAME_LOCATION_PHOTO = "standortefoto"; public static final String ABILITY_NAME_PRICES_PHOTO = "preisefoto"; public static final String ABILITY_NAME_ORDER = "bestellung"; - public static final String ABILITY_NAME_ITEM = "artikel"; + public static final String ABILITY_NAME_ITEM_LIST = "artikel"; public static final String ABILITY_NAME_ADD_POSITION = "addposition"; public static final String ABILITY_NAME_LIST_MY_ORDERS = "bestellungenauflistung"; public static final String ABILITY_NAME_MY_ORDERS_AS_KEYBOARD = "bestellungenkeyboard"; @@ -183,10 +183,10 @@ public Ability showOrder() public Ability showArticle() { - return Ability.builder().name(ABILITY_NAME_ITEM).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) + return Ability.builder().name(ABILITY_NAME_ITEM_LIST).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) .action(context -> { - if (roleController.canUseAbility(context.user(), ABILITY_NAME_ITEM)) + if (roleController.canUseAbility(context.user(), ABILITY_NAME_ITEM_LIST)) { final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java index 1294aca..140bea7 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -12,15 +12,31 @@ public class HertlRoleController implements RoleController { - private static List ADMIN_SET = Arrays.asList(HertlHendlBot.ABILITY_NAME_HELP,HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, - HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, - HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, - HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, - HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); - private static List USER_SET = Arrays.asList(HertlHendlBot.ABILITY_NAME_HELP,HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, - HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, HertlHendlBot.ABILITY_NAME_ITEM, - HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, - HertlHendlBot.ABILITY_NAME_NEW_ORDER, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS,HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); + private static List ADMIN_SET = Arrays.asList( + HertlHendlBot.ABILITY_NAME_HELP, + HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, + HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, + HertlHendlBot.ABILITY_NAME_ITEM_LIST, + HertlHendlBot.ABILITY_NAME_NEW_ORDER, + HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, + HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, + HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, + HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS, + HertlHendlBot.ABILITY_NAME_ADD_POSITION, + HertlHendlBot.ABILITY_NAME_ORDER, + HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); + private static List USER_SET = Arrays.asList( + HertlHendlBot.ABILITY_NAME_HELP, + HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, + HertlHendlBot.ABILITY_NAME_PRICES_PHOTO, + HertlHendlBot.ABILITY_NAME_ITEM_LIST, + HertlHendlBot.ABILITY_NAME_NEW_ORDER, + HertlHendlBot.ABILITY_NAME_LIST_MY_ORDERS, + HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, + HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, + HertlHendlBot.ABILITY_NAME_ADD_POSITION, + HertlHendlBot.ABILITY_NAME_ORDER, + HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); private RightController rigthController; diff --git a/storage/backup/deleted/channel_0/channel_0_1_2021-03-10_06-37-54_237.bak b/storage/backup/deleted/channel_0/channel_0_1_2021-03-10_06-37-54_237.bak new file mode 100644 index 0000000000000000000000000000000000000000..f0f3b6a06363e47b2d0f0e0ec9a697855b48e326 GIT binary patch literal 8109 zcmb`Ld2Cfx5XMhi6ve985YnKMhe9n&p(P4ck(7$sfJzZHN|c~b0ja21u$D?ti-KF! zD7cHpeL*7zjeFE+T?0mqyGQ`ns8QqkkN0wa-!slR*S>|Dz`U9H&di*1zB%{YR=VU_ z+_>lVAEj>gee2e5+PxBcJN91KtFd=r-x>P=#&k%N&#kX6V7kk!bc$YDtBZWr|{uJQ~A7w5NFWf4{!7aLWdI4KUOS$XnGc(_P5oLItIlGWn3 zI2}syX2j1}atXhZ+Ul{Zt+lDiDCg?=VdH18Yrz#?@$y}Rje#{#t;?zP5NbUbc_?xm z(yp28J*}B=cFhhWuI9ReI>uw)+S|D@w`+7rCXd#%0e{+>=6W!w2^)#0hBzEu4LuQE zjd%pQn(at*+mwoX6#gb;sM(ccGMJ;0p+iLZrhsWi#?5XUSULR$w#Z3D@sO)5Qnh)= zH5PenO3ac@dwggPIwjOs&G~NTR8nd)k3-jHPD9sb9*?fgJOSNqrsAB0|72u*YFeyf zo&x4nWIU-!3750S-HG^g3~B+I+!i<2EpW4<|63wir&ERQHoM_(jK;ROj_vts+?+@|+kN30%xKM12ShpkIyWjh z&TE{Viyc3M>~{Qrv(JxeZ*lXYwXg@mOvdX#&>NXDJpAbfZx3Y~U-((sRZ3n_Y4K;9 z_&@E3DrxpKM$PlL$^BgeeB14=$6JPP1R%L~7 zdI41w#%aydaxzy=FC@DipDU-^7@sSr7aM#}oEHB4>?-{~r`t{ZVmW;Q@x2&FZaJ+u%kW=>3~^d9yTB|*hB&&r&?n;2(rhBsrk1(h}s$R-dw{Px7z&wZyu~RucCVA|qjxygLx7edi^|xZ*;=x>|ayt z)w<`;1XWhZ>*oooDD3s4d8$FnnM%JhzvEjV!j9FePpP?-@#XWgR8Pa8vI?V zD6GLXPurlmHuwi*x8rwIgMUbTapEI%apGfiapDtnapF^S%L&E(4FBiIP=hPSmtZy{ zLk+HcTfuBYh8kQsy=L?pd=pVTq}Sl8%|m((z9l85-{6`<(GC6;DYcnjqiZw2LDyz} zi>}T54&831;{1UBM`WnM74v5>zaT>m{yo0p8(ftY(%?T)MPUuDdD;fewZVTSyB(j_ z;QHp!U;ck%d<9Y*;3DA~_@PgNF(#ir3C3ctM=EYwzTZ>wrQ!cb!P{>e;cPRMHKj~M j3F8wWe$poLCk5Dqe_^)?OBGlvt(Ezk0aeH(t#khXl9dTE literal 0 HcmV?d00001 From df36afe52ac8fc2166bfb22e8bcced3a5fd42363 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 10 Mar 2021 06:45:09 +0100 Subject: [PATCH 44/74] readme --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index be9b99b..0d09250 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,5 @@ = Telegram ChatBot For Order things in Small Groups += With a Microstream storing solution ifdef::env-github[:outfilesuffix: .adoc] Developer how to use: From d8035f8e87ebe671ec9fd6ce64ff637a23d60d40 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 10 Mar 2021 06:47:40 +0100 Subject: [PATCH 45/74] Update README.adoc --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 0d09250..60f92c8 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ -= Telegram ChatBot For Order things in Small Groups -= With a Microstream storing solution += Telegram ChatBot For Order things in Small Groups, with a Microstream storing solution + ifdef::env-github[:outfilesuffix: .adoc] Developer how to use: From ca1d01461806c62a6e302cce175914a860d31f69 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Wed, 10 Mar 2021 06:54:05 +0100 Subject: [PATCH 46/74] Update README.adoc --- README.adoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 60f92c8..173bb03 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,9 @@ ifdef::env-github[:outfilesuffix: .adoc] -Developer how to use: +== How to + +=== Developer how to use: Create your Ownbot : https://github.com/chatbot-workshop/java-telegram-workshop/blob/master/WORKSHOP.adoc @@ -14,8 +16,9 @@ Start the Bot like this. Or test it with this bot: @herthaehnchen_bot + -User how to use: +=== User how to use: type /help @@ -40,7 +43,7 @@ Commit your order /commitorder 0 -Admin how to use: +=== Admin how to use: /adminoffnenebestellungen From efc55338a42d4c3b8ecc4e494e1ce612344638a4 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Thu, 18 Mar 2021 14:32:37 +0100 Subject: [PATCH 47/74] Fixes Totalorder close order --- herthaehnchen_bot | Bin 2097152 -> 2097152 bytes .../builder/TelegramKeyBoardBuilder.java | 4 ++++ .../controller/HertlRoleController.java | 6 ++++-- .../hertlhendl/helper/OrderHelper.java | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/herthaehnchen_bot b/herthaehnchen_bot index 82625a29044606d52da0bd6828246cb3dd372782..aa142f5eb9d511fbb71b044ab1939d2b7aac65a9 100644 GIT binary patch delta 387 zcmZo@Xkcsr;t66>5&sxKKtS;rm}X$?0n-YnCr-ZDD8AACR|C5cNM3N$WRJ!U4aSWi zj%+bQ2#A(9W{?NdlNmRF>CF&v#iZtojqMj38G)Dyh?#+y1&CRJm<@>8ftUk`If0l9 zh`E872Z(urm~Z>VM*hym?TyR=_Iyn18@3-36j;Z-jbA{Gk(-9Kf$6IS1cD7g!fPAA0#Jeji6bDuz_89btm4ihi6Xb@8##D1 y-fjQSC!o&A#R)b)v^cd0Vtm>>r@0{Gji+xA5b$FIaW^zj=(P=vn;$gJi2(q|n}93; delta 211 zcmW;EF$%&!5QX7PqDIX#*%T@$f>-bamU@6(K*$v=>~<$bv{Uv59zc*3>21A{l`k3i zdBwnItrg4ei&b$8x-*+gzk!tfZodyNx_lpgHlBC?yzxhOtwd{4VIhmyfDPG*#ca$b zY|0V_He+cknpx+K?pha_eHuQC_LG}eQbB9b1WnKcP0$2Q&;(7;1WnKcP0$2QXm)mu H(e>#M5YIZp diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java index 4ae0c08..fc525f1 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/builder/TelegramKeyBoardBuilder.java @@ -45,6 +45,10 @@ public List loadAndShowAllArticleForOrder(final Long chatId, final row.add(new KeyboardButton(createKeyForAbility(HertlHendlBot.ABILITY_NAME_COMMIT_ORDER+" "+bestellungId))); keyboard.add(row); + row = new KeyboardRow(); + row.add(new KeyboardButton(createKeyForAbility(HertlHendlBot.ABILITY_NAME_CLOSE_ORDER+" "+bestellungId))); + keyboard.add(row); + return keyboard; } diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java index 140bea7..77c6039 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -24,7 +24,8 @@ public class HertlRoleController implements RoleController HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS, HertlHendlBot.ABILITY_NAME_ADD_POSITION, HertlHendlBot.ABILITY_NAME_ORDER, - HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); + HertlHendlBot.ABILITY_NAME_COMMIT_ORDER, + HertlHendlBot.ABILITY_NAME_CLOSE_ORDER); private static List USER_SET = Arrays.asList( HertlHendlBot.ABILITY_NAME_HELP, HertlHendlBot.ABILITY_NAME_LOCATION_PHOTO, @@ -36,7 +37,8 @@ public class HertlRoleController implements RoleController HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, HertlHendlBot.ABILITY_NAME_ADD_POSITION, HertlHendlBot.ABILITY_NAME_ORDER, - HertlHendlBot.ABILITY_NAME_COMMIT_ORDER); + HertlHendlBot.ABILITY_NAME_COMMIT_ORDER, + HertlHendlBot.ABILITY_NAME_CLOSE_ORDER); private RightController rigthController; diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java index ef14a6c..dabd548 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/helper/OrderHelper.java @@ -49,6 +49,7 @@ public static void addArticleToOrder(final HertlBotArticle artikel, BigInteger a { position = new HertlBotPosition(); position.setArtikel(artikel); + position.setMenge(amount); bestellung.addPosition(position, HertlBotRootDao.storageManager()); } } From a8a71fecd62a7c0f9aa458d5b3acf4c8b0e6e725 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Thu, 18 Mar 2021 15:09:39 +0100 Subject: [PATCH 48/74] closed fixed --- .../hertlhendl/HertlHendlBot.java | 58 +++++++++++++----- .../controller/HertlRoleController.java | 1 + .../hertlhendl/domain/HertlBotOrder.java | 13 ++-- .../channel_0_1_2021-03-18_14-54-15_066.bak | Bin 0 -> 4956 bytes 4 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 storage/backup/deleted/channel_0/channel_0_1_2021-03-18_14-54-15_066.bak diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index f090ecd..ccebbfc 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -79,11 +79,13 @@ public class HertlHendlBot extends AbilityBot public static final String ABILITY_NAME_NEW_ORDER = "neuebestellung"; public static final String ABILITY_NAME_MY_OPEN_ORDERS = "meineoffnenebestellungen"; public static final String ABILITY_NAME_ADMIN_OPEN_ORDERS = "adminoffnenebestellungen"; + public static final String ABILITY_NAME_ADMIN_CLOSE_ORDERS = "admincloseorders"; public static final String ABILITY_NAME_CLOSE_ORDER = "closeorder"; public static final String ABILITY_NAME_COMMIT_ORDER = "commitorder"; - private static final String MESSAGE_CLOSE_ALREADY_SUCCESSFULL = "Die Bestellung wurde erfolgreich abgeschlossen."; - private static final String MESSAGE_CLOSE_ALREADY_CLOSED = "Die Bestellung ist bereits abgeschlossen."; + private static final String MESSAGE_CLOSE_SUCCESSFULL = "Die Bestellung wurde erfolgreich geschlossen."; + private static final String ALL_MESSAGE_CLOSE_SUCCESSFULL = "Alle offenen Bestellungen wurde erfolgreich geschlossen."; + private static final String MESSAGE_CLOSE_ALREADY_CLOSED = "Die Bestellung ist bereits geschlossen."; private static final String MESSAGE_ALREADY_COMMITED = "Die Bestellung wurde bereits bestätigt"; private static final String MESSAGE_COMMIT_SUCCESSFULL = "Die Bestellung wurde erfolgreich bestätigt"; @@ -225,8 +227,28 @@ public Ability showAdminOpenOrders() final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(OrderHelper.getTotalOrder(hertlBotDao.loadOpenOrdersForToday()).toString()); - final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); - message.setReplyMarkup(keyboardMarkup); + + this.silent.execute(message); + } + }).build(); + } + + public Ability adminCloseOrders() + { + + return Ability.builder().name(ABILITY_NAME_ADMIN_CLOSE_ORDERS).info("Schliest alle offnen Bestellungen für Heute").locality(ALL) + .privacy(PUBLIC).action(context -> + { + if (roleController.canUseAbility(context.user(), ABILITY_NAME_ADMIN_CLOSE_ORDERS)) + { + SendMessage messageOrder = new SendMessage(); + messageOrder.setChatId(Long.toString(context.chatId())); + hertlBotDao.loadOpenOrdersForToday().stream().forEach(order -> closeOrder(order, messageOrder));; + + + SendMessage message = new SendMessage(); + message.setText(ALL_MESSAGE_CLOSE_SUCCESSFULL); + message.setChatId(Long.toString(context.chatId())); this.silent.execute(message); } }).build(); @@ -263,6 +285,8 @@ public Ability createNewOrder() final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); message.setText(keyBoardBuilder.createAndShowNewOrder(context.chatId(), TelegramHelper.getTotalUserName(context.user()))); + final ReplyKeyboardMarkup keyboardMarkup = keyBoardBuilder.buildOrderMarkup(context); + message.setReplyMarkup(keyboardMarkup); this.silent.execute(message); } }).build(); @@ -314,7 +338,7 @@ public Ability sendKeyboard() }).build(); } - public Ability closeOrder() + public Ability closeOrderAbility() { return Ability.builder().name(ABILITY_NAME_CLOSE_ORDER).info("Schließt die Bestellung ab.").locality(ALL) @@ -330,21 +354,25 @@ public Ability closeOrder() final SendMessage message = new SendMessage(); message.setChatId(Long.toString(context.chatId())); - if (bestellung.isClosed()) - { - - message.setText(MESSAGE_CLOSE_ALREADY_CLOSED); - } else - { - bestellung.setClosed(true); - HertlBotRootDao.storageManager().store(bestellung); - message.setText(MESSAGE_CLOSE_ALREADY_SUCCESSFULL); - } + closeOrder(bestellung, message); this.silent.execute(message); } }).build(); } +private void closeOrder(final HertlBotOrder bestellung, final SendMessage message) +{ + if (bestellung.isClosed()) + { + + message.setText(MESSAGE_CLOSE_ALREADY_CLOSED); + } else + { + bestellung.setClosed(true); + HertlBotRootDao.storageManager().store(bestellung); + message.setText(MESSAGE_CLOSE_SUCCESSFULL); + } +} public Ability commitOrder() { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java index 77c6039..fcf0564 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/controller/HertlRoleController.java @@ -22,6 +22,7 @@ public class HertlRoleController implements RoleController HertlHendlBot.ABILITY_NAME_MY_ORDERS_AS_KEYBOARD, HertlHendlBot.ABILITY_NAME_MY_OPEN_ORDERS, HertlHendlBot.ABILITY_NAME_ADMIN_OPEN_ORDERS, + HertlHendlBot.ABILITY_NAME_ADMIN_CLOSE_ORDERS, HertlHendlBot.ABILITY_NAME_ADD_POSITION, HertlHendlBot.ABILITY_NAME_ORDER, HertlHendlBot.ABILITY_NAME_COMMIT_ORDER, diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java index 6d03036..f82a745 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotOrder.java @@ -11,8 +11,9 @@ public class HertlBotOrder { - private static final String BESTELLUNG_COMMITED = "BESTÄTIGT"; - private static final String BESTELLUNG_TITLE = "Ihre Bestellung:"; + private static final String ORDER_COMMITED = "BESTÄTIGT"; + private static final String ORDER_CLOSED = "GESCHLOSSEN"; + private static final String ORDER_TITLE = "Ihre Bestellung:"; private static final String DD_MM_YYYY = "dd-MM-yyyy"; private int index; private LocalDate bestellDatum; @@ -45,8 +46,12 @@ public String getBestellDatumFormated() { @Override public String toString() { - final StringBuilder sb = new StringBuilder(BESTELLUNG_TITLE + " " +this.index); - sb.append(" Für: " + this.getUser().getUserName()).append(" Vom: " + this.getBestellDatumFormated() + "." + (isCommited() ? BESTELLUNG_COMMITED:"") + System.lineSeparator()); + final StringBuilder sb = new StringBuilder(ORDER_TITLE + " " +this.index); + sb.append(" Für: " + this.getUser().getUserName()) + .append(" Vom: " + this.getBestellDatumFormated() + "." + + (isCommited() ? ORDER_COMMITED + " und ":"") + + (isClosed() ? ORDER_CLOSED:"") + + System.lineSeparator()); this.positionen.forEach(pos -> sb.append(pos.toString()+System.lineSeparator())); sb.append("Summe: "+ this.getSumme()); return sb.toString(); diff --git a/storage/backup/deleted/channel_0/channel_0_1_2021-03-18_14-54-15_066.bak b/storage/backup/deleted/channel_0/channel_0_1_2021-03-18_14-54-15_066.bak new file mode 100644 index 0000000000000000000000000000000000000000..6833a1c14441a9b12c7ec7c69932f06c4f124028 GIT binary patch literal 4956 zcmbuC`)*ZL5XPsahykk5G^7D(PL)f!w6u*VAgS$!HOSkU)#2)TU|` zP`Mc;Dnj_r2Qcv&_*23IXbA8etkwPdPQ&bda%kBJoxNs#b6IP?nSE%mK1oqM|XTK3CKi`6z)+hCrpH@qr9CnLXON{X1afi{*MK)poI`R$V3gk-U zD&%TpGja`bEmGB;B!Br;oOR%0e2-O3<**)XWQ4~mALZ8qHZsCvm8)`Z1zVGW)j4#o z4PfU4tT-+!rggrWhzQO*|tVx2m4B;7Jav!u~SwE zH14)OJ837vDre21fwqCTNI~Aj!$xE~@-5`Q^Clnm6rYSqMstyF9lnH}E$LL?w~49C z-o#pD+00r+-ojdie229!xcqdo|1L5X(PQN^59U2&B+^dKtJ~koUI%(rZM!|PfpFu; z!rwxWE%r(2eK2T>w$*u3W-HLoM}8RUc*KTn$j$~?4F86#)7f^Bg+}cH_VdBEV53v< zTC6{;zOetS%USE3s_8=Z+iin&gv|X}y!|$!d;4dj4~EShxhr8kZ+}55gO=+@TY-(n6(D_5!M>$M_Fs2A7kx@ zwEP@rzaN=3(B<=UFoVdff!@d7iw|^VHk*MyKo+wb=sKqweWnAwNOW)iyaW9d_Rrf> zryaf$N6$FC=csyI18xYsA6#eA`*|e1dQftfgzK7-aEB42c@xDD) zF}?=#4KnM04T|?2nD3GCe)Kb0zt|Ns{fpfrC-9O&-t!H4dVS?9kzH{-*?k=O^< zGbQ^^*oo{{Sc~jeS&Qt~Sg%H2M|uLw?+x~UMrM&+F@6Pe6PZPJ#rqx1AIL1SD`twA u_dGFw!AlC6BD-=+AyZ`kt&Gn!*>#4BWd9SFp6s{Kd$J4f$u9hD?4APQ2}8^P literal 0 HcmV?d00001 From d0f2be15e42353831067b6608d1e7b5969060d01 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Wed, 20 Oct 2021 08:40:34 +0200 Subject: [PATCH 49/74] Preis anpassung --- .../java/telegrambots/hertlhendl/init/InitArticles.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index ac4aa82..421bdaa 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -19,9 +19,9 @@ public synchronized static void initArtikels(final HertlBotRootDao dao) { final List artikelList = new ArrayList<>(); - artikelList.add(new HertlBotArticle(1, "1/2-Hähnchen", BigInteger.valueOf(380L))); + artikelList.add(new HertlBotArticle(1, "1/2-Hähnchen", BigInteger.valueOf(400L))); artikelList.add(new HertlBotArticle(2, "Hähnchen-Schenkel", BigInteger.valueOf(200L))); - artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(150L))); + artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(160L))); artikelList.add(new HertlBotArticle(4, "Brezel-klein", BigInteger.valueOf(80L))); artikelList.add(new HertlBotArticle(5, "Brezel-groß", BigInteger.valueOf(160L))); From 561c9529d753e6ccd3990f5d94545d40cc084d25 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Wed, 20 Oct 2021 09:31:11 +0200 Subject: [PATCH 50/74] Artikel erweitert. --- .../java/telegrambots/hertlhendl/init/InitArticles.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index 421bdaa..509954b 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -21,9 +21,11 @@ public synchronized static void initArtikels(final HertlBotRootDao dao) artikelList.add(new HertlBotArticle(1, "1/2-Hähnchen", BigInteger.valueOf(400L))); artikelList.add(new HertlBotArticle(2, "Hähnchen-Schenkel", BigInteger.valueOf(200L))); - artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(160L))); artikelList.add(new HertlBotArticle(4, "Brezel-klein", BigInteger.valueOf(80L))); artikelList.add(new HertlBotArticle(5, "Brezel-groß", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArticle(6, "Kartoffelsalat Essig-Öl", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArticle(7, "Kartoffelsalat Majo", BigInteger.valueOf(160L))); dao.root().artikels().addAll(artikelList); } From e3c78c96332626218f2439411c5b54e79c267f9b Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Wed, 20 Oct 2021 10:10:07 +0200 Subject: [PATCH 51/74] Artikel korriegiert --- .../java/telegrambots/hertlhendl/init/InitArticles.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index 509954b..d8f6e0c 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -18,14 +18,14 @@ private InitArticles() public synchronized static void initArtikels(final HertlBotRootDao dao) { final List artikelList = new ArrayList<>(); - + // Die Namen Dürfen keine Leerzeichen enthalten !!!! artikelList.add(new HertlBotArticle(1, "1/2-Hähnchen", BigInteger.valueOf(400L))); artikelList.add(new HertlBotArticle(2, "Hähnchen-Schenkel", BigInteger.valueOf(200L))); artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(160L))); artikelList.add(new HertlBotArticle(4, "Brezel-klein", BigInteger.valueOf(80L))); artikelList.add(new HertlBotArticle(5, "Brezel-groß", BigInteger.valueOf(160L))); - artikelList.add(new HertlBotArticle(6, "Kartoffelsalat Essig-Öl", BigInteger.valueOf(160L))); - artikelList.add(new HertlBotArticle(7, "Kartoffelsalat Majo", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArticle(6, "Kartoffelsalat-Essig-Öl", BigInteger.valueOf(160L))); + artikelList.add(new HertlBotArticle(7, "Kartoffelsalat-Majo", BigInteger.valueOf(160L))); dao.root().artikels().addAll(artikelList); } From 9feb178fed4e90438d357aa17bacc3b8721a0a25 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Wed, 20 Oct 2021 10:12:20 +0200 Subject: [PATCH 52/74] init gefixt --- .../java/telegrambots/hertlhendl/init/InitArticles.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index d8f6e0c..74e5144 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -27,6 +27,8 @@ public synchronized static void initArtikels(final HertlBotRootDao dao) artikelList.add(new HertlBotArticle(6, "Kartoffelsalat-Essig-Öl", BigInteger.valueOf(160L))); artikelList.add(new HertlBotArticle(7, "Kartoffelsalat-Majo", BigInteger.valueOf(160L))); + dao.root().artikels().clear(); + dao.root().artikels().addAll(artikelList); } From e478462748c754b988fa17d1eb00ed1840e8e218 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Wed, 20 Oct 2021 10:17:52 +0200 Subject: [PATCH 53/74] add ClearAll --- .../hertlhendl/domain/HertlBotArticles.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java index 81abf53..575c851 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java @@ -62,6 +62,19 @@ public HertlBotArticle ofName(final String artikelName) { return this.artikels.get(artikelName); } + + public void clearAll() + { + this.clearAll(HertlBotArtikels, HertlBotRootDao.storageManager()); + } + + public void clearAll( + final Persister persister + ) + { + this.artikels.clear(); + persister.store(this.artikels); + } From ece5fa5e743228b9a3d74d24799556fdafebe147 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Wed, 20 Oct 2021 10:18:24 +0200 Subject: [PATCH 54/74] ClearAll gefixt, --- .../java/telegrambots/hertlhendl/init/InitArticles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index 74e5144..f947cd8 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -27,7 +27,7 @@ public synchronized static void initArtikels(final HertlBotRootDao dao) artikelList.add(new HertlBotArticle(6, "Kartoffelsalat-Essig-Öl", BigInteger.valueOf(160L))); artikelList.add(new HertlBotArticle(7, "Kartoffelsalat-Majo", BigInteger.valueOf(160L))); - dao.root().artikels().clear(); + dao.root().artikels().clearAll(); dao.root().artikels().addAll(artikelList); } From 98f805b1afa74176aec27326a84e888c9fd50784 Mon Sep 17 00:00:00 2001 From: Meier Date: Wed, 20 Oct 2021 10:21:43 +0200 Subject: [PATCH 55/74] ClearAll gefixt. --- .../java/telegrambots/hertlhendl/domain/HertlBotArticles.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java index 575c851..206583f 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/domain/HertlBotArticles.java @@ -65,14 +65,14 @@ public HertlBotArticle ofName(final String artikelName) public void clearAll() { - this.clearAll(HertlBotArtikels, HertlBotRootDao.storageManager()); + this.clearAll(HertlBotRootDao.storageManager()); } public void clearAll( final Persister persister ) { - this.artikels.clear(); + this.artikels.clear(); persister.store(this.artikels); } From e51d8fd346a33a0af8af2d8ed3e2cbcb91edc612 Mon Sep 17 00:00:00 2001 From: AM Date: Wed, 10 Nov 2021 20:33:55 +0100 Subject: [PATCH 56/74] Update to newest Telegram and Java 17 --- pom.xml | 6 +++--- .../telegrambots/hertlhendl/HertlHendlBot.java | 17 ++++++----------- .../hertlhendl/init/InitArticles.java | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index cf70cd7..593233d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,9 @@ UTF-8 - 1.8 - 1.8 - 5.0.1.1 + 17 + 17 + 5.4.0 diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index ccebbfc..41b0d97 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -129,14 +129,13 @@ public HertlHendlBot(final String botToken, final String botUsername, Integer cr } @Override - public int creatorId() + public long creatorId() { return this.creatorId; } public Ability showHelp() { - return Ability.builder().name(ABILITY_NAME_HELP).info("shows help").locality(ALL).privacy(PUBLIC) .action(context -> { @@ -153,7 +152,6 @@ public Ability showHelp() public Ability showOrder() { - return Ability.builder().name(ABILITY_NAME_ORDER).info("zeigt eine bestimmte Bestellung").locality(ALL) .privacy(PUBLIC).input(1).action(context -> { @@ -184,7 +182,6 @@ public Ability showOrder() public Ability showArticle() { - return Ability.builder().name(ABILITY_NAME_ITEM_LIST).info("Listet alle Artikel auf").locality(ALL).privacy(PUBLIC) .action(context -> { @@ -200,7 +197,6 @@ public Ability showArticle() public Ability showMyOrders() { - return Ability.builder().name(ABILITY_NAME_LIST_MY_ORDERS).info("Zeigt die eigenen Bestellungen").locality(ALL) .privacy(PUBLIC).action(context -> { @@ -218,7 +214,6 @@ public Ability showMyOrders() public Ability showAdminOpenOrders() { - return Ability.builder().name(ABILITY_NAME_ADMIN_OPEN_ORDERS).info("Zeigt die offenen Bestellungen").locality(ALL) .privacy(PUBLIC).action(context -> { @@ -235,7 +230,6 @@ public Ability showAdminOpenOrders() public Ability adminCloseOrders() { - return Ability.builder().name(ABILITY_NAME_ADMIN_CLOSE_ORDERS).info("Schliest alle offnen Bestellungen für Heute").locality(ALL) .privacy(PUBLIC).action(context -> { @@ -360,9 +354,10 @@ public Ability closeOrderAbility() } }).build(); } -private void closeOrder(final HertlBotOrder bestellung, final SendMessage message) -{ - if (bestellung.isClosed()) + + private void closeOrder(final HertlBotOrder bestellung, final SendMessage message) + { + if (bestellung.isClosed()) { message.setText(MESSAGE_CLOSE_ALREADY_CLOSED); @@ -372,7 +367,7 @@ private void closeOrder(final HertlBotOrder bestellung, final SendMessage messag HertlBotRootDao.storageManager().store(bestellung); message.setText(MESSAGE_CLOSE_SUCCESSFULL); } -} + } public Ability commitOrder() { diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java index f947cd8..fd02129 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/init/InitArticles.java @@ -20,7 +20,7 @@ public synchronized static void initArtikels(final HertlBotRootDao dao) final List artikelList = new ArrayList<>(); // Die Namen Dürfen keine Leerzeichen enthalten !!!! artikelList.add(new HertlBotArticle(1, "1/2-Hähnchen", BigInteger.valueOf(400L))); - artikelList.add(new HertlBotArticle(2, "Hähnchen-Schenkel", BigInteger.valueOf(200L))); + artikelList.add(new HertlBotArticle(2, "Hähnchen-Schenkel", BigInteger.valueOf(220L))); artikelList.add(new HertlBotArticle(3, "Krautsalat", BigInteger.valueOf(160L))); artikelList.add(new HertlBotArticle(4, "Brezel-klein", BigInteger.valueOf(80L))); artikelList.add(new HertlBotArticle(5, "Brezel-groß", BigInteger.valueOf(160L))); From 6221e724e44377008ad1c7043b4f0d5c0b224eac Mon Sep 17 00:00:00 2001 From: Meier Date: Tue, 16 Nov 2021 11:33:05 +0100 Subject: [PATCH 57/74] wieder auf 11 wegen raspi DockerFile szwischen Commit --- Dockerfile | 23 +++++++++++++++++++++++ pom.xml | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..75c9dea --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +ARG tagFrom=1.11.0-10-x86 +FROM amgamen/maven-3.8.3-zulu:${tagFrom} +LABEL maintainer="AMDev" + +RUN groupadd --system telegrambot && adduser --system --disabled-password --shell /bin/false telegrambot && adduser telegrambot telegrambot + +COPY --chown=telegrambot:telegrambot EMVSSLKeystore.jks /opt/telegrambot/ +COPY --chown=telegrambot:telegrambot target/lib /opt/telegrambot/lib/ +COPY --chown=telegrambot:telegrambot target/java.telegrambots-0.9-FINAL.jar /opt/telegrambot/ +RUN chmod +x /opt/telegrambot/java.telegrambots-0.9-FINAL.jar + +WORKDIR /opt/telegrambot/ + +USER telegrambot + +ENTRYPOINT [\ +"java", \ +"-classpath", \ +"java.telegrambots-0.9-FINAL.jar:lib/*", \ +"de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot"] + +# AM: could be overriden by command line +#CMD ["-betriebsmodus", "entwicklung"] diff --git a/pom.xml b/pom.xml index 593233d..f667ca4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ UTF-8 - 17 - 17 + 11 + 11 5.4.0 From 7a3af4e7b635010cf64c6328f667ad045d672f16 Mon Sep 17 00:00:00 2001 From: AM Date: Tue, 16 Nov 2021 21:04:27 +0100 Subject: [PATCH 58/74] Dockerfile fertig gestellt. --- Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75c9dea..05edbbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,8 @@ -ARG tagFrom=1.11.0-10-x86 -FROM amgamen/maven-3.8.3-zulu:${tagFrom} +FROM eclipse-temurin:17.0.1_12-jdk-focal LABEL maintainer="AMDev" RUN groupadd --system telegrambot && adduser --system --disabled-password --shell /bin/false telegrambot && adduser telegrambot telegrambot -COPY --chown=telegrambot:telegrambot EMVSSLKeystore.jks /opt/telegrambot/ COPY --chown=telegrambot:telegrambot target/lib /opt/telegrambot/lib/ COPY --chown=telegrambot:telegrambot target/java.telegrambots-0.9-FINAL.jar /opt/telegrambot/ RUN chmod +x /opt/telegrambot/java.telegrambots-0.9-FINAL.jar @@ -13,11 +11,10 @@ WORKDIR /opt/telegrambot/ USER telegrambot -ENTRYPOINT [\ -"java", \ -"-classpath", \ -"java.telegrambots-0.9-FINAL.jar:lib/*", \ -"de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot"] +#CMD ["ls", "-la"] + +ENTRYPOINT ["sh" , "-c", "java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot ${BOT_TOKEN}:${BOT_KEY} ${BOT_NAME} ${CREATOR_ID}"] + # AM: could be overriden by command line #CMD ["-betriebsmodus", "entwicklung"] From 74a68ed6563963f0a8444dc9c6fac0d156892103 Mon Sep 17 00:00:00 2001 From: Meier Date: Wed, 17 Nov 2021 10:43:03 +0100 Subject: [PATCH 59/74] =?UTF-8?q?multiarch=20erkl=C3=A4rt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multiarch.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 multiarch.txt diff --git a/multiarch.txt b/multiarch.txt new file mode 100644 index 0000000..09d4e23 --- /dev/null +++ b/multiarch.txt @@ -0,0 +1,3 @@ +https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/ +https://github.com/docker/buildx +docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag amgamen/chatbot:0.9 . \ No newline at end of file From fad3fd4e235f3c2afbf194b7a8fe69f8ee7dc5ed Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Thu, 18 Nov 2021 20:44:48 +0100 Subject: [PATCH 60/74] Storage eine ebene tiefer --- .../java/telegrambots/hertlhendl/dal/HertlBotRootDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java index 66e1d5b..9820803 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/dal/HertlBotRootDao.java @@ -36,7 +36,7 @@ public HertlBotRootDao() private static EmbeddedStorageManager createStorageManager() { final Configuration configuration = Configuration.Default(); - configuration.setBaseDirectory(Paths.get("data", "storage").toString()); + configuration.setBaseDirectory(Paths.get("data", "microstream", "storage").toString()); configuration.setChannelCount(2); final EmbeddedStorageFoundation foundation = configuration.createEmbeddedStorageFoundation(); From fe4f3416e6bd3cdba4e5a303bf4ddc4555860b8b Mon Sep 17 00:00:00 2001 From: Meier Date: Fri, 19 Nov 2021 12:51:53 +0100 Subject: [PATCH 61/74] Dockerfile + Volumes +exampels --- Dockerfile | 5 +++-- create_volume.sh | 2 ++ start_sh_example.sh | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 create_volume.sh create mode 100644 start_sh_example.sh diff --git a/Dockerfile b/Dockerfile index 05edbbc..883f06b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ -FROM eclipse-temurin:17.0.1_12-jdk-focal +FROM eclipse-temurin:11.0.13_8-jre LABEL maintainer="AMDev" -RUN groupadd --system telegrambot && adduser --system --disabled-password --shell /bin/false telegrambot && adduser telegrambot telegrambot +RUN groupadd -g 1001 telegrambot && adduser -u 1001 --gid 1001 --disabled-password --shell /bin/false telegrambot COPY --chown=telegrambot:telegrambot target/lib /opt/telegrambot/lib/ COPY --chown=telegrambot:telegrambot target/java.telegrambots-0.9-FINAL.jar /opt/telegrambot/ +RUN chown -R telegrambot:telegrambot /opt/telegrambot RUN chmod +x /opt/telegrambot/java.telegrambots-0.9-FINAL.jar WORKDIR /opt/telegrambot/ diff --git a/create_volume.sh b/create_volume.sh new file mode 100644 index 0000000..a76d241 --- /dev/null +++ b/create_volume.sh @@ -0,0 +1,2 @@ +docker volume create chatbotvol +chown 1001:1001 /var/lib/docker/volumes/chatbotvol/_data \ No newline at end of file diff --git a/start_sh_example.sh b/start_sh_example.sh new file mode 100644 index 0000000..d8ca510 --- /dev/null +++ b/start_sh_example.sh @@ -0,0 +1 @@ +docker run -it -v chatbotvol:/opt/telegrambot/data -e "BOT_TOKEN=" -e "BOT_KEY=" -e "BOT_NAME=" -e "CREATOR_ID=" amgamen/chatbot From a11061398bfa1bb4101c114c37e045e7698e9127 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sat, 20 Nov 2021 08:09:07 +0100 Subject: [PATCH 62/74] Locale DE Env.list vorbereitung --- Dockerfile | 13 +++++++++---- env.list | 4 ++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 env.list diff --git a/Dockerfile b/Dockerfile index 883f06b..0a2a678 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,23 @@ -FROM eclipse-temurin:11.0.13_8-jre +FROM eclipse-temurin:17.0.1_12-jdk-focal LABEL maintainer="AMDev" -RUN groupadd -g 1001 telegrambot && adduser -u 1001 --gid 1001 --disabled-password --shell /bin/false telegrambot +RUN groupadd --system -g 1001 telegrambot && adduser --system --disabled-password --shell --uid 1001 /bin/false telegrambot && adduser telegrambot telegrambot COPY --chown=telegrambot:telegrambot target/lib /opt/telegrambot/lib/ COPY --chown=telegrambot:telegrambot target/java.telegrambots-0.9-FINAL.jar /opt/telegrambot/ -RUN chown -R telegrambot:telegrambot /opt/telegrambot RUN chmod +x /opt/telegrambot/java.telegrambots-0.9-FINAL.jar +# Set the locale +RUN sed -i '/de_DE.UTF-8/s/^# //g' /etc/locale.gen && \ + locale-gen +ENV LANG de_DE.UTF-8 +ENV LANGUAGE de_DE:en +ENV LC_ALL de_DE.UTF-8 WORKDIR /opt/telegrambot/ USER telegrambot -#CMD ["ls", "-la"] +#CMD ["echo $UID"] ENTRYPOINT ["sh" , "-c", "java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot ${BOT_TOKEN}:${BOT_KEY} ${BOT_NAME} ${CREATOR_ID}"] diff --git a/env.list b/env.list new file mode 100644 index 0000000..4dde0c3 --- /dev/null +++ b/env.list @@ -0,0 +1,4 @@ +BOT_TOKEN= +BOT_KEY= +BOT_NAME= +CREATOR_ID= \ No newline at end of file From 2c0b7c33ab24d9eb84b2af1225ca96ee9606a74a Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sat, 20 Nov 2021 08:14:48 +0100 Subject: [PATCH 63/74] Exmaples with env.list --- start_docker_example.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 start_docker_example.sh diff --git a/start_docker_example.sh b/start_docker_example.sh new file mode 100644 index 0000000..dba0e64 --- /dev/null +++ b/start_docker_example.sh @@ -0,0 +1,6 @@ +#Production +docker run -d --name devtest -v chatbotvol:/opt/telegrambot/data --env-file ./env.list amgamen/chatbot + +#Develop +docker run -it -v chatbotvol:/opt/telegrambot/data --env-file ./env.list amgamen/chatbot +docker run -it -v chatbotvol:/opt/telegrambot/data -e "BOT_TOKEN=" -e "BOT_KEY=" -e "BOT_NAME=" -e "CREATOR_ID=" amgamen/chatbot From 1841accf835f3a7fe17129d82727abc8f94a5eb9 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sat, 20 Nov 2021 08:15:10 +0100 Subject: [PATCH 64/74] =?UTF-8?q?Aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- herthaehnchen_bot | Bin 2097152 -> 0 bytes start_sh_example.sh | 1 - .../channel_0_1_2021-03-10_06-37-54_237.bak | Bin 8109 -> 0 bytes .../channel_0_1_2021-03-18_14-54-15_066.bak | Bin 4956 -> 0 bytes 4 files changed, 1 deletion(-) delete mode 100644 herthaehnchen_bot delete mode 100644 start_sh_example.sh delete mode 100644 storage/backup/deleted/channel_0/channel_0_1_2021-03-10_06-37-54_237.bak delete mode 100644 storage/backup/deleted/channel_0/channel_0_1_2021-03-18_14-54-15_066.bak diff --git a/herthaehnchen_bot b/herthaehnchen_bot deleted file mode 100644 index aa142f5eb9d511fbb71b044ab1939d2b7aac65a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2097152 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 zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N f0t5&UAV7cs0RjXF5FkK+009C72oNB!Vg>#Ksygk# diff --git a/start_sh_example.sh b/start_sh_example.sh deleted file mode 100644 index d8ca510..0000000 --- a/start_sh_example.sh +++ /dev/null @@ -1 +0,0 @@ -docker run -it -v chatbotvol:/opt/telegrambot/data -e "BOT_TOKEN=" -e "BOT_KEY=" -e "BOT_NAME=" -e "CREATOR_ID=" amgamen/chatbot diff --git a/storage/backup/deleted/channel_0/channel_0_1_2021-03-10_06-37-54_237.bak b/storage/backup/deleted/channel_0/channel_0_1_2021-03-10_06-37-54_237.bak deleted file mode 100644 index f0f3b6a06363e47b2d0f0e0ec9a697855b48e326..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8109 zcmb`Ld2Cfx5XMhi6ve985YnKMhe9n&p(P4ck(7$sfJzZHN|c~b0ja21u$D?ti-KF! zD7cHpeL*7zjeFE+T?0mqyGQ`ns8QqkkN0wa-!slR*S>|Dz`U9H&di*1zB%{YR=VU_ z+_>lVAEj>gee2e5+PxBcJN91KtFd=r-x>P=#&k%N&#kX6V7kk!bc$YDtBZWr|{uJQ~A7w5NFWf4{!7aLWdI4KUOS$XnGc(_P5oLItIlGWn3 zI2}syX2j1}atXhZ+Ul{Zt+lDiDCg?=VdH18Yrz#?@$y}Rje#{#t;?zP5NbUbc_?xm z(yp28J*}B=cFhhWuI9ReI>uw)+S|D@w`+7rCXd#%0e{+>=6W!w2^)#0hBzEu4LuQE zjd%pQn(at*+mwoX6#gb;sM(ccGMJ;0p+iLZrhsWi#?5XUSULR$w#Z3D@sO)5Qnh)= zH5PenO3ac@dwggPIwjOs&G~NTR8nd)k3-jHPD9sb9*?fgJOSNqrsAB0|72u*YFeyf zo&x4nWIU-!3750S-HG^g3~B+I+!i<2EpW4<|63wir&ERQHoM_(jK;ROj_vts+?+@|+kN30%xKM12ShpkIyWjh z&TE{Viyc3M>~{Qrv(JxeZ*lXYwXg@mOvdX#&>NXDJpAbfZx3Y~U-((sRZ3n_Y4K;9 z_&@E3DrxpKM$PlL$^BgeeB14=$6JPP1R%L~7 zdI41w#%aydaxzy=FC@DipDU-^7@sSr7aM#}oEHB4>?-{~r`t{ZVmW;Q@x2&FZaJ+u%kW=>3~^d9yTB|*hB&&r&?n;2(rhBsrk1(h}s$R-dw{Px7z&wZyu~RucCVA|qjxygLx7edi^|xZ*;=x>|ayt z)w<`;1XWhZ>*oooDD3s4d8$FnnM%JhzvEjV!j9FePpP?-@#XWgR8Pa8vI?V zD6GLXPurlmHuwi*x8rwIgMUbTapEI%apGfiapDtnapF^S%L&E(4FBiIP=hPSmtZy{ zLk+HcTfuBYh8kQsy=L?pd=pVTq}Sl8%|m((z9l85-{6`<(GC6;DYcnjqiZw2LDyz} zi>}T54&831;{1UBM`WnM74v5>zaT>m{yo0p8(ftY(%?T)MPUuDdD;fewZVTSyB(j_ z;QHp!U;ck%d<9Y*;3DA~_@PgNF(#ir3C3ctM=EYwzTZ>wrQ!cb!P{>e;cPRMHKj~M j3F8wWe$poLCk5Dqe_^)?OBGlvt(Ezk0aeH(t#khXl9dTE diff --git a/storage/backup/deleted/channel_0/channel_0_1_2021-03-18_14-54-15_066.bak b/storage/backup/deleted/channel_0/channel_0_1_2021-03-18_14-54-15_066.bak deleted file mode 100644 index 6833a1c14441a9b12c7ec7c69932f06c4f124028..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4956 zcmbuC`)*ZL5XPsahykk5G^7D(PL)f!w6u*VAgS$!HOSkU)#2)TU|` zP`Mc;Dnj_r2Qcv&_*23IXbA8etkwPdPQ&bda%kBJoxNs#b6IP?nSE%mK1oqM|XTK3CKi`6z)+hCrpH@qr9CnLXON{X1afi{*MK)poI`R$V3gk-U zD&%TpGja`bEmGB;B!Br;oOR%0e2-O3<**)XWQ4~mALZ8qHZsCvm8)`Z1zVGW)j4#o z4PfU4tT-+!rggrWhzQO*|tVx2m4B;7Jav!u~SwE zH14)OJ837vDre21fwqCTNI~Aj!$xE~@-5`Q^Clnm6rYSqMstyF9lnH}E$LL?w~49C z-o#pD+00r+-ojdie229!xcqdo|1L5X(PQN^59U2&B+^dKtJ~koUI%(rZM!|PfpFu; z!rwxWE%r(2eK2T>w$*u3W-HLoM}8RUc*KTn$j$~?4F86#)7f^Bg+}cH_VdBEV53v< zTC6{;zOetS%USE3s_8=Z+iin&gv|X}y!|$!d;4dj4~EShxhr8kZ+}55gO=+@TY-(n6(D_5!M>$M_Fs2A7kx@ zwEP@rzaN=3(B<=UFoVdff!@d7iw|^VHk*MyKo+wb=sKqweWnAwNOW)iyaW9d_Rrf> zryaf$N6$FC=csyI18xYsA6#eA`*|e1dQftfgzK7-aEB42c@xDD) zF}?=#4KnM04T|?2nD3GCe)Kb0zt|Ns{fpfrC-9O&-t!H4dVS?9kzH{-*?k=O^< zGbQ^^*oo{{Sc~jeS&Qt~Sg%H2M|uLw?+x~UMrM&+F@6Pe6PZPJ#rqx1AIL1SD`twA u_dGFw!AlC6BD-=+AyZ`kt&Gn!*>#4BWd9SFp6s{Kd$J4f$u9hD?4APQ2}8^P From 50ebbedc53b7e85b3435178ea75ab623e7765d54 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sat, 20 Nov 2021 08:19:09 +0100 Subject: [PATCH 65/74] gitirgnore angepasst --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fa9a473..e8bb6a1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /target/ microStream.db/ data/ +herthaehnchen_bot* From 5a50d0e5f768fb847ae11156e76931268ded8d1a Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sat, 20 Nov 2021 08:20:47 +0100 Subject: [PATCH 66/74] start sh verbessert --- start_docker_example.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_docker_example.sh b/start_docker_example.sh index dba0e64..c830d86 100644 --- a/start_docker_example.sh +++ b/start_docker_example.sh @@ -1,5 +1,5 @@ #Production -docker run -d --name devtest -v chatbotvol:/opt/telegrambot/data --env-file ./env.list amgamen/chatbot +docker run -d --restart unless-stopped --name chatbot -v chatbotvol:/opt/telegrambot/data --env-file ./env.list amgamen/chatbot #Develop docker run -it -v chatbotvol:/opt/telegrambot/data --env-file ./env.list amgamen/chatbot From 908d5d8e34599202122da14037efe78e7adcfc20 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Sun, 21 Nov 2021 08:28:26 +0100 Subject: [PATCH 67/74] Create develop Action --- .github/workflows/build_develop.yml | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/build_develop.yml diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml new file mode 100644 index 0000000..333bfca --- /dev/null +++ b/.github/workflows/build_develop.yml @@ -0,0 +1,34 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ develop ] + pull_request: + branches: [ develop ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build with Maven + run: mvn --batch-mode --update-snapshots verify From 9220b1f0b290a094290487383bfa3742a4da3975 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Sun, 21 Nov 2021 08:36:40 +0100 Subject: [PATCH 68/74] Update CI with docker --- .github/workflows/build_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index 333bfca..d1a3082 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -6,9 +6,7 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ develop ] pull_request: - branches: [ develop ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -32,3 +30,5 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn --batch-mode --update-snapshots verify + - name: Build for docker + run: docker build -t amgamen/chatbot . From 8ed829bee8f4a5ce30f5fcf6671c4f25c92833ee Mon Sep 17 00:00:00 2001 From: AM Date: Sun, 21 Nov 2021 19:54:53 +0100 Subject: [PATCH 69/74] Docker file fixed --- Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a2a678..0396cec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ FROM eclipse-temurin:17.0.1_12-jdk-focal LABEL maintainer="AMDev" -RUN groupadd --system -g 1001 telegrambot && adduser --system --disabled-password --shell --uid 1001 /bin/false telegrambot && adduser telegrambot telegrambot +RUN groupadd --system -g 1001 telegrambot && adduser --uid 1001 --gid 1001 --disabled-password --shell /bin/false telegrambot COPY --chown=telegrambot:telegrambot target/lib /opt/telegrambot/lib/ COPY --chown=telegrambot:telegrambot target/java.telegrambots-0.9-FINAL.jar /opt/telegrambot/ +RUN chown telegrambot:telegrambot /opt/telegrambot RUN chmod +x /opt/telegrambot/java.telegrambots-0.9-FINAL.jar # Set the locale RUN sed -i '/de_DE.UTF-8/s/^# //g' /etc/locale.gen && \ @@ -19,8 +20,4 @@ USER telegrambot #CMD ["echo $UID"] -ENTRYPOINT ["sh" , "-c", "java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot ${BOT_TOKEN}:${BOT_KEY} ${BOT_NAME} ${CREATOR_ID}"] - - -# AM: could be overriden by command line -#CMD ["-betriebsmodus", "entwicklung"] +ENTRYPOINT ["sh" , "-c", "java -cp java.telegrambots-0.9-FINAL.jar:./lib/* de.bigamgamen.java.telegrambots.hertlhendl.HertlHendlBot ${BOT_TOKEN}:${BOT_KEY} ${BOT_NAME} ${CREATOR_ID}"] \ No newline at end of file From f1862851c6d683b4dec44e08eb7cc7f862123c73 Mon Sep 17 00:00:00 2001 From: AM Date: Sun, 21 Nov 2021 20:09:12 +0100 Subject: [PATCH 70/74] Docker with login and push --- .../workflows/{build_develop.yml => build_java_docker.yml} | 4 ++++ 1 file changed, 4 insertions(+) rename .github/workflows/{build_develop.yml => build_java_docker.yml} (85%) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_java_docker.yml similarity index 85% rename from .github/workflows/build_develop.yml rename to .github/workflows/build_java_docker.yml index d1a3082..6b67725 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_java_docker.yml @@ -32,3 +32,7 @@ jobs: run: mvn --batch-mode --update-snapshots verify - name: Build for docker run: docker build -t amgamen/chatbot . + - name: Docker login + run: docker login --username ${{ DOCKER_USER }} --password ${{ DOCKER_PASSWORD }} + - name: Docker push + run: docker amgamen/chatbot From 41f942bc9fa11a5fc47ef419dd1546cdc5cae091 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Sun, 21 Nov 2021 20:16:11 +0100 Subject: [PATCH 71/74] change secrat access --- .github/workflows/build_java_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 6b67725..dfb420a 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -33,6 +33,6 @@ jobs: - name: Build for docker run: docker build -t amgamen/chatbot . - name: Docker login - run: docker login --username ${{ DOCKER_USER }} --password ${{ DOCKER_PASSWORD }} + run: docker login --username ${{ env.DOCKER_USER }} --password ${{ env.DOCKER_PASSWORD }} - name: Docker push run: docker amgamen/chatbot From 34210b87d2b0f0fc2d431a0c3cc666f5e0a7a600 Mon Sep 17 00:00:00 2001 From: AM Date: Sun, 21 Nov 2021 20:28:08 +0100 Subject: [PATCH 72/74] Buildfile docker secrets --- .github/workflows/build_java_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index dfb420a..3fa1d31 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -33,6 +33,6 @@ jobs: - name: Build for docker run: docker build -t amgamen/chatbot . - name: Docker login - run: docker login --username ${{ env.DOCKER_USER }} --password ${{ env.DOCKER_PASSWORD }} + run: docker login --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASSWORD }} - name: Docker push run: docker amgamen/chatbot From 4290380418dd4b2276bc46fc2497064bd52def7b Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Tue, 23 Nov 2021 21:16:00 +0100 Subject: [PATCH 73/74] docker push --- .github/workflows/build_java_docker.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 3fa1d31..717c49e 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -30,9 +30,16 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn --batch-mode --update-snapshots verify - - name: Build for docker - run: docker build -t amgamen/chatbot . - - name: Docker login - run: docker login --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASSWORD }} - - name: Docker push - run: docker amgamen/chatbot + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: amgamen/chatbot:latest \ No newline at end of file From 3eb3f224edbd8f1e18181fa545f8f7939e6368f4 Mon Sep 17 00:00:00 2001 From: AMeierDev Date: Tue, 23 Nov 2021 21:27:47 +0100 Subject: [PATCH 74/74] docker push with setup --- .github/workflows/build_java_docker.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 717c49e..dd5f82a 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -30,6 +30,14 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn --batch-mode --update-snapshots verify + + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub uses: docker/login-action@v1