From f9998b58e05b33d8561f4927ba04abb48e8a1390 Mon Sep 17 00:00:00 2001 From: rafaelspereira90 Date: Wed, 4 Sep 2019 12:56:08 -0300 Subject: [PATCH 1/6] =?UTF-8?q?Classes=20de=20Autentica=C3=A7=C3=A3o=20do?= =?UTF-8?q?=20Usu=C3=A1rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 31 ++ .mvn/wrapper/MavenWrapperDownloader.java | 114 +++++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .mvn/wrapper/maven-wrapper.properties | 1 + mvnw | 286 ++++++++++++++++++ mvnw.cmd | 161 ++++++++++ pom.xml | 75 +++++ .../santander/gastos/GastosApplication.java | 15 + .../gastos/config/security/AuthService.java | 33 ++ .../security/SecurityConfigurations.java | 63 ++++ .../config/security/TokenAuthFilter.java | 71 +++++ .../gastos/config/security/TokenService.java | 57 ++++ .../gastos/controller/AuthController.java | 46 +++ .../gastos/controller/form/LoginForm.java | 26 ++ .../com/santander/gastos/model/Profile.java | 39 +++ .../br/com/santander/gastos/model/User.java | 148 +++++++++ .../gastos/repository/UserRepository.java | 12 + .../br/com/santander/gastos/vo/TokenVO.java | 20 ++ src/main/resources/application.properties | 17 ++ src/main/resources/data.sql | 1 + .../gastos/GastosApplicationTests.java | 16 + 21 files changed, 1232 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/br/com/santander/gastos/GastosApplication.java create mode 100644 src/main/java/br/com/santander/gastos/config/security/AuthService.java create mode 100644 src/main/java/br/com/santander/gastos/config/security/SecurityConfigurations.java create mode 100644 src/main/java/br/com/santander/gastos/config/security/TokenAuthFilter.java create mode 100644 src/main/java/br/com/santander/gastos/config/security/TokenService.java create mode 100644 src/main/java/br/com/santander/gastos/controller/AuthController.java create mode 100644 src/main/java/br/com/santander/gastos/controller/form/LoginForm.java create mode 100644 src/main/java/br/com/santander/gastos/model/Profile.java create mode 100644 src/main/java/br/com/santander/gastos/model/User.java create mode 100644 src/main/java/br/com/santander/gastos/repository/UserRepository.java create mode 100644 src/main/java/br/com/santander/gastos/vo/TokenVO.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/data.sql create mode 100644 src/test/java/br/com/santander/gastos/GastosApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a2a3040a --- /dev/null +++ b/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..72308aa4 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,114 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: : " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..fef5a8f7 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,161 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..48101c68 --- /dev/null +++ b/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.7.RELEASE + + + br.com.santander + gastos + 0.0.1-SNAPSHOT + gastos + Demo project for Spring Boot + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-cache + + + + org.springframework.boot + spring-boot-starter-security + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + com.h2database + h2 + + + + org.springframework.boot + spring-boot-devtools + runtime + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/br/com/santander/gastos/GastosApplication.java b/src/main/java/br/com/santander/gastos/GastosApplication.java new file mode 100644 index 00000000..eb2d5ee6 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/GastosApplication.java @@ -0,0 +1,15 @@ +package br.com.santander.gastos; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.web.config.EnableSpringDataWebSupport; + +@SpringBootApplication +@EnableSpringDataWebSupport +public class GastosApplication { + + public static void main(String[] args) { + SpringApplication.run(GastosApplication.class, args); + } + +} diff --git a/src/main/java/br/com/santander/gastos/config/security/AuthService.java b/src/main/java/br/com/santander/gastos/config/security/AuthService.java new file mode 100644 index 00000000..af19edec --- /dev/null +++ b/src/main/java/br/com/santander/gastos/config/security/AuthService.java @@ -0,0 +1,33 @@ +package br.com.santander.gastos.config.security; + +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import br.com.santander.gastos.model.User; +import br.com.santander.gastos.repository.UserRepository; + + +@Service +public class AuthService implements UserDetailsService { + + @Autowired + private UserRepository userRepository; + + @Override + public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { + + Optional user = userRepository.findByEmail(email); + + if(user.isPresent()){ + return user.get(); + } + + throw new UsernameNotFoundException("User not found."); + } + +} diff --git a/src/main/java/br/com/santander/gastos/config/security/SecurityConfigurations.java b/src/main/java/br/com/santander/gastos/config/security/SecurityConfigurations.java new file mode 100644 index 00000000..1ac1c9b6 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/config/security/SecurityConfigurations.java @@ -0,0 +1,63 @@ +package br.com.santander.gastos.config.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import br.com.santander.gastos.repository.UserRepository; + +@EnableWebSecurity +@Configuration +public class SecurityConfigurations extends WebSecurityConfigurerAdapter { + + @Autowired + AuthService authService; + + @Autowired + private TokenService tokenService; + + @Autowired + private UserRepository userRepository; + + @Override + @Bean + protected AuthenticationManager authenticationManager() throws Exception { + return super.authenticationManager(); + } + + //Autenticação + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(authService).passwordEncoder(new BCryptPasswordEncoder()); + } + + //Autorização + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .antMatchers(HttpMethod.POST, "/auth").permitAll() + .antMatchers("/h2-console/**").permitAll() + .anyRequest().authenticated() + .and().headers().frameOptions().sameOrigin() + .and().cors() + .and().csrf().disable() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and().addFilterBefore(new TokenAuthFilter(tokenService, userRepository), UsernamePasswordAuthenticationFilter.class); + } + + //Arquivos (js, css, jpg) + @Override + public void configure(WebSecurity web) throws Exception { + web.ignoring().antMatchers("/**.html", "/v2/api-docs", "/webjars/**", "/configuration/**", "/swagger-resources/**"); + } +} diff --git a/src/main/java/br/com/santander/gastos/config/security/TokenAuthFilter.java b/src/main/java/br/com/santander/gastos/config/security/TokenAuthFilter.java new file mode 100644 index 00000000..50c576f4 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/config/security/TokenAuthFilter.java @@ -0,0 +1,71 @@ +package br.com.santander.gastos.config.security; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +import br.com.santander.gastos.model.User; +import br.com.santander.gastos.repository.UserRepository; + +public class TokenAuthFilter extends OncePerRequestFilter { + + private TokenService tokenService; + + private UserRepository userRepository; + + + public TokenAuthFilter(TokenService tokenService, UserRepository userRepository) { + this.tokenService = tokenService; + this.userRepository = userRepository; + } + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String token = getToken(request); + + boolean isValid = tokenService.isTokenValid(token); + + if(isValid){ + authenticateClient(token); + } + + filterChain.doFilter(request, response); + } + + + private void authenticateClient(String token) { + + Long userId = tokenService.getUserId(token); + + User user = userRepository.findById(userId).get(); + + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities()); + + SecurityContextHolder.getContext().setAuthentication(authentication); + } + + + private String getToken(HttpServletRequest request) { + + String token = request.getHeader("Authorization"); + + if(token == null || token.isEmpty() || !token.startsWith("Bearer ")){ + return null; + } + + return token.substring(7, token.length()); + } + + + +} diff --git a/src/main/java/br/com/santander/gastos/config/security/TokenService.java b/src/main/java/br/com/santander/gastos/config/security/TokenService.java new file mode 100644 index 00000000..13cfefa8 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/config/security/TokenService.java @@ -0,0 +1,57 @@ +package br.com.santander.gastos.config.security; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Service; + +import br.com.santander.gastos.model.User; + + +@Service +public class TokenService { + + @Value("${gastos.jwt.expiration}") + private String expiration; + + @Value("${gastos.jwt.secret}") + private String secret; + + public String generateToken(Authentication authentication) { + + User loggedUser = (User) authentication.getPrincipal(); + Date today = new Date(); + Date expirationDate = new Date(today.getTime() + Long.valueOf(expiration)); + + return Jwts.builder() + .setIssuer("API do Fórum") + .setSubject(loggedUser.getId().toString()) + .setIssuedAt(today) + .setExpiration(expirationDate) + .signWith(SignatureAlgorithm.HS256, secret) + .compact(); + + } + + public boolean isTokenValid(String token) { + + try { + Jwts.parser().setSigningKey(this.secret).parseClaimsJws(token); + + return true; + } catch (Exception e) { + return false; + } + } + + public Long getUserId(String token) { + Claims claims = Jwts.parser().setSigningKey(this.secret).parseClaimsJws(token).getBody(); + + return Long.valueOf(claims.getSubject()); + } +} diff --git a/src/main/java/br/com/santander/gastos/controller/AuthController.java b/src/main/java/br/com/santander/gastos/controller/AuthController.java new file mode 100644 index 00000000..6c17a632 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/controller/AuthController.java @@ -0,0 +1,46 @@ +package br.com.santander.gastos.controller; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import br.com.santander.gastos.config.security.TokenService; +import br.com.santander.gastos.controller.form.LoginForm; +import br.com.santander.gastos.vo.TokenVO; + +@RestController +@RequestMapping("/auth") +public class AuthController { + + @Autowired + private AuthenticationManager authManager; + + @Autowired + private TokenService tokenService; + + @PostMapping + public ResponseEntity auth(@RequestBody @Valid LoginForm form) { + UsernamePasswordAuthenticationToken dadosLogin = form.converter(); + + try { + Authentication authentication = authManager.authenticate(dadosLogin); + + String token = tokenService.generateToken(authentication); + + return ResponseEntity.ok(new TokenVO(token, "Bearer")); + + } catch (AuthenticationException e) { + return ResponseEntity.badRequest().build(); + } + + } +} diff --git a/src/main/java/br/com/santander/gastos/controller/form/LoginForm.java b/src/main/java/br/com/santander/gastos/controller/form/LoginForm.java new file mode 100644 index 00000000..59523cd0 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/controller/form/LoginForm.java @@ -0,0 +1,26 @@ +package br.com.santander.gastos.controller.form; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; + +public class LoginForm { + + private String email; + private String password; + + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + + public UsernamePasswordAuthenticationToken converter() { + return new UsernamePasswordAuthenticationToken(email,password); + } +} diff --git a/src/main/java/br/com/santander/gastos/model/Profile.java b/src/main/java/br/com/santander/gastos/model/Profile.java new file mode 100644 index 00000000..76681ad4 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/model/Profile.java @@ -0,0 +1,39 @@ +package br.com.santander.gastos.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +import org.springframework.security.core.GrantedAuthority; + +@Entity +public class Profile implements GrantedAuthority { + + private static final long serialVersionUID = -6683879421499369119L; + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String name; + + @Override + public String getAuthority() { + return name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/br/com/santander/gastos/model/User.java b/src/main/java/br/com/santander/gastos/model/User.java new file mode 100644 index 00000000..eb96daa0 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/model/User.java @@ -0,0 +1,148 @@ +package br.com.santander.gastos.model; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToMany; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + + +@Entity +public class User implements UserDetails { + + private static final long serialVersionUID = -5617909948372378386L; + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String name; + private String email; + private String password; + private String cpf; + + @ManyToMany(fetch = FetchType.EAGER) + private List profiles = new ArrayList<>(); + + public User() { + } + + public User (String name, String email, String password, String cpf) { + this.name = name; + this.email = email; + this.password = new BCryptPasswordEncoder().encode(password); + this.cpf = cpf; + } + + @Override + public Collection getAuthorities() { + return this.profiles; + } + + @Override + public String getPassword() { + return this.password; + } + + @Override + public String getUsername() { + return this.email; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + User other = (User) obj; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + return true; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getCpf() { + return cpf; + } + + public void setCpf(String cpf) { + this.cpf = cpf; + } + + public void setPassword(String password) { + this.password = password; + } + + public List getProfiles() { + return profiles; + } + + public void setProfiles(List profiles) { + this.profiles = profiles; + } + +} diff --git a/src/main/java/br/com/santander/gastos/repository/UserRepository.java b/src/main/java/br/com/santander/gastos/repository/UserRepository.java new file mode 100644 index 00000000..6fa274e0 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/repository/UserRepository.java @@ -0,0 +1,12 @@ +package br.com.santander.gastos.repository; + +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; + +import br.com.santander.gastos.model.User; + +public interface UserRepository extends JpaRepository { + + Optional findByEmail(String email); +} diff --git a/src/main/java/br/com/santander/gastos/vo/TokenVO.java b/src/main/java/br/com/santander/gastos/vo/TokenVO.java new file mode 100644 index 00000000..204d8047 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/vo/TokenVO.java @@ -0,0 +1,20 @@ +package br.com.santander.gastos.vo; + +public class TokenVO { + + private String type; + private String token; + + public TokenVO(String token, String type) { + this.token = token; + this.type = type; + } + + public String getType() { + return type; + } + + public String getToken() { + return token; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..c3929e7b --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,17 @@ +# Datasource +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:gastos +spring.datasource.username=sa +spring.datasource.password= + +# Jpa +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=update + +# H2 +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console + +# Jwt +gastos.jwt.secret=n18beizXILyC5WtDJUAnIIMczoh8X0uY3nrVTjFENqrJpPCtckx5nt5CHw62 +gastos.jwt.expiration=172800000 diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql new file mode 100644 index 00000000..90f13ca7 --- /dev/null +++ b/src/main/resources/data.sql @@ -0,0 +1 @@ +INSERT INTO USER(name, email, password, cpf) VALUES('Rafael', 'rafael@gmail.com', '$2a$10$mnDScYY5JddnRUG.kbqSK.0tBPu5DW4DQe64liAC0Ztd4x1N3hBfi', '13630757723'); diff --git a/src/test/java/br/com/santander/gastos/GastosApplicationTests.java b/src/test/java/br/com/santander/gastos/GastosApplicationTests.java new file mode 100644 index 00000000..8d9197c9 --- /dev/null +++ b/src/test/java/br/com/santander/gastos/GastosApplicationTests.java @@ -0,0 +1,16 @@ +package br.com.santander.gastos; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GastosApplicationTests { + + @Test + public void contextLoads() { + } + +} From 22117336e2e03f0b6d89e1328d0651664d6675b0 Mon Sep 17 00:00:00 2001 From: rafaelspereira90 Date: Wed, 4 Sep 2019 14:53:12 -0300 Subject: [PATCH 2/6] =?UTF-8?q?Carga=20Inicial=20no=20banco=20H2=20e=20Cri?= =?UTF-8?q?a=C3=A7=C3=A3o=20de=20Classes=20Modelo=20de=20Gasto=20e=20Categ?= =?UTF-8?q?oria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/santander/gastos/model/Categoria.java | 32 ++++++++ .../br/com/santander/gastos/model/Gasto.java | 76 +++++++++++++++++++ src/main/resources/data.sql | 10 ++- 3 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 src/main/java/br/com/santander/gastos/model/Categoria.java create mode 100644 src/main/java/br/com/santander/gastos/model/Gasto.java diff --git a/src/main/java/br/com/santander/gastos/model/Categoria.java b/src/main/java/br/com/santander/gastos/model/Categoria.java new file mode 100644 index 00000000..0e5ea27f --- /dev/null +++ b/src/main/java/br/com/santander/gastos/model/Categoria.java @@ -0,0 +1,32 @@ +package br.com.santander.gastos.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Categoria { + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String descricao; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + +} diff --git a/src/main/java/br/com/santander/gastos/model/Gasto.java b/src/main/java/br/com/santander/gastos/model/Gasto.java new file mode 100644 index 00000000..984beaf2 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/model/Gasto.java @@ -0,0 +1,76 @@ +package br.com.santander.gastos.model; + +import java.time.LocalDateTime; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class Gasto { + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long Id; + + private Long idUsuario; + + private LocalDateTime data; + + private double valor; + + private String descricao; + + @ManyToOne + private Categoria categoria; + + + public Long getId() { + return Id; + } + + public void setId(Long id) { + Id = id; + } + + public Long getIdUsuario() { + return idUsuario; + } + + public void setIdUsuario(Long idUsuario) { + this.idUsuario = idUsuario; + } + + public LocalDateTime getData() { + return data; + } + + public void setData(LocalDateTime data) { + this.data = data; + } + + public double getValor() { + return valor; + } + + public void setValor(double valor) { + this.valor = valor; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } +} diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 90f13ca7..3aafea7f 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1 +1,9 @@ -INSERT INTO USER(name, email, password, cpf) VALUES('Rafael', 'rafael@gmail.com', '$2a$10$mnDScYY5JddnRUG.kbqSK.0tBPu5DW4DQe64liAC0Ztd4x1N3hBfi', '13630757723'); +INSERT INTO USER(name, email, password, cpf) +VALUES('Rafael', 'rafael@gmail.com', '$2a$10$mnDScYY5JddnRUG.kbqSK.0tBPu5DW4DQe64liAC0Ztd4x1N3hBfi', '13630757723'); + +INSERT INTO CATEGORIA(descricao) VALUES ('Transporte'); +INSERT INTO CATEGORIA(descricao) VALUES ('Alimentacao'); +INSERT INTO CATEGORIA(descricao) VALUES ('Saude'); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (1, '2019-05-05 18:00:00', 149.99, 'Compras Mensais Extra', 2); \ No newline at end of file From 9d1b2d3bfc691213a4d5e27b95a12cd132ca6cb6 Mon Sep 17 00:00:00 2001 From: rafaelspereira90 Date: Thu, 5 Sep 2019 14:22:08 -0300 Subject: [PATCH 3/6] =?UTF-8?q?Cria=C3=A7=C3=A3o=20do=20Controller=20de=20?= =?UTF-8?q?Gastos=20e=20implementa=C3=A7=C3=A3o=20de=20Endpoints=20de=20Li?= =?UTF-8?q?stagem=20e=20Cadastro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/controller/GastosController.java | 95 +++++++++++++++++++ .../gastos/controller/form/GastoForm.java | 54 +++++++++++ .../br/com/santander/gastos/model/Gasto.java | 12 +++ .../repository/CategoriaRepository.java | 10 ++ .../gastos/repository/GastoRepository.java | 20 ++++ .../br/com/santander/gastos/vo/GastoVO.java | 73 ++++++++++++++ src/main/resources/data.sql | 11 ++- 7 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 src/main/java/br/com/santander/gastos/controller/GastosController.java create mode 100644 src/main/java/br/com/santander/gastos/controller/form/GastoForm.java create mode 100644 src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java create mode 100644 src/main/java/br/com/santander/gastos/repository/GastoRepository.java create mode 100644 src/main/java/br/com/santander/gastos/vo/GastoVO.java diff --git a/src/main/java/br/com/santander/gastos/controller/GastosController.java b/src/main/java/br/com/santander/gastos/controller/GastosController.java new file mode 100644 index 00000000..d5343868 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/controller/GastosController.java @@ -0,0 +1,95 @@ +package br.com.santander.gastos.controller; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.util.UriComponentsBuilder; + +import br.com.santander.gastos.controller.form.GastoForm; +import br.com.santander.gastos.model.Gasto; +import br.com.santander.gastos.model.User; +import br.com.santander.gastos.repository.CategoriaRepository; +import br.com.santander.gastos.repository.GastoRepository; +import br.com.santander.gastos.repository.UserRepository; +import br.com.santander.gastos.vo.GastoVO; + +@RestController +@RequestMapping("/gastos") +public class GastosController { + + @Autowired + private GastoRepository gastoRepository; + + @Autowired + private CategoriaRepository categoriaRepository; + + @Autowired + private UserRepository userRepository; + + @GetMapping + @ResponseBody + public ResponseEntity> listarGastos(@RequestParam(required = false) String data) { + + Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + + String userName; + if(principal instanceof UserDetails) { + userName = ((UserDetails) principal).getUsername(); + } else { + userName = principal.toString(); + } + + Optional user = userRepository.findByEmail(userName); + + List listaGastos; + if(data == null) { + listaGastos = gastoRepository.findByIdUsuarioOrderByDataDesc(user.get().getId()); + + return new ResponseEntity<>(GastoVO.converter(listaGastos), HttpStatus.OK); + }else { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + Date date = new Date(); + try { + date = sdf.parse(data); + } catch (ParseException e) { + System.out.println("Erro ao converter data: " + e.getMessage()); + } + + listaGastos = gastoRepository.findGastosByDate(user.get().getId(), date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + + return new ResponseEntity<>(GastoVO.converter(listaGastos), HttpStatus.OK); + } + + } + + + @PostMapping(consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @Transactional + public ResponseEntity cadastrarGasto(@RequestBody List listaGastos, UriComponentsBuilder uriBuilder) { + + for(GastoForm gasto : listaGastos){ + Gasto novoGasto = gasto.converter(); + gastoRepository.save(novoGasto); + } + return ResponseEntity.status(HttpStatus.OK).build(); + } +} diff --git a/src/main/java/br/com/santander/gastos/controller/form/GastoForm.java b/src/main/java/br/com/santander/gastos/controller/form/GastoForm.java new file mode 100644 index 00000000..a830c861 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/controller/form/GastoForm.java @@ -0,0 +1,54 @@ +package br.com.santander.gastos.controller.form; + +import java.time.LocalDateTime; + +import br.com.santander.gastos.model.Gasto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GastoForm { + + @JsonProperty("descricao") + private String descricao; + + @JsonProperty("valor") + private double valor; + + @JsonProperty("codigousuario") + private Long codigousuario; + + @JsonProperty("data") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + private LocalDateTime data; + + public Gasto converter() { + return new Gasto(this.getCodigoUsuario(), this.getData(), this.getValor(), this.getDescricao(), null); + } + + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + public double getValor() { + return valor; + } + public void setValor(double valor) { + this.valor = valor; + } + public Long getCodigoUsuario() { + return codigousuario; + } + public void setCodigoUsuario(Long codigousuario) { + this.codigousuario = codigousuario; + } + public LocalDateTime getData() { + return data; + } + public void setData(LocalDateTime data) { + this.data = data; + } + +} diff --git a/src/main/java/br/com/santander/gastos/model/Gasto.java b/src/main/java/br/com/santander/gastos/model/Gasto.java index 984beaf2..19d5477d 100644 --- a/src/main/java/br/com/santander/gastos/model/Gasto.java +++ b/src/main/java/br/com/santander/gastos/model/Gasto.java @@ -25,6 +25,18 @@ public class Gasto { @ManyToOne private Categoria categoria; + + public Gasto(){ + + } + + public Gasto(Long idUsuario, LocalDateTime data, double valor, String descricao, Categoria categoria) { + this.idUsuario = idUsuario; + this.data = data; + this.valor = valor; + this.descricao = descricao; + this.categoria = categoria; + } public Long getId() { return Id; diff --git a/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java b/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java new file mode 100644 index 00000000..60a6b4b3 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java @@ -0,0 +1,10 @@ +package br.com.santander.gastos.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import br.com.santander.gastos.model.Categoria; + +public interface CategoriaRepository extends JpaRepository { + + Categoria findByDescricao(String descricao); +} diff --git a/src/main/java/br/com/santander/gastos/repository/GastoRepository.java b/src/main/java/br/com/santander/gastos/repository/GastoRepository.java new file mode 100644 index 00000000..91fd279f --- /dev/null +++ b/src/main/java/br/com/santander/gastos/repository/GastoRepository.java @@ -0,0 +1,20 @@ +package br.com.santander.gastos.repository; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import br.com.santander.gastos.model.Gasto; + +public interface GastoRepository extends JpaRepository { + + List findByIdUsuarioOrderByDataDesc(Long id); + + @Query("SELECT g FROM Gasto g WHERE g.idUsuario = :id AND g.data >= :date order by g.data DESC") + List findGastosByDate(@Param("id") Long id, @Param("date") LocalDateTime date); + + +} diff --git a/src/main/java/br/com/santander/gastos/vo/GastoVO.java b/src/main/java/br/com/santander/gastos/vo/GastoVO.java new file mode 100644 index 00000000..72586899 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/vo/GastoVO.java @@ -0,0 +1,73 @@ +package br.com.santander.gastos.vo; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +import br.com.santander.gastos.model.Gasto; + +public class GastoVO { + + private Long id; + + private Long idUsuario; + + private LocalDateTime data; + + private double valor; + + private String descricao; + + public GastoVO(Gasto gasto){ + this.id = gasto.getId(); + this.idUsuario = gasto.getIdUsuario(); + this.data = gasto.getData(); + this.valor = gasto.getValor(); + this.descricao = gasto.getDescricao(); + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getIdUsuario() { + return idUsuario; + } + + public void setIdUsuario(Long idUsuario) { + this.idUsuario = idUsuario; + } + + public LocalDateTime getData() { + return data; + } + + public void setData(LocalDateTime data) { + this.data = data; + } + + public double getValor() { + return valor; + } + + public void setValor(double valor) { + this.valor = valor; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public static List converter(List listaGastos) { + return listaGastos.stream().map(GastoVO::new).collect(Collectors.toList()); + } + +} diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 3aafea7f..769d7f29 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -6,4 +6,13 @@ INSERT INTO CATEGORIA(descricao) VALUES ('Alimentacao'); INSERT INTO CATEGORIA(descricao) VALUES ('Saude'); INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) -VALUES (1, '2019-05-05 18:00:00', 149.99, 'Compras Mensais Extra', 2); \ No newline at end of file +VALUES (1, '2019-05-05 18:00:00', 149.99, 'Compras Mensais Extra', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (1, '2019-08-04 18:00:00', 29.99, 'Compras Lojas Americanas', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (1, '2019-08-04 10:00:00', 333.00, 'Compra Mi Band', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (1, '2019-08-04 22:00:00', 80.00, 'Ifood', 2); \ No newline at end of file From 77e8fb5b7a5c814768781e537f6a21780375b723 Mon Sep 17 00:00:00 2001 From: rafaelspereira90 Date: Fri, 6 Sep 2019 12:52:32 -0300 Subject: [PATCH 4/6] =?UTF-8?q?Cria=C3=A7=C3=A3o=20das=20Classes=20Service?= =?UTF-8?q?s=20e=20endpoints=20de=20inclus=C3=A3o=20de=20categoria=20e=20d?= =?UTF-8?q?e=20detalhe=20dos=20Gastos=20e=20detalhe=20de=20gastos=20por=20?= =?UTF-8?q?data.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/controller/GastosController.java | 80 ++++++++++++------- .../gastos/controller/form/CategoriaForm.java | 42 ++++++++++ .../gastos/repository/GastoRepository.java | 8 +- .../gastos/service/GastoService.java | 18 +++++ .../gastos/service/GastoServiceImpl.java | 72 +++++++++++++++++ .../santander/gastos/service/UserService.java | 13 +++ .../gastos/service/UserServiceImpl.java | 38 +++++++++ .../br/com/santander/gastos/vo/GastoVO.java | 16 ++++ src/main/resources/data.sql | 20 ++++- 9 files changed, 274 insertions(+), 33 deletions(-) create mode 100644 src/main/java/br/com/santander/gastos/controller/form/CategoriaForm.java create mode 100644 src/main/java/br/com/santander/gastos/service/GastoService.java create mode 100644 src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java create mode 100644 src/main/java/br/com/santander/gastos/service/UserService.java create mode 100644 src/main/java/br/com/santander/gastos/service/UserServiceImpl.java diff --git a/src/main/java/br/com/santander/gastos/controller/GastosController.java b/src/main/java/br/com/santander/gastos/controller/GastosController.java index d5343868..3494f6c8 100644 --- a/src/main/java/br/com/santander/gastos/controller/GastosController.java +++ b/src/main/java/br/com/santander/gastos/controller/GastosController.java @@ -1,9 +1,5 @@ package br.com.santander.gastos.controller; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.ZoneId; -import java.util.Date; import java.util.List; import java.util.Optional; @@ -11,24 +7,25 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.util.UriComponentsBuilder; +import br.com.santander.gastos.controller.form.CategoriaForm; import br.com.santander.gastos.controller.form.GastoForm; import br.com.santander.gastos.model.Gasto; import br.com.santander.gastos.model.User; import br.com.santander.gastos.repository.CategoriaRepository; import br.com.santander.gastos.repository.GastoRepository; import br.com.santander.gastos.repository.UserRepository; +import br.com.santander.gastos.service.GastoService; +import br.com.santander.gastos.service.UserService; import br.com.santander.gastos.vo.GastoVO; @RestController @@ -44,51 +41,74 @@ public class GastosController { @Autowired private UserRepository userRepository; + @Autowired + private GastoService gastoService; + + @Autowired + private UserService userService; + @GetMapping @ResponseBody public ResponseEntity> listarGastos(@RequestParam(required = false) String data) { - Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); - - String userName; - if(principal instanceof UserDetails) { - userName = ((UserDetails) principal).getUsername(); - } else { - userName = principal.toString(); - } - - Optional user = userRepository.findByEmail(userName); + String userName = userService.getUsuarioLogado(); + + Optional user = userService.findByEmail(userName); List listaGastos; if(data == null) { - listaGastos = gastoRepository.findByIdUsuarioOrderByDataDesc(user.get().getId()); + listaGastos = gastoService.findByIdUsuarioOrderByDataDesc(user.get().getId()); return new ResponseEntity<>(GastoVO.converter(listaGastos), HttpStatus.OK); }else { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - - Date date = new Date(); - try { - date = sdf.parse(data); - } catch (ParseException e) { - System.out.println("Erro ao converter data: " + e.getMessage()); - } - - listaGastos = gastoRepository.findGastosByDate(user.get().getId(), date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + listaGastos = gastoService.findByDate(user.get().getId(), data); return new ResponseEntity<>(GastoVO.converter(listaGastos), HttpStatus.OK); } } + @GetMapping("/{id}") + public ResponseEntity detalhar(@PathVariable Long id) { + + String userName = userService.getUsuarioLogado(); + + Optional user = userService.findByEmail(userName); + + Optional gasto = gastoService.findById(user.get().getId(), id); + + if(gasto.isPresent()) { + return ResponseEntity.ok(new GastoVO(gasto.get())); + } + + return ResponseEntity.notFound().build(); + } @PostMapping(consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) @Transactional - public ResponseEntity cadastrarGasto(@RequestBody List listaGastos, UriComponentsBuilder uriBuilder) { + public ResponseEntity cadastrarGasto(@RequestBody List listaGastos) { for(GastoForm gasto : listaGastos){ Gasto novoGasto = gasto.converter(); - gastoRepository.save(novoGasto); + gastoService.save(novoGasto); + } + return ResponseEntity.status(HttpStatus.OK).build(); + } + + @PostMapping("/{id}") + public ResponseEntity AssociarCategoria(@PathVariable Long id, @RequestBody CategoriaForm categoria) { + + String userName = userService.getUsuarioLogado(); + + Optional user = userService.findByEmail(userName); + + Optional gasto = gastoService.findById(user.get().getId(), id); + + if(gasto.isPresent()){ + if(gasto.get().getCategoria() == null) { + gasto = categoria.incluirCategoria(gasto, gastoRepository, categoriaRepository); + gastoService.save(gasto.get()); + } } return ResponseEntity.status(HttpStatus.OK).build(); } diff --git a/src/main/java/br/com/santander/gastos/controller/form/CategoriaForm.java b/src/main/java/br/com/santander/gastos/controller/form/CategoriaForm.java new file mode 100644 index 00000000..eda58771 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/controller/form/CategoriaForm.java @@ -0,0 +1,42 @@ +package br.com.santander.gastos.controller.form; + +import java.util.Optional; + +import br.com.santander.gastos.model.Categoria; +import br.com.santander.gastos.model.Gasto; +import br.com.santander.gastos.repository.CategoriaRepository; +import br.com.santander.gastos.repository.GastoRepository; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class CategoriaForm { + + @JsonProperty("descricao") + private String descricao; + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Optional incluirCategoria(Optional gasto, GastoRepository gastoRepository, CategoriaRepository categoriaRepository) { + + Categoria cat = categoriaRepository.findByDescricao(this.descricao); + + if(cat != null){ + gasto.get().setCategoria(cat); + }else{ + cat = new Categoria(); + cat.setDescricao(this.descricao); + + categoriaRepository.save(cat); + + gasto.get().setCategoria(cat); + } + + return gasto; + } +} diff --git a/src/main/java/br/com/santander/gastos/repository/GastoRepository.java b/src/main/java/br/com/santander/gastos/repository/GastoRepository.java index 91fd279f..369f7eaf 100644 --- a/src/main/java/br/com/santander/gastos/repository/GastoRepository.java +++ b/src/main/java/br/com/santander/gastos/repository/GastoRepository.java @@ -2,6 +2,7 @@ import java.time.LocalDateTime; import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -13,8 +14,11 @@ public interface GastoRepository extends JpaRepository { List findByIdUsuarioOrderByDataDesc(Long id); - @Query("SELECT g FROM Gasto g WHERE g.idUsuario = :id AND g.data >= :date order by g.data DESC") - List findGastosByDate(@Param("id") Long id, @Param("date") LocalDateTime date); + @Query("SELECT g FROM Gasto g WHERE g.idUsuario = :id AND g.data >= :date AND g.data <= :dateFim order by g.data DESC") + List findGastosByDate(@Param("id") Long id, @Param("date") LocalDateTime date, @Param("dateFim") LocalDateTime dateFim); + + @Query("SELECT g FROM Gasto g WHERE g.idUsuario = :idUsuario AND g.id = :idGasto") + Optional findById(@Param("idUsuario") Long idUsuario, @Param("idGasto") Long idGasto); } diff --git a/src/main/java/br/com/santander/gastos/service/GastoService.java b/src/main/java/br/com/santander/gastos/service/GastoService.java new file mode 100644 index 00000000..7416ffea --- /dev/null +++ b/src/main/java/br/com/santander/gastos/service/GastoService.java @@ -0,0 +1,18 @@ +package br.com.santander.gastos.service; + +import java.util.List; +import java.util.Optional; + +import br.com.santander.gastos.model.Gasto; + +public interface GastoService { + + List findByIdUsuarioOrderByDataDesc(Long id); + + List findByDate(Long id, String data); + + Optional findById(Long userId, Long gastoId); + + void save(Gasto novoGasto); + +} diff --git a/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java b/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java new file mode 100644 index 00000000..06a36fcf --- /dev/null +++ b/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java @@ -0,0 +1,72 @@ +package br.com.santander.gastos.service; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.santander.gastos.model.Gasto; +import br.com.santander.gastos.repository.GastoRepository; + +@Service +public class GastoServiceImpl implements GastoService { + + Date date = new Date(); + Date dateFim = new Date(); + + + @Autowired + private GastoRepository gastoRepository; + + @Override + public List findByIdUsuarioOrderByDataDesc(Long id) { + return gastoRepository.findByIdUsuarioOrderByDataDesc(id); + } + + @Override + public List findByDate(Long userId, String data) { + + tratarDatas(data); + + return gastoRepository.findGastosByDate(userId, + date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), + dateFim.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + } + + private void tratarDatas(String data) { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + try { + date = sdf.parse(data); + } catch (ParseException e) { + System.out.println("Erro ao converter data: " + e.getMessage()); + } + + Calendar dateEnd = new GregorianCalendar(); + dateEnd.setTime(date); + dateEnd.set(Calendar.HOUR, 23); + dateEnd.set(Calendar.MINUTE, 59); + dateEnd.set(Calendar.SECOND, 59); + dateFim = dateEnd.getTime(); + + } + + @Override + public Optional findById(Long userId, Long gastoId) { + return gastoRepository.findById(userId, gastoId); + } + + @Override + public void save(Gasto novoGasto) { + gastoRepository.save(novoGasto); + } + +} diff --git a/src/main/java/br/com/santander/gastos/service/UserService.java b/src/main/java/br/com/santander/gastos/service/UserService.java new file mode 100644 index 00000000..1e3abb77 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/service/UserService.java @@ -0,0 +1,13 @@ +package br.com.santander.gastos.service; + +import java.util.Optional; + +import br.com.santander.gastos.model.User; + +public interface UserService { + + String getUsuarioLogado(); + + Optional findByEmail(String userName); + +} diff --git a/src/main/java/br/com/santander/gastos/service/UserServiceImpl.java b/src/main/java/br/com/santander/gastos/service/UserServiceImpl.java new file mode 100644 index 00000000..77646ec1 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/service/UserServiceImpl.java @@ -0,0 +1,38 @@ +package br.com.santander.gastos.service; + +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Service; + +import br.com.santander.gastos.model.User; +import br.com.santander.gastos.repository.UserRepository; + +@Service +public class UserServiceImpl implements UserService { + + @Autowired + private UserRepository userRepository; + + @Override + public String getUsuarioLogado() { + + Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + + if(principal instanceof UserDetails) { + return ((UserDetails) principal).getUsername(); + } else { + return principal.toString(); + } + + } + + @Override + public Optional findByEmail(String userName) { + + return userRepository.findByEmail(userName); + } + +} diff --git a/src/main/java/br/com/santander/gastos/vo/GastoVO.java b/src/main/java/br/com/santander/gastos/vo/GastoVO.java index 72586899..843e2b34 100644 --- a/src/main/java/br/com/santander/gastos/vo/GastoVO.java +++ b/src/main/java/br/com/santander/gastos/vo/GastoVO.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.stream.Collectors; +import br.com.santander.gastos.model.Categoria; import br.com.santander.gastos.model.Gasto; public class GastoVO { @@ -17,6 +18,8 @@ public class GastoVO { private double valor; private String descricao; + + private Categoria categoria; public GastoVO(Gasto gasto){ this.id = gasto.getId(); @@ -24,6 +27,11 @@ public GastoVO(Gasto gasto){ this.data = gasto.getData(); this.valor = gasto.getValor(); this.descricao = gasto.getDescricao(); + this.categoria = new Categoria(); + if(gasto.getCategoria() != null){ + this.categoria.setId(gasto.getCategoria().getId()); + this.categoria.setDescricao(gasto.getCategoria().getDescricao()); + } } public Long getId() { @@ -69,5 +77,13 @@ public void setDescricao(String descricao) { public static List converter(List listaGastos) { return listaGastos.stream().map(GastoVO::new).collect(Collectors.toList()); } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } } diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 769d7f29..db7fa813 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -15,4 +15,22 @@ INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) VALUES (1, '2019-08-04 10:00:00', 333.00, 'Compra Mi Band', 2); INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) -VALUES (1, '2019-08-04 22:00:00', 80.00, 'Ifood', 2); \ No newline at end of file +VALUES (1, '2019-08-04 22:00:00', 80.00, 'Ifood', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (1, '2019-08-05 22:00:00', 10.00, 'Ifood', null); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (2, '2019-05-05 18:00:00', 149.99, 'Compras Mensais Extra', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (2, '2019-08-04 18:00:00', 29.99, 'Compras Lojas Americanas', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (2, '2019-08-04 10:00:00', 333.00, 'Compra Mi Band', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (2, '2019-08-04 22:00:00', 80.00, 'Ifood', 2); + +INSERT INTO GASTO(id_usuario, data, valor, descricao, categoria_id) +VALUES (2, '2019-08-05 22:00:00', 10.00, 'Ifood', 2); \ No newline at end of file From da0a0cc29d00c570c860e8ebb4ad5c702b1baff6 Mon Sep 17 00:00:00 2001 From: rafaelspereira90 Date: Fri, 6 Sep 2019 19:29:16 -0300 Subject: [PATCH 5/6] =?UTF-8?q?Cria=C3=A7=C3=A3o=20dos=20Endpoints=20de=20?= =?UTF-8?q?Sugest=C3=A3o=20de=20Categoria=20e=20Categoriza=C3=A7=C3=A3o=20?= =?UTF-8?q?Autom=C3=A1tica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoriaController.java | 31 +++++++++++++++++ .../repository/CategoriaRepository.java | 7 ++++ .../gastos/repository/GastoRepository.java | 2 +- .../gastos/service/CategoriaService.java | 12 +++++++ .../gastos/service/CategoriaServiceImpl.java | 26 ++++++++++++++ .../gastos/service/GastoServiceImpl.java | 10 +++++- .../com/santander/gastos/vo/CategoriaVO.java | 34 +++++++++++++++++++ 7 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 src/main/java/br/com/santander/gastos/controller/CategoriaController.java create mode 100644 src/main/java/br/com/santander/gastos/service/CategoriaService.java create mode 100644 src/main/java/br/com/santander/gastos/service/CategoriaServiceImpl.java create mode 100644 src/main/java/br/com/santander/gastos/vo/CategoriaVO.java diff --git a/src/main/java/br/com/santander/gastos/controller/CategoriaController.java b/src/main/java/br/com/santander/gastos/controller/CategoriaController.java new file mode 100644 index 00000000..05a0edf7 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/controller/CategoriaController.java @@ -0,0 +1,31 @@ +package br.com.santander.gastos.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import br.com.santander.gastos.service.CategoriaService; +import br.com.santander.gastos.vo.CategoriaVO; + +@RestController +@RequestMapping("/categorias") +public class CategoriaController { + + @Autowired + CategoriaService categoriaService; + + @GetMapping("/{descricao}") + public ResponseEntity> sugestaoCategoria(@PathVariable String descricao){ + + List listaCategorias = categoriaService.findByDescricao(descricao); + + return new ResponseEntity<>(listaCategorias, HttpStatus.OK); + } + +} diff --git a/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java b/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java index 60a6b4b3..2c707dec 100644 --- a/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java +++ b/src/main/java/br/com/santander/gastos/repository/CategoriaRepository.java @@ -1,10 +1,17 @@ package br.com.santander.gastos.repository; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import br.com.santander.gastos.model.Categoria; public interface CategoriaRepository extends JpaRepository { Categoria findByDescricao(String descricao); + + @Query("SELECT c FROM Categoria c WHERE UPPER(c.descricao) LIKE CONCAT('%',UPPER(:descricao),'%')") + List findCategoriasByDescricao(@Param("descricao") String descricao); } diff --git a/src/main/java/br/com/santander/gastos/repository/GastoRepository.java b/src/main/java/br/com/santander/gastos/repository/GastoRepository.java index 369f7eaf..bba0bddc 100644 --- a/src/main/java/br/com/santander/gastos/repository/GastoRepository.java +++ b/src/main/java/br/com/santander/gastos/repository/GastoRepository.java @@ -20,5 +20,5 @@ public interface GastoRepository extends JpaRepository { @Query("SELECT g FROM Gasto g WHERE g.idUsuario = :idUsuario AND g.id = :idGasto") Optional findById(@Param("idUsuario") Long idUsuario, @Param("idGasto") Long idGasto); - + Optional findFirstByDescricao(String descricao); } diff --git a/src/main/java/br/com/santander/gastos/service/CategoriaService.java b/src/main/java/br/com/santander/gastos/service/CategoriaService.java new file mode 100644 index 00000000..735b28b3 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/service/CategoriaService.java @@ -0,0 +1,12 @@ +package br.com.santander.gastos.service; + +import java.util.List; + +import br.com.santander.gastos.vo.CategoriaVO; + + +public interface CategoriaService { + + List findByDescricao(String descricao); + +} diff --git a/src/main/java/br/com/santander/gastos/service/CategoriaServiceImpl.java b/src/main/java/br/com/santander/gastos/service/CategoriaServiceImpl.java new file mode 100644 index 00000000..688c8db8 --- /dev/null +++ b/src/main/java/br/com/santander/gastos/service/CategoriaServiceImpl.java @@ -0,0 +1,26 @@ +package br.com.santander.gastos.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.santander.gastos.model.Categoria; +import br.com.santander.gastos.repository.CategoriaRepository; +import br.com.santander.gastos.vo.CategoriaVO; + +@Service +public class CategoriaServiceImpl implements CategoriaService { + + @Autowired + CategoriaRepository categoriaRepository; + + @Override + public List findByDescricao(String descricao) { + List listaCategorias = categoriaRepository.findCategoriasByDescricao(descricao); + + List listaCategoriasVO = CategoriaVO.converter(listaCategorias); + + return listaCategoriasVO; + } +} diff --git a/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java b/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java index 06a36fcf..f7e0b25e 100644 --- a/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java +++ b/src/main/java/br/com/santander/gastos/service/GastoServiceImpl.java @@ -17,7 +17,7 @@ @Service public class GastoServiceImpl implements GastoService { - + Date date = new Date(); Date dateFim = new Date(); @@ -66,6 +66,14 @@ public Optional findById(Long userId, Long gastoId) { @Override public void save(Gasto novoGasto) { + + if(novoGasto.getDescricao() != null && !novoGasto.getDescricao().isEmpty()) { + + Optional listaGasto = gastoRepository.findFirstByDescricao(novoGasto.getDescricao()); + + listaGasto.ifPresent(g -> novoGasto.setCategoria(g.getCategoria())); + } + gastoRepository.save(novoGasto); } diff --git a/src/main/java/br/com/santander/gastos/vo/CategoriaVO.java b/src/main/java/br/com/santander/gastos/vo/CategoriaVO.java new file mode 100644 index 00000000..a3c9f4fe --- /dev/null +++ b/src/main/java/br/com/santander/gastos/vo/CategoriaVO.java @@ -0,0 +1,34 @@ +package br.com.santander.gastos.vo; + +import java.util.List; +import java.util.stream.Collectors; + +import br.com.santander.gastos.model.Categoria; + +public class CategoriaVO { + + private Long id; + private String descricao; + + public CategoriaVO(Categoria categoria) { + this.id = categoria.getId(); + this.descricao = categoria.getDescricao(); + } + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public static List converter(List listaCategorias) { + return listaCategorias.stream().map(CategoriaVO::new).collect(Collectors.toList()); + } +} From 1f3effc1f14aadd7c01e222c9fb6a096df208535 Mon Sep 17 00:00:00 2001 From: rafaelspereira90 Date: Sat, 7 Sep 2019 14:23:31 -0300 Subject: [PATCH 6/6] =?UTF-8?q?Teste=20com=20JUnit=20e=20Instru=C3=A7?= =?UTF-8?q?=C3=B5es=20para=20rodar=20o=20projeto.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 189 +++++++++++------- pom.xml | 6 + src/main/resources/data.sql | 3 + .../gastos/GastosControllerTest.java | 64 ++++++ 4 files changed, 186 insertions(+), 76 deletions(-) create mode 100644 src/test/java/br/com/santander/gastos/GastosControllerTest.java diff --git a/README.md b/README.md index 15d8f685..b747e1ee 100644 --- a/README.md +++ b/README.md @@ -1,76 +1,113 @@ -# Show me the code - -### # DESAFIO: - -API REST para Gestão de Gastos! - -``` -Funcionalidade: Integração de gastos por cartão - Apenas sistemas credenciados poderão incluir novos gastos - É esperado um volume de 100.000 inclusões por segundo - Os gastos, serão informados atraves do protoloco JSON, seguindo padrão: - { "descricao": "alfanumerico", "valor": double americano, "codigousuario": numerico, "data": Data dem formato UTC } -``` -``` -Funcionalidade: Listagem de gastos* - Dado que acesso como um cliente autenticado que pode visualizar os gastos do cartão - Quando acesso a interface de listagem de gastos - Então gostaria de ver meus gastos mais atuais. - -*Para esta funcionalidade é esperado 2.000 acessos por segundo. -*O cliente espera ver gastos realizados a 5 segundos atrás. -``` -``` -Funcionalidade: Filtro de gastos - Dado que acesso como um cliente autenticado - E acessei a interface de listagem de gastos - E configure o filtro de data igual a 27/03/1992 - Então gostaria de ver meus gastos apenas deste dia. -``` -``` -Funcionalidade: Categorização de gastos - Dado que acesso como um cliente autenticado - Quando acesso o detalhe de um gasto - E este não possui uma categoria - Então devo conseguir incluir uma categoria para este -``` -``` -Funcionalidade: Sugestão de categoria - Dado que acesso como um cliente autenticado - Quando acesso o detalhe do gasto que não possui categoria - E começo a digitar a categoria que desejo - Então uma lista de sugestões de categoria deve ser exibida, estas baseadas em categorias já informadas por outro usuários. -``` -``` -Funcionalidade: Categorização automatica de gasto - No processo de integração de gastos, a categoria deve ser incluida automaticamente - caso a descrição de um gasto seja igual a descrição de qualquer outro gasto já categorizado pelo cliente - o mesmo deve receber esta categoria no momento da inclusão do mesmo -``` -### # Avaliação - -Você será avaliado pela usabilidade, por respeitar o design e pela arquitetura da API. -É esperado que você consiga explicar as decisões que tomou durante o desenvolvimento através de commits. - -* Springboot - Java - Maven (preferêncialmente) ([https://projects.spring.io/spring-boot/](https://projects.spring.io/spring-boot/)) -* RESTFul ([https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/](https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/)) -* DDD ([https://airbrake.io/blog/software-design/domain-driven-design](https://airbrake.io/blog/software-design/domain-driven-design)) -* Microservices ([https://martinfowler.com/microservices/](https://martinfowler.com/microservices/)) -* Testes unitários, teste o que achar importante (De preferência JUnit + Mockito). Mas pode usar o que você tem mais experiência, só nos explique o que ele tem de bom. -* SOAPUI para testes de carga ([https://www.soapui.org/load-testing/concept.html](https://www.soapui.org/load-testing/concept.html)) -* Uso de diferentes formas de armazenamento de dados (REDIS, Cassandra, Solr/Lucene) -* Uso do git -* Diferencial: Criptografia de comunicação, com troca de chaves. ([http://noiseprotocol.org/](http://noiseprotocol.org/)) -* Diferencial: CQRS ([https://martinfowler.com/bliki/CQRS.html](https://martinfowler.com/bliki/CQRS.html)) -* Diferencial: Docker File + Docker Compose (com dbs) para rodar seus jars. - -### # Observações gerais - -Adicione um arquivo [README.md](http://README.md) com os procedimentos para executar o projeto. -Pedimos que trabalhe sozinho e não divulgue o resultado na internet. - -Faça um fork desse desse repositório em seu Github e nos envie um Pull Request com o resultado, por favor informe por qual empresa você esta se candidatando. - -### # Importante: não há prazo de entrega, faça com qualidade! - -# BOA SORTE! +# Show me the code + +### # Instruções para rodar o Projeto: + +Baixar o projeto na máquina local. +No CMD navegar até a pasta do projeto. +rodar o comando mvn spring-boot:run +(É necessário ter o maven instalado no computador). + +A Aplicação irá iniciar e já estará pronta para receber requisiões. +(O banco utilizado foi o banco em memória H2 para facilitar o uso. Não é necessária configuração). + +Funcionalidade: Login +EndPoint: (POST) /auth: +(Irá retornar o Bearer Token necessário para todas próximas requisições) +``` +Exemplo de JSON: +{ + "email": "user@email.com", + "password": "123456" +} +``` + +Funcionalidade: Integração de gastos por cartão +EndPoint: (POST) "/gastos": +(Retorna status 200 OK) + +``` + Exemplo de JSON: +[ + { + "descricao": "Novo Gasto", + "valor": 999.99, + "codigousuario": 1, + "data": "2013-08-12T18:00:00" + }, + { + "descricao": "Compras Mensais Extra", + "valor": 29.99, + "codigousuario": 1, + "data": "1999-08-12T18:00:00" + } +] +``` + +Funcionalidade: Detalhes do Gasto +EndPoint: (GET) "/gastos/{id}": +(Retorna Dados do gasto do usuário autenticado conforme id passado) +``` +Não é necessário passar nehum dado no corpo da requisição +``` + +Funcionalidade: Listagem de gastos +EndPoint: (GET) "/gastos": +(Retorna JSON com Gastos do Usuário que fez a requisição) +``` +Não é necessário passar nehum dado no corpo da requisição +``` + +Funcionalidade: Filtro de gastos por Data +EndPoint: GET "/gastos?data" +(Retorna JSON com Gastos do Usuário para a data passada) +``` +Exemplo de Requisição: "/gastos?data=2019-08-04" +``` + +Funcionalidade: Categorização de gastos +EndPoint: (POST) "/gastos/{id}" (id do gasto) +(Retorna status 200 OK) +``` + Exemplo de JSON: +{ + "descricao": "Alimentacao" +} +``` +Funcionalidade: Sugestão de categoria +EndPoint: (GET) "/categorias/{descricao}" (descricao da categoria. Não é neccesário a descrição completa.) +(Retorna sugestão de categoria) +``` +Não é necessário passar nehum dado no corpo da requisição +``` + +Funcionalidade: Categorização automatica de gasto +``` +Está implementada no momento de integração dos gastos +``` +### # Avaliação + +Você será avaliado pela usabilidade, por respeitar o design e pela arquitetura da API. +É esperado que você consiga explicar as decisões que tomou durante o desenvolvimento através de commits. + +* Springboot - Java - Maven (preferêncialmente) ([https://projects.spring.io/spring-boot/](https://projects.spring.io/spring-boot/)) +* RESTFul ([https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/](https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/)) +* DDD ([https://airbrake.io/blog/software-design/domain-driven-design](https://airbrake.io/blog/software-design/domain-driven-design)) +* Microservices ([https://martinfowler.com/microservices/](https://martinfowler.com/microservices/)) +* Testes unitários, teste o que achar importante (De preferência JUnit + Mockito). Mas pode usar o que você tem mais experiência, só nos explique o que ele tem de bom. +* SOAPUI para testes de carga ([https://www.soapui.org/load-testing/concept.html](https://www.soapui.org/load-testing/concept.html)) +* Uso de diferentes formas de armazenamento de dados (REDIS, Cassandra, Solr/Lucene) +* Uso do git +* Diferencial: Criptografia de comunicação, com troca de chaves. ([http://noiseprotocol.org/](http://noiseprotocol.org/)) +* Diferencial: CQRS ([https://martinfowler.com/bliki/CQRS.html](https://martinfowler.com/bliki/CQRS.html)) +* Diferencial: Docker File + Docker Compose (com dbs) para rodar seus jars. + +### # Observações gerais + +Adicione um arquivo [README.md](http://README.md) com os procedimentos para executar o projeto. +Pedimos que trabalhe sozinho e não divulgue o resultado na internet. + +Faça um fork desse desse repositório em seu Github e nos envie um Pull Request com o resultado, por favor informe por qual empresa você esta se candidatando. + +### # Importante: não há prazo de entrega, faça com qualidade! + +# BOA SORTE! diff --git a/pom.xml b/pom.xml index 48101c68..86c2c1e1 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,12 @@ h2 + + org.springframework.boot + spring-boot-starter-data-redis + 2.1.2.RELEASE + + org.springframework.boot spring-boot-devtools diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index db7fa813..6857c5da 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,6 +1,9 @@ INSERT INTO USER(name, email, password, cpf) VALUES('Rafael', 'rafael@gmail.com', '$2a$10$mnDScYY5JddnRUG.kbqSK.0tBPu5DW4DQe64liAC0Ztd4x1N3hBfi', '13630757723'); +INSERT INTO USER(name, email, password, cpf) +VALUES('User', 'user@email.com', '$2a$10$mnDScYY5JddnRUG.kbqSK.0tBPu5DW4DQe64liAC0Ztd4x1N3hBfi', '13630757723'); + INSERT INTO CATEGORIA(descricao) VALUES ('Transporte'); INSERT INTO CATEGORIA(descricao) VALUES ('Alimentacao'); INSERT INTO CATEGORIA(descricao) VALUES ('Saude'); diff --git a/src/test/java/br/com/santander/gastos/GastosControllerTest.java b/src/test/java/br/com/santander/gastos/GastosControllerTest.java new file mode 100644 index 00000000..8aed0d4b --- /dev/null +++ b/src/test/java/br/com/santander/gastos/GastosControllerTest.java @@ -0,0 +1,64 @@ +package br.com.santander.gastos; + +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.verify; + +import java.time.LocalDateTime; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import br.com.santander.gastos.model.Gasto; +import br.com.santander.gastos.repository.GastoRepository; +import br.com.santander.gastos.service.GastoService; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class GastosControllerTest { + + @Autowired + public WebApplicationContext context; + + private MockMvc mvc; + + private Gasto gasto; + + @Autowired + private GastoService service; + + @MockBean + private GastoRepository repository; + + @Before + public void setup() { + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + + gasto = new Gasto(); + gasto.setDescricao("Primeiro Gasto"); + gasto.setValor(new Double(1.0)); + gasto.setIdUsuario(Long.valueOf(1)); + gasto.setData(LocalDateTime.now()); + } + + @Test + public void cadastrarGasto() { + service.save(gasto); + verify(repository).save(gasto); + } + + @Test + public void buscarGastos() { + Long userId = Long.valueOf(1); + List listaGastos = service.findByIdUsuarioOrderByDataDesc(userId); + assertTrue(listaGastos.size() > 0); + } +}