From 61b3e5a1e02acfdd984fd3bcbec27f3b413c7773 Mon Sep 17 00:00:00 2001 From: cleversonmelo89 Date: Mon, 4 Feb 2019 22:34:26 +0000 Subject: [PATCH 01/17] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..4bb44a0d --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# gastos \ No newline at end of file From 4a7fb807558170388b1f1173348c37ddf42c2973 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Mon, 4 Feb 2019 20:41:36 -0200 Subject: [PATCH 02/17] commit inicial com controllers, models e repository --- .gitignore | 25 ++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .mvn/wrapper/maven-wrapper.properties | 1 + mvnw | 286 ++++++++++++++++++ mvnw.cmd | 161 ++++++++++ pom.xml | 71 +++++ .../com/gestao/gastos/GastosApplication.java | 14 + .../controller/CategoriasController.java | 5 + .../gastos/controller/GastosController.java | 5 + .../com/gestao/gastos/model/Categorias.java | 30 ++ .../br/com/gestao/gastos/model/Gastos.java | 61 ++++ .../gastos/repository/GastosRepository.java | 5 + src/main/resources/application.properties | 0 .../gestao/gastos/GastosApplicationTests.java | 17 ++ 14 files changed, 681 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/br/com/gestao/gastos/GastosApplication.java create mode 100644 src/main/java/br/com/gestao/gastos/controller/CategoriasController.java create mode 100644 src/main/java/br/com/gestao/gastos/controller/GastosController.java create mode 100644 src/main/java/br/com/gestao/gastos/model/Categorias.java create mode 100644 src/main/java/br/com/gestao/gastos/model/Gastos.java create mode 100644 src/main/java/br/com/gestao/gastos/repository/GastosRepository.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/br/com/gestao/gastos/GastosApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c456c4a3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### 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/ 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..e5cfb0ae --- /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 http://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..9c408257 --- /dev/null +++ b/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.2.RELEASE + + + br.com.gestao + gastos + 0.0.1-SNAPSHOT + gastos + Project Gestão de Gastos with Spring Boot + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-cassandra + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-web-services + + + + org.springframework.boot + spring-boot-devtools + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/br/com/gestao/gastos/GastosApplication.java b/src/main/java/br/com/gestao/gastos/GastosApplication.java new file mode 100644 index 00000000..875f4aef --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/GastosApplication.java @@ -0,0 +1,14 @@ +package br.com.gestao.gastos; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GastosApplication { + + public static void main(String[] args) { + SpringApplication.run(GastosApplication.class, args); + } + +} + diff --git a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java new file mode 100644 index 00000000..a3e645eb --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java @@ -0,0 +1,5 @@ +package br.com.gestao.gastos.controller; + +public class CategoriasController { + +} diff --git a/src/main/java/br/com/gestao/gastos/controller/GastosController.java b/src/main/java/br/com/gestao/gastos/controller/GastosController.java new file mode 100644 index 00000000..47242638 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/controller/GastosController.java @@ -0,0 +1,5 @@ +package br.com.gestao.gastos.controller; + +public class GastosController { + +} diff --git a/src/main/java/br/com/gestao/gastos/model/Categorias.java b/src/main/java/br/com/gestao/gastos/model/Categorias.java new file mode 100644 index 00000000..77984469 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/model/Categorias.java @@ -0,0 +1,30 @@ +package br.com.gestao.gastos.model; + +import java.util.UUID; + +import org.springframework.data.cassandra.core.mapping.PrimaryKey; + +public class Categorias { + + @PrimaryKey + private UUID id; + + private String Categoria; + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getCategoria() { + return Categoria; + } + + public void setCategoria(String categoria) { + Categoria = categoria; + } + +} diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java new file mode 100644 index 00000000..27b049c5 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -0,0 +1,61 @@ +package br.com.gestao.gastos.model; + +import java.time.LocalDate; +import java.util.UUID; + +import org.springframework.data.cassandra.core.mapping.Column; +import org.springframework.data.cassandra.core.mapping.PrimaryKey; +import org.springframework.data.cassandra.core.mapping.Table; + + +@Table("gastos") +public class Gastos { + + @PrimaryKey + private UUID id; + + @Column("descricao") + private String descricao; + + @Column("valor") + private double valor; + + @Column("codigousuario") + private int codigousuario; + + @Column("data") + private LocalDate data; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + 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 int getCodigousuario() { + return codigousuario; + } + public void setCodigousuario(int codigousuario) { + this.codigousuario = codigousuario; + } + public LocalDate getData() { + return data; + } + public void setData(LocalDate data) { + this.data = data; + } + +} diff --git a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java new file mode 100644 index 00000000..482de7c3 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java @@ -0,0 +1,5 @@ +package br.com.gestao.gastos.repository; + +public interface GastosRepository { + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/java/br/com/gestao/gastos/GastosApplicationTests.java b/src/test/java/br/com/gestao/gastos/GastosApplicationTests.java new file mode 100644 index 00000000..191f316b --- /dev/null +++ b/src/test/java/br/com/gestao/gastos/GastosApplicationTests.java @@ -0,0 +1,17 @@ +package br.com.gestao.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 6657d9050cbdbd979e40b8171c2e5b6970741b46 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Wed, 6 Feb 2019 16:34:05 -0200 Subject: [PATCH 03/17] =?UTF-8?q?alterado=20dependencias=20para=20utilizar?= =?UTF-8?q?=20mongodb=20ao=20inv=C3=A9s=20do=20cassandra?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +--- .../br/com/gestao/gastos/model/Categoria.java | 29 ++++++++++++++ .../br/com/gestao/gastos/model/Gastos.java | 40 ++++++++++--------- .../br/com/gestao/gastos/model/Usuario.java | 5 +++ .../repository/CategoriaRepository.java | 8 ++++ .../gastos/repository/GastosRepository.java | 6 ++- .../gestao/gastos/service/GastosService.java | 19 +++++++++ .../gastos/service/GastosServiceImpl.java | 38 ++++++++++++++++++ 8 files changed, 128 insertions(+), 25 deletions(-) create mode 100644 src/main/java/br/com/gestao/gastos/model/Categoria.java create mode 100644 src/main/java/br/com/gestao/gastos/model/Usuario.java create mode 100644 src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java create mode 100644 src/main/java/br/com/gestao/gastos/service/GastosService.java create mode 100644 src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java diff --git a/pom.xml b/pom.xml index 9c408257..265866a4 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ gastos 0.0.1-SNAPSHOT gastos - Project Gestão de Gastos with Spring Boot + Projeto Gestão de Gastos Para o Santander UTF-8 @@ -23,16 +23,12 @@ org.springframework.boot - spring-boot-starter-data-cassandra + spring-boot-starter-data-mongodb org.springframework.boot spring-boot-starter-data-jpa - - org.springframework.boot - spring-boot-starter-security - org.springframework.boot spring-boot-starter-web diff --git a/src/main/java/br/com/gestao/gastos/model/Categoria.java b/src/main/java/br/com/gestao/gastos/model/Categoria.java new file mode 100644 index 00000000..78caa489 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/model/Categoria.java @@ -0,0 +1,29 @@ +package br.com.gestao.gastos.model; + +import org.springframework.data.annotation.Id; + + +public class Categoria { + + @Id + private String id; + + private String categoria; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCategoria() { + return categoria; + } + + public void setCategoria(String categoria) { + this.categoria = categoria; + } + +} diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java index 27b049c5..07f6271d 100644 --- a/src/main/java/br/com/gestao/gastos/model/Gastos.java +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -1,36 +1,40 @@ package br.com.gestao.gastos.model; +import java.math.BigDecimal; import java.time.LocalDate; -import java.util.UUID; -import org.springframework.data.cassandra.core.mapping.Column; -import org.springframework.data.cassandra.core.mapping.PrimaryKey; -import org.springframework.data.cassandra.core.mapping.Table; +import org.bson.types.ObjectId; +import org.springframework.data.annotation.Id; -@Table("gastos") public class Gastos { - @PrimaryKey - private UUID id; + @Id + private ObjectId _id; - @Column("descricao") private String descricao; - @Column("valor") - private double valor; + private BigDecimal valor; - @Column("codigousuario") private int codigousuario; - @Column("data") private LocalDate data; - public UUID getId() { - return id; + public Gastos() {} + + public Gastos(ObjectId _id, String descricao, BigDecimal valor, int codigousuario, LocalDate data) { + this._id = _id; + this.descricao = descricao; + this.valor = valor; + this.codigousuario = codigousuario; + this.data = data; + } + + public String getId() { + return _id.toHexString(); } - public void setId(UUID id) { - this.id = id; + public void setId(ObjectId _id) { + this._id = _id; } public String getDescricao() { @@ -39,10 +43,10 @@ public String getDescricao() { public void setDescricao(String descricao) { this.descricao = descricao; } - public double getValor() { + public BigDecimal getValor() { return valor; } - public void setValor(double valor) { + public void setValor(BigDecimal valor) { this.valor = valor; } public int getCodigousuario() { diff --git a/src/main/java/br/com/gestao/gastos/model/Usuario.java b/src/main/java/br/com/gestao/gastos/model/Usuario.java new file mode 100644 index 00000000..79910a5a --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/model/Usuario.java @@ -0,0 +1,5 @@ +package br.com.gestao.gastos.model; + +public class Usuario { + +} diff --git a/src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java b/src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java new file mode 100644 index 00000000..d9bd394c --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java @@ -0,0 +1,8 @@ +package br.com.gestao.gastos.repository; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import br.com.gestao.gastos.model.Categoria; + +public interface CategoriaRepository extends MongoRepository{ +} diff --git a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java index 482de7c3..f27b8061 100644 --- a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java +++ b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java @@ -1,5 +1,9 @@ package br.com.gestao.gastos.repository; -public interface GastosRepository { +import org.springframework.data.mongodb.repository.MongoRepository; + +import br.com.gestao.gastos.model.Gastos; + +public interface GastosRepository extends MongoRepository { } diff --git a/src/main/java/br/com/gestao/gastos/service/GastosService.java b/src/main/java/br/com/gestao/gastos/service/GastosService.java new file mode 100644 index 00000000..920b7eaf --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/service/GastosService.java @@ -0,0 +1,19 @@ +package br.com.gestao.gastos.service; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import br.com.gestao.gastos.model.Gastos; + +public interface GastosService { + + List listAll(); + + Optional getById(UUID id); + + Gastos save(Gastos gastos); + + void delete(UUID id); + +} diff --git a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java new file mode 100644 index 00000000..980206cd --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java @@ -0,0 +1,38 @@ +package br.com.gestao.gastos.service; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import org.springframework.stereotype.Service; + +import br.com.gestao.gastos.model.Gastos; + +@Service +public class GastosServiceImpl implements GastosService { + + @Override + public List listAll() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Optional getById(UUID id) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Gastos save(Gastos gastos) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void delete(UUID id) { + // TODO Auto-generated method stub + + } + +} From b1536189cb2bf5b84d766ff9a331ff921bb7d498 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Wed, 6 Feb 2019 18:17:06 -0200 Subject: [PATCH 04/17] =?UTF-8?q?ajustados=20modelos,=20repositorios,=20se?= =?UTF-8?q?rvi=C3=A7os=20e=20come=C3=A7ado=20a=20criar=20a=20criar=20os=20?= =?UTF-8?q?controllers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 -- .../gastos/controller/GastosController.java | 19 ++++++++++ .../br/com/gestao/gastos/model/Categoria.java | 20 +++++++--- .../br/com/gestao/gastos/model/Gastos.java | 3 +- .../br/com/gestao/gastos/model/Usuario.java | 38 ++++++++++++++++++- .../gestao/gastos/service/GastosService.java | 6 +-- .../gastos/service/GastosServiceImpl.java | 27 +++++++------ src/main/resources/application.properties | 3 ++ 8 files changed, 92 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 265866a4..8d5a963b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,6 @@ org.springframework.boot spring-boot-starter-data-mongodb - - org.springframework.boot - spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-web diff --git a/src/main/java/br/com/gestao/gastos/controller/GastosController.java b/src/main/java/br/com/gestao/gastos/controller/GastosController.java index 47242638..71dd3214 100644 --- a/src/main/java/br/com/gestao/gastos/controller/GastosController.java +++ b/src/main/java/br/com/gestao/gastos/controller/GastosController.java @@ -1,5 +1,24 @@ package br.com.gestao.gastos.controller; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import br.com.gestao.gastos.model.Gastos; +import br.com.gestao.gastos.service.GastosService; + +@RestController +@RequestMapping("/api") public class GastosController { + @Autowired + private GastosService gastosService; + + @RequestMapping(value = "/gastos", method = RequestMethod.GET) + public List getAllPets() { + return gastosService.listAll(); + } } diff --git a/src/main/java/br/com/gestao/gastos/model/Categoria.java b/src/main/java/br/com/gestao/gastos/model/Categoria.java index 78caa489..80a7fabd 100644 --- a/src/main/java/br/com/gestao/gastos/model/Categoria.java +++ b/src/main/java/br/com/gestao/gastos/model/Categoria.java @@ -1,21 +1,31 @@ package br.com.gestao.gastos.model; -import org.springframework.data.annotation.Id; +import java.math.BigDecimal; +import java.time.LocalDate; +import org.bson.types.ObjectId; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; +@Document(collection = "categorias") public class Categoria { @Id - private String id; + private ObjectId _id; private String categoria; + public Categoria(ObjectId _id, String categoria) { + this._id = _id; + this.categoria = categoria; + } + public String getId() { - return id; + return _id.toHexString(); } - public void setId(String id) { - this.id = id; + public void setId(ObjectId _id) { + this._id = _id; } public String getCategoria() { diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java index 07f6271d..248c71bb 100644 --- a/src/main/java/br/com/gestao/gastos/model/Gastos.java +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -5,8 +5,9 @@ import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; - +@Document(collection = "gastos") public class Gastos { @Id diff --git a/src/main/java/br/com/gestao/gastos/model/Usuario.java b/src/main/java/br/com/gestao/gastos/model/Usuario.java index 79910a5a..daa922a7 100644 --- a/src/main/java/br/com/gestao/gastos/model/Usuario.java +++ b/src/main/java/br/com/gestao/gastos/model/Usuario.java @@ -1,5 +1,41 @@ package br.com.gestao.gastos.model; +import org.bson.types.ObjectId; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document(collection = "usuarios") public class Usuario { - + + @Id + private ObjectId _id; + + private String usuario; + private String senha; + + public Usuario(ObjectId _id, String usuario, String senha) { + this._id = _id; + this.usuario = usuario; + this.senha = senha; + } + + public String getid() { + return _id.toHexString(); + } + public void setid(ObjectId _id) { + this._id = _id; + } + public String getUsuario() { + return usuario; + } + public void setUsuario(String usuario) { + this.usuario = usuario; + } + public String getSenha() { + return senha; + } + public void setSenha(String senha) { + this.senha = senha; + } + } diff --git a/src/main/java/br/com/gestao/gastos/service/GastosService.java b/src/main/java/br/com/gestao/gastos/service/GastosService.java index 920b7eaf..0a453b96 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosService.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosService.java @@ -1,8 +1,6 @@ package br.com.gestao.gastos.service; import java.util.List; -import java.util.Optional; -import java.util.UUID; import br.com.gestao.gastos.model.Gastos; @@ -10,10 +8,8 @@ public interface GastosService { List listAll(); - Optional getById(UUID id); + Gastos findByCodigoUsuario(String codigousuario); Gastos save(Gastos gastos); - void delete(UUID id); - } diff --git a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java index 980206cd..c18feae4 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java @@ -1,38 +1,41 @@ package br.com.gestao.gastos.service; +import java.util.ArrayList; import java.util.List; -import java.util.Optional; -import java.util.UUID; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import br.com.gestao.gastos.model.Gastos; +import br.com.gestao.gastos.repository.GastosRepository; @Service public class GastosServiceImpl implements GastosService { + private GastosRepository gastosRepository; + + @Autowired + public GastosServiceImpl(GastosRepository gastosRepository){ + this.gastosRepository = gastosRepository; + } + @Override public List listAll() { - // TODO Auto-generated method stub - return null; + List gastos = new ArrayList<>(); + gastosRepository.findAll().forEach(gastos::add); + return gastos; } @Override - public Optional getById(UUID id) { + public Gastos findByCodigoUsuario(String codigousuario) { // TODO Auto-generated method stub return null; } - + @Override public Gastos save(Gastos gastos) { // TODO Auto-generated method stub return null; } - - @Override - public void delete(UUID id) { - // TODO Auto-generated method stub - - } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e69de29b..3473ea6b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -0,0 +1,3 @@ +spring.data.mongodb.host=localhost +spring.data.mongodb.port=27017 +spring.data.mongodb.database=santander \ No newline at end of file From 7d82036eb9abd5da95b4f1e73707e2f05c5f1efd Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Wed, 6 Feb 2019 23:59:18 -0200 Subject: [PATCH 05/17] ajustado controller, model e repositorio --- .../com/gestao/gastos/config/MongoConfig.java | 8 +++++++ .../controller/CategoriasController.java | 3 +++ .../gastos/controller/GastosController.java | 21 +++++++++++++++---- .../br/com/gestao/gastos/model/Categoria.java | 3 --- .../br/com/gestao/gastos/model/Gastos.java | 7 ++++++- .../gastos/repository/GastosRepository.java | 6 ++++++ .../gestao/gastos/service/GastosService.java | 4 +--- .../gastos/service/GastosServiceImpl.java | 15 +++---------- src/main/resources/application.properties | 2 +- 9 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 src/main/java/br/com/gestao/gastos/config/MongoConfig.java diff --git a/src/main/java/br/com/gestao/gastos/config/MongoConfig.java b/src/main/java/br/com/gestao/gastos/config/MongoConfig.java new file mode 100644 index 00000000..c3c253f2 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/config/MongoConfig.java @@ -0,0 +1,8 @@ +package br.com.gestao.gastos.config; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MongoConfig { + +} diff --git a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java index a3e645eb..23f0b192 100644 --- a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java +++ b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java @@ -1,5 +1,8 @@ package br.com.gestao.gastos.controller; +import org.springframework.web.bind.annotation.RestController; + +@RestController public class CategoriasController { } diff --git a/src/main/java/br/com/gestao/gastos/controller/GastosController.java b/src/main/java/br/com/gestao/gastos/controller/GastosController.java index 71dd3214..1ea3def2 100644 --- a/src/main/java/br/com/gestao/gastos/controller/GastosController.java +++ b/src/main/java/br/com/gestao/gastos/controller/GastosController.java @@ -2,7 +2,12 @@ import java.util.List; +import javax.validation.Valid; + +import org.bson.types.ObjectId; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -16,9 +21,17 @@ public class GastosController { @Autowired private GastosService gastosService; - - @RequestMapping(value = "/gastos", method = RequestMethod.GET) - public List getAllPets() { - return gastosService.listAll(); + + @RequestMapping(value = "/gastos/{codigousuario}", produces="application/json", method = RequestMethod.GET) + public List getListaDeGastos(@PathVariable int codigousuario) { + List gastos = gastosService.listaDeGastos(codigousuario); + return gastos; + } + + @RequestMapping(value = "/gastos/new", method = RequestMethod.POST) + public Gastos criarGastos(@Valid @RequestBody Gastos gastos) { + gastos.setId(ObjectId.get()); + gastosService.save(gastos); + return null; } } diff --git a/src/main/java/br/com/gestao/gastos/model/Categoria.java b/src/main/java/br/com/gestao/gastos/model/Categoria.java index 80a7fabd..2caf4ddd 100644 --- a/src/main/java/br/com/gestao/gastos/model/Categoria.java +++ b/src/main/java/br/com/gestao/gastos/model/Categoria.java @@ -1,8 +1,5 @@ package br.com.gestao.gastos.model; -import java.math.BigDecimal; -import java.time.LocalDate; - import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java index 248c71bb..6c74ba5c 100644 --- a/src/main/java/br/com/gestao/gastos/model/Gastos.java +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -5,20 +5,25 @@ import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; +import com.fasterxml.jackson.annotation.JsonProperty; + + @Document(collection = "gastos") public class Gastos { @Id private ObjectId _id; - private String descricao; + private String descricao; private BigDecimal valor; private int codigousuario; + @Indexed private LocalDate data; public Gastos() {} diff --git a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java index f27b8061..fab14c78 100644 --- a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java +++ b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java @@ -1,9 +1,15 @@ package br.com.gestao.gastos.repository; +import java.util.List; + import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.data.mongodb.repository.Query; import br.com.gestao.gastos.model.Gastos; public interface GastosRepository extends MongoRepository { + @Query("{ 'codigousuario' : ?0 }") + List findAllByCodigoUsuario(int codigousuario); + } diff --git a/src/main/java/br/com/gestao/gastos/service/GastosService.java b/src/main/java/br/com/gestao/gastos/service/GastosService.java index 0a453b96..a51f5d2f 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosService.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosService.java @@ -6,9 +6,7 @@ public interface GastosService { - List listAll(); - - Gastos findByCodigoUsuario(String codigousuario); + List listaDeGastos(int codigousuario); Gastos save(Gastos gastos); diff --git a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java index c18feae4..4b49d7dc 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java @@ -1,6 +1,5 @@ package br.com.gestao.gastos.service; -import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -20,21 +19,13 @@ public GastosServiceImpl(GastosRepository gastosRepository){ } @Override - public List listAll() { - List gastos = new ArrayList<>(); - gastosRepository.findAll().forEach(gastos::add); - return gastos; - } - - @Override - public Gastos findByCodigoUsuario(String codigousuario) { - // TODO Auto-generated method stub - return null; + public List listaDeGastos(int codigousuario) { + return gastosRepository.findAllByCodigoUsuario(codigousuario); } @Override public Gastos save(Gastos gastos) { - // TODO Auto-generated method stub + gastosRepository.save(gastos); return null; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3473ea6b..6121405f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,3 @@ -spring.data.mongodb.host=localhost +spring.data.mongodb.host=127.0.0.1 spring.data.mongodb.port=27017 spring.data.mongodb.database=santander \ No newline at end of file From fb2d8cfa5b98966f1b2ba2e1fb0952971cd09bba Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Thu, 7 Feb 2019 00:00:05 -0200 Subject: [PATCH 06/17] removido pacote config --- .../java/br/com/gestao/gastos/config/MongoConfig.java | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/main/java/br/com/gestao/gastos/config/MongoConfig.java diff --git a/src/main/java/br/com/gestao/gastos/config/MongoConfig.java b/src/main/java/br/com/gestao/gastos/config/MongoConfig.java deleted file mode 100644 index c3c253f2..00000000 --- a/src/main/java/br/com/gestao/gastos/config/MongoConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package br.com.gestao.gastos.config; - -import org.springframework.context.annotation.Configuration; - -@Configuration -public class MongoConfig { - -} From 8795585aaee306cb217bd25d125b346b87bafe44 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Thu, 7 Feb 2019 01:36:57 -0200 Subject: [PATCH 07/17] configurado repositorio de categorias e controller --- .../controller/CategoriasController.java | 19 +++++++++- .../gastos/controller/GastosController.java | 4 +-- .../br/com/gestao/gastos/model/Categoria.java | 36 ------------------- .../com/gestao/gastos/model/Categorias.java | 32 ++++++++++------- .../br/com/gestao/gastos/model/Gastos.java | 2 -- .../repository/CategoriaRepository.java | 8 ----- .../repository/CategoriasRepository.java | 13 +++++++ .../gastos/service/CategoriasService.java | 15 ++++++++ .../gastos/service/CategoriasServiceImpl.java | 36 +++++++++++++++++++ .../gastos/service/GastosServiceImpl.java | 12 +++---- 10 files changed, 110 insertions(+), 67 deletions(-) delete mode 100644 src/main/java/br/com/gestao/gastos/model/Categoria.java delete mode 100644 src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java create mode 100644 src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java create mode 100644 src/main/java/br/com/gestao/gastos/service/CategoriasService.java create mode 100644 src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java diff --git a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java index 23f0b192..87d3c0c9 100644 --- a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java +++ b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java @@ -1,8 +1,25 @@ package br.com.gestao.gastos.controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import br.com.gestao.gastos.model.Categorias; +import br.com.gestao.gastos.service.CategoriasService; + @RestController +@RequestMapping("/api") public class CategoriasController { - + + @Autowired + private CategoriasService categoriasService; + + @RequestMapping(value = "/categorias/{categoria}", produces="application/json", method = RequestMethod.GET) + public Categorias getCategoria(@PathVariable String categoria){ + Categorias categorias = categoriasService.findCategeoria(categoria); + return categorias; + } + } diff --git a/src/main/java/br/com/gestao/gastos/controller/GastosController.java b/src/main/java/br/com/gestao/gastos/controller/GastosController.java index 1ea3def2..3966279e 100644 --- a/src/main/java/br/com/gestao/gastos/controller/GastosController.java +++ b/src/main/java/br/com/gestao/gastos/controller/GastosController.java @@ -21,14 +21,14 @@ public class GastosController { @Autowired private GastosService gastosService; - + @RequestMapping(value = "/gastos/{codigousuario}", produces="application/json", method = RequestMethod.GET) public List getListaDeGastos(@PathVariable int codigousuario) { List gastos = gastosService.listaDeGastos(codigousuario); return gastos; } - @RequestMapping(value = "/gastos/new", method = RequestMethod.POST) + @RequestMapping(value = "/gastos", method = RequestMethod.POST) public Gastos criarGastos(@Valid @RequestBody Gastos gastos) { gastos.setId(ObjectId.get()); gastosService.save(gastos); diff --git a/src/main/java/br/com/gestao/gastos/model/Categoria.java b/src/main/java/br/com/gestao/gastos/model/Categoria.java deleted file mode 100644 index 2caf4ddd..00000000 --- a/src/main/java/br/com/gestao/gastos/model/Categoria.java +++ /dev/null @@ -1,36 +0,0 @@ -package br.com.gestao.gastos.model; - -import org.bson.types.ObjectId; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document(collection = "categorias") -public class Categoria { - - @Id - private ObjectId _id; - - private String categoria; - - public Categoria(ObjectId _id, String categoria) { - this._id = _id; - this.categoria = categoria; - } - - public String getId() { - return _id.toHexString(); - } - - public void setId(ObjectId _id) { - this._id = _id; - } - - public String getCategoria() { - return categoria; - } - - public void setCategoria(String categoria) { - this.categoria = categoria; - } - -} diff --git a/src/main/java/br/com/gestao/gastos/model/Categorias.java b/src/main/java/br/com/gestao/gastos/model/Categorias.java index 77984469..c847b650 100644 --- a/src/main/java/br/com/gestao/gastos/model/Categorias.java +++ b/src/main/java/br/com/gestao/gastos/model/Categorias.java @@ -1,30 +1,38 @@ package br.com.gestao.gastos.model; -import java.util.UUID; - -import org.springframework.data.cassandra.core.mapping.PrimaryKey; +import org.bson.types.ObjectId; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; +@Document(collection = "categorias") public class Categorias { - @PrimaryKey - private UUID id; + @Id + private ObjectId _id; + + @Indexed + private String categoria; - private String Categoria; + public Categorias(ObjectId _id, String categoria) { + this._id = _id; + this.categoria = categoria; + } - public UUID getId() { - return id; + public String getId() { + return _id.toHexString(); } - public void setId(UUID id) { - this.id = id; + public void setId(ObjectId _id) { + this._id = _id; } public String getCategoria() { - return Categoria; + return categoria; } public void setCategoria(String categoria) { - Categoria = categoria; + this.categoria = categoria; } } diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java index 6c74ba5c..77d6d44d 100644 --- a/src/main/java/br/com/gestao/gastos/model/Gastos.java +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -8,8 +8,6 @@ import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; -import com.fasterxml.jackson.annotation.JsonProperty; - @Document(collection = "gastos") public class Gastos { diff --git a/src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java b/src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java deleted file mode 100644 index d9bd394c..00000000 --- a/src/main/java/br/com/gestao/gastos/repository/CategoriaRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package br.com.gestao.gastos.repository; - -import org.springframework.data.mongodb.repository.MongoRepository; - -import br.com.gestao.gastos.model.Categoria; - -public interface CategoriaRepository extends MongoRepository{ -} diff --git a/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java b/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java new file mode 100644 index 00000000..8c888f69 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java @@ -0,0 +1,13 @@ +package br.com.gestao.gastos.repository; + +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.data.mongodb.repository.Query; + +import br.com.gestao.gastos.model.Categorias; + +public interface CategoriasRepository extends MongoRepository{ + + @Query("{ 'categoria' : ?0 }") + Categorias findByNomeCategoria(String categoria); + +} diff --git a/src/main/java/br/com/gestao/gastos/service/CategoriasService.java b/src/main/java/br/com/gestao/gastos/service/CategoriasService.java new file mode 100644 index 00000000..bb436141 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/service/CategoriasService.java @@ -0,0 +1,15 @@ +package br.com.gestao.gastos.service; + +import java.util.List; + +import br.com.gestao.gastos.model.Categorias; + +public interface CategoriasService { + + List listaCategoriasSugeridas(); + + Categorias findCategeoria(String categoria); + + Categorias save(Categorias categoria); + +} diff --git a/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java new file mode 100644 index 00000000..4d19d5c4 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java @@ -0,0 +1,36 @@ +package br.com.gestao.gastos.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; + +import br.com.gestao.gastos.model.Categorias; +import br.com.gestao.gastos.repository.CategoriasRepository; + +public class CategoriasServiceImpl implements CategoriasService { + + private CategoriasRepository categoriasRepository; + + @Autowired + public CategoriasServiceImpl(CategoriasRepository categoriasRepository) { + this.categoriasRepository = categoriasRepository; + } + + @Override + public List listaCategoriasSugeridas() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Categorias findCategeoria(String categoria) { + return categoriasRepository.findByNomeCategoria(categoria); + } + + @Override + public Categorias save(Categorias gastos) { + categoriasRepository.save(gastos); + return null; + } + +} diff --git a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java index 4b49d7dc..7d3aaeef 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java @@ -12,21 +12,21 @@ public class GastosServiceImpl implements GastosService { private GastosRepository gastosRepository; - + @Autowired - public GastosServiceImpl(GastosRepository gastosRepository){ - this.gastosRepository = gastosRepository; + public GastosServiceImpl(GastosRepository gastosRepository) { + this.gastosRepository = gastosRepository; } - + @Override public List listaDeGastos(int codigousuario) { return gastosRepository.findAllByCodigoUsuario(codigousuario); } - + @Override public Gastos save(Gastos gastos) { gastosRepository.save(gastos); return null; } - + } From 0a804ba0753488fad6510f4a3e93981d4d04b5ae Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Thu, 7 Feb 2019 05:06:48 -0200 Subject: [PATCH 08/17] =?UTF-8?q?alterado=20formato=20de=20data=20para=20l?= =?UTF-8?q?ocaldatetime,=20colocado=20valida=C3=A7=C3=B5es=20ao=20inserir?= =?UTF-8?q?=20gastos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/controller/GastosController.java | 1 - .../com/gestao/gastos/model/Categorias.java | 2 ++ .../br/com/gestao/gastos/model/Gastos.java | 23 +++++++++---- .../gastos/repository/GastosRepository.java | 5 +-- .../gastos/service/CategoriasServiceImpl.java | 2 ++ .../gastos/service/GastosServiceImpl.java | 33 +++++++++++++++++-- 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/main/java/br/com/gestao/gastos/controller/GastosController.java b/src/main/java/br/com/gestao/gastos/controller/GastosController.java index 3966279e..0174da95 100644 --- a/src/main/java/br/com/gestao/gastos/controller/GastosController.java +++ b/src/main/java/br/com/gestao/gastos/controller/GastosController.java @@ -30,7 +30,6 @@ public List getListaDeGastos(@PathVariable int codigousuario) { @RequestMapping(value = "/gastos", method = RequestMethod.POST) public Gastos criarGastos(@Valid @RequestBody Gastos gastos) { - gastos.setId(ObjectId.get()); gastosService.save(gastos); return null; } diff --git a/src/main/java/br/com/gestao/gastos/model/Categorias.java b/src/main/java/br/com/gestao/gastos/model/Categorias.java index c847b650..9312fbf3 100644 --- a/src/main/java/br/com/gestao/gastos/model/Categorias.java +++ b/src/main/java/br/com/gestao/gastos/model/Categorias.java @@ -14,6 +14,8 @@ public class Categorias { @Indexed private String categoria; + public Categorias() {} + public Categorias(ObjectId _id, String categoria) { this._id = _id; this.categoria = categoria; diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java index 77d6d44d..13519758 100644 --- a/src/main/java/br/com/gestao/gastos/model/Gastos.java +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -1,20 +1,22 @@ package br.com.gestao.gastos.model; import java.math.BigDecimal; -import java.time.LocalDate; +import java.time.Instant; +import java.time.LocalDateTime; import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; - @Document(collection = "gastos") public class Gastos { @Id private ObjectId _id; + private ObjectId idcategoria; + private String descricao; private BigDecimal valor; @@ -22,16 +24,17 @@ public class Gastos { private int codigousuario; @Indexed - private LocalDate data; + private LocalDateTime data; public Gastos() {} - public Gastos(ObjectId _id, String descricao, BigDecimal valor, int codigousuario, LocalDate data) { + public Gastos(ObjectId _id, String descricao, BigDecimal valor, int codigousuario, LocalDateTime data, ObjectId idcategoria) { this._id = _id; this.descricao = descricao; this.valor = valor; this.codigousuario = codigousuario; this.data = data; + this.idcategoria = idcategoria; } public String getId() { @@ -59,11 +62,19 @@ public int getCodigousuario() { public void setCodigousuario(int codigousuario) { this.codigousuario = codigousuario; } - public LocalDate getData() { + public LocalDateTime getData() { return data; } - public void setData(LocalDate data) { + public void setData(LocalDateTime data) { this.data = data; } + + public String getIdCategoria() { + return (idcategoria == null) ? null : idcategoria.toHexString(); + } + + public void setIdCategoria(ObjectId idcategoria) { + this.idcategoria = idcategoria; + } } diff --git a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java index fab14c78..94294425 100644 --- a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java +++ b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java @@ -2,6 +2,7 @@ import java.util.List; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; @@ -10,6 +11,6 @@ public interface GastosRepository extends MongoRepository { @Query("{ 'codigousuario' : ?0 }") - List findAllByCodigoUsuario(int codigousuario); - + List findAllByCodigoUsuario(int codigousuario, Sort sort); + } diff --git a/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java index 4d19d5c4..9681d7e5 100644 --- a/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java @@ -3,10 +3,12 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import br.com.gestao.gastos.model.Categorias; import br.com.gestao.gastos.repository.CategoriasRepository; +@Service public class CategoriasServiceImpl implements CategoriasService { private CategoriasRepository categoriasRepository; diff --git a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java index 7d3aaeef..a9f40631 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java @@ -1,32 +1,61 @@ package br.com.gestao.gastos.service; +import java.time.LocalDateTime; import java.util.List; +import org.bson.types.ObjectId; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; import org.springframework.stereotype.Service; +import br.com.gestao.gastos.model.Categorias; import br.com.gestao.gastos.model.Gastos; +import br.com.gestao.gastos.repository.CategoriasRepository; import br.com.gestao.gastos.repository.GastosRepository; @Service public class GastosServiceImpl implements GastosService { private GastosRepository gastosRepository; + private CategoriasRepository categeoriasRepository; @Autowired - public GastosServiceImpl(GastosRepository gastosRepository) { + public GastosServiceImpl(GastosRepository gastosRepository, CategoriasRepository categoriasRepository) { this.gastosRepository = gastosRepository; + this.categeoriasRepository = categoriasRepository; } @Override public List listaDeGastos(int codigousuario) { - return gastosRepository.findAllByCodigoUsuario(codigousuario); + List gastos = gastosRepository.findAllByCodigoUsuario(codigousuario, new Sort(Direction.DESC, "_id")); + return gastos; } @Override public Gastos save(Gastos gastos) { + gastos.setId(ObjectId.get()); + gastos.setData(LocalDateTime.now()); + Categorias categoria = new Categorias(); + categoria = getCategoria(gastos); + if(categoria != null && categoria.getCategoria().equals(gastos.getDescricao())){ + gastos.setIdCategoria(new ObjectId(categoria.getId())); + }else{ + if(gastos.getDescricao() != null){ + categoria = new Categorias(); + ObjectId idCategoria = ObjectId.get(); + categoria.setId(idCategoria); + categoria.setCategoria(gastos.getDescricao()); + categeoriasRepository.save(categoria); + gastos.setIdCategoria(idCategoria); + } + } gastosRepository.save(gastos); return null; } + + public Categorias getCategoria(Gastos gastos){ + return categeoriasRepository.findByNomeCategoria(gastos.getDescricao()); + } } From d4aa3d2b0df4583f51421f9af2ed1583e72ba085 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Thu, 7 Feb 2019 20:52:21 -0200 Subject: [PATCH 09/17] =?UTF-8?q?criados=20controllers=20e=20servi=C3=A7os?= =?UTF-8?q?=20para=20detalhe=20do=20gasto=20e=20alte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/controller/GastosController.java | 27 ++++++++--- .../br/com/gestao/gastos/model/Gastos.java | 1 - .../gastos/repository/GastosRepository.java | 10 +++- .../gestao/gastos/service/GastosService.java | 10 +++- .../gastos/service/GastosServiceImpl.java | 47 +++++++++++++++---- 5 files changed, 75 insertions(+), 20 deletions(-) diff --git a/src/main/java/br/com/gestao/gastos/controller/GastosController.java b/src/main/java/br/com/gestao/gastos/controller/GastosController.java index 0174da95..f99a70a3 100644 --- a/src/main/java/br/com/gestao/gastos/controller/GastosController.java +++ b/src/main/java/br/com/gestao/gastos/controller/GastosController.java @@ -6,10 +6,13 @@ import org.bson.types.ObjectId; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import br.com.gestao.gastos.model.Gastos; @@ -23,14 +26,26 @@ public class GastosController { private GastosService gastosService; @RequestMapping(value = "/gastos/{codigousuario}", produces="application/json", method = RequestMethod.GET) - public List getListaDeGastos(@PathVariable int codigousuario) { - List gastos = gastosService.listaDeGastos(codigousuario); - return gastos; + public ResponseEntity> getListaDeGastos(@PathVariable int codigousuario, @RequestParam(value = "data", required=false) String data) { + List gastos = gastosService.listaDeGastos(codigousuario, data); + return new ResponseEntity<>(gastos, HttpStatus.OK); + } + + @RequestMapping(value = "/gastos/{codigousuario}/{id}", produces="application/json", method = RequestMethod.GET) + public ResponseEntity getDetalheGasto(@PathVariable int codigousuario, @PathVariable ObjectId id) { + Gastos gastos = gastosService.detalheGasto(codigousuario, id); + return new ResponseEntity<>(gastos, HttpStatus.OK); } @RequestMapping(value = "/gastos", method = RequestMethod.POST) - public Gastos criarGastos(@Valid @RequestBody Gastos gastos) { - gastosService.save(gastos); - return null; + public ResponseEntity criarGastos(@Valid @RequestBody Gastos gastos) { + gastosService.criarGasto(gastos); + return new ResponseEntity<>(null, HttpStatus.CREATED); + } + + @RequestMapping(value = "/gastos", method = RequestMethod.PUT) + public ResponseEntity alterarGasto(@Valid @RequestBody Gastos gastos) { + gastosService.alterarGasto(gastos); + return new ResponseEntity<>(gastos, HttpStatus.NO_CONTENT); } } diff --git a/src/main/java/br/com/gestao/gastos/model/Gastos.java b/src/main/java/br/com/gestao/gastos/model/Gastos.java index 13519758..cbcab9ae 100644 --- a/src/main/java/br/com/gestao/gastos/model/Gastos.java +++ b/src/main/java/br/com/gestao/gastos/model/Gastos.java @@ -1,7 +1,6 @@ package br.com.gestao.gastos.model; import java.math.BigDecimal; -import java.time.Instant; import java.time.LocalDateTime; import org.bson.types.ObjectId; diff --git a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java index 94294425..ece6d783 100644 --- a/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java +++ b/src/main/java/br/com/gestao/gastos/repository/GastosRepository.java @@ -1,7 +1,9 @@ package br.com.gestao.gastos.repository; +import java.time.LocalDate; import java.util.List; +import org.bson.types.ObjectId; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; @@ -10,7 +12,13 @@ public interface GastosRepository extends MongoRepository { - @Query("{ 'codigousuario' : ?0 }") + @Query("{ 'codigousuario': ?0 }") List findAllByCodigoUsuario(int codigousuario, Sort sort); + + @Query("{ '_id': ?0, 'codigousuario': ?1 }") + Gastos findByIdAndCodigoUsuario(ObjectId id, int codigousuario); + + @Query("{ 'codigousuario' : ?0, 'data': {$gte: ?1, $lte: ?2} }") + List findAllByCodigoUsuarioData(int codigousuario, LocalDate dataInicio, LocalDate dataFim, Sort sort); } diff --git a/src/main/java/br/com/gestao/gastos/service/GastosService.java b/src/main/java/br/com/gestao/gastos/service/GastosService.java index a51f5d2f..dcd7eea2 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosService.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosService.java @@ -2,12 +2,18 @@ import java.util.List; +import org.bson.types.ObjectId; + import br.com.gestao.gastos.model.Gastos; public interface GastosService { - List listaDeGastos(int codigousuario); + List listaDeGastos(int codigousuario, String data); + + Gastos detalheGasto(int codigousuario, ObjectId id); + + Gastos criarGasto(Gastos gastos); - Gastos save(Gastos gastos); + Gastos alterarGasto(Gastos gastos); } diff --git a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java index a9f40631..08bbd8f1 100644 --- a/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/GastosServiceImpl.java @@ -1,6 +1,8 @@ package br.com.gestao.gastos.service; -import java.time.LocalDateTime; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.List; import org.bson.types.ObjectId; @@ -27,21 +29,46 @@ public GastosServiceImpl(GastosRepository gastosRepository, CategoriasRepository } @Override - public List listaDeGastos(int codigousuario) { - List gastos = gastosRepository.findAllByCodigoUsuario(codigousuario, new Sort(Direction.DESC, "_id")); + public List listaDeGastos(int codigousuario, String data) { + List gastos = new ArrayList<>(); + if (data == null) { + gastos = gastosRepository.findAllByCodigoUsuario(codigousuario, new Sort(Direction.DESC, "data")); + } else { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy"); + LocalDate dataInicio = LocalDate.parse(data, formatter); + LocalDate dataFim = dataInicio.plusDays(1); + gastos = gastosRepository.findAllByCodigoUsuarioData(codigousuario, dataInicio, dataFim, + new Sort(Direction.DESC, "data")); + } + return gastos; + } + + @Override + public Gastos detalheGasto(int codigousuario, ObjectId id) { + Gastos gastos = new Gastos(); + gastos = gastosRepository.findByIdAndCodigoUsuario(id, codigousuario); return gastos; } @Override - public Gastos save(Gastos gastos) { + public Gastos criarGasto(Gastos gastos) { gastos.setId(ObjectId.get()); - gastos.setData(LocalDateTime.now()); + // gastos.setData(LocalDateTime.now()); + return validaGasto(gastos); + } + + @Override + public Gastos alterarGasto(Gastos gastos) { + return validaGasto(gastos); + } + + public Gastos validaGasto(Gastos gastos) { Categorias categoria = new Categorias(); categoria = getCategoria(gastos); - if(categoria != null && categoria.getCategoria().equals(gastos.getDescricao())){ + if (categoria != null && categoria.getCategoria().equals(gastos.getDescricao())) { gastos.setIdCategoria(new ObjectId(categoria.getId())); - }else{ - if(gastos.getDescricao() != null){ + } else { + if (gastos.getDescricao() != null) { categoria = new Categorias(); ObjectId idCategoria = ObjectId.get(); categoria.setId(idCategoria); @@ -53,8 +80,8 @@ public Gastos save(Gastos gastos) { gastosRepository.save(gastos); return null; } - - public Categorias getCategoria(Gastos gastos){ + + public Categorias getCategoria(Gastos gastos) { return categeoriasRepository.findByNomeCategoria(gastos.getDescricao()); } From 6feae8078eb6430351d70cd0261e1f0ab18ca15e Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Thu, 7 Feb 2019 22:29:24 -0200 Subject: [PATCH 10/17] =?UTF-8?q?Adicionado=20controller=20e=20servi=C3=A7?= =?UTF-8?q?o=20para=20retornar=20a=20lista=20de=20sugest=C3=A3o=20de=20cat?= =?UTF-8?q?egorias=20sugeridas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/controller/CategoriasController.java | 10 +++++++--- .../gastos/repository/CategoriasRepository.java | 13 +++++++++---- .../gastos/service/CategoriasService.java | 6 +----- .../gastos/service/CategoriasServiceImpl.java | 17 +++-------------- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java index 87d3c0c9..07151b34 100644 --- a/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java +++ b/src/main/java/br/com/gestao/gastos/controller/CategoriasController.java @@ -1,6 +1,10 @@ package br.com.gestao.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.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -17,9 +21,9 @@ public class CategoriasController { private CategoriasService categoriasService; @RequestMapping(value = "/categorias/{categoria}", produces="application/json", method = RequestMethod.GET) - public Categorias getCategoria(@PathVariable String categoria){ - Categorias categorias = categoriasService.findCategeoria(categoria); - return categorias; + public ResponseEntity> getCategoria(@PathVariable String categoria){ + List categorias = categoriasService.listaCategoriasSugeridas(categoria); + return new ResponseEntity<>(categorias, HttpStatus.OK); } } diff --git a/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java b/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java index 8c888f69..24523e97 100644 --- a/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java +++ b/src/main/java/br/com/gestao/gastos/repository/CategoriasRepository.java @@ -1,13 +1,18 @@ package br.com.gestao.gastos.repository; +import java.util.List; + import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.Query; import br.com.gestao.gastos.model.Categorias; -public interface CategoriasRepository extends MongoRepository{ - - @Query("{ 'categoria' : ?0 }") +public interface CategoriasRepository extends MongoRepository { + + @Query("{ 'categoria': ?0 }") Categorias findByNomeCategoria(String categoria); - + + @Query("{ 'categoria': {$regex: ?0, $options: 'i'} }") + List findCategoriasSugeridas(String categoria); + } diff --git a/src/main/java/br/com/gestao/gastos/service/CategoriasService.java b/src/main/java/br/com/gestao/gastos/service/CategoriasService.java index bb436141..9283eda4 100644 --- a/src/main/java/br/com/gestao/gastos/service/CategoriasService.java +++ b/src/main/java/br/com/gestao/gastos/service/CategoriasService.java @@ -6,10 +6,6 @@ public interface CategoriasService { - List listaCategoriasSugeridas(); + List listaCategoriasSugeridas(String categoria); - Categorias findCategeoria(String categoria); - - Categorias save(Categorias categoria); - } diff --git a/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java b/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java index 9681d7e5..b36079bb 100644 --- a/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java +++ b/src/main/java/br/com/gestao/gastos/service/CategoriasServiceImpl.java @@ -19,20 +19,9 @@ public CategoriasServiceImpl(CategoriasRepository categoriasRepository) { } @Override - public List listaCategoriasSugeridas() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Categorias findCategeoria(String categoria) { - return categoriasRepository.findByNomeCategoria(categoria); - } - - @Override - public Categorias save(Categorias gastos) { - categoriasRepository.save(gastos); - return null; + public List listaCategoriasSugeridas(String categoria) { + List categorias = categoriasRepository.findCategoriasSugeridas(".*"+categoria+".*"); + return categorias; } } From f9e4695b8e4860c231376e962ffcdac6b1b41f39 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 01:48:15 -0200 Subject: [PATCH 11/17] adicionado autenticacao oauth com auto configuration utilizando usuario em memoria --- pom.xml | 8 +++- .../gestao/gastos/config/SegurancaConfig.java | 33 +++++++++++++++ .../br/com/gestao/gastos/model/Usuario.java | 41 ------------------- src/main/resources/application.properties | 5 ++- 4 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 src/main/java/br/com/gestao/gastos/config/SegurancaConfig.java delete mode 100644 src/main/java/br/com/gestao/gastos/model/Usuario.java diff --git a/pom.xml b/pom.xml index 8d5a963b..ba9b302c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent 2.1.2.RELEASE - + br.com.gestao gastos @@ -33,7 +33,11 @@ org.springframework.boot spring-boot-starter-web-services - + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + 2.1.0.RELEASE + org.springframework.boot spring-boot-devtools diff --git a/src/main/java/br/com/gestao/gastos/config/SegurancaConfig.java b/src/main/java/br/com/gestao/gastos/config/SegurancaConfig.java new file mode 100644 index 00000000..f4a72e36 --- /dev/null +++ b/src/main/java/br/com/gestao/gastos/config/SegurancaConfig.java @@ -0,0 +1,33 @@ +package br.com.gestao.gastos.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; + +@EnableWebSecurity +@EnableAuthorizationServer +@EnableResourceServer +public class SegurancaConfig extends WebSecurityConfigurerAdapter{ + + @Bean + @Override + protected AuthenticationManager authenticationManager() throws Exception { + return super.authenticationManager(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication().withUser("santander").password("san123").roles("ADMIN"); + } + + @Bean + public PasswordEncoder PasswordEncoder() { + return NoOpPasswordEncoder.getInstance(); + } +} diff --git a/src/main/java/br/com/gestao/gastos/model/Usuario.java b/src/main/java/br/com/gestao/gastos/model/Usuario.java deleted file mode 100644 index daa922a7..00000000 --- a/src/main/java/br/com/gestao/gastos/model/Usuario.java +++ /dev/null @@ -1,41 +0,0 @@ -package br.com.gestao.gastos.model; - -import org.bson.types.ObjectId; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document(collection = "usuarios") -public class Usuario { - - @Id - private ObjectId _id; - - private String usuario; - private String senha; - - public Usuario(ObjectId _id, String usuario, String senha) { - this._id = _id; - this.usuario = usuario; - this.senha = senha; - } - - public String getid() { - return _id.toHexString(); - } - public void setid(ObjectId _id) { - this._id = _id; - } - public String getUsuario() { - return usuario; - } - public void setUsuario(String usuario) { - this.usuario = usuario; - } - public String getSenha() { - return senha; - } - public void setSenha(String senha) { - this.senha = senha; - } - -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6121405f..50661f3e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,6 @@ spring.data.mongodb.host=127.0.0.1 spring.data.mongodb.port=27017 -spring.data.mongodb.database=santander \ No newline at end of file +spring.data.mongodb.database=santander +security.oauth2.client.scope=password +security.oauth2.client.client-id=usuarioapi +security.oauth2.client.client-secret=soeusei \ No newline at end of file From 5ee7fc65d455ae341cfaafcb543ed016935e0b9d Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 03:04:05 -0200 Subject: [PATCH 12/17] Iniciado testes unitarios controller --- .../controller/GastosControllerTests.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/test/java/br/com/gestao/gastos/controller/GastosControllerTests.java diff --git a/src/test/java/br/com/gestao/gastos/controller/GastosControllerTests.java b/src/test/java/br/com/gestao/gastos/controller/GastosControllerTests.java new file mode 100644 index 00000000..1799735f --- /dev/null +++ b/src/test/java/br/com/gestao/gastos/controller/GastosControllerTests.java @@ -0,0 +1,66 @@ +package br.com.gestao.gastos.controller; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import org.bson.types.ObjectId; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import br.com.gestao.gastos.GastosApplicationTests; +import br.com.gestao.gastos.model.Gastos; +import br.com.gestao.gastos.service.GastosService; + +public class GastosControllerTests extends GastosApplicationTests { + + private MockMvc mockMvc; + + @Autowired + private GastosController gastosController; + + @Autowired + private GastosService gastosService; + + @Before + public void setUp() { + this.mockMvc = MockMvcBuilders.standaloneSetup(gastosController).build(); + } + + @Test + public void testGETGastosController() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/api/gastos/1")) + .andExpect(MockMvcResultMatchers.status().isOk()); + } + + @Test + public void testGETGastosDetalheController() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/api/gastos/1/5c5bcc6c0000000000000000")) + .andExpect(MockMvcResultMatchers.status().isOk()); + } + + @Test + public void testPOSTGastoController() throws Exception { + String json = "{\"descricao\":\"Recarga Bilhete Unico\",\"valor\":200,\"codigousuario\":1,\"data\":\"2019-02-08T19:50:00\"}"; + this.mockMvc.perform(MockMvcRequestBuilders.post("/api/gastos") + .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE).content(json)) + .andExpect(MockMvcResultMatchers.status().isCreated()); + } + + @Test + public void testPUTAddressController() throws Exception { + String json = "{\"descricao\":\"Recarga Bilhete Unico\",\"valor\":200,\"codigousuario\":1,\"data\":\"2019-02-08T19:50:00\"}"; + Gastos gasto = (new Gastos(new ObjectId("5c5bcc6c0000000000000000"), "Recarga Bilhete Unico", + new BigDecimal(200), 1, LocalDateTime.now(), new ObjectId("5c5bcc6c0000000000000001"))); + gastosService.alterarGasto(gasto); + this.mockMvc.perform(MockMvcRequestBuilders.put("/api/gastos").contentType(MediaType.APPLICATION_JSON_UTF8) + .content(json)) + .andExpect(MockMvcResultMatchers.status().isNoContent()); + } + +} From 6b421c5a0c917d2a454b0d85c07d1a41572e2106 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 03:27:41 -0200 Subject: [PATCH 13/17] criado teste categorias controller --- .../controller/CategoriasControllerTests.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/test/java/br/com/gestao/gastos/controller/CategoriasControllerTests.java diff --git a/src/test/java/br/com/gestao/gastos/controller/CategoriasControllerTests.java b/src/test/java/br/com/gestao/gastos/controller/CategoriasControllerTests.java new file mode 100644 index 00000000..a495aafc --- /dev/null +++ b/src/test/java/br/com/gestao/gastos/controller/CategoriasControllerTests.java @@ -0,0 +1,30 @@ +package br.com.gestao.gastos.controller; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import br.com.gestao.gastos.GastosApplicationTests; + +public class CategoriasControllerTests extends GastosApplicationTests{ + + private MockMvc mockMvc; + + @Autowired + private CategoriasController categoriasController; + + @Before + public void setUp() { + this.mockMvc = MockMvcBuilders.standaloneSetup(categoriasController).build(); + } + + @Test + public void testGETCategoriasController() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/api/categorias/recarga")) + .andExpect(MockMvcResultMatchers.status().isOk()); + } +} From 8d7a3efb1b2bc8a88b4021cee80172af3cf0f055 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 04:18:55 -0200 Subject: [PATCH 14/17] adicionado dockerfile e dockercompose --- Dockerfile | 8 ++++++++ docker-compose.yml | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..bf9cc15b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM java:8 + +MAINTAINER Cleverson de Melo + +EXPOSE 8080 + +ADD /target/gastos.jar gastos.jar +ENTRYPOINT ["java","-jar", "gastos.jar"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..9e1bdeb8 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ + mongo: + container_name: mongo + image: mongo + restart: always + ports: + - '27017:27017' + environment: + MONGODB_DBNAME: santander +gastos: + container_name: gastos-api + image: gastos-api:latest + restart: always + links: + - mongo + ports: + - '8080:8080' From 5635d97e2970d60f2eed5e146709e385627f3347 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 06:06:56 -0200 Subject: [PATCH 15/17] feito correcao do docker compose --- Dockerfile | 6 ++---- docker-compose.yml | 30 ++++++++++++++---------------- pom.xml | 2 +- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf9cc15b..a661cf18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,5 @@ FROM java:8 MAINTAINER Cleverson de Melo -EXPOSE 8080 - -ADD /target/gastos.jar gastos.jar -ENTRYPOINT ["java","-jar", "gastos.jar"] \ No newline at end of file +ADD /target/gastos-v1.jar gastos-v1.jar +ENTRYPOINT ["java","-jar", "gastos-v1.jar"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9e1bdeb8..f2529a1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,14 @@ - mongo: - container_name: mongo - image: mongo - restart: always - ports: - - '27017:27017' - environment: - MONGODB_DBNAME: santander -gastos: - container_name: gastos-api - image: gastos-api:latest - restart: always - links: - - mongo - ports: - - '8080:8080' +version: '3' +services: + gastos: + container_name: gastos-v1 + image: gastos-v1:latest + ports: + - '8080:8080' + links: + - mongo + mongo: + container_name: mongo + image: mongo:3.4.6 + ports: + - '27017:27017' diff --git a/pom.xml b/pom.xml index ba9b302c..3d2b2016 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ br.com.gestao gastos - 0.0.1-SNAPSHOT + v1 gastos Projeto Gestão de Gastos Para o Santander From 89e5e5581d53fa5f7d0bc7541f0622873c9c1b84 Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 14:21:19 -0200 Subject: [PATCH 16/17] Configurado ReadMe --- README.md | 74 +++++++++++++++++++++++++++++++++++++++++++++- docker-compose.yml | 14 +++++++-- 2 files changed, 84 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4bb44a0d..d31f7706 100644 --- a/README.md +++ b/README.md @@ -1 +1,73 @@ -# gastos \ No newline at end of file +# Api gastos + +Para este projeto é necessário utilizar o banco de dados NO SQL mongodb para inclusão, alteração e consulta dos dados. + +Para rodar o projeto basta ter o docker e docker compose instalado na maquina e utilizar o seguinte comando para gerar os container com a imagem do projeto e do mongodb: + +docker-compose -f docker-compose.yml up -d + +

Versões utilizadas

+-Java v1.8
+-Framework SpringBoot v2.1.2
+-Maven para gerenciar as dependencias do projeto
+-Utilização mongorepository para gerenciamento do repositório
+-Banco de dados Mongodb v3.4.6 +-IDE Eclipse Mars.2 Release (4.5.2)
+-Utilizado Oauth2 v2.1.0 com auto configure para autenticação da api + +

EndPoints Disponiveis

+ +

POST

+http://localhost:8080/oauth/token + +Utilizar Header Authorization Basic dXN1YXJpb2FwaTpzb2V1c2Vp +Body do tipo form-data com esse parametros: +grant_type: password +username: santander +password: san123 + +Após efetuar esta autenticação será gerado o token para utilização dos endpoits da api. + +

Endpoints da API

+ +Lembrando que o uso só será liberado após a autenticaçao onde irá retornar o token do tipo Bearer. + +Utilizar no header o parametro Authorization: Bearer Token-gerado e Content-Type: "application/json" + +

GET Lista de gastos

+http://localhost:8080/api/gastos/{codigousuario} + +

GET Detalhe do gasto

+http://localhost:8080/api/gastos/{codigousuario}/{id} + +

POST Criar gasto

+http://localhost:8080/api/gastos/ +

Body

+{ + "descricao": "Descricao", + "valor": 1500.00, + "codigousuario": 1, + "data": "2019-02-08T19:50:00" +} + +

PUT alterar gasto

+{ + "descricao": "Descricao", + "valor": 1500.00, + "codigousuario": 1, + "data": "2019-02-08T19:50:00", + "idCategoria": "5c5cb2b2aa2d1652ae3a17ea", + "id": "5c5cb2b2aa2d1652ae3a17e9" +} + +

GET Sugestão de categorias

+http://localhost:8080/api/categorias/{categoria} + +Para este recurso caso digite uma letra como a por exemplo, irá retornar todas as categorais com a existentes na base, caso digite loja, irá retornar as categorias cujo tenha loja na Base, método não é case sensitive, irá trazer o dado caso esteja maiusculo ou minusculo. + +As funcionalidades de atributição automatica da categoria está definido no serviço. + +Foram criada todas as funcionalidades solicitadas no teste. + +Qualquer dúvida sigo a disposição. + diff --git a/docker-compose.yml b/docker-compose.yml index f2529a1c..8842581a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,16 @@ services: - '8080:8080' links: - mongo + volumes: + - /application/application.properties mongo: container_name: mongo - image: mongo:3.4.6 - ports: - - '27017:27017' + image: mongo + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + volumes: + - ./data/db:/data/db + ports: + - 27017:27017 + command: mongod --smallfiles --logpath=/dev/null \ No newline at end of file From 08361a01a63dd58ffd34fdf0cc4807382f739ccf Mon Sep 17 00:00:00 2001 From: Cleverson de Melo Date: Fri, 8 Feb 2019 14:31:48 -0200 Subject: [PATCH 17/17] fix conflitos --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e4b8ea3e..b63e10f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Api gastos Para este projeto é necessário utilizar o banco de dados NO SQL mongodb para inclusão, alteração e consulta dos dados. @@ -72,7 +71,6 @@ Foram criada todas as funcionalidades solicitadas no teste. Qualquer dúvida sigo a disposição. -======= # Show me the code ### # DESAFIO: