├── .gitignore ├── .mvn └── wrapper │ ├── MavenWrapperDownloader.java │ ├── maven-wrapper.jar │ └── maven-wrapper.properties ├── Dockerfile ├── README.MD ├── entrypoint.sh ├── heroku-create-app.sh ├── heroku-deploy-app.sh ├── html ├── index.html ├── login.html └── register.html ├── mvnw ├── mvnw.cmd ├── pom.xml ├── script.sql └── src ├── main ├── java │ └── ru │ │ └── geekbrains │ │ ├── GeekShoppingListApplication.java │ │ ├── controller │ │ ├── LoginController.java │ │ └── ShoppingListController.java │ │ ├── persist │ │ ├── ShoppingItem.java │ │ ├── ShoppingItemRepository.java │ │ ├── User.java │ │ └── UserRepository.java │ │ ├── security │ │ ├── SecurityConfig.java │ │ └── UserAuthService.java │ │ └── service │ │ ├── UserRepr.java │ │ └── UserService.java └── resources │ ├── application.properties │ ├── db │ └── changelog │ │ ├── db.changelog-master.xml │ │ ├── v-1.0 │ │ ├── 01-changeset-users-table.xml │ │ ├── 01-create-users-table.sql │ │ ├── 01-drop-users-table.sql │ │ ├── 10-changeset-shopping-items-table.xml │ │ ├── 10-create-shopping-items-table.sql │ │ ├── 10-drop-shopping-items-table.sql │ │ └── db.changelog-v.1.0.xml │ │ └── v-2.0 │ │ ├── 01-add-users-email.sql │ │ ├── 01-changeset-add-users-email.xml │ │ ├── 01-drop-users-email.sql │ │ └── db.changelog-v.2.0.xml │ ├── liquibase.properties │ └── templates │ ├── index.html │ ├── login.html │ └── register.html └── test └── java └── ru └── geekbrains └── GeekShoppingListApplicationTests.java /.gitignore: -------------------------------------------------------------------------------- 1 | HELP.md 2 | target/ 3 | !.mvn/wrapper/maven-wrapper.jar 4 | !**/src/main/** 5 | !**/src/test/** 6 | 7 | ### STS ### 8 | .apt_generated 9 | .classpath 10 | .factorypath 11 | .project 12 | .settings 13 | .springBeans 14 | .sts4-cache 15 | 16 | ### IntelliJ IDEA ### 17 | .idea 18 | *.iws 19 | *.iml 20 | *.ipr 21 | 22 | ### NetBeans ### 23 | /nbproject/private/ 24 | /nbbuild/ 25 | /dist/ 26 | /nbdist/ 27 | /.nb-gradle/ 28 | build/ 29 | 30 | ### VS Code ### 31 | .vscode/ 32 | -------------------------------------------------------------------------------- /.mvn/wrapper/MavenWrapperDownloader.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright 2007-present the original author or authors. 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * https://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | import java.net.*; 17 | import java.io.*; 18 | import java.nio.channels.*; 19 | import java.util.Properties; 20 | 21 | public class MavenWrapperDownloader { 22 | 23 | private static final String WRAPPER_VERSION = "0.5.6"; 24 | /** 25 | * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. 26 | */ 27 | private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" 28 | + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; 29 | 30 | /** 31 | * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to 32 | * use instead of the default one. 33 | */ 34 | private static final String MAVEN_WRAPPER_PROPERTIES_PATH = 35 | ".mvn/wrapper/maven-wrapper.properties"; 36 | 37 | /** 38 | * Path where the maven-wrapper.jar will be saved to. 39 | */ 40 | private static final String MAVEN_WRAPPER_JAR_PATH = 41 | ".mvn/wrapper/maven-wrapper.jar"; 42 | 43 | /** 44 | * Name of the property which should be used to override the default download url for the wrapper. 45 | */ 46 | private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; 47 | 48 | public static void main(String args[]) { 49 | System.out.println("- Downloader started"); 50 | File baseDirectory = new File(args[0]); 51 | System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); 52 | 53 | // If the maven-wrapper.properties exists, read it and check if it contains a custom 54 | // wrapperUrl parameter. 55 | File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); 56 | String url = DEFAULT_DOWNLOAD_URL; 57 | if(mavenWrapperPropertyFile.exists()) { 58 | FileInputStream mavenWrapperPropertyFileInputStream = null; 59 | try { 60 | mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); 61 | Properties mavenWrapperProperties = new Properties(); 62 | mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); 63 | url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); 64 | } catch (IOException e) { 65 | System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); 66 | } finally { 67 | try { 68 | if(mavenWrapperPropertyFileInputStream != null) { 69 | mavenWrapperPropertyFileInputStream.close(); 70 | } 71 | } catch (IOException e) { 72 | // Ignore ... 73 | } 74 | } 75 | } 76 | System.out.println("- Downloading from: " + url); 77 | 78 | File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); 79 | if(!outputFile.getParentFile().exists()) { 80 | if(!outputFile.getParentFile().mkdirs()) { 81 | System.out.println( 82 | "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); 83 | } 84 | } 85 | System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); 86 | try { 87 | downloadFileFromURL(url, outputFile); 88 | System.out.println("Done"); 89 | System.exit(0); 90 | } catch (Throwable e) { 91 | System.out.println("- Error downloading"); 92 | e.printStackTrace(); 93 | System.exit(1); 94 | } 95 | } 96 | 97 | private static void downloadFileFromURL(String urlString, File destination) throws Exception { 98 | if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { 99 | String username = System.getenv("MVNW_USERNAME"); 100 | char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); 101 | Authenticator.setDefault(new Authenticator() { 102 | @Override 103 | protected PasswordAuthentication getPasswordAuthentication() { 104 | return new PasswordAuthentication(username, password); 105 | } 106 | }); 107 | } 108 | URL website = new URL(urlString); 109 | ReadableByteChannel rbc; 110 | rbc = Channels.newChannel(website.openStream()); 111 | FileOutputStream fos = new FileOutputStream(destination); 112 | fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); 113 | fos.close(); 114 | rbc.close(); 115 | } 116 | 117 | } 118 | -------------------------------------------------------------------------------- /.mvn/wrapper/maven-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/usharik/geek-shopping-list/d977fa355d88ff2bab02a90cf8d3ea152d0c68e5/.mvn/wrapper/maven-wrapper.jar -------------------------------------------------------------------------------- /.mvn/wrapper/maven-wrapper.properties: -------------------------------------------------------------------------------- 1 | distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip 2 | wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar 3 | -------------------------------------------------------------------------------- /Dockerfile: -------------------------------------------------------------------------------- 1 | FROM openjdk:8-jdk-alpine 2 | 3 | ARG JAR_FILE 4 | 5 | RUN mkdir -p /apps 6 | COPY ./target/${JAR_FILE} /apps/app.jar 7 | COPY ./entrypoint.sh /apps/entrypoint.sh 8 | RUN chmod +x /apps/entrypoint.sh 9 | 10 | CMD ["/apps/entrypoint.sh"] -------------------------------------------------------------------------------- /README.MD: -------------------------------------------------------------------------------- 1 | # Geek shopping list 2 | 3 | * [Link to webinar 1](https://www.youtube.com/watch?v=asWX47oZthw) 4 | * [Link to webinar 2](https://www.youtube.com/watch?v=rBKxqQJFeHQ) 5 | * [Link to webinar 3](https://www.youtube.com/watch?v=jl6f0bHl8Pw) 6 | 7 | -------------------------------------------------------------------------------- /entrypoint.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env sh 2 | 3 | if [ -z "$JDBC_DATABASE_URL" ]; then 4 | echo "[INFO] Extracting JDBC_DATABASE_URL from Heroku DATABASE_URL" 5 | 6 | # extract the protocol 7 | proto="`echo $DATABASE_URL | grep '://' | sed -e's,^\(.*://\).*,\1,g'`" 8 | # remove the protocol 9 | url=`echo $DATABASE_URL | sed -e s,$proto,,g` 10 | 11 | echo "[INFO] protocol: "$proto 12 | 13 | # extract the user and password (if any) 14 | userpass="`echo $url | grep @ | cut -d@ -f1`" 15 | pass=`echo $userpass | grep : | cut -d: -f2` 16 | if [ -n "$pass" ]; then 17 | user=`echo $userpass | grep : | cut -d: -f1` 18 | else 19 | user=$userpass 20 | fi 21 | 22 | echo "[INFO] password= "$pass 23 | echo "[INFO] user= "$user 24 | 25 | # extract the host -- updated 26 | hostport=`echo $url | sed -e s,$userpass@,,g | cut -d/ -f1` 27 | port=`echo $hostport | grep : | cut -d: -f2` 28 | if [ -n "$port" ]; then 29 | host=`echo $hostport | grep : | cut -d: -f1` 30 | else 31 | host=$hostport 32 | fi 33 | 34 | echo "[INFO] host= "$host 35 | echo "[INFO] port= "$port 36 | 37 | # extract the path (if any) 38 | db_name="`echo $url | grep / | cut -d/ -f2-`" 39 | 40 | echo "[INFO] path= "$path 41 | 42 | export JDBC_DATABASE_URL="jdbc:postgresql://${host}:${port}/${db_name}" 43 | export JDBC_DATABASE_USERNAME=$user 44 | export JDBC_DATABASE_PASSWORD=$pass 45 | else 46 | echo "[INFO] Using predefined JDBC_DATABASE_URL" 47 | fi 48 | 49 | /usr/bin/java -XX:+UnlockExperimentalVMOptions \ 50 | -XX:+UseCGroupMemoryLimitForHeap \ 51 | -Xmx256m -Xss512k -XX:MetaspaceSize=100m \ 52 | -jar /apps/app.jar -------------------------------------------------------------------------------- /heroku-create-app.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env sh 2 | 3 | heroku apps:create geek-shopping-list 4 | heroku addons:create heroku-postgresql:hobby-dev --app geek-shopping-list -------------------------------------------------------------------------------- /heroku-deploy-app.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env sh 2 | 3 | heroku container:release web --app=geek-shopping-list -------------------------------------------------------------------------------- /html/index.html: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | Список покупок 12 | 13 | 14 | 15 | 35 | 36 | 37 |
38 |
39 |
40 | 41 |
42 | 43 |
44 |
45 |
46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 |
#Название
1Мясо
2Молоко
3Квас
69 |
70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | -------------------------------------------------------------------------------- /html/login.html: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 12 | 13 | Список покупок 14 | 15 | 16 | 17 | 18 | 35 | 36 |
37 |
38 |
39 |
40 |
41 | 42 | 43 | Некорректное имя пользователя или пароль 44 |
45 |
46 | 47 | 48 |
49 | 50 | Зарегистрироваться 51 |
52 |
53 |
54 |
55 | 56 | 57 | 58 | 61 | 64 | 67 | 68 | 69 | 70 | -------------------------------------------------------------------------------- /html/register.html: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 12 | 13 | Список покупок 14 | 15 | 16 | 17 | 18 | 38 | 39 |
40 |
41 |
42 |
43 |
44 | 45 | 46 | Validation error 47 |
48 |
49 | 50 | 51 | Validation error 52 |
53 |
54 | 55 | 56 | Validation error 57 |
58 | 59 |
60 |
61 |
62 |
63 | 64 | 65 | 66 | 69 | 72 | 75 | 76 | 77 | 78 | -------------------------------------------------------------------------------- /mvnw: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # ---------------------------------------------------------------------------- 3 | # Licensed to the Apache Software Foundation (ASF) under one 4 | # or more contributor license agreements. See the NOTICE file 5 | # distributed with this work for additional information 6 | # regarding copyright ownership. The ASF licenses this file 7 | # to you under the Apache License, Version 2.0 (the 8 | # "License"); you may not use this file except in compliance 9 | # with the License. You may obtain a copy of the License at 10 | # 11 | # https://www.apache.org/licenses/LICENSE-2.0 12 | # 13 | # Unless required by applicable law or agreed to in writing, 14 | # software distributed under the License is distributed on an 15 | # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 | # KIND, either express or implied. See the License for the 17 | # specific language governing permissions and limitations 18 | # under the License. 19 | # ---------------------------------------------------------------------------- 20 | 21 | # ---------------------------------------------------------------------------- 22 | # Maven Start Up Batch script 23 | # 24 | # Required ENV vars: 25 | # ------------------ 26 | # JAVA_HOME - location of a JDK home dir 27 | # 28 | # Optional ENV vars 29 | # ----------------- 30 | # M2_HOME - location of maven2's installed home dir 31 | # MAVEN_OPTS - parameters passed to the Java VM when running Maven 32 | # e.g. to debug Maven itself, use 33 | # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 34 | # MAVEN_SKIP_RC - flag to disable loading of mavenrc files 35 | # ---------------------------------------------------------------------------- 36 | 37 | if [ -z "$MAVEN_SKIP_RC" ] ; then 38 | 39 | if [ -f /etc/mavenrc ] ; then 40 | . /etc/mavenrc 41 | fi 42 | 43 | if [ -f "$HOME/.mavenrc" ] ; then 44 | . "$HOME/.mavenrc" 45 | fi 46 | 47 | fi 48 | 49 | # OS specific support. $var _must_ be set to either true or false. 50 | cygwin=false; 51 | darwin=false; 52 | mingw=false 53 | case "`uname`" in 54 | CYGWIN*) cygwin=true ;; 55 | MINGW*) mingw=true;; 56 | Darwin*) darwin=true 57 | # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home 58 | # See https://developer.apple.com/library/mac/qa/qa1170/_index.html 59 | if [ -z "$JAVA_HOME" ]; then 60 | if [ -x "/usr/libexec/java_home" ]; then 61 | export JAVA_HOME="`/usr/libexec/java_home`" 62 | else 63 | export JAVA_HOME="/Library/Java/Home" 64 | fi 65 | fi 66 | ;; 67 | esac 68 | 69 | if [ -z "$JAVA_HOME" ] ; then 70 | if [ -r /etc/gentoo-release ] ; then 71 | JAVA_HOME=`java-config --jre-home` 72 | fi 73 | fi 74 | 75 | if [ -z "$M2_HOME" ] ; then 76 | ## resolve links - $0 may be a link to maven's home 77 | PRG="$0" 78 | 79 | # need this for relative symlinks 80 | while [ -h "$PRG" ] ; do 81 | ls=`ls -ld "$PRG"` 82 | link=`expr "$ls" : '.*-> \(.*\)$'` 83 | if expr "$link" : '/.*' > /dev/null; then 84 | PRG="$link" 85 | else 86 | PRG="`dirname "$PRG"`/$link" 87 | fi 88 | done 89 | 90 | saveddir=`pwd` 91 | 92 | M2_HOME=`dirname "$PRG"`/.. 93 | 94 | # make it fully qualified 95 | M2_HOME=`cd "$M2_HOME" && pwd` 96 | 97 | cd "$saveddir" 98 | # echo Using m2 at $M2_HOME 99 | fi 100 | 101 | # For Cygwin, ensure paths are in UNIX format before anything is touched 102 | if $cygwin ; then 103 | [ -n "$M2_HOME" ] && 104 | M2_HOME=`cygpath --unix "$M2_HOME"` 105 | [ -n "$JAVA_HOME" ] && 106 | JAVA_HOME=`cygpath --unix "$JAVA_HOME"` 107 | [ -n "$CLASSPATH" ] && 108 | CLASSPATH=`cygpath --path --unix "$CLASSPATH"` 109 | fi 110 | 111 | # For Mingw, ensure paths are in UNIX format before anything is touched 112 | if $mingw ; then 113 | [ -n "$M2_HOME" ] && 114 | M2_HOME="`(cd "$M2_HOME"; pwd)`" 115 | [ -n "$JAVA_HOME" ] && 116 | JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" 117 | fi 118 | 119 | if [ -z "$JAVA_HOME" ]; then 120 | javaExecutable="`which javac`" 121 | if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then 122 | # readlink(1) is not available as standard on Solaris 10. 123 | readLink=`which readlink` 124 | if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then 125 | if $darwin ; then 126 | javaHome="`dirname \"$javaExecutable\"`" 127 | javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" 128 | else 129 | javaExecutable="`readlink -f \"$javaExecutable\"`" 130 | fi 131 | javaHome="`dirname \"$javaExecutable\"`" 132 | javaHome=`expr "$javaHome" : '\(.*\)/bin'` 133 | JAVA_HOME="$javaHome" 134 | export JAVA_HOME 135 | fi 136 | fi 137 | fi 138 | 139 | if [ -z "$JAVACMD" ] ; then 140 | if [ -n "$JAVA_HOME" ] ; then 141 | if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 142 | # IBM's JDK on AIX uses strange locations for the executables 143 | JAVACMD="$JAVA_HOME/jre/sh/java" 144 | else 145 | JAVACMD="$JAVA_HOME/bin/java" 146 | fi 147 | else 148 | JAVACMD="`which java`" 149 | fi 150 | fi 151 | 152 | if [ ! -x "$JAVACMD" ] ; then 153 | echo "Error: JAVA_HOME is not defined correctly." >&2 154 | echo " We cannot execute $JAVACMD" >&2 155 | exit 1 156 | fi 157 | 158 | if [ -z "$JAVA_HOME" ] ; then 159 | echo "Warning: JAVA_HOME environment variable is not set." 160 | fi 161 | 162 | CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher 163 | 164 | # traverses directory structure from process work directory to filesystem root 165 | # first directory with .mvn subdirectory is considered project base directory 166 | find_maven_basedir() { 167 | 168 | if [ -z "$1" ] 169 | then 170 | echo "Path not specified to find_maven_basedir" 171 | return 1 172 | fi 173 | 174 | basedir="$1" 175 | wdir="$1" 176 | while [ "$wdir" != '/' ] ; do 177 | if [ -d "$wdir"/.mvn ] ; then 178 | basedir=$wdir 179 | break 180 | fi 181 | # workaround for JBEAP-8937 (on Solaris 10/Sparc) 182 | if [ -d "${wdir}" ]; then 183 | wdir=`cd "$wdir/.."; pwd` 184 | fi 185 | # end of workaround 186 | done 187 | echo "${basedir}" 188 | } 189 | 190 | # concatenates all lines of a file 191 | concat_lines() { 192 | if [ -f "$1" ]; then 193 | echo "$(tr -s '\n' ' ' < "$1")" 194 | fi 195 | } 196 | 197 | BASE_DIR=`find_maven_basedir "$(pwd)"` 198 | if [ -z "$BASE_DIR" ]; then 199 | exit 1; 200 | fi 201 | 202 | ########################################################################################## 203 | # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central 204 | # This allows using the maven wrapper in projects that prohibit checking in binary data. 205 | ########################################################################################## 206 | if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then 207 | if [ "$MVNW_VERBOSE" = true ]; then 208 | echo "Found .mvn/wrapper/maven-wrapper.jar" 209 | fi 210 | else 211 | if [ "$MVNW_VERBOSE" = true ]; then 212 | echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." 213 | fi 214 | if [ -n "$MVNW_REPOURL" ]; then 215 | jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" 216 | else 217 | jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" 218 | fi 219 | while IFS="=" read key value; do 220 | case "$key" in (wrapperUrl) jarUrl="$value"; break ;; 221 | esac 222 | done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" 223 | if [ "$MVNW_VERBOSE" = true ]; then 224 | echo "Downloading from: $jarUrl" 225 | fi 226 | wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" 227 | if $cygwin; then 228 | wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` 229 | fi 230 | 231 | if command -v wget > /dev/null; then 232 | if [ "$MVNW_VERBOSE" = true ]; then 233 | echo "Found wget ... using wget" 234 | fi 235 | if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then 236 | wget "$jarUrl" -O "$wrapperJarPath" 237 | else 238 | wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" 239 | fi 240 | elif command -v curl > /dev/null; then 241 | if [ "$MVNW_VERBOSE" = true ]; then 242 | echo "Found curl ... using curl" 243 | fi 244 | if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then 245 | curl -o "$wrapperJarPath" "$jarUrl" -f 246 | else 247 | curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f 248 | fi 249 | 250 | else 251 | if [ "$MVNW_VERBOSE" = true ]; then 252 | echo "Falling back to using Java to download" 253 | fi 254 | javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" 255 | # For Cygwin, switch paths to Windows format before running javac 256 | if $cygwin; then 257 | javaClass=`cygpath --path --windows "$javaClass"` 258 | fi 259 | if [ -e "$javaClass" ]; then 260 | if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then 261 | if [ "$MVNW_VERBOSE" = true ]; then 262 | echo " - Compiling MavenWrapperDownloader.java ..." 263 | fi 264 | # Compiling the Java class 265 | ("$JAVA_HOME/bin/javac" "$javaClass") 266 | fi 267 | if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then 268 | # Running the downloader 269 | if [ "$MVNW_VERBOSE" = true ]; then 270 | echo " - Running MavenWrapperDownloader.java ..." 271 | fi 272 | ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") 273 | fi 274 | fi 275 | fi 276 | fi 277 | ########################################################################################## 278 | # End of extension 279 | ########################################################################################## 280 | 281 | export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} 282 | if [ "$MVNW_VERBOSE" = true ]; then 283 | echo $MAVEN_PROJECTBASEDIR 284 | fi 285 | MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" 286 | 287 | # For Cygwin, switch paths to Windows format before running java 288 | if $cygwin; then 289 | [ -n "$M2_HOME" ] && 290 | M2_HOME=`cygpath --path --windows "$M2_HOME"` 291 | [ -n "$JAVA_HOME" ] && 292 | JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` 293 | [ -n "$CLASSPATH" ] && 294 | CLASSPATH=`cygpath --path --windows "$CLASSPATH"` 295 | [ -n "$MAVEN_PROJECTBASEDIR" ] && 296 | MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` 297 | fi 298 | 299 | # Provide a "standardized" way to retrieve the CLI args that will 300 | # work with both Windows and non-Windows executions. 301 | MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" 302 | export MAVEN_CMD_LINE_ARGS 303 | 304 | WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain 305 | 306 | exec "$JAVACMD" \ 307 | $MAVEN_OPTS \ 308 | -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ 309 | "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ 310 | ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" 311 | -------------------------------------------------------------------------------- /mvnw.cmd: -------------------------------------------------------------------------------- 1 | @REM ---------------------------------------------------------------------------- 2 | @REM Licensed to the Apache Software Foundation (ASF) under one 3 | @REM or more contributor license agreements. See the NOTICE file 4 | @REM distributed with this work for additional information 5 | @REM regarding copyright ownership. The ASF licenses this file 6 | @REM to you under the Apache License, Version 2.0 (the 7 | @REM "License"); you may not use this file except in compliance 8 | @REM with the License. You may obtain a copy of the License at 9 | @REM 10 | @REM https://www.apache.org/licenses/LICENSE-2.0 11 | @REM 12 | @REM Unless required by applicable law or agreed to in writing, 13 | @REM software distributed under the License is distributed on an 14 | @REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 15 | @REM KIND, either express or implied. See the License for the 16 | @REM specific language governing permissions and limitations 17 | @REM under the License. 18 | @REM ---------------------------------------------------------------------------- 19 | 20 | @REM ---------------------------------------------------------------------------- 21 | @REM Maven Start Up Batch script 22 | @REM 23 | @REM Required ENV vars: 24 | @REM JAVA_HOME - location of a JDK home dir 25 | @REM 26 | @REM Optional ENV vars 27 | @REM M2_HOME - location of maven2's installed home dir 28 | @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands 29 | @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending 30 | @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven 31 | @REM e.g. to debug Maven itself, use 32 | @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 33 | @REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files 34 | @REM ---------------------------------------------------------------------------- 35 | 36 | @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' 37 | @echo off 38 | @REM set title of command window 39 | title %0 40 | @REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' 41 | @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% 42 | 43 | @REM set %HOME% to equivalent of $HOME 44 | if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") 45 | 46 | @REM Execute a user defined script before this one 47 | if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre 48 | @REM check for pre script, once with legacy .bat ending and once with .cmd ending 49 | if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" 50 | if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" 51 | :skipRcPre 52 | 53 | @setlocal 54 | 55 | set ERROR_CODE=0 56 | 57 | @REM To isolate internal variables from possible post scripts, we use another setlocal 58 | @setlocal 59 | 60 | @REM ==== START VALIDATION ==== 61 | if not "%JAVA_HOME%" == "" goto OkJHome 62 | 63 | echo. 64 | echo Error: JAVA_HOME not found in your environment. >&2 65 | echo Please set the JAVA_HOME variable in your environment to match the >&2 66 | echo location of your Java installation. >&2 67 | echo. 68 | goto error 69 | 70 | :OkJHome 71 | if exist "%JAVA_HOME%\bin\java.exe" goto init 72 | 73 | echo. 74 | echo Error: JAVA_HOME is set to an invalid directory. >&2 75 | echo JAVA_HOME = "%JAVA_HOME%" >&2 76 | echo Please set the JAVA_HOME variable in your environment to match the >&2 77 | echo location of your Java installation. >&2 78 | echo. 79 | goto error 80 | 81 | @REM ==== END VALIDATION ==== 82 | 83 | :init 84 | 85 | @REM Find the project base dir, i.e. the directory that contains the folder ".mvn". 86 | @REM Fallback to current working directory if not found. 87 | 88 | set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% 89 | IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir 90 | 91 | set EXEC_DIR=%CD% 92 | set WDIR=%EXEC_DIR% 93 | :findBaseDir 94 | IF EXIST "%WDIR%"\.mvn goto baseDirFound 95 | cd .. 96 | IF "%WDIR%"=="%CD%" goto baseDirNotFound 97 | set WDIR=%CD% 98 | goto findBaseDir 99 | 100 | :baseDirFound 101 | set MAVEN_PROJECTBASEDIR=%WDIR% 102 | cd "%EXEC_DIR%" 103 | goto endDetectBaseDir 104 | 105 | :baseDirNotFound 106 | set MAVEN_PROJECTBASEDIR=%EXEC_DIR% 107 | cd "%EXEC_DIR%" 108 | 109 | :endDetectBaseDir 110 | 111 | IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig 112 | 113 | @setlocal EnableExtensions EnableDelayedExpansion 114 | for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a 115 | @endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% 116 | 117 | :endReadAdditionalConfig 118 | 119 | SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" 120 | set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" 121 | set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain 122 | 123 | set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" 124 | 125 | FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( 126 | IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 127 | ) 128 | 129 | @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central 130 | @REM This allows using the maven wrapper in projects that prohibit checking in binary data. 131 | if exist %WRAPPER_JAR% ( 132 | if "%MVNW_VERBOSE%" == "true" ( 133 | echo Found %WRAPPER_JAR% 134 | ) 135 | ) else ( 136 | if not "%MVNW_REPOURL%" == "" ( 137 | SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" 138 | ) 139 | if "%MVNW_VERBOSE%" == "true" ( 140 | echo Couldn't find %WRAPPER_JAR%, downloading it ... 141 | echo Downloading from: %DOWNLOAD_URL% 142 | ) 143 | 144 | powershell -Command "&{"^ 145 | "$webclient = new-object System.Net.WebClient;"^ 146 | "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ 147 | "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ 148 | "}"^ 149 | "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ 150 | "}" 151 | if "%MVNW_VERBOSE%" == "true" ( 152 | echo Finished downloading %WRAPPER_JAR% 153 | ) 154 | ) 155 | @REM End of extension 156 | 157 | @REM Provide a "standardized" way to retrieve the CLI args that will 158 | @REM work with both Windows and non-Windows executions. 159 | set MAVEN_CMD_LINE_ARGS=%* 160 | 161 | %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* 162 | if ERRORLEVEL 1 goto error 163 | goto end 164 | 165 | :error 166 | set ERROR_CODE=1 167 | 168 | :end 169 | @endlocal & set ERROR_CODE=%ERROR_CODE% 170 | 171 | if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost 172 | @REM check for post script, once with legacy .bat ending and once with .cmd ending 173 | if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" 174 | if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" 175 | :skipRcPost 176 | 177 | @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' 178 | if "%MAVEN_BATCH_PAUSE%" == "on" pause 179 | 180 | if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% 181 | 182 | exit /B %ERROR_CODE% 183 | -------------------------------------------------------------------------------- /pom.xml: -------------------------------------------------------------------------------- 1 | 2 | 4 | 4.0.0 5 | 6 | org.springframework.boot 7 | spring-boot-starter-parent 8 | 2.2.6.RELEASE 9 | 10 | 11 | ru.geekbrains 12 | geek-shopping-list 13 | 0.0.1-SNAPSHOT 14 | geek-shopping-list 15 | Spring Boot Shopping List 16 | 17 | 18 | 1.8 19 | true 20 | 21 | 22 | 23 | 24 | org.springframework.boot 25 | spring-boot-starter-data-jpa 26 | 27 | 28 | org.springframework.boot 29 | spring-boot-starter-thymeleaf 30 | 31 | 32 | org.springframework.boot 33 | spring-boot-starter-web 34 | 35 | 36 | org.springframework.boot 37 | spring-boot-starter-security 38 | 39 | 40 | org.springframework.boot 41 | spring-boot-starter-validation 42 | 43 | 44 | 45 | org.thymeleaf.extras 46 | thymeleaf-extras-springsecurity5 47 | 48 | 49 | 50 | org.liquibase 51 | liquibase-core 52 | 53 | 54 | 55 | com.h2database 56 | h2 57 | runtime 58 | 59 | 60 | mysql 61 | mysql-connector-java 62 | runtime 63 | 64 | 65 | org.postgresql 66 | postgresql 67 | runtime 68 | 69 | 70 | org.springframework.boot 71 | spring-boot-starter-test 72 | test 73 | 74 | 75 | org.junit.vintage 76 | junit-vintage-engine 77 | 78 | 79 | 80 | 81 | 82 | 83 | 84 | 85 | org.springframework.boot 86 | spring-boot-maven-plugin 87 | 88 | 89 | 90 | org.liquibase 91 | liquibase-maven-plugin 92 | 3.6.3 93 | 94 | ${project.basedir}/src/main/resources/liquibase.properties 95 | 96 | 97 | 98 | 99 | com.spotify 100 | dockerfile-maven-plugin 101 | 1.4.13 102 | 103 | 104 | default 105 | 106 | build 107 | push 108 | 109 | 110 | 111 | 112 | registry.heroku.com/${project.artifactId}/web 113 | latest 114 | 115 | ${project.build.finalName}.jar 116 | 117 | 118 | 119 | 120 | 121 | 122 | 123 | -------------------------------------------------------------------------------- /script.sql: -------------------------------------------------------------------------------- 1 | create table shopping_items ( 2 | id bigint not null auto_increment, 3 | name varchar(255) not null, 4 | user_id bigint, 5 | primary key (id) 6 | ) engine=InnoDB 7 | 8 | create table users ( 9 | id bigint not null auto_increment, 10 | password varchar(255) not null, 11 | username varchar(255) not null, 12 | primary key (id) 13 | ) engine=InnoDB 14 | 15 | alter table users 16 | drop index UK_r43af9ap4edm43mmtq01oddj6 17 | 18 | alter table users 19 | add constraint UK_r43af9ap4edm43mmtq01oddj6 unique (username) 20 | 21 | alter table shopping_items 22 | add constraint FKtpkopyby8qwu1noj4n4t3yuig 23 | foreign key (user_id) 24 | references users (id) -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/GeekShoppingListApplication.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains; 2 | 3 | import org.springframework.boot.SpringApplication; 4 | import org.springframework.boot.autoconfigure.SpringBootApplication; 5 | import org.springframework.context.annotation.Bean; 6 | import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; 7 | 8 | @SpringBootApplication 9 | public class GeekShoppingListApplication { 10 | 11 | @Bean 12 | public BCryptPasswordEncoder passwordEncoder() { 13 | return new BCryptPasswordEncoder(); 14 | } 15 | 16 | public static void main(String[] args) { 17 | SpringApplication.run(GeekShoppingListApplication.class, args); 18 | } 19 | 20 | } 21 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/controller/LoginController.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.controller; 2 | 3 | import org.springframework.beans.factory.annotation.Autowired; 4 | import org.springframework.stereotype.Controller; 5 | import org.springframework.ui.Model; 6 | import org.springframework.validation.BindingResult; 7 | import org.springframework.web.bind.annotation.GetMapping; 8 | import org.springframework.web.bind.annotation.ModelAttribute; 9 | import org.springframework.web.bind.annotation.PostMapping; 10 | import ru.geekbrains.service.UserRepr; 11 | import ru.geekbrains.service.UserService; 12 | 13 | import javax.validation.Valid; 14 | 15 | @Controller 16 | public class LoginController { 17 | 18 | private final UserService userService; 19 | 20 | @Autowired 21 | public LoginController(UserService userService) { 22 | this.userService = userService; 23 | } 24 | 25 | @GetMapping("/login") 26 | public String loginPage() { 27 | return "login"; 28 | } 29 | 30 | @GetMapping("/register") 31 | public String registerPage(Model model) { 32 | model.addAttribute("user", new UserRepr()); 33 | return "register"; 34 | } 35 | 36 | @PostMapping("/register") 37 | public String registerNewUser(@Valid @ModelAttribute("user") UserRepr userRepr, BindingResult bindingResult) { 38 | if (bindingResult.hasErrors()) { 39 | return "register"; 40 | } 41 | if (!userRepr.getPassword().equals(userRepr.getRepeatPassword())) { 42 | bindingResult.rejectValue("password", "", "Пароли не совпадают"); 43 | return "register"; 44 | } 45 | 46 | userService.create(userRepr); 47 | return "redirect:/login"; 48 | } 49 | } 50 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/controller/ShoppingListController.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.controller; 2 | 3 | import org.slf4j.Logger; 4 | import org.slf4j.LoggerFactory; 5 | import org.springframework.beans.factory.annotation.Autowired; 6 | import org.springframework.stereotype.Controller; 7 | import org.springframework.ui.Model; 8 | import org.springframework.web.bind.annotation.DeleteMapping; 9 | import org.springframework.web.bind.annotation.GetMapping; 10 | import org.springframework.web.bind.annotation.PathVariable; 11 | import org.springframework.web.bind.annotation.PostMapping; 12 | import ru.geekbrains.persist.ShoppingItem; 13 | import ru.geekbrains.persist.ShoppingItemRepository; 14 | import ru.geekbrains.persist.User; 15 | import ru.geekbrains.persist.UserRepository; 16 | 17 | import java.security.Principal; 18 | 19 | @Controller 20 | public class ShoppingListController { 21 | 22 | private static final Logger logger = LoggerFactory.getLogger(ShoppingListController.class); 23 | 24 | private final ShoppingItemRepository repository; 25 | 26 | private final UserRepository userRepository; 27 | 28 | @Autowired 29 | public ShoppingListController(ShoppingItemRepository repository, UserRepository userRepository) { 30 | this.repository = repository; 31 | this.userRepository = userRepository; 32 | } 33 | 34 | @GetMapping 35 | public String indexPage(Model model, Principal principal) { 36 | logger.info("User name: {}", principal.getName()); 37 | 38 | model.addAttribute("items", repository.findByUserUsername(principal.getName())); 39 | model.addAttribute("item", new ShoppingItem()); 40 | return "index"; 41 | } 42 | 43 | @PostMapping 44 | public String newShoppingItem(ShoppingItem item, Principal principal) { 45 | logger.info("User name: {}", principal.getName()); 46 | 47 | User user = userRepository.findByUsername(principal.getName()).get(); 48 | item.setUser(user); 49 | repository.save(item); 50 | return "redirect:/"; 51 | } 52 | 53 | @DeleteMapping("/{id}") 54 | public String deleteShoppingItem(@PathVariable("id") long id) { 55 | repository.deleteById(id); 56 | return "redirect:/"; 57 | } 58 | } 59 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/persist/ShoppingItem.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.persist; 2 | 3 | import javax.persistence.*; 4 | 5 | @Entity 6 | @Table(name = "shopping_items") 7 | public class ShoppingItem { 8 | 9 | @Id 10 | @GeneratedValue(strategy = GenerationType.IDENTITY) 11 | private Long id; 12 | 13 | @Column(nullable = false) 14 | private String name; 15 | 16 | @ManyToOne 17 | private User user; 18 | 19 | public ShoppingItem() { 20 | } 21 | 22 | public Long getId() { 23 | return id; 24 | } 25 | 26 | public void setId(Long id) { 27 | this.id = id; 28 | } 29 | 30 | public String getName() { 31 | return name; 32 | } 33 | 34 | public void setName(String name) { 35 | this.name = name; 36 | } 37 | 38 | public User getUser() { 39 | return user; 40 | } 41 | 42 | public void setUser(User user) { 43 | this.user = user; 44 | } 45 | } 46 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/persist/ShoppingItemRepository.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.persist; 2 | 3 | import org.springframework.data.jpa.repository.JpaRepository; 4 | import org.springframework.stereotype.Repository; 5 | 6 | import java.util.List; 7 | 8 | @Repository 9 | public interface ShoppingItemRepository extends JpaRepository { 10 | 11 | List findByUserUsername(String username); 12 | } 13 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/persist/User.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.persist; 2 | 3 | import javax.persistence.*; 4 | import java.util.List; 5 | 6 | @Entity 7 | @Table(name = "users") 8 | public class User { 9 | 10 | @Id 11 | @GeneratedValue(strategy = GenerationType.IDENTITY) 12 | private Long id; 13 | 14 | @Column(unique = true, nullable = false) 15 | private String username; 16 | 17 | @Column(nullable = false) 18 | private String password; 19 | 20 | @Column 21 | private String email; 22 | 23 | @OneToMany( 24 | mappedBy = "user", 25 | cascade = CascadeType.ALL, 26 | orphanRemoval = true 27 | ) 28 | private List shoppingItems; 29 | 30 | public User() { 31 | } 32 | 33 | public Long getId() { 34 | return id; 35 | } 36 | 37 | public void setId(Long id) { 38 | this.id = id; 39 | } 40 | 41 | public String getUsername() { 42 | return username; 43 | } 44 | 45 | public void setUsername(String username) { 46 | this.username = username; 47 | } 48 | 49 | public String getPassword() { 50 | return password; 51 | } 52 | 53 | public void setPassword(String password) { 54 | this.password = password; 55 | } 56 | 57 | public List getShoppingItems() { 58 | return shoppingItems; 59 | } 60 | 61 | public void setShoppingItems(List shoppingItems) { 62 | this.shoppingItems = shoppingItems; 63 | } 64 | 65 | public String getEmail() { 66 | return email; 67 | } 68 | 69 | public void setEmail(String email) { 70 | this.email = email; 71 | } 72 | } 73 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/persist/UserRepository.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.persist; 2 | 3 | import org.springframework.data.jpa.repository.JpaRepository; 4 | import org.springframework.stereotype.Repository; 5 | 6 | import java.util.Optional; 7 | 8 | @Repository 9 | public interface UserRepository extends JpaRepository { 10 | 11 | Optional findByUsername(String username); 12 | } 13 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/security/SecurityConfig.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.security; 2 | 3 | import org.springframework.beans.factory.annotation.Autowired; 4 | import org.springframework.context.annotation.Bean; 5 | import org.springframework.context.annotation.Configuration; 6 | import org.springframework.security.authentication.dao.DaoAuthenticationProvider; 7 | import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; 8 | import org.springframework.security.config.annotation.web.builders.HttpSecurity; 9 | import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; 10 | import org.springframework.security.crypto.password.PasswordEncoder; 11 | 12 | @Configuration 13 | public class SecurityConfig extends WebSecurityConfigurerAdapter { 14 | 15 | private PasswordEncoder passwordEncoder; 16 | 17 | private UserAuthService userAuthService; 18 | 19 | @Autowired 20 | public void setPasswordEncoder(PasswordEncoder passwordEncoder) { 21 | this.passwordEncoder = passwordEncoder; 22 | } 23 | 24 | @Autowired 25 | public void setUserAuthService(UserAuthService userAuthService) { 26 | this.userAuthService = userAuthService; 27 | } 28 | 29 | @Override 30 | protected void configure(AuthenticationManagerBuilder auth) throws Exception { 31 | auth.authenticationProvider(authenticationProvider()); 32 | } 33 | 34 | @Override 35 | protected void configure(HttpSecurity http) throws Exception { 36 | http 37 | .authorizeRequests() 38 | .antMatchers("/login").permitAll() 39 | .antMatchers("/register").permitAll() 40 | .antMatchers("/**").authenticated() 41 | .and() 42 | .formLogin() 43 | .loginPage("/login") 44 | .loginProcessingUrl("/authenticateTheUser") 45 | .and() 46 | .logout() 47 | .logoutSuccessUrl("/login") 48 | .permitAll(); 49 | 50 | } 51 | 52 | @Bean 53 | public DaoAuthenticationProvider authenticationProvider() { 54 | DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider(); 55 | authenticationProvider.setUserDetailsService(userAuthService); 56 | authenticationProvider.setPasswordEncoder(passwordEncoder); 57 | return authenticationProvider; 58 | } 59 | } 60 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/security/UserAuthService.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.security; 2 | 3 | import org.springframework.beans.factory.annotation.Autowired; 4 | import org.springframework.security.core.authority.SimpleGrantedAuthority; 5 | import org.springframework.security.core.userdetails.User; 6 | import org.springframework.security.core.userdetails.UserDetails; 7 | import org.springframework.security.core.userdetails.UserDetailsService; 8 | import org.springframework.security.core.userdetails.UsernameNotFoundException; 9 | import org.springframework.stereotype.Service; 10 | import ru.geekbrains.persist.UserRepository; 11 | 12 | import java.util.Collections; 13 | 14 | @Service 15 | public class UserAuthService implements UserDetailsService { 16 | 17 | private final UserRepository repository; 18 | 19 | @Autowired 20 | public UserAuthService(UserRepository repository) { 21 | this.repository = repository; 22 | } 23 | 24 | @Override 25 | public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { 26 | return repository.findByUsername(username) 27 | .map(user -> new User( 28 | user.getUsername(), 29 | user.getPassword(), 30 | Collections.singletonList(new SimpleGrantedAuthority("USER")) 31 | )) 32 | .orElseThrow(() -> new UsernameNotFoundException("Пользователь не найден")); 33 | } 34 | } 35 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/service/UserRepr.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.service; 2 | 3 | import javax.validation.constraints.NotBlank; 4 | 5 | public class UserRepr { 6 | 7 | private Long id; 8 | 9 | @NotBlank 10 | private String username; 11 | 12 | @NotBlank 13 | private String password; 14 | 15 | @NotBlank 16 | private String repeatPassword; 17 | 18 | public Long getId() { 19 | return id; 20 | } 21 | 22 | public void setId(Long id) { 23 | this.id = id; 24 | } 25 | 26 | public String getUsername() { 27 | return username; 28 | } 29 | 30 | public void setUsername(String username) { 31 | this.username = username; 32 | } 33 | 34 | public String getPassword() { 35 | return password; 36 | } 37 | 38 | public void setPassword(String password) { 39 | this.password = password; 40 | } 41 | 42 | public String getRepeatPassword() { 43 | return repeatPassword; 44 | } 45 | 46 | public void setRepeatPassword(String repeatPassword) { 47 | this.repeatPassword = repeatPassword; 48 | } 49 | } 50 | -------------------------------------------------------------------------------- /src/main/java/ru/geekbrains/service/UserService.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains.service; 2 | 3 | import org.springframework.beans.factory.annotation.Autowired; 4 | import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; 5 | import org.springframework.stereotype.Service; 6 | import ru.geekbrains.persist.User; 7 | import ru.geekbrains.persist.UserRepository; 8 | 9 | @Service 10 | public class UserService { 11 | 12 | private final UserRepository repository; 13 | 14 | private final BCryptPasswordEncoder passwordEncoder; 15 | 16 | @Autowired 17 | public UserService(UserRepository repository, BCryptPasswordEncoder passwordEncoder) { 18 | this.repository = repository; 19 | this.passwordEncoder = passwordEncoder; 20 | } 21 | 22 | public void create(UserRepr userRepr) { 23 | User user = new User(); 24 | user.setUsername(userRepr.getUsername()); 25 | user.setPassword(passwordEncoder.encode(userRepr.getPassword())); 26 | repository.save(user); 27 | } 28 | } 29 | -------------------------------------------------------------------------------- /src/main/resources/application.properties: -------------------------------------------------------------------------------- 1 | server.servlet.context-path=/ 2 | server.port=${PORT:8080} 3 | 4 | spring.mvc.hiddenmethod.filter.enabled=true 5 | 6 | #spring.datasource.url=jdbc:h2:mem:testdb 7 | #spring.datasource.driverClassName=org.h2.Driver 8 | #spring.datasource.username=sa 9 | #spring.datasource.password= 10 | #spring.jpa.database-platform=org.hibernate.dialect.H2Dialect 11 | 12 | spring.datasource.url=${JDBC_DATABASE_URL:jdbc:mysql://localhost:3306/shopping_list_db_333?createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true&useSSL=false&useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC} 13 | spring.datasource.username=${JDBC_DATABASE_USERNAME:root} 14 | spring.datasource.password=${JDBC_DATABASE_PASSWORD:root} 15 | spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 16 | spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect 17 | 18 | spring.jpa.show-sql=true 19 | spring.jpa.properties.hibernate.format_sql=true 20 | spring.jpa.hibernate.ddl-auto=validate 21 | 22 | logging.level.root=INFO 23 | logging.level.org.springframework.security=DEBUG 24 | 25 | spring.liquibase.change-log=classpath:db/changelog/db.changelog-master.xml 26 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/db.changelog-master.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/01-changeset-users-table.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | 16 | 17 | 24 | 25 | 26 | 27 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/01-create-users-table.sql: -------------------------------------------------------------------------------- 1 | create table users ( 2 | id bigint not null auto_increment, 3 | password varchar(255) not null, 4 | username varchar(255) not null, 5 | primary key (id) 6 | ) engine=InnoDB 7 | 8 | GO 9 | 10 | alter table users 11 | add constraint UK_r43af9ap4edm43mmtq01oddj6 unique (username) 12 | GO -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/01-drop-users-table.sql: -------------------------------------------------------------------------------- 1 | alter table users 2 | drop index UK_r43af9ap4edm43mmtq01oddj6 3 | GO 4 | 5 | drop table users 6 | GO -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/10-changeset-shopping-items-table.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | 16 | 17 | 24 | 25 | 26 | 27 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/10-create-shopping-items-table.sql: -------------------------------------------------------------------------------- 1 | create table shopping_items ( 2 | id bigint not null auto_increment, 3 | name varchar(255) not null, 4 | user_id bigint, 5 | primary key (id) 6 | ) engine=InnoDB 7 | 8 | GO 9 | 10 | alter table shopping_items 11 | add constraint FKtpkopyby8qwu1noj4n4t3yuig 12 | foreign key (user_id) 13 | references users (id) 14 | GO 15 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/10-drop-shopping-items-table.sql: -------------------------------------------------------------------------------- 1 | alter table shopping_items 2 | drop constraint FKtpkopyby8qwu1noj4n4t3yuig 3 | GO 4 | 5 | drop table shopping_items 6 | GO 7 | 8 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-1.0/db.changelog-v.1.0.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | 10 | 11 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-2.0/01-add-users-email.sql: -------------------------------------------------------------------------------- 1 | alter table users 2 | add column email varchar(256) 3 | GO -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-2.0/01-changeset-add-users-email.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | 16 | 17 | 24 | 25 | 26 | 27 | -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-2.0/01-drop-users-email.sql: -------------------------------------------------------------------------------- 1 | alter table users 2 | drop column email 3 | GO -------------------------------------------------------------------------------- /src/main/resources/db/changelog/v-2.0/db.changelog-v.2.0.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | 10 | -------------------------------------------------------------------------------- /src/main/resources/liquibase.properties: -------------------------------------------------------------------------------- 1 | classpath= 2 | changeLogFile= db/changelog/db.changelog-master.xml 3 | url= jdbc:mysql://localhost:3306/shopping_list_db_333?allowPublicKeyRetrieval=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC 4 | username= root 5 | password= root 6 | driver= com.mysql.cj.jdbc.Driver -------------------------------------------------------------------------------- /src/main/resources/templates/index.html: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | Список покупок 13 | 14 | 15 | 16 | 36 | 37 |
38 |
39 |
40 | 41 |
42 | 43 |
44 |
45 |
46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 64 | 65 | 66 |
#НазваниеДействия
1Мясо 60 |
61 | 62 |
63 |
67 |
68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | -------------------------------------------------------------------------------- /src/main/resources/templates/login.html: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 13 | 14 | Список покупок 15 | 16 | 17 | 18 | 19 | 36 | 37 |
38 |
39 |
40 |
41 |
42 | 43 | 44 | Некорректное имя пользователя или пароль 45 |
46 |
47 | 48 | 49 |
50 | 51 | Зарегистрироваться 52 |
53 |
54 |
55 |
56 | 57 | 58 | 59 | 62 | 65 | 68 | 69 | 70 | 71 | -------------------------------------------------------------------------------- /src/main/resources/templates/register.html: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 13 | 14 | Список покупок 15 | 16 | 17 | 18 | 19 | 36 | 37 |
38 |
39 |
40 |
41 |
42 | 43 | 44 | Validation error 45 |
46 |
47 | 48 | 49 | Validation error 50 |
51 |
52 | 53 | 54 | Validation error 55 |
56 | 57 |
58 |
59 |
60 |
61 | 62 | 63 | 64 | 67 | 70 | 73 | 74 | 75 | 76 | -------------------------------------------------------------------------------- /src/test/java/ru/geekbrains/GeekShoppingListApplicationTests.java: -------------------------------------------------------------------------------- 1 | package ru.geekbrains; 2 | 3 | import org.junit.jupiter.api.Test; 4 | import org.springframework.boot.test.context.SpringBootTest; 5 | 6 | @SpringBootTest 7 | class GeekShoppingListApplicationTests { 8 | 9 | @Test 10 | void contextLoads() { 11 | } 12 | 13 | } 14 | --------------------------------------------------------------------------------