From 4380fb189b243f38aa040ab5a19b2725404dcfe7 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Sun, 23 Jun 2019 16:06:53 -0300 Subject: [PATCH 01/48] projeto iniciado --- gastos/.gitignore | 32 ++++ gastos/build.gradle | 41 +++++ gastos/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + gastos/gradlew | 172 ++++++++++++++++++ gastos/gradlew.bat | 84 +++++++++ gastos/settings.gradle | 6 + .../src/main/java/commons/AbstractMapper.java | 99 ++++++++++ .../gastos/SantanderGastosApplication.java | 15 ++ .../io/santander/gastos/domain/Gasto.java | 34 ++++ .../io/santander/gastos/dto/GastoDTO.java | 20 ++ .../gastos/repository/GastoRepository.java | 20 ++ .../gastos/service/GastosService.java | 21 +++ .../java/io/santander/gastos/vo/GastosVO.java | 22 +++ .../web/controller/GastosController.java | 28 +++ gastos/src/main/resources/application.yml | 1 + .../SantanderGastosApplicationTests.java | 16 ++ 17 files changed, 616 insertions(+) create mode 100644 gastos/.gitignore create mode 100644 gastos/build.gradle create mode 100644 gastos/gradle/wrapper/gradle-wrapper.jar create mode 100644 gastos/gradle/wrapper/gradle-wrapper.properties create mode 100755 gastos/gradlew create mode 100644 gastos/gradlew.bat create mode 100644 gastos/settings.gradle create mode 100644 gastos/src/main/java/commons/AbstractMapper.java create mode 100644 gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java create mode 100644 gastos/src/main/java/io/santander/gastos/domain/Gasto.java create mode 100644 gastos/src/main/java/io/santander/gastos/dto/GastoDTO.java create mode 100644 gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/GastosService.java create mode 100644 gastos/src/main/java/io/santander/gastos/vo/GastosVO.java create mode 100644 gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java create mode 100644 gastos/src/main/resources/application.yml create mode 100644 gastos/src/test/java/io/santander/gastos/SantanderGastosApplicationTests.java diff --git a/gastos/.gitignore b/gastos/.gitignore new file mode 100644 index 00000000..6c018781 --- /dev/null +++ b/gastos/.gitignore @@ -0,0 +1,32 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/gastos/build.gradle b/gastos/build.gradle new file mode 100644 index 00000000..900f370c --- /dev/null +++ b/gastos/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'org.springframework.boot' version '2.1.6.RELEASE' + id 'java' +} + +apply plugin: 'io.spring.dependency-management' + +group = 'io.santander' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +configurations { + developmentOnly + runtimeClasspath { + extendsFrom developmentOnly + } + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +ext { + orikaVersion = '1.5.2' +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation "ma.glasnost.orika:orika-core:${orikaVersion}" + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'mysql:mysql-connector-java' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} diff --git a/gastos/gradle/wrapper/gradle-wrapper.jar b/gastos/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 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 z 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gastos/gradlew.bat b/gastos/gradlew.bat new file mode 100644 index 00000000..0f8d5937 --- /dev/null +++ b/gastos/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gastos/settings.gradle b/gastos/settings.gradle new file mode 100644 index 00000000..680a2edf --- /dev/null +++ b/gastos/settings.gradle @@ -0,0 +1,6 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} +rootProject.name = 'gastos' diff --git a/gastos/src/main/java/commons/AbstractMapper.java b/gastos/src/main/java/commons/AbstractMapper.java new file mode 100644 index 00000000..40f8d477 --- /dev/null +++ b/gastos/src/main/java/commons/AbstractMapper.java @@ -0,0 +1,99 @@ +package commons; + +import ma.glasnost.orika.MapperFacade; +import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.impl.DefaultMapperFactory; +import ma.glasnost.orika.metadata.ClassMapBuilder; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.List; + +public abstract class AbstractMapper { + + protected static final MapperFactory factory = createFactory(); + protected static final MapperFacade mapper = factory.getMapperFacade(); + + private final Class entityClass; + private final Class dtoClass; + + public AbstractMapper() { + final Type[] actualTypeArguments = ((ParameterizedType) this.getClass().getGenericSuperclass()) + .getActualTypeArguments(); + this.entityClass = (Class) actualTypeArguments[0]; + this.dtoClass = (Class) actualTypeArguments[1]; + } + + public AbstractMapper(final String... fields) { + this(); + final ClassMapBuilder classMap = factory.classMap(entityClass, + dtoClass); + + for (final String field : fields) { + final String[] split = field.split("="); + classMap.field(split[0], split[1]); + } + + factory.registerClassMap(classMap.byDefault().toClassMap()); + } + + private static MapperFactory createFactory() { + return new DefaultMapperFactory.Builder().build(); + } + + protected D toDTO(final E entity) { + return mapper.map(entity, dtoClass); + } + + protected D toDTO(final E entity, final String... exclusions) { + final MapperFactory instanceFactory = createFactory(); + final ClassMapBuilder classMap = instanceFactory.classMap( + dtoClass, entityClass); + for (final String exc : exclusions) { + classMap.exclude(exc); + } + classMap.byDefault().register(); + return instanceFactory.getMapperFacade().map(entity, dtoClass); + } + + protected List toDTOList(final List entity) { + return mapper.mapAsList(entity, dtoClass); + } + + protected E toEntity(final D dto) { + return mapper.map(dto, entityClass); + } + + protected E toEntity(final D dto, final String... exclusions) { + final MapperFactory instanceFactory = createFactory(); + final ClassMapBuilder classMap = instanceFactory.classMap( + entityClass, dtoClass); + for (final String exc : exclusions) { + classMap.exclude(exc); + } + classMap.byDefault().register(); + return instanceFactory.getMapperFacade().map(dto, entityClass); + } + + protected List toEntityList(final List dto) { + return mapper.mapAsList(dto, entityClass); + } + + /** + * Thread-safe. Create a new MapperFacade for every update + */ + protected void updateEntity(final E entity, final D dto, + final String... exclusions) { + final MapperFactory instanceFactory = createFactory(); + final ClassMapBuilder classMap = instanceFactory.classMap( + entityClass, dtoClass); + for (final String exc : exclusions) { + classMap.exclude(exc); + } + classMap.byDefault().register(); + + instanceFactory.getMapperFacade(entityClass, dtoClass).mapReverse(dto, + entity); + } + +} \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java new file mode 100644 index 00000000..d013dad1 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java @@ -0,0 +1,15 @@ +package io.santander.gastos; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class SantanderGastosApplication { + + public static void main(String[] args) { + SpringApplication.run(SantanderGastosApplication.class, args); + } + +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/Gasto.java b/gastos/src/main/java/io/santander/gastos/domain/Gasto.java new file mode 100644 index 00000000..3160400a --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/Gasto.java @@ -0,0 +1,34 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import java.util.Date; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity(name = "GASTO") +public class Gasto { + @Id + private Long id; + private Long codigoUsuario; + private String descricao; + private Double valor; + private Date data; + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; +} diff --git a/gastos/src/main/java/io/santander/gastos/dto/GastoDTO.java b/gastos/src/main/java/io/santander/gastos/dto/GastoDTO.java new file mode 100644 index 00000000..7006acd4 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/dto/GastoDTO.java @@ -0,0 +1,20 @@ +package io.santander.gastos.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class GastoDTO { + private Long id; + private Long codigoUsuario; + private String descricao; + private Double valor; + private Date data; +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java b/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java new file mode 100644 index 00000000..e9651717 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java @@ -0,0 +1,20 @@ +package io.santander.gastos.repository; + +import io.santander.gastos.domain.Gasto; +import io.santander.gastos.vo.GastosVO; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.Date; + +@Repository +public interface GastoRepository extends JpaRepository { + @Query(value = "FROM Gastos g WHERE g.codigoUsuario = ?1 " + + "AND (?2 IS NULL OR g.descricao = ?2) " + + "AND (?3 IS NULL OR g.valor = ?3) " + + "AND (?4 IS NULL OR g.data = ?4)") + PageImpl buscaTodosOsGastoPorCliente(Long codigoUsuario, String descricao, Double valor, Date data, Pageable pageable); +} diff --git a/gastos/src/main/java/io/santander/gastos/service/GastosService.java b/gastos/src/main/java/io/santander/gastos/service/GastosService.java new file mode 100644 index 00000000..cc615d8d --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/GastosService.java @@ -0,0 +1,21 @@ +package io.santander.gastos.service; + +import io.santander.gastos.dto.GastoDTO; +import io.santander.gastos.repository.GastoRepository; +import io.santander.gastos.vo.GastosVO; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor(onConstructor = @__({@Lazy})) +public class GastosService { + + private final GastoRepository gastoRepository; + + public PageImpl buscaTodosOsGastoPorCliente(final Long codigoUsuario, final GastosVO vo, final Pageable pageable) { + return gastoRepository.buscaTodosOsGastoPorCliente(codigoUsuario,vo.getDescricao(),vo.getValor(),vo.getData(),pageable); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastosVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastosVO.java new file mode 100644 index 00000000..ba835b74 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/vo/GastosVO.java @@ -0,0 +1,22 @@ +package io.santander.gastos.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class GastosVO { + + private String descricao; + private Double valor; + private Long codigoUsuario; + private Date data; +} diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java b/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java new file mode 100644 index 00000000..c2e3555b --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java @@ -0,0 +1,28 @@ +package io.santander.gastos.web.controller; + +import io.santander.gastos.service.GastosService; +import io.santander.gastos.vo.GastosVO; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.validation.annotation.Validated; +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 javax.validation.Valid; + +@RestController +@RequestMapping(GastosController.GASTOS_ENDPOINT) +@Validated +public class GastosController { + + public static final String GASTOS_ENDPOINT = "/gastos"; + + private GastosService gastosService; + + @GetMapping("/{codigoUsuario}") + PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, final GastosVO vo, Pageable pageable){ + return gastosService.buscaTodosOsGastoPorCliente(codigoUsuario, vo, pageable); + } +} diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/gastos/src/main/resources/application.yml @@ -0,0 +1 @@ + diff --git a/gastos/src/test/java/io/santander/gastos/SantanderGastosApplicationTests.java b/gastos/src/test/java/io/santander/gastos/SantanderGastosApplicationTests.java new file mode 100644 index 00000000..cc069f7e --- /dev/null +++ b/gastos/src/test/java/io/santander/gastos/SantanderGastosApplicationTests.java @@ -0,0 +1,16 @@ +package io.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 SantanderGastosApplicationTests { + + @Test + public void contextLoads() { + } + +} From 66b31d2d252ee85086f4b8b64792cf70e2259bd5 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 25 Jun 2019 20:33:52 -0300 Subject: [PATCH 02/48] adicionado docker compose --- gastos/build.gradle | 42 +++++++++---------- gastos/docker-compose.yml | 31 ++++++++++++++ .../io/santander/gastos/domain/Gasto.java | 7 ++-- .../santander/gastos/mapper/GastosMapper.java | 29 +++++++++++++ .../gastos/repository/GastoRepository.java | 11 ----- .../gastos/service/GastosService.java | 10 +++-- .../gastos/vo/{GastosVO.java => GastoVO.java} | 2 +- .../web/controller/GastosController.java | 19 +++++++-- gastos/src/main/resources/application.yml | 9 +++- gastos/src/main/resources/data.sql | 0 10 files changed, 115 insertions(+), 45 deletions(-) create mode 100644 gastos/docker-compose.yml create mode 100644 gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java rename gastos/src/main/java/io/santander/gastos/vo/{GastosVO.java => GastoVO.java} (94%) create mode 100644 gastos/src/main/resources/data.sql diff --git a/gastos/build.gradle b/gastos/build.gradle index 900f370c..39fb6378 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.1.6.RELEASE' - id 'java' + id 'org.springframework.boot' version '2.1.6.RELEASE' + id 'java' } apply plugin: 'io.spring.dependency-management' @@ -10,32 +10,32 @@ version = '0.0.1-SNAPSHOT' sourceCompatibility = '1.8' configurations { - developmentOnly - runtimeClasspath { - extendsFrom developmentOnly - } - compileOnly { - extendsFrom annotationProcessor - } + developmentOnly + runtimeClasspath { + extendsFrom developmentOnly + } + compileOnly { + extendsFrom annotationProcessor + } } repositories { - mavenCentral() + mavenCentral() } ext { - orikaVersion = '1.5.2' + orikaVersion = '1.5.2' } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation "ma.glasnost.orika:orika-core:${orikaVersion}" - compileOnly 'org.projectlombok:lombok' - developmentOnly 'org.springframework.boot:spring-boot-devtools' - runtimeOnly 'com.h2database:h2' - runtimeOnly 'mysql:mysql-connector-java' - annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation "ma.glasnost.orika:orika-core:${orikaVersion}" + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'mysql:mysql-connector-java' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml new file mode 100644 index 00000000..874b76ba --- /dev/null +++ b/gastos/docker-compose.yml @@ -0,0 +1,31 @@ +version: '3.3' + +services: + mysql: + image: mysql:5.7 + restart: always + environment: + MYSQL_DATABASE: 'gastos' + MYSQL_USER: 'gastos' + MYSQL_PASSWORD: 'gastos' + MYSQL_ROOT_PASSWORD: 'root' + ports: + - '3306:3306' + expose: + - '3306' + volumes: + - my-db:/var/lib/mysql + + redis: + image: redis + command: redis-server --requirepass Redis2019! + ports: + - "6379:6379" + + mongo: + image: mongo + ports: + - "27017:27017" + +volumes: + my-db: \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/domain/Gasto.java b/gastos/src/main/java/io/santander/gastos/domain/Gasto.java index 3160400a..c487f5f4 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Gasto.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Gasto.java @@ -7,18 +7,17 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import javax.persistence.*; import java.util.Date; @Builder @Data @AllArgsConstructor @NoArgsConstructor -@Entity(name = "GASTO") +@Entity(name = "gasto") public class Gasto { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private Long codigoUsuario; private String descricao; diff --git a/gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java new file mode 100644 index 00000000..181e1803 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java @@ -0,0 +1,29 @@ +package io.santander.gastos.mapper; + +import commons.AbstractMapper; +import io.santander.gastos.domain.Gasto; +import io.santander.gastos.dto.GastoDTO; + +import java.util.List; + +public class GastosMapper extends AbstractMapper { + @Override + public GastoDTO toDTO(Gasto entity) { + return super.toDTO(entity); + } + + @Override + public Gasto toEntity(GastoDTO dto) { + return super.toEntity(dto); + } + + @Override + public List toDTOList(List entity) { + return super.toDTOList(entity); + } + + @Override + public List toEntityList(List dto) { + return super.toEntityList(dto); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java b/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java index e9651717..f7755889 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java @@ -1,20 +1,9 @@ package io.santander.gastos.repository; import io.santander.gastos.domain.Gasto; -import io.santander.gastos.vo.GastosVO; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import java.util.Date; - @Repository public interface GastoRepository extends JpaRepository { - @Query(value = "FROM Gastos g WHERE g.codigoUsuario = ?1 " + - "AND (?2 IS NULL OR g.descricao = ?2) " + - "AND (?3 IS NULL OR g.valor = ?3) " + - "AND (?4 IS NULL OR g.data = ?4)") - PageImpl buscaTodosOsGastoPorCliente(Long codigoUsuario, String descricao, Double valor, Date data, Pageable pageable); } diff --git a/gastos/src/main/java/io/santander/gastos/service/GastosService.java b/gastos/src/main/java/io/santander/gastos/service/GastosService.java index cc615d8d..4fa48ce2 100644 --- a/gastos/src/main/java/io/santander/gastos/service/GastosService.java +++ b/gastos/src/main/java/io/santander/gastos/service/GastosService.java @@ -1,8 +1,9 @@ package io.santander.gastos.service; import io.santander.gastos.dto.GastoDTO; +import io.santander.gastos.mapper.GastosMapper; import io.santander.gastos.repository.GastoRepository; -import io.santander.gastos.vo.GastosVO; +import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.PageImpl; @@ -10,12 +11,13 @@ import org.springframework.stereotype.Service; @Service -@RequiredArgsConstructor(onConstructor = @__({@Lazy})) +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class GastosService { private final GastoRepository gastoRepository; + private final GastosMapper gastosMapper; - public PageImpl buscaTodosOsGastoPorCliente(final Long codigoUsuario, final GastosVO vo, final Pageable pageable) { - return gastoRepository.buscaTodosOsGastoPorCliente(codigoUsuario,vo.getDescricao(),vo.getValor(),vo.getData(),pageable); + public PageImpl buscaTodosOsGastoPorCliente(final Long codigoUsuario, final GastoVO vo, final Pageable pageable) { + return null; } } diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastosVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java similarity index 94% rename from gastos/src/main/java/io/santander/gastos/vo/GastosVO.java rename to gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index ba835b74..dae7e728 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastosVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -13,7 +13,7 @@ @NoArgsConstructor @Builder @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class GastosVO { +public class GastoVO { private String descricao; private Double valor; diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java b/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java index c2e3555b..4a89b57d 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java @@ -1,7 +1,9 @@ package io.santander.gastos.web.controller; +import io.santander.gastos.dto.GastoDTO; import io.santander.gastos.service.GastosService; -import io.santander.gastos.vo.GastosVO; +import io.santander.gastos.vo.GastoVO; +import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.validation.annotation.Validated; @@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; +import java.util.stream.Collectors; @RestController @RequestMapping(GastosController.GASTOS_ENDPOINT) @@ -22,7 +25,17 @@ public class GastosController { private GastosService gastosService; @GetMapping("/{codigoUsuario}") - PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, final GastosVO vo, Pageable pageable){ - return gastosService.buscaTodosOsGastoPorCliente(codigoUsuario, vo, pageable); + PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, final GastoVO vo, Pageable pageable) { + Page dtoPage = gastosService.buscaTodosOsGastoPorCliente(codigoUsuario, vo, pageable); + return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); + } + + private GastoVO toVo(GastoDTO gastoDTO) { + return GastoVO.builder() + .codigoUsuario(gastoDTO.getCodigoUsuario()) + .descricao(gastoDTO.getDescricao()) + .data(gastoDTO.getData()) + .valor(gastoDTO.getValor()) + .build(); } } diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 8b137891..659be00b 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -1 +1,8 @@ - +spring: + jpa: + hibernate: + ddl-auto: create + datasource: + url: jdbc:mysql://localhost:3306/gastos + username: gastos + password: gastos \ No newline at end of file diff --git a/gastos/src/main/resources/data.sql b/gastos/src/main/resources/data.sql new file mode 100644 index 00000000..e69de29b From 44c1a7abc85cd7b3b47277a63ab4418fab48af41 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 00:28:03 -0300 Subject: [PATCH 03/48] adicionado versionamento de banco de dados --- .../gastos}/commons/AbstractMapper.java | 0 .../gastos/domain/{Gasto.java => Spent.java} | 0 .../dto/{GastoDTO.java => SpentDTO.java} | 0 .../santander/gastos/mapper/GastosMapper.java | 29 ------------------- .../santander/gastos/mapper/SpentMapper.java | 29 +++++++++++++++++++ ...toRepository.java => SpentRepository.java} | 4 +-- .../{GastosService.java => SpentService.java} | 4 +++ ...osController.java => SpentController.java} | 10 +++---- gastos/src/main/resources/data.sql | 0 9 files changed, 40 insertions(+), 36 deletions(-) rename gastos/src/main/java/{ => io/santander/gastos}/commons/AbstractMapper.java (100%) rename gastos/src/main/java/io/santander/gastos/domain/{Gasto.java => Spent.java} (100%) rename gastos/src/main/java/io/santander/gastos/dto/{GastoDTO.java => SpentDTO.java} (100%) delete mode 100644 gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java create mode 100644 gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java rename gastos/src/main/java/io/santander/gastos/repository/{GastoRepository.java => SpentRepository.java} (62%) rename gastos/src/main/java/io/santander/gastos/service/{GastosService.java => SpentService.java} (93%) rename gastos/src/main/java/io/santander/gastos/web/controller/{GastosController.java => SpentController.java} (85%) delete mode 100644 gastos/src/main/resources/data.sql diff --git a/gastos/src/main/java/commons/AbstractMapper.java b/gastos/src/main/java/io/santander/gastos/commons/AbstractMapper.java similarity index 100% rename from gastos/src/main/java/commons/AbstractMapper.java rename to gastos/src/main/java/io/santander/gastos/commons/AbstractMapper.java diff --git a/gastos/src/main/java/io/santander/gastos/domain/Gasto.java b/gastos/src/main/java/io/santander/gastos/domain/Spent.java similarity index 100% rename from gastos/src/main/java/io/santander/gastos/domain/Gasto.java rename to gastos/src/main/java/io/santander/gastos/domain/Spent.java diff --git a/gastos/src/main/java/io/santander/gastos/dto/GastoDTO.java b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java similarity index 100% rename from gastos/src/main/java/io/santander/gastos/dto/GastoDTO.java rename to gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java diff --git a/gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java deleted file mode 100644 index 181e1803..00000000 --- a/gastos/src/main/java/io/santander/gastos/mapper/GastosMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.santander.gastos.mapper; - -import commons.AbstractMapper; -import io.santander.gastos.domain.Gasto; -import io.santander.gastos.dto.GastoDTO; - -import java.util.List; - -public class GastosMapper extends AbstractMapper { - @Override - public GastoDTO toDTO(Gasto entity) { - return super.toDTO(entity); - } - - @Override - public Gasto toEntity(GastoDTO dto) { - return super.toEntity(dto); - } - - @Override - public List toDTOList(List entity) { - return super.toDTOList(entity); - } - - @Override - public List toEntityList(List dto) { - return super.toEntityList(dto); - } -} diff --git a/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java new file mode 100644 index 00000000..581662e0 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java @@ -0,0 +1,29 @@ +package io.santander.gastos.mapper; + +import commons.AbstractMapper; +import io.santander.gastos.domain.Spent; +import io.santander.gastos.dto.SpentDTO; + +import java.util.List; + +public class GastosMapper extends AbstractMapper { + @Override + public SpentDTO toDTO(Spent entity) { + return super.toDTO(entity); + } + + @Override + public Spent toEntity(SpentDTO dto) { + return super.toEntity(dto); + } + + @Override + public List toDTOList(List entity) { + return super.toDTOList(entity); + } + + @Override + public List toEntityList(List dto) { + return super.toEntityList(dto); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java similarity index 62% rename from gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java rename to gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index f7755889..1cff84c3 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/GastoRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -1,9 +1,9 @@ package io.santander.gastos.repository; -import io.santander.gastos.domain.Gasto; +import io.santander.gastos.domain.Spent; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @Repository -public interface GastoRepository extends JpaRepository { +public interface GastoRepository extends JpaRepository { } diff --git a/gastos/src/main/java/io/santander/gastos/service/GastosService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java similarity index 93% rename from gastos/src/main/java/io/santander/gastos/service/GastosService.java rename to gastos/src/main/java/io/santander/gastos/service/SpentService.java index 4fa48ce2..58715d2b 100644 --- a/gastos/src/main/java/io/santander/gastos/service/GastosService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -10,6 +10,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class GastosService { @@ -20,4 +22,6 @@ public class GastosService { public PageImpl buscaTodosOsGastoPorCliente(final Long codigoUsuario, final GastoVO vo, final Pageable pageable) { return null; } + + public List getAll } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java similarity index 85% rename from gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java rename to gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 4a89b57d..e1849bb2 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/GastosController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -1,7 +1,7 @@ package io.santander.gastos.web.controller; -import io.santander.gastos.dto.GastoDTO; -import io.santander.gastos.service.GastosService; +import io.santander.gastos.dto.SpentDTO; +import io.santander.gastos.service.SpentService; import io.santander.gastos.vo.GastoVO; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -22,15 +22,15 @@ public class GastosController { public static final String GASTOS_ENDPOINT = "/gastos"; - private GastosService gastosService; + private SpentService gastosService; @GetMapping("/{codigoUsuario}") PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, final GastoVO vo, Pageable pageable) { - Page dtoPage = gastosService.buscaTodosOsGastoPorCliente(codigoUsuario, vo, pageable); + Page dtoPage = gastosService.buscaTodosOsGastoPorCliente(codigoUsuario, vo, pageable); return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); } - private GastoVO toVo(GastoDTO gastoDTO) { + private GastoVO toVo(SpentDTO gastoDTO) { return GastoVO.builder() .codigoUsuario(gastoDTO.getCodigoUsuario()) .descricao(gastoDTO.getDescricao()) diff --git a/gastos/src/main/resources/data.sql b/gastos/src/main/resources/data.sql deleted file mode 100644 index e69de29b..00000000 From a37c70778dbccb8bedbf688f2790c2a9db2e7567 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 00:29:09 -0300 Subject: [PATCH 04/48] adicionado classe de tratativa de erros --- gastos/build.gradle | 2 ++ .../gastos/commons/AbstractMapper.java | 2 +- .../santander/gastos/commons/DateParser.java | 22 +++++++++++++ .../io/santander/gastos/domain/Spent.java | 17 ++++++---- .../io/santander/gastos/dto/SpentDTO.java | 11 ++++--- .../santander/gastos/mapper/SpentMapper.java | 6 ++-- .../gastos/repository/SpentRepository.java | 15 ++++++++- .../gastos/service/SpentService.java | 33 ++++++++++++++----- .../java/io/santander/gastos/vo/GastoVO.java | 7 +++- .../web/advice/SpertServiceAdvices.java | 9 +++++ .../web/controller/SpentController.java | 28 ++++++++-------- gastos/src/main/resources/application.yml | 12 +++++-- .../db/migration/V1__init_script.sql | 11 +++++++ .../db/migration/v2__init_script.sql | 3 ++ 14 files changed, 137 insertions(+), 41 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/commons/DateParser.java create mode 100644 gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java create mode 100644 gastos/src/main/resources/db/migration/V1__init_script.sql create mode 100644 gastos/src/main/resources/db/migration/v2__init_script.sql diff --git a/gastos/build.gradle b/gastos/build.gradle index 39fb6378..33dca92d 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -25,12 +25,14 @@ repositories { ext { orikaVersion = '1.5.2' + flywayVersion = '5.2.4' } dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' implementation "ma.glasnost.orika:orika-core:${orikaVersion}" + implementation "org.flywaydb:flyway-core:${flywayVersion}" compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' diff --git a/gastos/src/main/java/io/santander/gastos/commons/AbstractMapper.java b/gastos/src/main/java/io/santander/gastos/commons/AbstractMapper.java index 40f8d477..3a6fe9f3 100644 --- a/gastos/src/main/java/io/santander/gastos/commons/AbstractMapper.java +++ b/gastos/src/main/java/io/santander/gastos/commons/AbstractMapper.java @@ -1,4 +1,4 @@ -package commons; +package io.santander.gastos.commons; import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFactory; diff --git a/gastos/src/main/java/io/santander/gastos/commons/DateParser.java b/gastos/src/main/java/io/santander/gastos/commons/DateParser.java new file mode 100644 index 00000000..c9b7db24 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/commons/DateParser.java @@ -0,0 +1,22 @@ +package io.santander.gastos.commons; + +import org.springframework.stereotype.Component; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Component +public abstract class DateParser extends SimpleDateFormat { + + final SimpleDateFormat sdf = new SimpleDateFormat("${spent.date-format}"); + + public Date toDate(String utcDate) throws ParseException { + return sdf.parse(utcDate); + } + + public String toUtcDate(Date date) throws ParseException { + return new SimpleDateFormat("${spent.date-format}").format(date); + } + +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/Spent.java b/gastos/src/main/java/io/santander/gastos/domain/Spent.java index c487f5f4..17321a1f 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Spent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Spent.java @@ -4,25 +4,30 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.CreditCardNumber; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import javax.persistence.*; +import java.io.Serializable; import java.util.Date; @Builder @Data @AllArgsConstructor @NoArgsConstructor -@Entity(name = "gasto") -public class Gasto { +@Entity +@Table(name = "spent") +public class Spent implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private Long codigoUsuario; - private String descricao; - private Double valor; - private Date data; + private Long userCode; + @CreditCardNumber + private String cardNumber; + private String description; + private Double spentValue; + private Date spentDate; @CreatedDate @Column(name = "dat_creation", updatable = false, nullable = false) private Date creationTime; diff --git a/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java index 7006acd4..fc4f9e5d 100644 --- a/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java +++ b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java @@ -11,10 +11,11 @@ @Data @AllArgsConstructor @NoArgsConstructor -public class GastoDTO { +public class SpentDTO { private Long id; - private Long codigoUsuario; - private String descricao; - private Double valor; - private Date data; + private Long userCode; + private String cardNumber; + private String description; + private Double spentValue; + private Date spentDate; } diff --git a/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java index 581662e0..1509e255 100644 --- a/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java +++ b/gastos/src/main/java/io/santander/gastos/mapper/SpentMapper.java @@ -1,12 +1,14 @@ package io.santander.gastos.mapper; -import commons.AbstractMapper; +import io.santander.gastos.commons.AbstractMapper; import io.santander.gastos.domain.Spent; import io.santander.gastos.dto.SpentDTO; +import org.springframework.stereotype.Component; import java.util.List; -public class GastosMapper extends AbstractMapper { +@Component +public class SpentMapper extends AbstractMapper { @Override public SpentDTO toDTO(Spent entity) { return super.toDTO(entity); diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index 1cff84c3..3a1ee9b9 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -1,9 +1,22 @@ package io.santander.gastos.repository; import io.santander.gastos.domain.Spent; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.util.Date; + @Repository -public interface GastoRepository extends JpaRepository { +public interface SpentRepository extends JpaRepository { + + @Query(value = "SELECT s FROM Spent s " + + "WHERE s.userCode = ?1 " + + "AND s.cardNumber = ?2 " + + "AND (?3 is NULL OR s.description = ?3) " + + "AND (?4 is NULL OR s.spentValue = ?4) " + + "AND (?5 is NULL OR s.spentDate = ?5) ") + Page findAllWithFilters(Long userCode, String cardNumber, String description, Double value, Date date, Pageable pageable); } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 58715d2b..78783036 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -1,27 +1,42 @@ package io.santander.gastos.service; -import io.santander.gastos.dto.GastoDTO; -import io.santander.gastos.mapper.GastosMapper; -import io.santander.gastos.repository.GastoRepository; +import io.santander.gastos.commons.DateParser; +import io.santander.gastos.domain.Spent; +import io.santander.gastos.dto.SpentDTO; +import io.santander.gastos.mapper.SpentMapper; +import io.santander.gastos.repository.SpentRepository; import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; +import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; @Service @RequiredArgsConstructor(onConstructor = @__(@Lazy)) -public class GastosService { +public class SpentService { - private final GastoRepository gastoRepository; - private final GastosMapper gastosMapper; + private final SpentRepository spentRepository; + private final SpentMapper spentMapper; + private final DateParser dateParser; - public PageImpl buscaTodosOsGastoPorCliente(final Long codigoUsuario, final GastoVO vo, final Pageable pageable) { - return null; + public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { + Page spentPage = null; + spentPage = spentRepository.findAllWithFilters( + userCode, + cardNumber, + Optional.ofNullable(vo.getDescricao()).orElse(null), + Optional.ofNullable(vo.getValor()).orElse(null), + Optional.ofNullable(vo.getData()).orElse(null), + pageable); + return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); } - public List getAll + public List getAllspents() { + return spentMapper.toDTOList(spentRepository.findAll()); + } } diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index dae7e728..27abfdee 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -1,20 +1,25 @@ package io.santander.gastos.vo; import com.fasterxml.jackson.annotation.JsonInclude; +import io.santander.gastos.commons.DateParser; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; @Data -@AllArgsConstructor @NoArgsConstructor +@AllArgsConstructor @Builder @JsonInclude(JsonInclude.Include.NON_EMPTY) public class GastoVO { + @Autowired + private DateParser dateParser; + private String descricao; private Double valor; private Long codigoUsuario; diff --git a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java new file mode 100644 index 00000000..537d5db2 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java @@ -0,0 +1,9 @@ +package io.santander.gastos.web.advice; + +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.ControllerAdvice; + +@ControllerAdvice +@Log4j2 +public class SpertServiceAdvices { +} diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index e1849bb2..c9f370ce 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -3,39 +3,39 @@ import io.santander.gastos.dto.SpentDTO; import io.santander.gastos.service.SpentService; import io.santander.gastos.vo.GastoVO; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.validation.annotation.Validated; -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 org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.stream.Collectors; @RestController -@RequestMapping(GastosController.GASTOS_ENDPOINT) +@RequestMapping(SpentController.GASTOS_ENDPOINT) @Validated -public class GastosController { +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class SpentController { public static final String GASTOS_ENDPOINT = "/gastos"; - private SpentService gastosService; + private final SpentService spentService; @GetMapping("/{codigoUsuario}") - PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, final GastoVO vo, Pageable pageable) { - Page dtoPage = gastosService.buscaTodosOsGastoPorCliente(codigoUsuario, vo, pageable); + PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { + Page dtoPage = spentService.buscaTodosOsGastoPorCliente(codigoUsuario, numeroCartão, vo, pageable); return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); } - private GastoVO toVo(SpentDTO gastoDTO) { + private GastoVO toVo(SpentDTO spentDTO) { return GastoVO.builder() - .codigoUsuario(gastoDTO.getCodigoUsuario()) - .descricao(gastoDTO.getDescricao()) - .data(gastoDTO.getData()) - .valor(gastoDTO.getValor()) + .codigoUsuario(spentDTO.getUserCode()) + .descricao(spentDTO.getDescription()) + .data(spentDTO.getSpentDate()) + .valor(spentDTO.getSpentValue()) .build(); } } diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 659be00b..1035eff9 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -1,8 +1,16 @@ +spent: + date-format: yyyy-MM-dd HH:mm:ss + spring: jpa: + show-sql: true hibernate: - ddl-auto: create + ddl-auto: validate + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL5InnoDBDialect datasource: url: jdbc:mysql://localhost:3306/gastos username: gastos - password: gastos \ No newline at end of file + password: gastos + initialization-mode: EMBEDDED diff --git a/gastos/src/main/resources/db/migration/V1__init_script.sql b/gastos/src/main/resources/db/migration/V1__init_script.sql new file mode 100644 index 00000000..6898a112 --- /dev/null +++ b/gastos/src/main/resources/db/migration/V1__init_script.sql @@ -0,0 +1,11 @@ +CREATE TABLE spent ( + id bigint(20) NOT NULL AUTO_INCREMENT, + card_number varchar(255) DEFAULT NULL, + dat_creation datetime NOT NULL, + description varchar(255) DEFAULT NULL, + spent_date datetime DEFAULT NULL, + spent_value double DEFAULT NULL, + dat_update datetime NOT NULL, + user_code bigint(20) DEFAULT NULL, + PRIMARY KEY (id) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; \ No newline at end of file diff --git a/gastos/src/main/resources/db/migration/v2__init_script.sql b/gastos/src/main/resources/db/migration/v2__init_script.sql new file mode 100644 index 00000000..679c2964 --- /dev/null +++ b/gastos/src/main/resources/db/migration/v2__init_script.sql @@ -0,0 +1,3 @@ +INSERT INTO spent +(card_number, dat_creation, description, spent_date, spent_value, dat_update, user_code) +VALUES('5105105105105100', NOW(), 'teste1', NOW(), 9.99, NOW(), 1); \ No newline at end of file From 55d0a5a23bbdfb598819b332f9add2a5fc18b143 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 01:01:22 -0300 Subject: [PATCH 05/48] erros customizados --- .../gastos/SantanderGastosApplication.java | 1 + .../gastos/enumerators/ErrorMessages.java | 25 +++++++++++++++++ .../exceptions/MissingFieldException.java | 9 ++++++ .../io/santander/gastos/vo/ErrorResponse.java | 28 +++++++++++++++++++ .../web/advice/SpertServiceAdvices.java | 27 ++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java create mode 100644 gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java create mode 100644 gastos/src/main/java/io/santander/gastos/vo/ErrorResponse.java diff --git a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java index d013dad1..8223f45d 100644 --- a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java +++ b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java @@ -2,6 +2,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.PropertySource; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication diff --git a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java new file mode 100644 index 00000000..aa13e357 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java @@ -0,0 +1,25 @@ +package io.santander.gastos.enumerators; + +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public enum ErrorMessages { + + MISSING_PARAMETER { + @Override + public String getErrorMessage(String error) { + return String.format("The %s parameter was not found.", error); + } + }, + + INTERNAL_SERVER_ERROR { + @Override + public String getErrorMessage(String error) { + return String.format("%s", error); + } + }; + + public abstract String getErrorMessage(String error); +} diff --git a/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java b/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java new file mode 100644 index 00000000..c5fdc9d1 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java @@ -0,0 +1,9 @@ +package io.santander.gastos.exceptions; + +public class MissingFieldException extends RuntimeException { + private static final long serialVersionUID = 6210964506339092884L; + + public MissingFieldException(final String message) { + super(message); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/vo/ErrorResponse.java b/gastos/src/main/java/io/santander/gastos/vo/ErrorResponse.java new file mode 100644 index 00000000..0c2c966d --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/vo/ErrorResponse.java @@ -0,0 +1,28 @@ +package io.santander.gastos.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Builder; +import lombok.Data; +import lombok.Singular; + +import java.time.Instant; +import java.util.List; + +import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY; + +@Data +@Builder +@JsonInclude(NON_EMPTY) +public class ErrorResponse { + + private Instant timestamp; + + private int status; + + private String error; + + @Singular + @JsonProperty("error_description") + private List messages; +} \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java index 537d5db2..018deebc 100644 --- a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java +++ b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java @@ -1,9 +1,36 @@ package io.santander.gastos.web.advice; +import io.santander.gastos.enumerators.ErrorMessages; +import io.santander.gastos.vo.ErrorResponse; import lombok.extern.log4j.Log4j2; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import java.util.Arrays; + +import static java.time.Instant.now; +import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.ResponseEntity.status; @ControllerAdvice @Log4j2 public class SpertServiceAdvices { + + @ExceptionHandler(MissingServletRequestParameterException.class) + public ResponseEntity handleMissingFieldException(final MissingServletRequestParameterException e) { + return status(BAD_REQUEST) + .body(this.constructErrorResponse(BAD_REQUEST, ErrorMessages.MISSING_PARAMETER.getErrorMessage(e.getParameterName()))); + } + + private ErrorResponse constructErrorResponse(final HttpStatus httpStatus, final String... messages) { + return ErrorResponse.builder() + .timestamp(now()) + .status(httpStatus.value()) + .error(httpStatus.getReasonPhrase()) + .messages(Arrays.asList(messages)) + .build(); + } } From d5cacfdd1ca674821291d5ccbbe79f3522ebc84c Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 01:47:02 -0300 Subject: [PATCH 06/48] =?UTF-8?q?modelagem=20para=20inser=C3=A7=C3=A3o=20d?= =?UTF-8?q?e=20gastos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/santander/gastos/domain/CardSpent.java | 40 +++++++++++++++++++ .../io/santander/gastos/domain/Client.java | 24 +++++++++++ .../santander/gastos/domain/ClientCard.java | 40 +++++++++++++++++++ .../santander/gastos/domain/CreditCard.java | 35 ++++++++++++++++ .../io/santander/gastos/domain/Spent.java | 4 -- 5 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/domain/CardSpent.java create mode 100644 gastos/src/main/java/io/santander/gastos/domain/Client.java create mode 100644 gastos/src/main/java/io/santander/gastos/domain/ClientCard.java create mode 100644 gastos/src/main/java/io/santander/gastos/domain/CreditCard.java diff --git a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java new file mode 100644 index 00000000..79d2d1c2 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java @@ -0,0 +1,40 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +import javax.persistence.*; +import javax.smartcardio.Card; +import java.util.Date; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "card_spent") +public class CardSpent { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "card") + private Card card; + + @OneToOne + @JoinColumn(name = "spent") + private Spent spent; + + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/Client.java b/gastos/src/main/java/io/santander/gastos/domain/Client.java new file mode 100644 index 00000000..8484f949 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/Client.java @@ -0,0 +1,24 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.List; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "client") +public class Client { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToMany(mappedBy = "client", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) + private List clientCards; +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java b/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java new file mode 100644 index 00000000..ef7096f7 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java @@ -0,0 +1,40 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +import javax.persistence.*; +import java.util.Date; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "client_card") +public class ClientCard { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @JoinColumn(name = "client") + private Client client; + + @ManyToMany + @JoinColumn(name = "card") + private CreditCard creditCard; + + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java b/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java new file mode 100644 index 00000000..52dd27ac --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java @@ -0,0 +1,35 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "card") +public class CreditCard { + private Long id; + @Column(unique = true) + private String cardNumber; + + @OneToMany(mappedBy = "card", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) + private List clientCards; + + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/Spent.java b/gastos/src/main/java/io/santander/gastos/domain/Spent.java index 17321a1f..b7a62813 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Spent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Spent.java @@ -4,7 +4,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.CreditCardNumber; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; @@ -22,9 +21,6 @@ public class Spent implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private Long userCode; - @CreditCardNumber - private String cardNumber; private String description; private Double spentValue; private Date spentDate; From 4f88ede841f9832589491dcea0cb7c9f9ffc581f Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 01:48:05 -0300 Subject: [PATCH 07/48] =?UTF-8?q?modelagem=20para=20inser=C3=A7=C3=A3o=20d?= =?UTF-8?q?e=20gastos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gastos/src/main/java/io/santander/gastos/domain/CardSpent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java index 79d2d1c2..b8d4783b 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java @@ -8,7 +8,6 @@ import org.springframework.data.annotation.LastModifiedDate; import javax.persistence.*; -import javax.smartcardio.Card; import java.util.Date; @Builder @@ -24,7 +23,7 @@ public class CardSpent { @ManyToOne @JoinColumn(name = "card") - private Card card; + private CreditCard card; @OneToOne @JoinColumn(name = "spent") From f345f72ff10da28e05c76fb6830006fe7932656c Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 02:05:54 -0300 Subject: [PATCH 08/48] =?UTF-8?q?modelagem=20para=20inser=C3=A7=C3=A3o=20d?= =?UTF-8?q?e=20gastos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gastos/build.gradle | 2 +- .../main/java/io/santander/gastos/domain/CardSpent.java | 2 +- .../main/java/io/santander/gastos/domain/ClientCard.java | 2 +- .../main/java/io/santander/gastos/domain/CreditCard.java | 8 +++++++- .../src/main/java/io/santander/gastos/domain/Spent.java | 3 +++ gastos/src/main/resources/application.yml | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gastos/build.gradle b/gastos/build.gradle index 33dca92d..5444e5e2 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' implementation "ma.glasnost.orika:orika-core:${orikaVersion}" - implementation "org.flywaydb:flyway-core:${flywayVersion}" +// implementation "org.flywaydb:flyway-core:${flywayVersion}" compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' diff --git a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java index b8d4783b..776a96e1 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java @@ -23,7 +23,7 @@ public class CardSpent { @ManyToOne @JoinColumn(name = "card") - private CreditCard card; + private CreditCard creditCard; @OneToOne @JoinColumn(name = "spent") diff --git a/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java b/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java index ef7096f7..438121c9 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java +++ b/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java @@ -26,7 +26,7 @@ public class ClientCard { @JoinColumn(name = "client") private Client client; - @ManyToMany + @OneToOne @JoinColumn(name = "card") private CreditCard creditCard; diff --git a/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java b/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java index 52dd27ac..5e5232d3 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java +++ b/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java @@ -18,13 +18,19 @@ @Entity @Table(name = "card") public class CreditCard { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @Column(unique = true) private String cardNumber; - @OneToMany(mappedBy = "card", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) + @OneToMany(mappedBy = "creditCard", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) private List clientCards; + @OneToMany(mappedBy = "creditCard", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) + private List cardSpents; + @CreatedDate @Column(name = "dat_creation", updatable = false, nullable = false) private Date creationTime; diff --git a/gastos/src/main/java/io/santander/gastos/domain/Spent.java b/gastos/src/main/java/io/santander/gastos/domain/Spent.java index b7a62813..88530558 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Spent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Spent.java @@ -21,6 +21,9 @@ public class Spent implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @OneToOne(mappedBy = "spent") + @JoinColumn + private CardSpent cardSpent; private String description; private Double spentValue; private Date spentDate; diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 1035eff9..095f38a8 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: jpa: show-sql: true hibernate: - ddl-auto: validate + ddl-auto: create properties: hibernate: dialect: org.hibernate.dialect.MySQL5InnoDBDialect From 0a944497c54692119e152c12317efa0ccaeb3161 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 02:17:36 -0300 Subject: [PATCH 09/48] repositorios criados --- .../santander/gastos/repository/CardSpentRepository.java | 9 +++++++++ .../gastos/repository/ClientCardRepository.java | 8 ++++++++ .../io/santander/gastos/repository/ClientRepository.java | 9 +++++++++ .../gastos/repository/CreditCardRepository.java | 9 +++++++++ .../io/santander/gastos/repository/SpentRepository.java | 1 - 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gastos/src/main/java/io/santander/gastos/repository/CardSpentRepository.java create mode 100644 gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java create mode 100644 gastos/src/main/java/io/santander/gastos/repository/ClientRepository.java create mode 100644 gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java diff --git a/gastos/src/main/java/io/santander/gastos/repository/CardSpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/CardSpentRepository.java new file mode 100644 index 00000000..b7345766 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/repository/CardSpentRepository.java @@ -0,0 +1,9 @@ +package io.santander.gastos.repository; + +import io.santander.gastos.domain.CardSpent; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CardSpentRepository extends JpaRepository { +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java new file mode 100644 index 00000000..2b7d018d --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java @@ -0,0 +1,8 @@ +package io.santander.gastos.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ClientCardRepository extends JpaRepository { +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClientRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClientRepository.java new file mode 100644 index 00000000..bd463784 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/repository/ClientRepository.java @@ -0,0 +1,9 @@ +package io.santander.gastos.repository; + +import io.santander.gastos.domain.Client; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ClientRepository extends JpaRepository { +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java new file mode 100644 index 00000000..e3aa1896 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java @@ -0,0 +1,9 @@ +package io.santander.gastos.repository; + +import io.santander.gastos.domain.CreditCard; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CreditCardRepository extends JpaRepository { +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index 3a1ee9b9..905e05af 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -14,7 +14,6 @@ public interface SpentRepository extends JpaRepository { @Query(value = "SELECT s FROM Spent s " + "WHERE s.userCode = ?1 " + - "AND s.cardNumber = ?2 " + "AND (?3 is NULL OR s.description = ?3) " + "AND (?4 is NULL OR s.spentValue = ?4) " + "AND (?5 is NULL OR s.spentDate = ?5) ") From 1b459171dd8c2f81bdf2a587707f8ce9c31900d8 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 26 Jun 2019 02:24:38 -0300 Subject: [PATCH 10/48] criado metodo registro gastos --- gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java | 1 - .../main/java/io/santander/gastos/service/SpentService.java | 3 +++ .../io/santander/gastos/web/controller/SpentController.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java index fc4f9e5d..87798635 100644 --- a/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java +++ b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java @@ -14,7 +14,6 @@ public class SpentDTO { private Long id; private Long userCode; - private String cardNumber; private String description; private Double spentValue; private Date spentDate; diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 78783036..c585d62b 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -39,4 +39,7 @@ public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, Strin public List getAllspents() { return spentMapper.toDTOList(spentRepository.findAll()); } + + public void saveSpent(Long numeroCartão, GastoVO vo) { + } } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index c9f370ce..5022485a 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -24,6 +24,11 @@ public class SpentController { private final SpentService spentService; + @PostMapping("/{numeroCartão}") + void addSpent(@Valid @PathVariable final Long numeroCartão, final GastoVO vo) { + return spentService.saveSpent(numeroCartão,vo); + } + @GetMapping("/{codigoUsuario}") PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { Page dtoPage = spentService.buscaTodosOsGastoPorCliente(codigoUsuario, numeroCartão, vo, pageable); From 5f0d6d499cee38c59fe0392ea6e3ddc05ceaab5a Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Fri, 28 Jun 2019 00:09:06 -0300 Subject: [PATCH 11/48] adicionado registro de gasto --- .../gastos/SantanderGastosApplication.java | 9 ++- .../io/santander/gastos/domain/CardSpent.java | 5 +- .../io/santander/gastos/domain/Client.java | 16 ++++- .../santander/gastos/domain/ClientCard.java | 5 +- .../santander/gastos/domain/CreditCard.java | 5 +- .../io/santander/gastos/domain/Spent.java | 5 +- .../io/santander/gastos/dto/CardSpentDTO.java | 18 ++++++ .../santander/gastos/dto/CreditCardDTO.java | 15 +++++ .../santander/gastos/mapper/CardMapper.java | 31 ++++++++++ .../gastos/mapper/CardSpentMapper.java | 31 ++++++++++ .../repository/ClientCardRepository.java | 9 ++- .../repository/CreditCardRepository.java | 1 + .../gastos/repository/SpentRepository.java | 13 +--- .../santander/gastos/service/CardService.java | 21 +++++++ .../gastos/service/CardSpentService.java | 20 ++++++ .../gastos/service/ClientCardService.java | 18 ++++++ .../gastos/service/ClientService.java | 16 +++++ .../gastos/service/SpentService.java | 61 ++++++++++++++++--- .../java/io/santander/gastos/vo/GastoVO.java | 4 +- .../web/controller/SpentController.java | 8 +-- gastos/src/main/resources/application.yml | 2 +- 21 files changed, 270 insertions(+), 43 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/dto/CardSpentDTO.java create mode 100644 gastos/src/main/java/io/santander/gastos/dto/CreditCardDTO.java create mode 100644 gastos/src/main/java/io/santander/gastos/mapper/CardMapper.java create mode 100644 gastos/src/main/java/io/santander/gastos/mapper/CardSpentMapper.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/CardService.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/CardSpentService.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/ClientCardService.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/ClientService.java diff --git a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java index 8223f45d..86c405e0 100644 --- a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java +++ b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java @@ -2,15 +2,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.PropertySource; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -@SpringBootApplication @EnableJpaAuditing +@SpringBootApplication public class SantanderGastosApplication { - public static void main(String[] args) { - SpringApplication.run(SantanderGastosApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SantanderGastosApplication.class, args); + } } diff --git a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java index 776a96e1..898824b7 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/CardSpent.java @@ -6,8 +6,10 @@ import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; +import java.io.Serializable; import java.util.Date; @Builder @@ -16,7 +18,8 @@ @NoArgsConstructor @Entity @Table(name = "card_spent") -public class CardSpent { +@EntityListeners(AuditingEntityListener.class) +public class CardSpent implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/gastos/src/main/java/io/santander/gastos/domain/Client.java b/gastos/src/main/java/io/santander/gastos/domain/Client.java index 8484f949..84936562 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Client.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Client.java @@ -4,8 +4,13 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; import java.util.List; @Builder @@ -14,11 +19,20 @@ @NoArgsConstructor @Entity @Table(name = "client") -public class Client { +@EntityListeners(AuditingEntityListener.class) +public class Client implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @OneToMany(mappedBy = "client", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) private List clientCards; + + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; } diff --git a/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java b/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java index 438121c9..b1ef9f75 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java +++ b/gastos/src/main/java/io/santander/gastos/domain/ClientCard.java @@ -6,8 +6,10 @@ import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; +import java.io.Serializable; import java.util.Date; @Builder @@ -16,7 +18,8 @@ @NoArgsConstructor @Entity @Table(name = "client_card") -public class ClientCard { +@EntityListeners(AuditingEntityListener.class) +public class ClientCard implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java b/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java index 5e5232d3..64262030 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java +++ b/gastos/src/main/java/io/santander/gastos/domain/CreditCard.java @@ -6,8 +6,10 @@ import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -17,7 +19,8 @@ @NoArgsConstructor @Entity @Table(name = "card") -public class CreditCard { +@EntityListeners(AuditingEntityListener.class) +public class CreditCard implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/gastos/src/main/java/io/santander/gastos/domain/Spent.java b/gastos/src/main/java/io/santander/gastos/domain/Spent.java index 88530558..032bcbef 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Spent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Spent.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; import java.io.Serializable; @@ -17,13 +18,11 @@ @NoArgsConstructor @Entity @Table(name = "spent") +@EntityListeners(AuditingEntityListener.class) public class Spent implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @OneToOne(mappedBy = "spent") - @JoinColumn - private CardSpent cardSpent; private String description; private Double spentValue; private Date spentDate; diff --git a/gastos/src/main/java/io/santander/gastos/dto/CardSpentDTO.java b/gastos/src/main/java/io/santander/gastos/dto/CardSpentDTO.java new file mode 100644 index 00000000..e7dd9c01 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/dto/CardSpentDTO.java @@ -0,0 +1,18 @@ +package io.santander.gastos.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CardSpentDTO { + private Long id; + + private CreditCardDTO creditCard; + + private SpentDTO spent; +} \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/dto/CreditCardDTO.java b/gastos/src/main/java/io/santander/gastos/dto/CreditCardDTO.java new file mode 100644 index 00000000..1fd5473e --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/dto/CreditCardDTO.java @@ -0,0 +1,15 @@ +package io.santander.gastos.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CreditCardDTO { + + private Long id; + private String cardNumber; + +} \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/mapper/CardMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/CardMapper.java new file mode 100644 index 00000000..7c9936a6 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/mapper/CardMapper.java @@ -0,0 +1,31 @@ +package io.santander.gastos.mapper; + +import io.santander.gastos.commons.AbstractMapper; +import io.santander.gastos.domain.CreditCard; +import io.santander.gastos.dto.CreditCardDTO; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class CardMapper extends AbstractMapper { + @Override + public CreditCardDTO toDTO(CreditCard entity) { + return super.toDTO(entity); + } + + @Override + public CreditCard toEntity(CreditCardDTO dto) { + return super.toEntity(dto); + } + + @Override + public List toDTOList(List entity) { + return super.toDTOList(entity); + } + + @Override + public List toEntityList(List dto) { + return super.toEntityList(dto); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/mapper/CardSpentMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/CardSpentMapper.java new file mode 100644 index 00000000..11b111c5 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/mapper/CardSpentMapper.java @@ -0,0 +1,31 @@ +package io.santander.gastos.mapper; + +import io.santander.gastos.commons.AbstractMapper; +import io.santander.gastos.domain.CardSpent; +import io.santander.gastos.dto.CardSpentDTO; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class CardSpentMapper extends AbstractMapper { + @Override + public CardSpentDTO toDTO(CardSpent entity) { + return super.toDTO(entity); + } + + @Override + public CardSpent toEntity(CardSpentDTO dto) { + return super.toEntity(dto); + } + + @Override + public List toDTOList(List entity) { + return super.toDTOList(entity); + } + + @Override + public List toEntityList(List dto) { + return super.toEntityList(dto); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java index 2b7d018d..0581e8c0 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java @@ -1,8 +1,15 @@ package io.santander.gastos.repository; +import io.santander.gastos.domain.ClientCard; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; @Repository -public interface ClientCardRepository extends JpaRepository { +public interface ClientCardRepository extends JpaRepository { + @Query(value = "SELECT CASE WHEN COUNT(cc) > 0 THEN true ELSE false END FROM ClientCard cc " + + "INNER JOIN cc.client c " + + "INNER JOIN cc.creditCard ca " + + "WHERE c.id = ?1 AND ca.id = ?2") + boolean existsByClientAndCard(long client, long card); } diff --git a/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java index e3aa1896..b70bd20a 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/CreditCardRepository.java @@ -6,4 +6,5 @@ @Repository public interface CreditCardRepository extends JpaRepository { + CreditCard findByCardNumber(String cardNumber); } diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index 905e05af..c9837fb4 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -1,21 +1,10 @@ package io.santander.gastos.repository; import io.santander.gastos.domain.Spent; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import java.util.Date; - @Repository public interface SpentRepository extends JpaRepository { - - @Query(value = "SELECT s FROM Spent s " + - "WHERE s.userCode = ?1 " + - "AND (?3 is NULL OR s.description = ?3) " + - "AND (?4 is NULL OR s.spentValue = ?4) " + - "AND (?5 is NULL OR s.spentDate = ?5) ") - Page findAllWithFilters(Long userCode, String cardNumber, String description, Double value, Date date, Pageable pageable); + } diff --git a/gastos/src/main/java/io/santander/gastos/service/CardService.java b/gastos/src/main/java/io/santander/gastos/service/CardService.java new file mode 100644 index 00000000..231510f3 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/CardService.java @@ -0,0 +1,21 @@ +package io.santander.gastos.service; + +import io.santander.gastos.dto.CreditCardDTO; +import io.santander.gastos.mapper.CardMapper; +import io.santander.gastos.repository.CreditCardRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class CardService { + private final CreditCardRepository creditCardRepository; + private final CardMapper cardMapper; + + + public CreditCardDTO findCard(String cardNumber) { + return cardMapper.toDTO(creditCardRepository.findByCardNumber(cardNumber)); + } + +} diff --git a/gastos/src/main/java/io/santander/gastos/service/CardSpentService.java b/gastos/src/main/java/io/santander/gastos/service/CardSpentService.java new file mode 100644 index 00000000..d3c44469 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/CardSpentService.java @@ -0,0 +1,20 @@ +package io.santander.gastos.service; + +import io.santander.gastos.dto.CardSpentDTO; +import io.santander.gastos.mapper.CardSpentMapper; +import io.santander.gastos.repository.CardSpentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class CardSpentService { + private final CardSpentRepository cardSpentRepository; + private final CardSpentMapper cardSpentMapper; + + public void save(CardSpentDTO cardSpentDTO){ + cardSpentRepository.save(cardSpentMapper.toEntity(cardSpentDTO)); + } + +} diff --git a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java new file mode 100644 index 00000000..c7e71142 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java @@ -0,0 +1,18 @@ +package io.santander.gastos.service; + +import io.santander.gastos.repository.ClientCardRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class ClientCardService { + + private final ClientCardRepository clientCardRepository; + + public boolean verifiCardWoner(long client, long card) { + return clientCardRepository.existsByClientAndCard(client, card); + + } +} diff --git a/gastos/src/main/java/io/santander/gastos/service/ClientService.java b/gastos/src/main/java/io/santander/gastos/service/ClientService.java new file mode 100644 index 00000000..c399d564 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/ClientService.java @@ -0,0 +1,16 @@ +package io.santander.gastos.service; + +import io.santander.gastos.repository.ClientRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class ClientService { + private final ClientRepository clientRepository; + + public boolean verifyUser(Long id){ + return clientRepository.existsById(id); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index c585d62b..932297a0 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -2,6 +2,8 @@ import io.santander.gastos.commons.DateParser; import io.santander.gastos.domain.Spent; +import io.santander.gastos.dto.CardSpentDTO; +import io.santander.gastos.dto.CreditCardDTO; import io.santander.gastos.dto.SpentDTO; import io.santander.gastos.mapper.SpentMapper; import io.santander.gastos.repository.SpentRepository; @@ -13,8 +15,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; +import java.util.Date; import java.util.List; -import java.util.Optional; @Service @RequiredArgsConstructor(onConstructor = @__(@Lazy)) @@ -22,24 +25,62 @@ public class SpentService { private final SpentRepository spentRepository; private final SpentMapper spentMapper; + private final CardService cardService; + private final CardSpentService cardSpentService; + private final ClientService clientService; + private final ClientCardService clientCardService; private final DateParser dateParser; public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage = null; - spentPage = spentRepository.findAllWithFilters( - userCode, - cardNumber, - Optional.ofNullable(vo.getDescricao()).orElse(null), - Optional.ofNullable(vo.getValor()).orElse(null), - Optional.ofNullable(vo.getData()).orElse(null), - pageable); - return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); +// spentPage = spentRepository.findAllWithFilters( +// userCode, +// cardNumber, +// Optional.ofNullable(vo.getDescricao()).orElse(null), +// Optional.ofNullable(vo.getValor()).orElse(null), +// Optional.ofNullable(vo.getData()).orElse(null), +// pageable); +// return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); + return null; } public List getAllspents() { return spentMapper.toDTOList(spentRepository.findAll()); } - public void saveSpent(Long numeroCartão, GastoVO vo) { + @Transactional + public String saveSpent(String numeroCartão, GastoVO vo) { + + if (clientService.verifyUser(vo.getCodigoUsuario())) { + CreditCardDTO cardDTO = cardService.findCard(numeroCartão); + if (cardDTO == null) { + //TODO corrigir exeption + throw new RuntimeException("Cartão inexistente"); + } else { + if (clientCardService.verifiCardWoner(vo.getCodigoUsuario(), cardDTO.getId())) { + cardSpentService.save(CardSpentDTO + .builder() + .creditCard(cardDTO) + .spent(spentMapper.toDTO(spentRepository.save(Spent + .builder() + .description(vo.getDescricao()) + .spentDate(new Date(vo.getData())) + .spentValue(vo.getValor()) + .build()))) + .build()); + return "gasto registrado"; + } + else { + //TODO corrigir exeption + throw new RuntimeException("Este cartão não pertence ou esta autorizado para o usuário"); + } + } + + } else { + //TODO corrigir exeption + throw new RuntimeException("Usuario inexistente"); + + } + } } diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index 27abfdee..712f81d6 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -8,8 +8,6 @@ import lombok.NoArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Date; - @Data @NoArgsConstructor @AllArgsConstructor @@ -23,5 +21,5 @@ public class GastoVO { private String descricao; private Double valor; private Long codigoUsuario; - private Date data; + private Long data; } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 5022485a..8151bcca 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -24,9 +24,9 @@ public class SpentController { private final SpentService spentService; - @PostMapping("/{numeroCartão}") - void addSpent(@Valid @PathVariable final Long numeroCartão, final GastoVO vo) { - return spentService.saveSpent(numeroCartão,vo); + @PostMapping("/{numeroCartao}") + String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo){ + return spentService.saveSpent(numeroCartao,vo); } @GetMapping("/{codigoUsuario}") @@ -39,7 +39,7 @@ private GastoVO toVo(SpentDTO spentDTO) { return GastoVO.builder() .codigoUsuario(spentDTO.getUserCode()) .descricao(spentDTO.getDescription()) - .data(spentDTO.getSpentDate()) + .data(spentDTO.getSpentDate().getTime()) .valor(spentDTO.getSpentValue()) .build(); } diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 095f38a8..1035eff9 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: jpa: show-sql: true hibernate: - ddl-auto: create + ddl-auto: validate properties: hibernate: dialect: org.hibernate.dialect.MySQL5InnoDBDialect From 30e9d93ece718a9e695283b95e47103fda25533b Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Fri, 28 Jun 2019 00:43:29 -0300 Subject: [PATCH 12/48] adicionado formato de data utc --- .../santander/gastos/commons/DateParser.java | 22 ------------ .../gastos/service/DateUTCParser.java | 28 +++++++++++++++ .../gastos/service/SpentService.java | 36 +++++++++++-------- .../java/io/santander/gastos/vo/GastoVO.java | 6 ++-- .../web/controller/SpentController.java | 8 +++-- gastos/src/main/resources/application.yml | 2 +- 6 files changed, 58 insertions(+), 44 deletions(-) delete mode 100644 gastos/src/main/java/io/santander/gastos/commons/DateParser.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java diff --git a/gastos/src/main/java/io/santander/gastos/commons/DateParser.java b/gastos/src/main/java/io/santander/gastos/commons/DateParser.java deleted file mode 100644 index c9b7db24..00000000 --- a/gastos/src/main/java/io/santander/gastos/commons/DateParser.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.santander.gastos.commons; - -import org.springframework.stereotype.Component; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -@Component -public abstract class DateParser extends SimpleDateFormat { - - final SimpleDateFormat sdf = new SimpleDateFormat("${spent.date-format}"); - - public Date toDate(String utcDate) throws ParseException { - return sdf.parse(utcDate); - } - - public String toUtcDate(Date date) throws ParseException { - return new SimpleDateFormat("${spent.date-format}").format(date); - } - -} diff --git a/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java b/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java new file mode 100644 index 00000000..db77d44e --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java @@ -0,0 +1,28 @@ +package io.santander.gastos.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Component +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class DateUTCParser extends SimpleDateFormat { + + private String pattern = "yyyy-MM-dd"; + + final SimpleDateFormat sdf = new SimpleDateFormat(pattern); + + public Date toDate(String utcDate) throws ParseException { + return sdf.parse(utcDate); + } + + public String toUtcDate(Date date) { + return new SimpleDateFormat(pattern).format(date); + } + +} diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 932297a0..e3a5de56 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -1,6 +1,5 @@ package io.santander.gastos.service; -import io.santander.gastos.commons.DateParser; import io.santander.gastos.domain.Spent; import io.santander.gastos.dto.CardSpentDTO; import io.santander.gastos.dto.CreditCardDTO; @@ -9,6 +8,7 @@ import io.santander.gastos.repository.SpentRepository; import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -16,9 +16,10 @@ import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.util.Date; +import java.text.ParseException; import java.util.List; +@Log4j2 @Service @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class SpentService { @@ -29,7 +30,7 @@ public class SpentService { private final CardSpentService cardSpentService; private final ClientService clientService; private final ClientCardService clientCardService; - private final DateParser dateParser; + private final DateUTCParser utcParser; public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage = null; @@ -58,19 +59,24 @@ public String saveSpent(String numeroCartão, GastoVO vo) { throw new RuntimeException("Cartão inexistente"); } else { if (clientCardService.verifiCardWoner(vo.getCodigoUsuario(), cardDTO.getId())) { - cardSpentService.save(CardSpentDTO - .builder() - .creditCard(cardDTO) - .spent(spentMapper.toDTO(spentRepository.save(Spent - .builder() - .description(vo.getDescricao()) - .spentDate(new Date(vo.getData())) - .spentValue(vo.getValor()) - .build()))) - .build()); + try { + cardSpentService.save(CardSpentDTO + .builder() + .creditCard(cardDTO) + .spent(spentMapper.toDTO(spentRepository.save(Spent + .builder() + .description(vo.getDescricao()) + .spentDate(utcParser.toDate(vo.getData())) + .spentValue(vo.getValor()) + .build()))) + .build()); + } catch (ParseException e) { + //TODO corrigir exeption + e.printStackTrace(); + } + log.info("gasto registrado"); return "gasto registrado"; - } - else { + } else { //TODO corrigir exeption throw new RuntimeException("Este cartão não pertence ou esta autorizado para o usuário"); } diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index 712f81d6..64505fee 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -1,7 +1,7 @@ package io.santander.gastos.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import io.santander.gastos.commons.DateParser; +import io.santander.gastos.service.DateUTCParser; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -16,10 +16,10 @@ public class GastoVO { @Autowired - private DateParser dateParser; + private DateUTCParser dateParser; private String descricao; private Double valor; private Long codigoUsuario; - private Long data; + private String data; } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 8151bcca..73b1f49c 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -1,5 +1,6 @@ package io.santander.gastos.web.controller; +import io.santander.gastos.service.DateUTCParser; import io.santander.gastos.dto.SpentDTO; import io.santander.gastos.service.SpentService; import io.santander.gastos.vo.GastoVO; @@ -23,10 +24,11 @@ public class SpentController { public static final String GASTOS_ENDPOINT = "/gastos"; private final SpentService spentService; + private final DateUTCParser dateParser; @PostMapping("/{numeroCartao}") - String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo){ - return spentService.saveSpent(numeroCartao,vo); + String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo) { + return spentService.saveSpent(numeroCartao, vo); } @GetMapping("/{codigoUsuario}") @@ -39,7 +41,7 @@ private GastoVO toVo(SpentDTO spentDTO) { return GastoVO.builder() .codigoUsuario(spentDTO.getUserCode()) .descricao(spentDTO.getDescription()) - .data(spentDTO.getSpentDate().getTime()) + .data(dateParser.toUtcDate(spentDTO.getSpentDate())) .valor(spentDTO.getSpentValue()) .build(); } diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 1035eff9..22d3d20b 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -1,5 +1,5 @@ spent: - date-format: yyyy-MM-dd HH:mm:ss + date-format: yyyy-MM-dd spring: jpa: From cf8e27ac0b288a4e907430c85f711faf6bf0abe5 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Fri, 28 Jun 2019 01:32:38 -0300 Subject: [PATCH 13/48] adicionado metodo para busca de gastos --- .../gastos/repository/SpentRepository.java | 7 ++++- .../gastos/service/SpentService.java | 27 ++++++++----------- .../web/controller/SpentController.java | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index c9837fb4..0712fe78 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -1,10 +1,15 @@ package io.santander.gastos.repository; import io.santander.gastos.domain.Spent; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; @Repository public interface SpentRepository extends JpaRepository { - + + @Query(value = "SELECT spent FROM card_spent AS cs INNER JOIN spent ON cs.spent = spent.id INNER JOIN card ON cs.card = card.id INNER JOIN client_card AS cc ON cc.card = card.id INNER JOIN client ON client.id = cc.client;",nativeQuery = true) + Page findAllWithFilters(Long userCode, String cardNumber, String description, Double value, String date, Pageable pageable); } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index e3a5de56..a7a9127b 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -17,7 +17,7 @@ import javax.transaction.Transactional; import java.text.ParseException; -import java.util.List; +import java.util.Optional; @Log4j2 @Service @@ -34,26 +34,21 @@ public class SpentService { public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage = null; -// spentPage = spentRepository.findAllWithFilters( -// userCode, -// cardNumber, -// Optional.ofNullable(vo.getDescricao()).orElse(null), -// Optional.ofNullable(vo.getValor()).orElse(null), -// Optional.ofNullable(vo.getData()).orElse(null), -// pageable); -// return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); - return null; - } - - public List getAllspents() { - return spentMapper.toDTOList(spentRepository.findAll()); + spentPage = spentRepository.findAllWithFilters( + userCode, + cardNumber, + Optional.ofNullable(vo.getDescricao()).orElse(null), + Optional.ofNullable(vo.getValor()).orElse(null), + Optional.ofNullable(vo.getData()).orElse(null), + pageable); + return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); } @Transactional - public String saveSpent(String numeroCartão, GastoVO vo) { + public String saveSpent(String numeroCartao, GastoVO vo) { if (clientService.verifyUser(vo.getCodigoUsuario())) { - CreditCardDTO cardDTO = cardService.findCard(numeroCartão); + CreditCardDTO cardDTO = cardService.findCard(numeroCartao); if (cardDTO == null) { //TODO corrigir exeption throw new RuntimeException("Cartão inexistente"); diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 73b1f49c..fc87764d 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -31,7 +31,7 @@ String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, return spentService.saveSpent(numeroCartao, vo); } - @GetMapping("/{codigoUsuario}") + @GetMapping("/user/{codigoUsuario}") PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { Page dtoPage = spentService.buscaTodosOsGastoPorCliente(codigoUsuario, numeroCartão, vo, pageable); return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); From e9f3cc296434b7fc1958ee2fe4fe56c51aa30ff1 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Sun, 30 Jun 2019 23:55:25 -0300 Subject: [PATCH 14/48] =?UTF-8?q?adicionado=20consulta=20ao=20banco=20de?= =?UTF-8?q?=20dados=20para=20busca=20de=20cart=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/repository/ClientCardRepository.java | 9 +++++++++ .../santander/gastos/repository/SpentRepository.java | 12 ++++++++++-- .../santander/gastos/service/ClientCardService.java | 6 ++++++ .../io/santander/gastos/service/SpentService.java | 11 +++++++++-- .../gastos/web/controller/SpentController.java | 2 +- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java index 0581e8c0..19654fb7 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java @@ -1,10 +1,13 @@ package io.santander.gastos.repository; import io.santander.gastos.domain.ClientCard; +import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface ClientCardRepository extends JpaRepository { @Query(value = "SELECT CASE WHEN COUNT(cc) > 0 THEN true ELSE false END FROM ClientCard cc " + @@ -12,4 +15,10 @@ public interface ClientCardRepository extends JpaRepository { "INNER JOIN cc.creditCard ca " + "WHERE c.id = ?1 AND ca.id = ?2") boolean existsByClientAndCard(long client, long card); + + @Query(value = "SELECT cc.id FROM ClientCard clic " + + "INNER JOIN clic.creditCard cc " + + "INNER JOIN clic.client cli " + + "WHERE cli.id = ?1 AND cc.cardNumber = ?2") + List findByClientAndCard(long client, String card); } diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index 0712fe78..400a147b 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -7,9 +7,17 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface SpentRepository extends JpaRepository { - @Query(value = "SELECT spent FROM card_spent AS cs INNER JOIN spent ON cs.spent = spent.id INNER JOIN card ON cs.card = card.id INNER JOIN client_card AS cc ON cc.card = card.id INNER JOIN client ON client.id = cc.client;",nativeQuery = true) - Page findAllWithFilters(Long userCode, String cardNumber, String description, Double value, String date, Pageable pageable); + @Query(value = "SELECT s FROM CardSpent cs " + + "INNER JOIN cs.creditCard cc " + + "INNER JOIN cs.spent s " + + "WHERE cc.id IN ?1 " + + "AND (?2 IS NULL OR s.description = ?2) " + + "AND (?3 IS NULL OR s.spentValue = ?3) " + + "AND (?4 IS NULL OR s.spentDate like ?4) ") + Page findAllWithFilters(List cards, String description, Double value, String date, Pageable pageable); } diff --git a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java index c7e71142..dc99d0c1 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java @@ -5,6 +5,8 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class ClientCardService { @@ -15,4 +17,8 @@ public boolean verifiCardWoner(long client, long card) { return clientCardRepository.existsByClientAndCard(client, card); } + + public List getClientsCard(long client, String card) { + return clientCardRepository.findByClientAndCard(client, card); + } } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index a7a9127b..a25fce0a 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -17,6 +17,7 @@ import javax.transaction.Transactional; import java.text.ParseException; +import java.util.List; import java.util.Optional; @Log4j2 @@ -32,11 +33,17 @@ public class SpentService { private final ClientCardService clientCardService; private final DateUTCParser utcParser; + @Transactional public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage = null; + + List cards = clientCardService.getClientsCard(userCode, cardNumber); + if (cardNumber.isEmpty()) { + //TODO corrigir exeption + throw new RuntimeException("Nenhum cartão para o cliente"); + } spentPage = spentRepository.findAllWithFilters( - userCode, - cardNumber, + cards, Optional.ofNullable(vo.getDescricao()).orElse(null), Optional.ofNullable(vo.getValor()).orElse(null), Optional.ofNullable(vo.getData()).orElse(null), diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index fc87764d..5f08d279 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -21,7 +21,7 @@ @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class SpentController { - public static final String GASTOS_ENDPOINT = "/gastos"; + public static final String GASTOS_ENDPOINT = "/spent"; private final SpentService spentService; private final DateUTCParser dateParser; From f0204d7586938ccf924d4c70b94b388682e4a266 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 1 Jul 2019 00:15:38 -0300 Subject: [PATCH 15/48] busca por data no formato utc --- .../gastos/repository/SpentRepository.java | 5 ++-- .../gastos/service/DateUTCParser.java | 10 +++++-- .../gastos/service/SpentService.java | 30 ++++++++----------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index 400a147b..b6e496f3 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.util.Date; import java.util.List; @Repository @@ -18,6 +19,6 @@ public interface SpentRepository extends JpaRepository { "WHERE cc.id IN ?1 " + "AND (?2 IS NULL OR s.description = ?2) " + "AND (?3 IS NULL OR s.spentValue = ?3) " + - "AND (?4 IS NULL OR s.spentDate like ?4) ") - Page findAllWithFilters(List cards, String description, Double value, String date, Pageable pageable); + "AND (?4 IS NULL OR s.spentDate = ?4) ") + Page findAllWithFilters(List cards, String description, Double value, Date date, Pageable pageable); } diff --git a/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java b/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java index db77d44e..0a1062fa 100644 --- a/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java +++ b/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java @@ -1,7 +1,6 @@ package io.santander.gastos.service; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -17,8 +16,13 @@ public class DateUTCParser extends SimpleDateFormat { final SimpleDateFormat sdf = new SimpleDateFormat(pattern); - public Date toDate(String utcDate) throws ParseException { - return sdf.parse(utcDate); + public Date toDate(String utcDate) { + try { + return sdf.parse(utcDate); + } catch (ParseException e) { + e.printStackTrace(); + } + return null; } public String toUtcDate(Date date) { diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index a25fce0a..9fc2df76 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -16,7 +16,6 @@ import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.text.ParseException; import java.util.List; import java.util.Optional; @@ -38,7 +37,7 @@ public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, Strin Page spentPage = null; List cards = clientCardService.getClientsCard(userCode, cardNumber); - if (cardNumber.isEmpty()) { + if (cards.isEmpty()) { //TODO corrigir exeption throw new RuntimeException("Nenhum cartão para o cliente"); } @@ -46,7 +45,7 @@ public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, Strin cards, Optional.ofNullable(vo.getDescricao()).orElse(null), Optional.ofNullable(vo.getValor()).orElse(null), - Optional.ofNullable(vo.getData()).orElse(null), + Optional.ofNullable(utcParser.toDate(vo.getData())).orElse(null), pageable); return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); } @@ -61,21 +60,16 @@ public String saveSpent(String numeroCartao, GastoVO vo) { throw new RuntimeException("Cartão inexistente"); } else { if (clientCardService.verifiCardWoner(vo.getCodigoUsuario(), cardDTO.getId())) { - try { - cardSpentService.save(CardSpentDTO - .builder() - .creditCard(cardDTO) - .spent(spentMapper.toDTO(spentRepository.save(Spent - .builder() - .description(vo.getDescricao()) - .spentDate(utcParser.toDate(vo.getData())) - .spentValue(vo.getValor()) - .build()))) - .build()); - } catch (ParseException e) { - //TODO corrigir exeption - e.printStackTrace(); - } + cardSpentService.save(CardSpentDTO + .builder() + .creditCard(cardDTO) + .spent(spentMapper.toDTO(spentRepository.save(Spent + .builder() + .description(vo.getDescricao()) + .spentDate(utcParser.toDate(vo.getData())) + .spentValue(vo.getValor()) + .build()))) + .build()); log.info("gasto registrado"); return "gasto registrado"; } else { From d578167787f4da85b9491cc66a5d85f73fb3af20 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 1 Jul 2019 00:46:44 -0300 Subject: [PATCH 16/48] =?UTF-8?q?adicionado=20tratatica=20para=20usuario?= =?UTF-8?q?=20sem=20cart=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/santander/gastos/enumerators/ErrorMessages.java | 7 +++++++ .../santander/gastos/exceptions/MissingCardException.java | 7 +++++++ .../java/io/santander/gastos/service/SpentService.java | 4 ++-- .../santander/gastos/web/advice/SpertServiceAdvices.java | 8 ++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/exceptions/MissingCardException.java diff --git a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java index aa13e357..4b6873dc 100644 --- a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java +++ b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java @@ -14,6 +14,13 @@ public String getErrorMessage(String error) { } }, + MISSING_CARD { + @Override + public String getErrorMessage(String error) { + return String.format("There is no card for the customer %s", error); + } + }, + INTERNAL_SERVER_ERROR { @Override public String getErrorMessage(String error) { diff --git a/gastos/src/main/java/io/santander/gastos/exceptions/MissingCardException.java b/gastos/src/main/java/io/santander/gastos/exceptions/MissingCardException.java new file mode 100644 index 00000000..7cbdfa23 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/exceptions/MissingCardException.java @@ -0,0 +1,7 @@ +package io.santander.gastos.exceptions; + +public class MissingCardException extends RuntimeException { + public MissingCardException(String message) { + super(message); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 9fc2df76..54f4701a 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -4,6 +4,7 @@ import io.santander.gastos.dto.CardSpentDTO; import io.santander.gastos.dto.CreditCardDTO; import io.santander.gastos.dto.SpentDTO; +import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.mapper.SpentMapper; import io.santander.gastos.repository.SpentRepository; import io.santander.gastos.vo.GastoVO; @@ -38,8 +39,7 @@ public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, Strin List cards = clientCardService.getClientsCard(userCode, cardNumber); if (cards.isEmpty()) { - //TODO corrigir exeption - throw new RuntimeException("Nenhum cartão para o cliente"); + throw new MissingCardException(userCode.toString()); } spentPage = spentRepository.findAllWithFilters( cards, diff --git a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java index 018deebc..7360dedd 100644 --- a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java +++ b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java @@ -1,6 +1,7 @@ package io.santander.gastos.web.advice; import io.santander.gastos.enumerators.ErrorMessages; +import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.vo.ErrorResponse; import lombok.extern.log4j.Log4j2; import org.springframework.http.HttpStatus; @@ -13,6 +14,7 @@ import static java.time.Instant.now; import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.HttpStatus.NOT_FOUND; import static org.springframework.http.ResponseEntity.status; @ControllerAdvice @@ -25,6 +27,12 @@ public ResponseEntity handleMissingFieldException(final MissingSe .body(this.constructErrorResponse(BAD_REQUEST, ErrorMessages.MISSING_PARAMETER.getErrorMessage(e.getParameterName()))); } + @ExceptionHandler(MissingCardException.class) + public ResponseEntity handleMissingCardException(final MissingCardException e) { + return status(NOT_FOUND) + .body(this.constructErrorResponse(NOT_FOUND, ErrorMessages.MISSING_CARD.getErrorMessage(e.getMessage()))); + } + private ErrorResponse constructErrorResponse(final HttpStatus httpStatus, final String... messages) { return ErrorResponse.builder() .timestamp(now()) From 322c4d27e2a7417ac1bdeb092dff3b91527e86a8 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 00:58:12 -0300 Subject: [PATCH 17/48] =?UTF-8?q?tratando=20error=20de=20cart=C3=A3o=20ine?= =?UTF-8?q?xistente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../santander/gastos/enumerators/ErrorMessages.java | 10 +++++++++- .../gastos/exceptions/MissingFieldException.java | 5 ----- .../gastos/exceptions/NonexistentCardException.java | 7 +++++++ .../gastos/repository/ClientCardRepository.java | 1 - .../santander/gastos/service/ClientCardService.java | 2 +- .../io/santander/gastos/service/SpentService.java | 6 +++--- .../gastos/web/advice/SpertServiceAdvices.java | 12 +++++++++++- .../gastos/web/controller/SpentController.java | 2 +- 8 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/exceptions/NonexistentCardException.java diff --git a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java index 4b6873dc..61edb65d 100644 --- a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java +++ b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java @@ -2,6 +2,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import org.springframework.lang.Nullable; @Getter @NoArgsConstructor @@ -14,13 +15,20 @@ public String getErrorMessage(String error) { } }, - MISSING_CARD { + MISSING_USER_CARD { @Override public String getErrorMessage(String error) { return String.format("There is no card for the customer %s", error); } }, + NONEXISTENT_CARD { + @Override + public String getErrorMessage(@Nullable String error) { + return String.format("Nonexistent card", error); + } + }, + INTERNAL_SERVER_ERROR { @Override public String getErrorMessage(String error) { diff --git a/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java b/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java index c5fdc9d1..953cb63a 100644 --- a/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java +++ b/gastos/src/main/java/io/santander/gastos/exceptions/MissingFieldException.java @@ -1,9 +1,4 @@ package io.santander.gastos.exceptions; public class MissingFieldException extends RuntimeException { - private static final long serialVersionUID = 6210964506339092884L; - - public MissingFieldException(final String message) { - super(message); - } } diff --git a/gastos/src/main/java/io/santander/gastos/exceptions/NonexistentCardException.java b/gastos/src/main/java/io/santander/gastos/exceptions/NonexistentCardException.java new file mode 100644 index 00000000..84bd2a08 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/exceptions/NonexistentCardException.java @@ -0,0 +1,7 @@ +package io.santander.gastos.exceptions; + +public class NonexistentCardException extends RuntimeException { + public NonexistentCardException(String message) { + super(message); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java index 19654fb7..1443278c 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java @@ -1,7 +1,6 @@ package io.santander.gastos.repository; import io.santander.gastos.domain.ClientCard; -import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java index dc99d0c1..dbe885e0 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java @@ -13,7 +13,7 @@ public class ClientCardService { private final ClientCardRepository clientCardRepository; - public boolean verifiCardWoner(long client, long card) { + public boolean verifyCardHolder(long client, long card) { return clientCardRepository.existsByClientAndCard(client, card); } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 54f4701a..1a201415 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -4,6 +4,7 @@ import io.santander.gastos.dto.CardSpentDTO; import io.santander.gastos.dto.CreditCardDTO; import io.santander.gastos.dto.SpentDTO; +import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.mapper.SpentMapper; import io.santander.gastos.repository.SpentRepository; @@ -56,10 +57,9 @@ public String saveSpent(String numeroCartao, GastoVO vo) { if (clientService.verifyUser(vo.getCodigoUsuario())) { CreditCardDTO cardDTO = cardService.findCard(numeroCartao); if (cardDTO == null) { - //TODO corrigir exeption - throw new RuntimeException("Cartão inexistente"); + throw new NonexistentCardException(numeroCartao); } else { - if (clientCardService.verifiCardWoner(vo.getCodigoUsuario(), cardDTO.getId())) { + if (clientCardService.verifyCardHolder(vo.getCodigoUsuario(), cardDTO.getId())) { cardSpentService.save(CardSpentDTO .builder() .creditCard(cardDTO) diff --git a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java index 7360dedd..910551c1 100644 --- a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java +++ b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java @@ -1,6 +1,7 @@ package io.santander.gastos.web.advice; import io.santander.gastos.enumerators.ErrorMessages; +import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.vo.ErrorResponse; import lombok.extern.log4j.Log4j2; @@ -23,14 +24,23 @@ public class SpertServiceAdvices { @ExceptionHandler(MissingServletRequestParameterException.class) public ResponseEntity handleMissingFieldException(final MissingServletRequestParameterException e) { + log.error(ErrorMessages.MISSING_PARAMETER.getErrorMessage(e.getParameterName())); return status(BAD_REQUEST) .body(this.constructErrorResponse(BAD_REQUEST, ErrorMessages.MISSING_PARAMETER.getErrorMessage(e.getParameterName()))); } @ExceptionHandler(MissingCardException.class) public ResponseEntity handleMissingCardException(final MissingCardException e) { + log.error(ErrorMessages.MISSING_USER_CARD.getErrorMessage(e.getMessage())); return status(NOT_FOUND) - .body(this.constructErrorResponse(NOT_FOUND, ErrorMessages.MISSING_CARD.getErrorMessage(e.getMessage()))); + .body(this.constructErrorResponse(NOT_FOUND, ErrorMessages.MISSING_USER_CARD.getErrorMessage(e.getMessage()))); + } + + @ExceptionHandler(NonexistentCardException.class) + public ResponseEntity handleInexistentCardException(final NonexistentCardException e) { + log.error(ErrorMessages.NONEXISTENT_CARD.getErrorMessage(e.getMessage())); + return status(NOT_FOUND) + .body(this.constructErrorResponse(NOT_FOUND, ErrorMessages.NONEXISTENT_CARD.getErrorMessage(e.getMessage()))); } private ErrorResponse constructErrorResponse(final HttpStatus httpStatus, final String... messages) { diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 5f08d279..d304e5ee 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -1,7 +1,7 @@ package io.santander.gastos.web.controller; -import io.santander.gastos.service.DateUTCParser; import io.santander.gastos.dto.SpentDTO; +import io.santander.gastos.service.DateUTCParser; import io.santander.gastos.service.SpentService; import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; From 0ae33023fce75123a2ec5b751eab2db28ea4275e Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 01:01:17 -0300 Subject: [PATCH 18/48] adicionado readme --- gastos/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 gastos/README.md diff --git a/gastos/README.md b/gastos/README.md new file mode 100644 index 00000000..05b79124 --- /dev/null +++ b/gastos/README.md @@ -0,0 +1 @@ +# Gastos \ No newline at end of file From d2de33d0658d9f5a64467c36cf1bbf15c16cc795 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 01:08:57 -0300 Subject: [PATCH 19/48] adicionado readme --- gastos/README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gastos/README.md b/gastos/README.md index 05b79124..17fb746a 100644 --- a/gastos/README.md +++ b/gastos/README.md @@ -1 +1,17 @@ -# Gastos \ No newline at end of file +# Gastos + +## Compilando + +Dentro da pasta do projeto execute o comando + +```$ ./gradlew clean build``` + +Será gerado um arquivo .jar dentro do diretório ```/build/libs```. + +## Executando + +Para executar a aplicação execute o seguinte comando: + +```java -jar /.jar ``` + +## Executando com Docker \ No newline at end of file From df0bc3688eb000b89e7bca5dc647f9fd3d6e69f5 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 01:09:55 -0300 Subject: [PATCH 20/48] adicionado readme --- gastos/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gastos/README.md b/gastos/README.md index 17fb746a..bc65480c 100644 --- a/gastos/README.md +++ b/gastos/README.md @@ -12,6 +12,6 @@ Será gerado um arquivo .jar dentro do diretório ```/build/libs```. Para executar a aplicação execute o seguinte comando: -```java -jar /.jar ``` +```$ java -jar /.jar ``` ## Executando com Docker \ No newline at end of file From 2f0bf7d20246345c19e30dc7a50b8bbab870a254 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 02:12:04 -0300 Subject: [PATCH 21/48] criado docker compose --- gastos/Dockerfile | 4 +++ gastos/README.md | 6 ++++- gastos/docker-compose.yml | 32 ++++++++++++++--------- gastos/src/main/resources/application.yml | 2 +- 4 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 gastos/Dockerfile diff --git a/gastos/Dockerfile b/gastos/Dockerfile new file mode 100644 index 00000000..3cba0b98 --- /dev/null +++ b/gastos/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:8-jdk-alpine +VOLUME /tmp +COPY build/libs/*.jar app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/gastos/README.md b/gastos/README.md index bc65480c..73b5de2b 100644 --- a/gastos/README.md +++ b/gastos/README.md @@ -14,4 +14,8 @@ Para executar a aplicação execute o seguinte comando: ```$ java -jar /.jar ``` -## Executando com Docker \ No newline at end of file +## Executando com Docker + +Para executar a aplicação execute o seguinte comando: + +```$ docker-compose up --build ``` \ No newline at end of file diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml index 874b76ba..877bba40 100644 --- a/gastos/docker-compose.yml +++ b/gastos/docker-compose.yml @@ -9,23 +9,31 @@ services: MYSQL_USER: 'gastos' MYSQL_PASSWORD: 'gastos' MYSQL_ROOT_PASSWORD: 'root' + networks: + - net-spents ports: - '3306:3306' - expose: - - '3306' volumes: - my-db:/var/lib/mysql - redis: - image: redis - command: redis-server --requirepass Redis2019! - ports: - - "6379:6379" - - mongo: - image: mongo + santander-spents: + depends_on: + - mysql + links: + - mysql + environment: + SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" + networks: + - net-spents + build: + context: . + container_name: spents-app ports: - - "27017:27017" + - "9401:8080" volumes: - my-db: \ No newline at end of file + my-db: + +networks: + net-spents: + driver: bridge \ No newline at end of file diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 22d3d20b..d3bd9df5 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: jpa: show-sql: true hibernate: - ddl-auto: validate + ddl-auto: create properties: hibernate: dialect: org.hibernate.dialect.MySQL5InnoDBDialect From 32496041774e750c8af922e2054efb7534e3cf42 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 02:37:08 -0300 Subject: [PATCH 22/48] criado versionamento do flyway --- gastos/build.gradle | 2 +- gastos/docker-compose.yml | 2 + gastos/src/main/resources/application.yml | 2 +- .../db/migration/V1__init_script.sql | 46 +++++++++++++++++-- .../db/migration/V2__init_script.sql | 27 +++++++++++ .../db/migration/v2__init_script.sql | 3 -- 6 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 gastos/src/main/resources/db/migration/V2__init_script.sql delete mode 100644 gastos/src/main/resources/db/migration/v2__init_script.sql diff --git a/gastos/build.gradle b/gastos/build.gradle index 5444e5e2..33dca92d 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' implementation "ma.glasnost.orika:orika-core:${orikaVersion}" -// implementation "org.flywaydb:flyway-core:${flywayVersion}" + implementation "org.flywaydb:flyway-core:${flywayVersion}" compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml index 877bba40..9affce36 100644 --- a/gastos/docker-compose.yml +++ b/gastos/docker-compose.yml @@ -13,6 +13,8 @@ services: - net-spents ports: - '3306:3306' + expose: + - '3306' volumes: - my-db:/var/lib/mysql diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index d3bd9df5..22d3d20b 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: jpa: show-sql: true hibernate: - ddl-auto: create + ddl-auto: validate properties: hibernate: dialect: org.hibernate.dialect.MySQL5InnoDBDialect diff --git a/gastos/src/main/resources/db/migration/V1__init_script.sql b/gastos/src/main/resources/db/migration/V1__init_script.sql index 6898a112..8b06c1b7 100644 --- a/gastos/src/main/resources/db/migration/V1__init_script.sql +++ b/gastos/src/main/resources/db/migration/V1__init_script.sql @@ -1,11 +1,51 @@ -CREATE TABLE spent ( +CREATE TABLE card ( id bigint(20) NOT NULL AUTO_INCREMENT, card_number varchar(255) DEFAULT NULL, dat_creation datetime NOT NULL, + dat_update datetime NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY card_UK (card_number) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE spent ( + id bigint(20) NOT NULL AUTO_INCREMENT, + dat_creation datetime NOT NULL, description varchar(255) DEFAULT NULL, spent_date datetime DEFAULT NULL, spent_value double DEFAULT NULL, dat_update datetime NOT NULL, - user_code bigint(20) DEFAULT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE client ( + id bigint(20) NOT NULL AUTO_INCREMENT, + dat_creation datetime NOT NULL, + dat_update datetime NOT NULL, + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE card_spent ( + id bigint(20) NOT NULL AUTO_INCREMENT, + dat_creation datetime NOT NULL, + dat_update datetime NOT NULL, + card bigint(20) DEFAULT NULL, + spent bigint(20) DEFAULT NULL, + PRIMARY KEY (id), + KEY FK_card (card), + KEY FK_spent (spent), + CONSTRAINT FK_spent FOREIGN KEY (spent) REFERENCES spent (id), + CONSTRAINT FK_card FOREIGN KEY (card) REFERENCES card (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE client_card ( + id bigint(20) NOT NULL AUTO_INCREMENT, + dat_creation datetime NOT NULL, + dat_update datetime NOT NULL, + client bigint(20) DEFAULT NULL, + card bigint(20) DEFAULT NULL, + PRIMARY KEY (id), + KEY FK_client (client), + KEY FK_card_2 (card), + CONSTRAINT FK_card_2 FOREIGN KEY (card) REFERENCES card (id), + CONSTRAINT FK_client FOREIGN KEY (client) REFERENCES client (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file diff --git a/gastos/src/main/resources/db/migration/V2__init_script.sql b/gastos/src/main/resources/db/migration/V2__init_script.sql new file mode 100644 index 00000000..8a8a0e2e --- /dev/null +++ b/gastos/src/main/resources/db/migration/V2__init_script.sql @@ -0,0 +1,27 @@ +INSERT INTO gastos.card (card_number,dat_creation,dat_update) VALUES +('1','2013-06-22 20:58:21.000','2006-11-06 13:38:49.000') +,('2','1984-02-07 15:42:40.000','2006-01-17 16:14:02.000') +,('3','2004-07-22 23:07:29.000','2014-02-03 18:56:08.000') +,('4','1983-09-05 00:08:47.000','2014-08-16 05:15:51.000') +,('5','1980-05-26 19:08:51.000','2013-07-24 01:11:33.000') +,('6','1997-08-04 18:55:48.000','1999-03-16 22:38:51.000') +,('7','2019-01-06 08:45:08.000','2001-04-28 10:27:05.000') +,('8','2002-04-30 12:12:36.000','1980-11-30 14:56:37.000') +,('9','2013-06-15 08:35:55.000','1996-03-16 14:40:45.000') +,('10','2009-01-17 03:29:33.000','1992-04-30 22:45:46.000'); + +INSERT INTO gastos.client (dat_creation,dat_update) VALUES +('2010-01-26 03:03:37.000','1995-05-09 18:54:48.000') +,('1985-04-22 08:36:52.000','2006-06-14 03:05:45.000') +,('2005-09-09 15:56:26.000','1998-05-04 09:20:31.000') +,('1991-02-01 03:24:08.000','1994-01-04 06:10:38.000') +,('1996-10-27 06:58:41.000','1986-02-25 04:16:15.000') +,('1999-10-23 18:30:11.000','2017-06-03 23:06:17.000') +,('1992-07-05 15:04:39.000','2017-12-31 12:34:51.000') +,('1985-02-19 09:32:50.000','1993-11-04 15:42:28.000') +,('1992-04-28 15:26:02.000','2012-11-09 23:07:22.000') +,('1992-09-04 00:51:32.000','1984-02-04 04:46:11.000'); + +INSERT INTO gastos.client_card (dat_creation,dat_update,client,card) VALUES +('1995-04-08 23:39:13.000','1995-11-09 12:21:31.000',1,1) +,('2015-03-23 10:51:45.000','1990-04-22 16:11:22.000',2,8); \ No newline at end of file diff --git a/gastos/src/main/resources/db/migration/v2__init_script.sql b/gastos/src/main/resources/db/migration/v2__init_script.sql deleted file mode 100644 index 679c2964..00000000 --- a/gastos/src/main/resources/db/migration/v2__init_script.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO spent -(card_number, dat_creation, description, spent_date, spent_value, dat_update, user_code) -VALUES('5105105105105100', NOW(), 'teste1', NOW(), 9.99, NOW(), 1); \ No newline at end of file From eda437c5fe2f1c229eb60b8aac205bfc439ff546 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 02:56:17 -0300 Subject: [PATCH 23/48] adicionado cache --- gastos/build.gradle | 1 + .../santander/gastos/SantanderGastosApplication.java | 2 ++ .../io/santander/gastos/service/DateUTCParser.java | 11 ++++++----- .../io/santander/gastos/service/SpentService.java | 2 ++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gastos/build.gradle b/gastos/build.gradle index 33dca92d..a8b35ae2 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation "ma.glasnost.orika:orika-core:${orikaVersion}" implementation "org.flywaydb:flyway-core:${flywayVersion}" + implementation 'org.springframework.boot:spring-boot-starter-cache' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' diff --git a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java index 86c405e0..814c2a3b 100644 --- a/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java +++ b/gastos/src/main/java/io/santander/gastos/SantanderGastosApplication.java @@ -2,10 +2,12 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cache.annotation.EnableCaching; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @EnableJpaAuditing @SpringBootApplication +@EnableCaching public class SantanderGastosApplication { public static void main(String[] args) { diff --git a/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java b/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java index 0a1062fa..72320104 100644 --- a/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java +++ b/gastos/src/main/java/io/santander/gastos/service/DateUTCParser.java @@ -17,11 +17,12 @@ public class DateUTCParser extends SimpleDateFormat { final SimpleDateFormat sdf = new SimpleDateFormat(pattern); public Date toDate(String utcDate) { - try { - return sdf.parse(utcDate); - } catch (ParseException e) { - e.printStackTrace(); - } + if (utcDate != null) + try { + return sdf.parse(utcDate); + } catch (ParseException e) { + e.printStackTrace(); + } return null; } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 1a201415..87301ca6 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -11,6 +11,7 @@ import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -35,6 +36,7 @@ public class SpentService { private final DateUTCParser utcParser; @Transactional + @Cacheable("spents") public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage = null; From fafc744c2a9232f304d5eed0ff57f51715ab87ab Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 03:16:50 -0300 Subject: [PATCH 24/48] adicionado cache com redis --- gastos/build.gradle | 2 +- gastos/docker-compose.yml | 11 +++++++++++ gastos/src/main/resources/application.yml | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gastos/build.gradle b/gastos/build.gradle index a8b35ae2..a4b7c233 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation "ma.glasnost.orika:orika-core:${orikaVersion}" implementation "org.flywaydb:flyway-core:${flywayVersion}" - implementation 'org.springframework.boot:spring-boot-starter-cache' + implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.1.2.RELEASE' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml index 9affce36..a85c34a2 100644 --- a/gastos/docker-compose.yml +++ b/gastos/docker-compose.yml @@ -18,9 +18,20 @@ services: volumes: - my-db:/var/lib/mysql + redis: + image: redis + command: redis-server --requirepass Redis2019! + networks: + - net-spents + ports: + - "6379:6379" + expose: + - '6379' + santander-spents: depends_on: - mysql + - redis links: - mysql environment: diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 22d3d20b..7c644ef7 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -2,6 +2,12 @@ spent: date-format: yyyy-MM-dd spring: + cache: + type: REDIS + redis: + host: localhost + password: Redis2019! + port: 6379 jpa: show-sql: true hibernate: From f9218fd9ffccc887376634e9156695995e972cee Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 03:30:30 -0300 Subject: [PATCH 25/48] adicionado cache com redis --- gastos/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml index a85c34a2..85794024 100644 --- a/gastos/docker-compose.yml +++ b/gastos/docker-compose.yml @@ -20,7 +20,7 @@ services: redis: image: redis - command: redis-server --requirepass Redis2019! + command: redis-server --requirepass Redis2019! --protected-mode no networks: - net-spents ports: @@ -35,6 +35,7 @@ services: links: - mysql environment: + SPRING_REDIS_HOST: redis SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" networks: - net-spents From 3bff3fb052cb11e2b793e4941780051a834e370d Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 03:36:48 -0300 Subject: [PATCH 26/48] adicionado tempo de cache --- gastos/src/main/resources/application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 7c644ef7..89a88df6 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -4,6 +4,8 @@ spent: spring: cache: type: REDIS + redis: + time-to-live: 600000 redis: host: localhost password: Redis2019! From 8405446664d6e41f1bb727f7b631cf560d0383a4 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 2 Jul 2019 11:29:49 -0300 Subject: [PATCH 27/48] readme modificado --- gastos/README.md | 2 ++ .../santander/gastos/enumerators/ErrorMessages.java | 9 ++++++++- .../gastos/exceptions/InvalidHolderException.java | 7 +++++++ .../io/santander/gastos/service/SpentService.java | 6 +++--- .../gastos/web/advice/SpertServiceAdvices.java | 12 ++++++++++-- gastos/src/main/resources/application.yml | 2 +- 6 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/exceptions/InvalidHolderException.java diff --git a/gastos/README.md b/gastos/README.md index 73b5de2b..dff68e76 100644 --- a/gastos/README.md +++ b/gastos/README.md @@ -1,5 +1,7 @@ # Gastos +App desenvolvido utilizando Spring boot, Mysql para persistência de dados e Redis para cache de requisições. + ## Compilando Dentro da pasta do projeto execute o comando diff --git a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java index 61edb65d..af8c2788 100644 --- a/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java +++ b/gastos/src/main/java/io/santander/gastos/enumerators/ErrorMessages.java @@ -25,7 +25,14 @@ public String getErrorMessage(String error) { NONEXISTENT_CARD { @Override public String getErrorMessage(@Nullable String error) { - return String.format("Nonexistent card", error); + return String.format("This card does not belong to the user %s", error); + } + }, + + INVALID_HOLDER { + @Override + public String getErrorMessage(@Nullable String error) { + return String.format(" card", error); } }, diff --git a/gastos/src/main/java/io/santander/gastos/exceptions/InvalidHolderException.java b/gastos/src/main/java/io/santander/gastos/exceptions/InvalidHolderException.java new file mode 100644 index 00000000..4c451187 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/exceptions/InvalidHolderException.java @@ -0,0 +1,7 @@ +package io.santander.gastos.exceptions; + +public class InvalidHolderException extends RuntimeException { + public InvalidHolderException(String message) { + super(message); + } +} diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 87301ca6..560deeb6 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -4,6 +4,7 @@ import io.santander.gastos.dto.CardSpentDTO; import io.santander.gastos.dto.CreditCardDTO; import io.santander.gastos.dto.SpentDTO; +import io.santander.gastos.exceptions.InvalidHolderException; import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.mapper.SpentMapper; @@ -38,7 +39,7 @@ public class SpentService { @Transactional @Cacheable("spents") public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { - Page spentPage = null; + Page spentPage; List cards = clientCardService.getClientsCard(userCode, cardNumber); if (cards.isEmpty()) { @@ -75,8 +76,7 @@ public String saveSpent(String numeroCartao, GastoVO vo) { log.info("gasto registrado"); return "gasto registrado"; } else { - //TODO corrigir exeption - throw new RuntimeException("Este cartão não pertence ou esta autorizado para o usuário"); + throw new InvalidHolderException(vo.getCodigoUsuario().toString()); } } diff --git a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java index 910551c1..ae249834 100644 --- a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java +++ b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java @@ -1,6 +1,7 @@ package io.santander.gastos.web.advice; import io.santander.gastos.enumerators.ErrorMessages; +import io.santander.gastos.exceptions.InvalidHolderException; import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.vo.ErrorResponse; @@ -14,8 +15,7 @@ import java.util.Arrays; import static java.time.Instant.now; -import static org.springframework.http.HttpStatus.BAD_REQUEST; -import static org.springframework.http.HttpStatus.NOT_FOUND; +import static org.springframework.http.HttpStatus.*; import static org.springframework.http.ResponseEntity.status; @ControllerAdvice @@ -43,6 +43,14 @@ public ResponseEntity handleInexistentCardException(final Nonexis .body(this.constructErrorResponse(NOT_FOUND, ErrorMessages.NONEXISTENT_CARD.getErrorMessage(e.getMessage()))); } + @ExceptionHandler(InvalidHolderException.class) + public ResponseEntity handleInvalidHolderException(final InvalidHolderException e) { + log.error(ErrorMessages.INVALID_HOLDER.getErrorMessage(e.getMessage())); + return status(CONFLICT) + .body(this.constructErrorResponse(CONFLICT, ErrorMessages.INVALID_HOLDER.getErrorMessage(e.getMessage()))); + } + + private ErrorResponse constructErrorResponse(final HttpStatus httpStatus, final String... messages) { return ErrorResponse.builder() .timestamp(now()) diff --git a/gastos/src/main/resources/application.yml b/gastos/src/main/resources/application.yml index 89a88df6..0ce65529 100644 --- a/gastos/src/main/resources/application.yml +++ b/gastos/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: cache: type: REDIS redis: - time-to-live: 600000 + time-to-live: 60000 redis: host: localhost password: Redis2019! From 825041aaca2bd0d27b0abdbf5337cd2eafac0245 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 00:39:53 -0300 Subject: [PATCH 28/48] =?UTF-8?q?adicionado=20projeto=20de=20classifica?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classificacao/.gitignore | 32 ++++ classificacao/Dockerfile | 4 + classificacao/build.gradle | 35 ++++ classificacao/docker-compose.yml | 67 +++++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + classificacao/gradlew | 172 ++++++++++++++++++ classificacao/gradlew.bat | 84 +++++++++ classificacao/settings.gradle | 6 + .../java/io/santander/DemoApplication.java | 13 ++ .../src/main/resources/application.properties | 1 + .../io/santander/DemoApplicationTests.java | 16 ++ 12 files changed, 435 insertions(+) create mode 100644 classificacao/.gitignore create mode 100644 classificacao/Dockerfile create mode 100644 classificacao/build.gradle create mode 100644 classificacao/docker-compose.yml create mode 100644 classificacao/gradle/wrapper/gradle-wrapper.jar create mode 100644 classificacao/gradle/wrapper/gradle-wrapper.properties create mode 100755 classificacao/gradlew create mode 100644 classificacao/gradlew.bat create mode 100644 classificacao/settings.gradle create mode 100644 classificacao/src/main/java/io/santander/DemoApplication.java create mode 100644 classificacao/src/main/resources/application.properties create mode 100644 classificacao/src/test/java/io/santander/DemoApplicationTests.java diff --git a/classificacao/.gitignore b/classificacao/.gitignore new file mode 100644 index 00000000..6c018781 --- /dev/null +++ b/classificacao/.gitignore @@ -0,0 +1,32 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/classificacao/Dockerfile b/classificacao/Dockerfile new file mode 100644 index 00000000..3cba0b98 --- /dev/null +++ b/classificacao/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:8-jdk-alpine +VOLUME /tmp +COPY build/libs/*.jar app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/classificacao/build.gradle b/classificacao/build.gradle new file mode 100644 index 00000000..b26f0a6c --- /dev/null +++ b/classificacao/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'org.springframework.boot' version '2.1.6.RELEASE' + id 'java' +} + +apply plugin: 'io.spring.dependency-management' + +group = 'io.santander.classificacao' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +configurations { + developmentOnly + runtimeClasspath { + extendsFrom developmentOnly + } + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' +} diff --git a/classificacao/docker-compose.yml b/classificacao/docker-compose.yml new file mode 100644 index 00000000..ea1a3b04 --- /dev/null +++ b/classificacao/docker-compose.yml @@ -0,0 +1,67 @@ +version: '2.2' +services: + es01: + image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3 + container_name: es01 + environment: + - node.name=es01 + - discovery.seed_hosts=es02 + - cluster.initial_master_nodes=es01,es02 + - cluster.name=docker-cluster + - bootstrap.memory_lock=true + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + ulimits: + memlock: + soft: -1 + hard: -1 + volumes: + - esdata01:/usr/share/elasticsearch/data + ports: + - 9200:9200 + networks: + - net-classification + es02: + image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3 + container_name: es02 + environment: + - node.name=es02 + - discovery.seed_hosts=es01 + - cluster.initial_master_nodes=es01,es02 + - cluster.name=docker-cluster + - bootstrap.memory_lock=true + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + ulimits: + memlock: + soft: -1 + hard: -1 + volumes: + - esdata02:/usr/share/elasticsearch/data + networks: + - net-classification + +# santander-classification: +# depends_on: +# - mysql +# - redis +# links: +# - mysql +# environment: +# SPRING_REDIS_HOST: redis +# SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" +# networks: +# - net-classification +# build: +# context: . +# container_name: classification-app +# ports: +# - "9401:8080" + +volumes: + esdata01: + driver: local + esdata02: + driver: local + +networks: + net-classification: + driver: bridge \ No newline at end of file diff --git a/classificacao/gradle/wrapper/gradle-wrapper.jar b/classificacao/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 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 z 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/classificacao/gradlew.bat b/classificacao/gradlew.bat new file mode 100644 index 00000000..0f8d5937 --- /dev/null +++ b/classificacao/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/classificacao/settings.gradle b/classificacao/settings.gradle new file mode 100644 index 00000000..8a0ded28 --- /dev/null +++ b/classificacao/settings.gradle @@ -0,0 +1,6 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} +rootProject.name = 'classificacao' diff --git a/classificacao/src/main/java/io/santander/DemoApplication.java b/classificacao/src/main/java/io/santander/DemoApplication.java new file mode 100644 index 00000000..47cde219 --- /dev/null +++ b/classificacao/src/main/java/io/santander/DemoApplication.java @@ -0,0 +1,13 @@ +package io.santander; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/classificacao/src/main/resources/application.properties b/classificacao/src/main/resources/application.properties new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/classificacao/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/classificacao/src/test/java/io/santander/DemoApplicationTests.java b/classificacao/src/test/java/io/santander/DemoApplicationTests.java new file mode 100644 index 00000000..b6f6bf83 --- /dev/null +++ b/classificacao/src/test/java/io/santander/DemoApplicationTests.java @@ -0,0 +1,16 @@ +package io.santander; + +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 DemoApplicationTests { + + @Test + public void contextLoads() { + } + +} From 809b7de303fa091d32609f8b14ae0b2cf20d3fdb Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 01:04:59 -0300 Subject: [PATCH 29/48] adicionado endpoint para datalhes de gasto --- gastos/src/main/java/io/santander/gastos/vo/GastoVO.java | 1 + .../santander/gastos/web/controller/SpentController.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index 64505fee..00bc9fad 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -22,4 +22,5 @@ public class GastoVO { private Double valor; private Long codigoUsuario; private String data; + private String classificacao; } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index d304e5ee..4389821d 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -27,16 +27,21 @@ public class SpentController { private final DateUTCParser dateParser; @PostMapping("/{numeroCartao}") - String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo) { + String adicionaGasto(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo) { return spentService.saveSpent(numeroCartao, vo); } @GetMapping("/user/{codigoUsuario}") - PageImpl buscaTodosOsGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { + PageImpl buscaTodosGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { Page dtoPage = spentService.buscaTodosOsGastoPorCliente(codigoUsuario, numeroCartão, vo, pageable); return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); } + @GetMapping("/user/{codigoUsuario}/{codigoGasto}") + PageImpl buscaDestalheGastoCliente(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão) { + return null; + } + private GastoVO toVo(SpentDTO spentDTO) { return GastoVO.builder() .codigoUsuario(spentDTO.getUserCode()) From 446c694946597906f2e1ba0484839afba409a05e Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 01:23:10 -0300 Subject: [PATCH 30/48] =?UTF-8?q?adicionado=20entidades=20para=20classific?= =?UTF-8?q?a=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/domain/Classification.java | 40 +++++++++++++++++++ .../io/santander/gastos/domain/Client.java | 3 ++ .../gastos/domain/ClientClassification.java | 40 +++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 gastos/src/main/java/io/santander/gastos/domain/Classification.java create mode 100644 gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java diff --git a/gastos/src/main/java/io/santander/gastos/domain/Classification.java b/gastos/src/main/java/io/santander/gastos/domain/Classification.java new file mode 100644 index 00000000..b28a659b --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/Classification.java @@ -0,0 +1,40 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "classification") +@EntityListeners(AuditingEntityListener.class) +public class Classification { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + @OneToMany(mappedBy = "classification", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) + private List clientClassifications; + + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; +} diff --git a/gastos/src/main/java/io/santander/gastos/domain/Client.java b/gastos/src/main/java/io/santander/gastos/domain/Client.java index 84936562..63e2bb51 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Client.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Client.java @@ -28,6 +28,9 @@ public class Client implements Serializable { @OneToMany(mappedBy = "client", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) private List clientCards; + @OneToMany(mappedBy = "client", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) + private List clientClassifications; + @CreatedDate @Column(name = "dat_creation", updatable = false, nullable = false) private Date creationTime; diff --git a/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java b/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java new file mode 100644 index 00000000..b92c7df4 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java @@ -0,0 +1,40 @@ +package io.santander.gastos.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.*; +import java.util.Date; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "client_classification") +@EntityListeners(AuditingEntityListener.class) +public class ClientClassification { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + private Client client; + + @ManyToOne + private Classification classification; + + @CreatedDate + @Column(name = "dat_creation", updatable = false, nullable = false) + private Date creationTime; + + @LastModifiedDate + @Column(name = "dat_update", nullable = false) + private Date updateTime; +} From b7b5054a3f79b4569d12917c94ff949f0fc499ae Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 01:28:43 -0300 Subject: [PATCH 31/48] =?UTF-8?q?modifica=C3=A7=C3=A3o=20flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V1__init_script.sql | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gastos/src/main/resources/db/migration/V1__init_script.sql b/gastos/src/main/resources/db/migration/V1__init_script.sql index 8b06c1b7..9d4251ec 100644 --- a/gastos/src/main/resources/db/migration/V1__init_script.sql +++ b/gastos/src/main/resources/db/migration/V1__init_script.sql @@ -24,6 +24,14 @@ CREATE TABLE client ( PRIMARY KEY (id) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE TABLE classification ( + id bigint(20) NOT NULL AUTO_INCREMENT, + name varchar(255) DEFAULT NULL, + dat_creation datetime NOT NULL, + dat_update datetime NOT NULL, + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + CREATE TABLE card_spent ( id bigint(20) NOT NULL AUTO_INCREMENT, dat_creation datetime NOT NULL, @@ -48,4 +56,17 @@ CREATE TABLE client_card ( KEY FK_card_2 (card), CONSTRAINT FK_card_2 FOREIGN KEY (card) REFERENCES card (id), CONSTRAINT FK_client FOREIGN KEY (client) REFERENCES client (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE client_classification ( + id bigint(20) NOT NULL AUTO_INCREMENT, + dat_creation datetime NOT NULL, + dat_update datetime NOT NULL, + client bigint(20) DEFAULT NULL, + classification bigint(20) DEFAULT NULL, + PRIMARY KEY (id), + KEY FK_client (client), + KEY FK_card_2 (card), + CONSTRAINT FK_classification FOREIGN KEY (classification) REFERENCES classification (id), + CONSTRAINT FK_client_2 FOREIGN KEY (client) REFERENCES client (id) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file From c5ee265cbd5624623a7dec7be13d8858d72958ad Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 01:33:56 -0300 Subject: [PATCH 32/48] =?UTF-8?q?adicionado=20controller=20de=20classifica?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClassificationController.java | 23 +++++++++++++++++++ .../web/controller/SpentController.java | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java new file mode 100644 index 00000000..221bf2ce --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -0,0 +1,23 @@ +package io.santander.gastos.web.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping(ClassificationController.ClASSIFICATION_ENDPOINT) +@Validated +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class ClassificationController { + public static final String ClASSIFICATION_ENDPOINT = "/classicacao"; + + @GetMapping + List buscaCassificacao() { + return null; + } +} diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 4389821d..b3752d70 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -16,12 +16,12 @@ import java.util.stream.Collectors; @RestController -@RequestMapping(SpentController.GASTOS_ENDPOINT) +@RequestMapping(SpentController.SPENTS_ENDPOINT) @Validated @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class SpentController { - public static final String GASTOS_ENDPOINT = "/spent"; + public static final String SPENTS_ENDPOINT = "/spent"; private final SpentService spentService; private final DateUTCParser dateParser; From 58e42b6cae4b89a532134c9161e2f050a8e4fa25 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 01:48:17 -0300 Subject: [PATCH 33/48] =?UTF-8?q?adicionado=20repository=20e=20service=20d?= =?UTF-8?q?e=20classifica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ClassificationRepository.java | 14 +++++++++++++ .../gastos/service/ClassificationService.java | 20 +++++++++++++++++++ .../controller/ClassificationController.java | 4 +++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java create mode 100644 gastos/src/main/java/io/santander/gastos/service/ClassificationService.java diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java new file mode 100644 index 00000000..956468ae --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java @@ -0,0 +1,14 @@ +package io.santander.gastos.repository; + +import io.santander.gastos.domain.Classification; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.Set; + +@Repository +public interface ClassificationRepository extends JpaRepository { + @Query(value = "SELECT c.name FROM Classification c WHERE c.name LIKE ?1 ") + Set findByText(String text); +} diff --git a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java new file mode 100644 index 00000000..cc7f8789 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java @@ -0,0 +1,20 @@ +package io.santander.gastos.service; + +import io.santander.gastos.repository.ClassificationRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +import java.util.Set; + +@Service +@RequiredArgsConstructor(onConstructor = @__(@Lazy)) +public class ClassificationService { + + private final ClassificationRepository classificationRepository; + + Set getAllClassificatios(String text) { + return classificationRepository.findByText("%"+text+"%"); + + } +} diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java index 221bf2ce..9bbaff7d 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -5,8 +5,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.validation.Valid; import java.util.List; @RestController @@ -17,7 +19,7 @@ public class ClassificationController { public static final String ClASSIFICATION_ENDPOINT = "/classicacao"; @GetMapping - List buscaCassificacao() { + List buscaCassificacao(@RequestParam @Valid String searchText) { return null; } } From c741b9a78af6a6928fae61091a46292b888ead82 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 02:01:12 -0300 Subject: [PATCH 34/48] =?UTF-8?q?corre=C3=A7=C3=B5es=20flyway=20e=20domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gastos/docker-compose.yml | 32 +++++++++---------- .../gastos/domain/ClientClassification.java | 2 ++ .../gastos/service/ClassificationService.java | 2 +- .../controller/ClassificationController.java | 9 ++++-- .../db/migration/V1__init_script.sql | 6 ++-- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml index 85794024..42d7b288 100644 --- a/gastos/docker-compose.yml +++ b/gastos/docker-compose.yml @@ -28,22 +28,22 @@ services: expose: - '6379' - santander-spents: - depends_on: - - mysql - - redis - links: - - mysql - environment: - SPRING_REDIS_HOST: redis - SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" - networks: - - net-spents - build: - context: . - container_name: spents-app - ports: - - "9401:8080" +# santander-spents: +# depends_on: +# - mysql +# - redis +# links: +# - mysql +# environment: +# SPRING_REDIS_HOST: redis +# SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" +# networks: +# - net-spents +# build: +# context: . +# container_name: spents-app +# ports: +# - "9401:8080" volumes: my-db: diff --git a/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java b/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java index b92c7df4..350a0d40 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java +++ b/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java @@ -25,9 +25,11 @@ public class ClientClassification { private Long id; @ManyToOne + @JoinColumn(name = "client") private Client client; @ManyToOne + @JoinColumn(name = "classification") private Classification classification; @CreatedDate diff --git a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java index cc7f8789..b5f2b602 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java @@ -13,7 +13,7 @@ public class ClassificationService { private final ClassificationRepository classificationRepository; - Set getAllClassificatios(String text) { + public Set getAllClassificatios(String text) { return classificationRepository.findByText("%"+text+"%"); } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java index 9bbaff7d..b03097f2 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -1,5 +1,6 @@ package io.santander.gastos.web.controller; +import io.santander.gastos.service.ClassificationService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.validation.annotation.Validated; @@ -9,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import java.util.List; +import java.util.Set; @RestController @RequestMapping(ClassificationController.ClASSIFICATION_ENDPOINT) @@ -18,8 +19,10 @@ public class ClassificationController { public static final String ClASSIFICATION_ENDPOINT = "/classicacao"; + private final ClassificationService classificationService; + @GetMapping - List buscaCassificacao(@RequestParam @Valid String searchText) { - return null; + Set buscaCassificacao(@RequestParam @Valid String searchText) { + return classificationService.getAllClassificatios(searchText); } } diff --git a/gastos/src/main/resources/db/migration/V1__init_script.sql b/gastos/src/main/resources/db/migration/V1__init_script.sql index 9d4251ec..e2b23d2f 100644 --- a/gastos/src/main/resources/db/migration/V1__init_script.sql +++ b/gastos/src/main/resources/db/migration/V1__init_script.sql @@ -65,8 +65,8 @@ CREATE TABLE client_classification ( client bigint(20) DEFAULT NULL, classification bigint(20) DEFAULT NULL, PRIMARY KEY (id), - KEY FK_client (client), - KEY FK_card_2 (card), + KEY FK_client_3 (client), + KEY FK_classification (classification), CONSTRAINT FK_classification FOREIGN KEY (classification) REFERENCES classification (id), - CONSTRAINT FK_client_2 FOREIGN KEY (client) REFERENCES client (id) + CONSTRAINT FK_client_3 FOREIGN KEY (client) REFERENCES client (id) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file From b34dbc2772689d360bdfb91a86569756d4fb21a8 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 02:06:35 -0300 Subject: [PATCH 35/48] =?UTF-8?q?corre=C3=A7=C3=A3o=20endpoint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/santander/gastos/service/ClassificationService.java | 2 ++ .../gastos/web/controller/ClassificationController.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java index b5f2b602..68ded1c1 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java @@ -2,6 +2,7 @@ import io.santander.gastos.repository.ClassificationRepository; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -13,6 +14,7 @@ public class ClassificationService { private final ClassificationRepository classificationRepository; + @Cacheable("classification") public Set getAllClassificatios(String text) { return classificationRepository.findByText("%"+text+"%"); diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java index b03097f2..d9bddcd9 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -17,7 +17,7 @@ @Validated @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class ClassificationController { - public static final String ClASSIFICATION_ENDPOINT = "/classicacao"; + public static final String ClASSIFICATION_ENDPOINT = "/classification"; private final ClassificationService classificationService; From 2de2c93a2b0e1c69580c3061002c52cba0d21481 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 02:46:08 -0300 Subject: [PATCH 36/48] =?UTF-8?q?corre=C3=A7=C3=A3o=20dto=20e=20criacao=20?= =?UTF-8?q?mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/dto/ClassificationDTO.java | 18 ++++++++++ .../gastos/mapper/ClassificationMapper.java | 34 +++++++++++++++++++ .../repository/ClassificationRepository.java | 6 ++-- .../gastos/service/ClassificationService.java | 10 +++--- .../java/io/santander/gastos/vo/GastoVO.java | 4 +++ .../controller/ClassificationController.java | 5 +-- .../web/controller/SpentController.java | 11 ++++-- .../db/migration/V2__init_script.sql | 14 +++++++- 8 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 gastos/src/main/java/io/santander/gastos/dto/ClassificationDTO.java create mode 100644 gastos/src/main/java/io/santander/gastos/mapper/ClassificationMapper.java diff --git a/gastos/src/main/java/io/santander/gastos/dto/ClassificationDTO.java b/gastos/src/main/java/io/santander/gastos/dto/ClassificationDTO.java new file mode 100644 index 00000000..ad238ab8 --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/dto/ClassificationDTO.java @@ -0,0 +1,18 @@ +package io.santander.gastos.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ClassificationDTO { + + private Long id; + + private String name; + +} \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/mapper/ClassificationMapper.java b/gastos/src/main/java/io/santander/gastos/mapper/ClassificationMapper.java new file mode 100644 index 00000000..f8d47c1f --- /dev/null +++ b/gastos/src/main/java/io/santander/gastos/mapper/ClassificationMapper.java @@ -0,0 +1,34 @@ +package io.santander.gastos.mapper; + +import io.santander.gastos.commons.AbstractMapper; +import io.santander.gastos.domain.Classification; +import io.santander.gastos.dto.ClassificationDTO; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class ClassificationMapper extends AbstractMapper { + + @Override + public ClassificationDTO toDTO(Classification entity) { + return super.toDTO(entity); + } + + @Override + public Classification toEntity(ClassificationDTO dto) { + return super.toEntity(dto); + } + + @Override + public List toDTOList(List entity) { + return super.toDTOList(entity); + } + + @Override + public List toEntityList(List dto) { + return super.toEntityList(dto); + } + + +} diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java index 956468ae..0c996068 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java @@ -5,10 +5,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import java.util.Set; +import java.util.List; @Repository public interface ClassificationRepository extends JpaRepository { - @Query(value = "SELECT c.name FROM Classification c WHERE c.name LIKE ?1 ") - Set findByText(String text); + @Query(value = "FROM Classification c WHERE c.name LIKE ?1 ") + List findByText(String text); } diff --git a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java index 68ded1c1..03723fdc 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java @@ -1,22 +1,24 @@ package io.santander.gastos.service; +import io.santander.gastos.dto.ClassificationDTO; +import io.santander.gastos.mapper.ClassificationMapper; import io.santander.gastos.repository.ClassificationRepository; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Set; +import java.util.List; @Service @RequiredArgsConstructor(onConstructor = @__(@Lazy)) public class ClassificationService { private final ClassificationRepository classificationRepository; + private final ClassificationMapper classificationMapper; @Cacheable("classification") - public Set getAllClassificatios(String text) { - return classificationRepository.findByText("%"+text+"%"); - + public List getAllClassificatios(String text) { + return classificationMapper.toDTOList(classificationRepository.findByText("%" + text + "%")); } } diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index 00bc9fad..c98b2208 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -1,6 +1,7 @@ package io.santander.gastos.vo; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.santander.gastos.service.DateUTCParser; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,5 +23,8 @@ public class GastoVO { private Double valor; private Long codigoUsuario; private String data; + @JsonProperty(access = JsonProperty.Access.READ_ONLY) private String classificacao; + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private Long classificacaoId; } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java index d9bddcd9..b249c15b 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -1,5 +1,6 @@ package io.santander.gastos.web.controller; +import io.santander.gastos.dto.ClassificationDTO; import io.santander.gastos.service.ClassificationService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; @@ -10,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -import java.util.Set; +import java.util.List; @RestController @RequestMapping(ClassificationController.ClASSIFICATION_ENDPOINT) @@ -22,7 +23,7 @@ public class ClassificationController { private final ClassificationService classificationService; @GetMapping - Set buscaCassificacao(@RequestParam @Valid String searchText) { + List buscaCassificacao(@RequestParam @Valid String searchText) { return classificationService.getAllClassificatios(searchText); } } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index b3752d70..e5f99e7c 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -27,18 +27,23 @@ public class SpentController { private final DateUTCParser dateParser; @PostMapping("/{numeroCartao}") - String adicionaGasto(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo) { + String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, final GastoVO vo) { return spentService.saveSpent(numeroCartao, vo); } @GetMapping("/user/{codigoUsuario}") - PageImpl buscaTodosGastoPorCliente(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { + PageImpl getAllSpents(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { Page dtoPage = spentService.buscaTodosOsGastoPorCliente(codigoUsuario, numeroCartão, vo, pageable); return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); } @GetMapping("/user/{codigoUsuario}/{codigoGasto}") - PageImpl buscaDestalheGastoCliente(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão) { + PageImpl getSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão) { + return null; + } + + @PutMapping("/user/{codigoUsuario}/{codigoGasto}") + PageImpl updateSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão, GastoVO vo) { return null; } diff --git a/gastos/src/main/resources/db/migration/V2__init_script.sql b/gastos/src/main/resources/db/migration/V2__init_script.sql index 8a8a0e2e..842467ec 100644 --- a/gastos/src/main/resources/db/migration/V2__init_script.sql +++ b/gastos/src/main/resources/db/migration/V2__init_script.sql @@ -24,4 +24,16 @@ INSERT INTO gastos.client (dat_creation,dat_update) VALUES INSERT INTO gastos.client_card (dat_creation,dat_update,client,card) VALUES ('1995-04-08 23:39:13.000','1995-11-09 12:21:31.000',1,1) -,('2015-03-23 10:51:45.000','1990-04-22 16:11:22.000',2,8); \ No newline at end of file +,('2015-03-23 10:51:45.000','1990-04-22 16:11:22.000',2,8); + +INSERT INTO gastos.classification (name,dat_creation,dat_update) VALUES +('laboris nisi','1998-08-22 08:32:33.000','1995-02-18 19:52:51.000') +,('Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pari','2002-04-27 22:42:05.000','2003-09-22 05:19:05.000') +,('cupidatat non proident, sunt in culpa qui ','1999-05-27 06:31:04.000','2013-10-04 22:44:45.000') +,('incididunt ut labore et dolore magna aliqua. Ut enim ad minim v','1999-03-31 10:09:37.000','1998-07-11 20:48:46.000') +,('ex ea commodo consequat. Duis aute irure dolor in reprehenderit in','1980-12-02 23:23:49.000','1992-02-06 16:20:42.000') +,('velit esse ci','2007-08-20 23:20:58.000','1980-12-19 04:56:13.000') +,('in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Exc','2002-03-14 01:08:02.000','1994-12-28 09:17:43.000') +,('magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ','2003-03-03 00:41:31.000','2018-06-26 20:23:33.000') +,('Excepteur sint occaecat cu','2003-07-22 07:39:24.000','2005-08-10 07:04:08.000') +,('dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa','1997-07-01 01:25:24.000','1983-04-13 10:37:49.000') \ No newline at end of file From 86f258cecc538f909743842e54a2fd3f685a3921 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Mon, 8 Jul 2019 03:20:20 -0300 Subject: [PATCH 37/48] retornando gasto --- .../gastos/service/SpentService.java | 24 +++++++++++++++---- .../web/controller/SpentController.java | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 560deeb6..6f5f40b6 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -5,8 +5,8 @@ import io.santander.gastos.dto.CreditCardDTO; import io.santander.gastos.dto.SpentDTO; import io.santander.gastos.exceptions.InvalidHolderException; -import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.exceptions.MissingCardException; +import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.mapper.SpentMapper; import io.santander.gastos.repository.SpentRepository; import io.santander.gastos.vo.GastoVO; @@ -36,15 +36,21 @@ public class SpentService { private final ClientCardService clientCardService; private final DateUTCParser utcParser; + + private List getCarHolder(final Long userCode, final String cardNumber) { + List cards = clientCardService.getClientsCard(userCode, cardNumber); + if (cards.isEmpty()) { + throw new MissingCardException(userCode.toString()); + } else + return cards; + } + @Transactional @Cacheable("spents") public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage; - List cards = clientCardService.getClientsCard(userCode, cardNumber); - if (cards.isEmpty()) { - throw new MissingCardException(userCode.toString()); - } + List cards = getCarHolder(userCode, cardNumber); spentPage = spentRepository.findAllWithFilters( cards, Optional.ofNullable(vo.getDescricao()).orElse(null), @@ -87,4 +93,12 @@ public String saveSpent(String numeroCartao, GastoVO vo) { } } + + @Transactional + public SpentDTO getSpentDetail(Long userCode, Long codigoGasto, String cardNumber) { + List cards = getCarHolder(userCode, cardNumber); + //TODO: corrigir retorno + return spentMapper.toDTO(spentRepository.findById(codigoGasto).get()); + + } } diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index e5f99e7c..62b3f7c9 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -38,8 +38,8 @@ PageImpl getAllSpents(@Valid @PathVariable final Long codigoUsuario, @R } @GetMapping("/user/{codigoUsuario}/{codigoGasto}") - PageImpl getSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão) { - return null; + GastoVO getSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão) { + return toVo(spentService.getSpentDetail(codigoUsuario, codigoGasto, numeroCartão)); } @PutMapping("/user/{codigoUsuario}/{codigoGasto}") From cbc29bf8177e0bcaa2078229cdd9c2b650faebc4 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 9 Jul 2019 23:23:27 -0300 Subject: [PATCH 38/48] =?UTF-8?q?adicionado=20feature=20de=20classifica?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gastos/domain/Classification.java | 3 +- .../gastos/domain/ClientClassification.java | 3 +- .../io/santander/gastos/domain/Spent.java | 6 +++- .../io/santander/gastos/dto/SpentDTO.java | 1 + .../repository/ClassificationRepository.java | 8 ++++++ .../repository/ClientCardRepository.java | 6 ++++ .../gastos/repository/SpentRepository.java | 1 + .../gastos/service/ClassificationService.java | 17 +++++++++-- .../gastos/service/ClientCardService.java | 4 +++ .../gastos/service/SpentService.java | 28 ++++++++++++++++--- .../java/io/santander/gastos/vo/GastoVO.java | 1 + .../controller/ClassificationController.java | 1 + .../web/controller/SpentController.java | 8 +++++- .../db/migration/V1__init_script.sql | 3 +- 14 files changed, 79 insertions(+), 11 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/domain/Classification.java b/gastos/src/main/java/io/santander/gastos/domain/Classification.java index b28a659b..6c9e5f5e 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Classification.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Classification.java @@ -9,6 +9,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -19,7 +20,7 @@ @Entity @Table(name = "classification") @EntityListeners(AuditingEntityListener.class) -public class Classification { +public class Classification implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java b/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java index 350a0d40..23e361d0 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java +++ b/gastos/src/main/java/io/santander/gastos/domain/ClientClassification.java @@ -9,6 +9,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import javax.persistence.*; +import java.io.Serializable; import java.util.Date; @Builder @@ -18,7 +19,7 @@ @Entity @Table(name = "client_classification") @EntityListeners(AuditingEntityListener.class) -public class ClientClassification { +public class ClientClassification implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/gastos/src/main/java/io/santander/gastos/domain/Spent.java b/gastos/src/main/java/io/santander/gastos/domain/Spent.java index 032bcbef..b07634cc 100644 --- a/gastos/src/main/java/io/santander/gastos/domain/Spent.java +++ b/gastos/src/main/java/io/santander/gastos/domain/Spent.java @@ -23,9 +23,13 @@ public class Spent implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Column(nullable = false) private String description; private Double spentValue; private Date spentDate; + @JoinColumn(name = "classification") + @ManyToOne + private Classification classification; @CreatedDate @Column(name = "dat_creation", updatable = false, nullable = false) private Date creationTime; @@ -33,4 +37,4 @@ public class Spent implements Serializable { @LastModifiedDate @Column(name = "dat_update", nullable = false) private Date updateTime; -} +} \ No newline at end of file diff --git a/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java index 87798635..4ea4a745 100644 --- a/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java +++ b/gastos/src/main/java/io/santander/gastos/dto/SpentDTO.java @@ -17,4 +17,5 @@ public class SpentDTO { private String description; private Double spentValue; private Date spentDate; + private ClassificationDTO classification; } diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java index 0c996068..dbce2545 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/ClassificationRepository.java @@ -11,4 +11,12 @@ public interface ClassificationRepository extends JpaRepository { @Query(value = "FROM Classification c WHERE c.name LIKE ?1 ") List findByText(String text); + + @Query(value = "SELECT cla FROM CardSpent cs " + + "INNER JOIN cs.creditCard cc " + + "INNER JOIN cs.spent s " + + "INNER JOIN s.classification cla " + + "WHERE cc.id IN ?1 " + + "AND s.description = ?2 ") + Classification findSpendClassification(List cards, String description); } diff --git a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java index 1443278c..121596ac 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/ClientCardRepository.java @@ -20,4 +20,10 @@ public interface ClientCardRepository extends JpaRepository { "INNER JOIN clic.client cli " + "WHERE cli.id = ?1 AND cc.cardNumber = ?2") List findByClientAndCard(long client, String card); + + @Query(value = "SELECT cc.id FROM ClientCard clic " + + "INNER JOIN clic.creditCard cc " + + "INNER JOIN clic.client cli " + + "WHERE cli.id = ?1") + List findAllCardByClient(Long userCode); } diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index b6e496f3..dc7153cc 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -1,5 +1,6 @@ package io.santander.gastos.repository; +import io.santander.gastos.domain.Classification; import io.santander.gastos.domain.Spent; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java index 03723fdc..9fca6f61 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java @@ -4,10 +4,10 @@ import io.santander.gastos.mapper.ClassificationMapper; import io.santander.gastos.repository.ClassificationRepository; import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; import java.util.List; @Service @@ -15,10 +15,23 @@ public class ClassificationService { private final ClassificationRepository classificationRepository; + private final SpentService spentService; private final ClassificationMapper classificationMapper; - @Cacheable("classification") public List getAllClassificatios(String text) { return classificationMapper.toDTOList(classificationRepository.findByText("%" + text + "%")); } + + @Transactional + public void getClassificationByDescription(final Long userCode, final String description) { + spentService.getSpentClassification(userCode, description); + } + + public ClassificationDTO getClassification(final List cards, final String description) { + return classificationMapper.toDTO(classificationRepository.findSpendClassification(cards, description)); + } + + public ClassificationDTO getById(Long id) { + return classificationMapper.toDTO(classificationRepository.findById(id).get()); + } } diff --git a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java index dbe885e0..93a78941 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClientCardService.java @@ -21,4 +21,8 @@ public boolean verifyCardHolder(long client, long card) { public List getClientsCard(long client, String card) { return clientCardRepository.findByClientAndCard(client, card); } + + public List getCardsByClient(Long userCode) { + return clientCardRepository.findAllCardByClient(userCode); + } } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 6f5f40b6..12f5557f 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -2,17 +2,18 @@ import io.santander.gastos.domain.Spent; import io.santander.gastos.dto.CardSpentDTO; +import io.santander.gastos.dto.ClassificationDTO; import io.santander.gastos.dto.CreditCardDTO; import io.santander.gastos.dto.SpentDTO; import io.santander.gastos.exceptions.InvalidHolderException; import io.santander.gastos.exceptions.MissingCardException; import io.santander.gastos.exceptions.NonexistentCardException; +import io.santander.gastos.mapper.ClassificationMapper; import io.santander.gastos.mapper.SpentMapper; import io.santander.gastos.repository.SpentRepository; import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -34,8 +35,11 @@ public class SpentService { private final CardSpentService cardSpentService; private final ClientService clientService; private final ClientCardService clientCardService; + private final ClassificationService classificationService; private final DateUTCParser utcParser; + private final ClassificationMapper classificationMapper; + private List getCarHolder(final Long userCode, final String cardNumber) { List cards = clientCardService.getClientsCard(userCode, cardNumber); @@ -46,7 +50,6 @@ private List getCarHolder(final Long userCode, final String cardNumber) { } @Transactional - @Cacheable("spents") public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, String cardNumber, final GastoVO vo, final Pageable pageable) { Page spentPage; @@ -60,6 +63,12 @@ public PageImpl buscaTodosOsGastoPorCliente(final Long userCode, Strin return new PageImpl<>(this.spentMapper.toDTOList(spentPage.getContent()), pageable, spentPage.getTotalElements()); } + @Transactional + public ClassificationDTO getSpentClassification(final Long userCode, final String decription) { + List cards = clientCardService.getCardsByClient(userCode); + return classificationService.getClassification(cards, decription); + } + @Transactional public String saveSpent(String numeroCartao, GastoVO vo) { @@ -77,6 +86,7 @@ public String saveSpent(String numeroCartao, GastoVO vo) { .description(vo.getDescricao()) .spentDate(utcParser.toDate(vo.getData())) .spentValue(vo.getValor()) + .classification(Optional.ofNullable(classificationMapper.toEntity(getSpentClassification(vo.getCodigoUsuario(), vo.getDescricao()))).orElse(null)) .build()))) .build()); log.info("gasto registrado"); @@ -89,16 +99,26 @@ public String saveSpent(String numeroCartao, GastoVO vo) { } else { //TODO corrigir exeption throw new RuntimeException("Usuario inexistente"); - } } + @Transactional + public void updateSpendDatail(final Long userCode, final Long spentId, String cardNumber, final String description, final Long classificationId) { + + SpentDTO spentDTO = getSpentDetail(userCode, spentId, cardNumber); + + Optional.ofNullable(description).ifPresent(s -> spentDTO.setDescription(s)); + Optional.of(classificationId).ifPresent(aLong -> spentDTO.setClassification(classificationService.getById(aLong))); + + spentRepository.save(spentMapper.toEntity(spentDTO)); + + } + @Transactional public SpentDTO getSpentDetail(Long userCode, Long codigoGasto, String cardNumber) { List cards = getCarHolder(userCode, cardNumber); //TODO: corrigir retorno return spentMapper.toDTO(spentRepository.findById(codigoGasto).get()); - } } diff --git a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java index c98b2208..141016fc 100644 --- a/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java +++ b/gastos/src/main/java/io/santander/gastos/vo/GastoVO.java @@ -19,6 +19,7 @@ public class GastoVO { @Autowired private DateUTCParser dateParser; + private Long id; private String descricao; private Double valor; private Long codigoUsuario; diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java index b249c15b..a1824227 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -3,6 +3,7 @@ import io.santander.gastos.dto.ClassificationDTO; import io.santander.gastos.service.ClassificationService; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java index 62b3f7c9..dc2d7015 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/SpentController.java @@ -5,6 +5,7 @@ import io.santander.gastos.service.SpentService; import io.santander.gastos.vo.GastoVO; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -32,27 +33,32 @@ String addSpent(@Valid @PathVariable("numeroCartao") final String numeroCartao, } @GetMapping("/user/{codigoUsuario}") + @Cacheable("spents") PageImpl getAllSpents(@Valid @PathVariable final Long codigoUsuario, @RequestParam final String numeroCartão, final GastoVO vo, Pageable pageable) { Page dtoPage = spentService.buscaTodosOsGastoPorCliente(codigoUsuario, numeroCartão, vo, pageable); return new PageImpl<>(dtoPage.getContent().stream().map(this::toVo).collect(Collectors.toList()), pageable, dtoPage.getTotalElements()); } @GetMapping("/user/{codigoUsuario}/{codigoGasto}") + @Cacheable("spent-datail") GastoVO getSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão) { return toVo(spentService.getSpentDetail(codigoUsuario, codigoGasto, numeroCartão)); } @PutMapping("/user/{codigoUsuario}/{codigoGasto}") - PageImpl updateSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão, GastoVO vo) { + GastoVO updateSpentDatail(@Valid @PathVariable final Long codigoUsuario, @Valid @PathVariable final Long codigoGasto, @RequestParam final String numeroCartão, @RequestParam(required = false) final String description, @RequestParam(required = false) final Long classification) { + spentService.updateSpendDatail(codigoUsuario, codigoGasto, numeroCartão, description, classification); return null; } private GastoVO toVo(SpentDTO spentDTO) { return GastoVO.builder() + .id(spentDTO.getId()) .codigoUsuario(spentDTO.getUserCode()) .descricao(spentDTO.getDescription()) .data(dateParser.toUtcDate(spentDTO.getSpentDate())) .valor(spentDTO.getSpentValue()) + .classificacao(spentDTO.getClassification().getName()) .build(); } } diff --git a/gastos/src/main/resources/db/migration/V1__init_script.sql b/gastos/src/main/resources/db/migration/V1__init_script.sql index e2b23d2f..625ee4ab 100644 --- a/gastos/src/main/resources/db/migration/V1__init_script.sql +++ b/gastos/src/main/resources/db/migration/V1__init_script.sql @@ -10,7 +10,8 @@ CREATE TABLE card ( CREATE TABLE spent ( id bigint(20) NOT NULL AUTO_INCREMENT, dat_creation datetime NOT NULL, - description varchar(255) DEFAULT NULL, + description varchar(255) NOT NULL, + classification bigint(20) DEFAULT NULL, spent_date datetime DEFAULT NULL, spent_value double DEFAULT NULL, dat_update datetime NOT NULL, From 5109552141833733bcf548b9f5e6264f9b1d2224 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 9 Jul 2019 23:30:45 -0300 Subject: [PATCH 39/48] =?UTF-8?q?adicionado=20feature=20de=20classifica?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gastos/build.gradle | 2 +- .../main/java/io/santander/gastos/service/SpentService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gastos/build.gradle b/gastos/build.gradle index a4b7c233..7b1f40d3 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'io.spring.dependency-management' group = 'io.santander' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +sourceCompatibility = '11' configurations { developmentOnly diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 12f5557f..04f1ad4b 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -109,7 +109,8 @@ public void updateSpendDatail(final Long userCode, final Long spentId, String ca SpentDTO spentDTO = getSpentDetail(userCode, spentId, cardNumber); Optional.ofNullable(description).ifPresent(s -> spentDTO.setDescription(s)); - Optional.of(classificationId).ifPresent(aLong -> spentDTO.setClassification(classificationService.getById(aLong))); + Optional.of(classificationId).ifPresentOrElse(aLong -> spentDTO.setClassification(classificationService.getById(aLong)), + () -> spentDTO.setClassification(getSpentClassification(userCode, description))); spentRepository.save(spentMapper.toEntity(spentDTO)); From 7f20ee8cfed0357d4d385047eeb0e172b52304ca Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 9 Jul 2019 23:33:01 -0300 Subject: [PATCH 40/48] lixo removido --- classificacao/.gitignore => .gitignore | 0 classificacao/Dockerfile | 4 - classificacao/build.gradle | 35 ---- classificacao/docker-compose.yml | 67 ------- .../gradle/wrapper/gradle-wrapper.jar | Bin 55190 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - classificacao/gradlew | 172 ------------------ classificacao/gradlew.bat | 84 --------- classificacao/settings.gradle | 6 - .../java/io/santander/DemoApplication.java | 13 -- .../src/main/resources/application.properties | 1 - .../io/santander/DemoApplicationTests.java | 16 -- 12 files changed, 403 deletions(-) rename classificacao/.gitignore => .gitignore (100%) delete mode 100644 classificacao/Dockerfile delete mode 100644 classificacao/build.gradle delete mode 100644 classificacao/docker-compose.yml delete mode 100644 classificacao/gradle/wrapper/gradle-wrapper.jar delete mode 100644 classificacao/gradle/wrapper/gradle-wrapper.properties delete mode 100755 classificacao/gradlew delete mode 100644 classificacao/gradlew.bat delete mode 100644 classificacao/settings.gradle delete mode 100644 classificacao/src/main/java/io/santander/DemoApplication.java delete mode 100644 classificacao/src/main/resources/application.properties delete mode 100644 classificacao/src/test/java/io/santander/DemoApplicationTests.java diff --git a/classificacao/.gitignore b/.gitignore similarity index 100% rename from classificacao/.gitignore rename to .gitignore diff --git a/classificacao/Dockerfile b/classificacao/Dockerfile deleted file mode 100644 index 3cba0b98..00000000 --- a/classificacao/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM openjdk:8-jdk-alpine -VOLUME /tmp -COPY build/libs/*.jar app.jar -ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/classificacao/build.gradle b/classificacao/build.gradle deleted file mode 100644 index b26f0a6c..00000000 --- a/classificacao/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id 'org.springframework.boot' version '2.1.6.RELEASE' - id 'java' -} - -apply plugin: 'io.spring.dependency-management' - -group = 'io.santander.classificacao' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' - -configurations { - developmentOnly - runtimeClasspath { - extendsFrom developmentOnly - } - compileOnly { - extendsFrom annotationProcessor - } -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - compileOnly 'org.projectlombok:lombok' - developmentOnly 'org.springframework.boot:spring-boot-devtools' - annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' -} diff --git a/classificacao/docker-compose.yml b/classificacao/docker-compose.yml deleted file mode 100644 index ea1a3b04..00000000 --- a/classificacao/docker-compose.yml +++ /dev/null @@ -1,67 +0,0 @@ -version: '2.2' -services: - es01: - image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3 - container_name: es01 - environment: - - node.name=es01 - - discovery.seed_hosts=es02 - - cluster.initial_master_nodes=es01,es02 - - cluster.name=docker-cluster - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - ulimits: - memlock: - soft: -1 - hard: -1 - volumes: - - esdata01:/usr/share/elasticsearch/data - ports: - - 9200:9200 - networks: - - net-classification - es02: - image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3 - container_name: es02 - environment: - - node.name=es02 - - discovery.seed_hosts=es01 - - cluster.initial_master_nodes=es01,es02 - - cluster.name=docker-cluster - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - ulimits: - memlock: - soft: -1 - hard: -1 - volumes: - - esdata02:/usr/share/elasticsearch/data - networks: - - net-classification - -# santander-classification: -# depends_on: -# - mysql -# - redis -# links: -# - mysql -# environment: -# SPRING_REDIS_HOST: redis -# SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" -# networks: -# - net-classification -# build: -# context: . -# container_name: classification-app -# ports: -# - "9401:8080" - -volumes: - esdata01: - driver: local - esdata02: - driver: local - -networks: - net-classification: - driver: bridge \ No newline at end of file diff --git a/classificacao/gradle/wrapper/gradle-wrapper.jar b/classificacao/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 87b738cbd051603d91cc39de6cb000dd98fe6b02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55190 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 z 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/classificacao/gradlew.bat b/classificacao/gradlew.bat deleted file mode 100644 index 0f8d5937..00000000 --- a/classificacao/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/classificacao/settings.gradle b/classificacao/settings.gradle deleted file mode 100644 index 8a0ded28..00000000 --- a/classificacao/settings.gradle +++ /dev/null @@ -1,6 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - } -} -rootProject.name = 'classificacao' diff --git a/classificacao/src/main/java/io/santander/DemoApplication.java b/classificacao/src/main/java/io/santander/DemoApplication.java deleted file mode 100644 index 47cde219..00000000 --- a/classificacao/src/main/java/io/santander/DemoApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.santander; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - -} diff --git a/classificacao/src/main/resources/application.properties b/classificacao/src/main/resources/application.properties deleted file mode 100644 index 8b137891..00000000 --- a/classificacao/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/classificacao/src/test/java/io/santander/DemoApplicationTests.java b/classificacao/src/test/java/io/santander/DemoApplicationTests.java deleted file mode 100644 index b6f6bf83..00000000 --- a/classificacao/src/test/java/io/santander/DemoApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.santander; - -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 DemoApplicationTests { - - @Test - public void contextLoads() { - } - -} From 4e3b0577a0a52f495d2177b893f5c2fbf3eff2e2 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 9 Jul 2019 23:51:39 -0300 Subject: [PATCH 41/48] docker compose modificado --- gastos/README.md | 6 +++++- gastos/docker-compose.yml | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/gastos/README.md b/gastos/README.md index dff68e76..047c2ba0 100644 --- a/gastos/README.md +++ b/gastos/README.md @@ -20,4 +20,8 @@ Para executar a aplicação execute o seguinte comando: Para executar a aplicação execute o seguinte comando: -```$ docker-compose up --build ``` \ No newline at end of file +```$ docker-compose up --build ``` + +## Link para docmentação API + +[Santander API](https://documenter.getpostman.com/view/7191301/SVSEur2A?version=latest) \ No newline at end of file diff --git a/gastos/docker-compose.yml b/gastos/docker-compose.yml index 42d7b288..44af9147 100644 --- a/gastos/docker-compose.yml +++ b/gastos/docker-compose.yml @@ -28,22 +28,22 @@ services: expose: - '6379' -# santander-spents: -# depends_on: -# - mysql -# - redis -# links: -# - mysql -# environment: -# SPRING_REDIS_HOST: redis -# SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" -# networks: -# - net-spents -# build: -# context: . -# container_name: spents-app -# ports: -# - "9401:8080" + santander-spents: + depends_on: + - mysql + - redis + links: + - mysql + environment: + SPRING_REDIS_HOST: redis + SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/gastos" + networks: + - net-spents + build: + context: . + container_name: spents-app + ports: + - "8080:8080" volumes: my-db: From 4d8c42f7703a630f875a667949ce3364998e7a27 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Tue, 9 Jul 2019 23:55:04 -0300 Subject: [PATCH 42/48] readme modificado --- gastos/README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gastos/README.md b/gastos/README.md index 047c2ba0..e62417a9 100644 --- a/gastos/README.md +++ b/gastos/README.md @@ -11,13 +11,6 @@ Dentro da pasta do projeto execute o comando Será gerado um arquivo .jar dentro do diretório ```/build/libs```. ## Executando - -Para executar a aplicação execute o seguinte comando: - -```$ java -jar /.jar ``` - -## Executando com Docker - Para executar a aplicação execute o seguinte comando: ```$ docker-compose up --build ``` From aa0fdd5f64c9024362788d2c619df6dfe2048642 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 10 Jul 2019 00:00:34 -0300 Subject: [PATCH 43/48] =?UTF-8?q?adicionado=20cache=20ao=20endpoint=20de?= =?UTF-8?q?=20classifica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/santander/gastos/repository/SpentRepository.java | 1 - .../io/santander/gastos/web/advice/SpertServiceAdvices.java | 2 +- .../gastos/web/controller/ClassificationController.java | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java index dc7153cc..b6e496f3 100644 --- a/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java +++ b/gastos/src/main/java/io/santander/gastos/repository/SpentRepository.java @@ -1,6 +1,5 @@ package io.santander.gastos.repository; -import io.santander.gastos.domain.Classification; import io.santander.gastos.domain.Spent; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java index ae249834..3f82d1e3 100644 --- a/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java +++ b/gastos/src/main/java/io/santander/gastos/web/advice/SpertServiceAdvices.java @@ -2,8 +2,8 @@ import io.santander.gastos.enumerators.ErrorMessages; import io.santander.gastos.exceptions.InvalidHolderException; -import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.exceptions.MissingCardException; +import io.santander.gastos.exceptions.NonexistentCardException; import io.santander.gastos.vo.ErrorResponse; import lombok.extern.log4j.Log4j2; import org.springframework.http.HttpStatus; diff --git a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java index a1824227..6c52a7fa 100644 --- a/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java +++ b/gastos/src/main/java/io/santander/gastos/web/controller/ClassificationController.java @@ -24,6 +24,7 @@ public class ClassificationController { private final ClassificationService classificationService; @GetMapping + @Cacheable("classification") List buscaCassificacao(@RequestParam @Valid String searchText) { return classificationService.getAllClassificatios(searchText); } From 71b781e177c483d5186ceb6627ab36fb1271bb4d Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 10 Jul 2019 00:09:46 -0300 Subject: [PATCH 44/48] =?UTF-8?q?modificado=20vers=C3=A3o=20java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gastos/build.gradle | 2 +- .../main/java/io/santander/gastos/service/SpentService.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gastos/build.gradle b/gastos/build.gradle index 7b1f40d3..a4b7c233 100644 --- a/gastos/build.gradle +++ b/gastos/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'io.spring.dependency-management' group = 'io.santander' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '11' +sourceCompatibility = '1.8' configurations { developmentOnly diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 04f1ad4b..5e7575e9 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -109,8 +109,10 @@ public void updateSpendDatail(final Long userCode, final Long spentId, String ca SpentDTO spentDTO = getSpentDetail(userCode, spentId, cardNumber); Optional.ofNullable(description).ifPresent(s -> spentDTO.setDescription(s)); - Optional.of(classificationId).ifPresentOrElse(aLong -> spentDTO.setClassification(classificationService.getById(aLong)), - () -> spentDTO.setClassification(getSpentClassification(userCode, description))); + Optional.of(classificationId).ifPresent(aLong -> spentDTO.setClassification(classificationService.getById(aLong))); + if (classificationId == null) { + spentDTO.setClassification(Optional.ofNullable(getSpentClassification(userCode, description)).orElse(null)); + } spentRepository.save(spentMapper.toEntity(spentDTO)); From dabe76f359ac1c5f3ec1357cfbfb3e5469118c7a Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 10 Jul 2019 00:18:21 -0300 Subject: [PATCH 45/48] criado base para testes --- gastos/src/test/resources/application.yml | 19 +++++++++++ gastos/src/test/resources/data.sql | 39 +++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 gastos/src/test/resources/application.yml create mode 100644 gastos/src/test/resources/data.sql diff --git a/gastos/src/test/resources/application.yml b/gastos/src/test/resources/application.yml new file mode 100644 index 00000000..b83bbbf5 --- /dev/null +++ b/gastos/src/test/resources/application.yml @@ -0,0 +1,19 @@ +info: + artifactId: '${project.name}' + version: '${project.version}' + +spring: + cache: + type: SIMPLE + datasource: + initialize: true + url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1 + driver-class-name: org.h2.Driver + username: sa + jpa: + show-sql: true + hibernate: + ddl-auto: create + flyway: + enabled: false + baselineOnMigrate: true \ No newline at end of file diff --git a/gastos/src/test/resources/data.sql b/gastos/src/test/resources/data.sql new file mode 100644 index 00000000..3088e34d --- /dev/null +++ b/gastos/src/test/resources/data.sql @@ -0,0 +1,39 @@ +INSERT INTO card (card_number,dat_creation,dat_update) VALUES +('1','2013-06-22 20:58:21.000','2006-11-06 13:38:49.000') +,('2','1984-02-07 15:42:40.000','2006-01-17 16:14:02.000') +,('3','2004-07-22 23:07:29.000','2014-02-03 18:56:08.000') +,('4','1983-09-05 00:08:47.000','2014-08-16 05:15:51.000') +,('5','1980-05-26 19:08:51.000','2013-07-24 01:11:33.000') +,('6','1997-08-04 18:55:48.000','1999-03-16 22:38:51.000') +,('7','2019-01-06 08:45:08.000','2001-04-28 10:27:05.000') +,('8','2002-04-30 12:12:36.000','1980-11-30 14:56:37.000') +,('9','2013-06-15 08:35:55.000','1996-03-16 14:40:45.000') +,('10','2009-01-17 03:29:33.000','1992-04-30 22:45:46.000'); + +INSERT INTO client (dat_creation,dat_update) VALUES +('2010-01-26 03:03:37.000','1995-05-09 18:54:48.000') +,('1985-04-22 08:36:52.000','2006-06-14 03:05:45.000') +,('2005-09-09 15:56:26.000','1998-05-04 09:20:31.000') +,('1991-02-01 03:24:08.000','1994-01-04 06:10:38.000') +,('1996-10-27 06:58:41.000','1986-02-25 04:16:15.000') +,('1999-10-23 18:30:11.000','2017-06-03 23:06:17.000') +,('1992-07-05 15:04:39.000','2017-12-31 12:34:51.000') +,('1985-02-19 09:32:50.000','1993-11-04 15:42:28.000') +,('1992-04-28 15:26:02.000','2012-11-09 23:07:22.000') +,('1992-09-04 00:51:32.000','1984-02-04 04:46:11.000'); + +INSERT INTO client_card (dat_creation,dat_update,client,card) VALUES +('1995-04-08 23:39:13.000','1995-11-09 12:21:31.000',1,1) +,('2015-03-23 10:51:45.000','1990-04-22 16:11:22.000',2,8); + +INSERT INTO classification (name,dat_creation,dat_update) VALUES +('laboris nisi','1998-08-22 08:32:33.000','1995-02-18 19:52:51.000') +,('Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pari','2002-04-27 22:42:05.000','2003-09-22 05:19:05.000') +,('cupidatat non proident, sunt in culpa qui ','1999-05-27 06:31:04.000','2013-10-04 22:44:45.000') +,('incididunt ut labore et dolore magna aliqua. Ut enim ad minim v','1999-03-31 10:09:37.000','1998-07-11 20:48:46.000') +,('ex ea commodo consequat. Duis aute irure dolor in reprehenderit in','1980-12-02 23:23:49.000','1992-02-06 16:20:42.000') +,('velit esse ci','2007-08-20 23:20:58.000','1980-12-19 04:56:13.000') +,('in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Exc','2002-03-14 01:08:02.000','1994-12-28 09:17:43.000') +,('magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ','2003-03-03 00:41:31.000','2018-06-26 20:23:33.000') +,('Excepteur sint occaecat cu','2003-07-22 07:39:24.000','2005-08-10 07:04:08.000') +,('dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa','1997-07-01 01:25:24.000','1983-04-13 10:37:49.000') \ No newline at end of file From ebaa51d8a04b3796119e1011c6c003d4c08d8400 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 10 Jul 2019 00:22:11 -0300 Subject: [PATCH 46/48] criado base para testes --- .../santander/gastos/base/AlertBaseTest.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java diff --git a/gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java b/gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java new file mode 100644 index 00000000..984a39b9 --- /dev/null +++ b/gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java @@ -0,0 +1,64 @@ +package io.santander.gastos.base; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Before; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.web.context.WebApplicationContext; + +import javax.servlet.Filter; +import java.io.IOException; +import java.io.InputStream; + +import static com.fasterxml.jackson.core.JsonGenerator.Feature.IGNORE_UNKNOWN; +import static com.fasterxml.jackson.core.JsonParser.Feature.IGNORE_UNDEFINED; +import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES; +import static java.lang.String.format; +import static java.nio.file.Paths.get; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; + +@ActiveProfiles("test") +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = RANDOM_PORT) +public abstract class AlertBaseTest { + + protected static final String PATH_TEMPLATE = "./src/test/resources/json/%s.json"; + + protected static final ObjectMapper MAPPER; + + @Autowired + protected WebApplicationContext context; + + @Autowired + protected Filter[] filters; + + protected MockMvc mockMvc; + + static { + MAPPER = new ObjectMapper() + .configure(FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(IGNORE_UNDEFINED, true) + .configure(IGNORE_UNKNOWN, true); + } + + @Before + public void setUp() { + this.mockMvc = webAppContextSetup(this.context).addFilters(this.filters).build(); + } + + + public static T createMockFromFile(final String fileName, final Class resultClass) + throws IOException { + final Resource resource = new FileSystemResource(get(format(PATH_TEMPLATE, fileName)).toFile()); + try (final InputStream stream = resource.getInputStream()) { + return MAPPER.readValue(stream, resultClass); + } + } +} \ No newline at end of file From 64aa540a1dcb787667eb0be5a3db792a68e22450 Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 10 Jul 2019 00:28:19 -0300 Subject: [PATCH 47/48] =?UTF-8?q?anota=C3=A7=C3=B5es=20para=20corre=C3=A7?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/santander/gastos/service/ClassificationService.java | 2 +- .../src/main/java/io/santander/gastos/service/SpentService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java index 9fca6f61..93fbbb1f 100644 --- a/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java +++ b/gastos/src/main/java/io/santander/gastos/service/ClassificationService.java @@ -23,7 +23,7 @@ public List getAllClassificatios(String text) { } @Transactional - public void getClassificationByDescription(final Long userCode, final String description) { + public void saveClassificationToClient(final Long userCode, final String description) { spentService.getSpentClassification(userCode, description); } diff --git a/gastos/src/main/java/io/santander/gastos/service/SpentService.java b/gastos/src/main/java/io/santander/gastos/service/SpentService.java index 5e7575e9..f8110046 100644 --- a/gastos/src/main/java/io/santander/gastos/service/SpentService.java +++ b/gastos/src/main/java/io/santander/gastos/service/SpentService.java @@ -104,6 +104,7 @@ public String saveSpent(String numeroCartao, GastoVO vo) { } @Transactional + //TODO: salvar classificação que não exista no banco e associar ao usuario public void updateSpendDatail(final Long userCode, final Long spentId, String cardNumber, final String description, final Long classificationId) { SpentDTO spentDTO = getSpentDetail(userCode, spentId, cardNumber); From 0c4c0651d0358af736ee587911a5dd7f3450ecab Mon Sep 17 00:00:00 2001 From: Daniel Kiluange Assiz Date: Wed, 10 Jul 2019 00:32:26 -0300 Subject: [PATCH 48/48] Classe renomeada --- .../gastos/base/{AlertBaseTest.java => SpentBaseTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename gastos/src/test/java/io/santander/gastos/base/{AlertBaseTest.java => SpentBaseTest.java} (98%) diff --git a/gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java b/gastos/src/test/java/io/santander/gastos/base/SpentBaseTest.java similarity index 98% rename from gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java rename to gastos/src/test/java/io/santander/gastos/base/SpentBaseTest.java index 984a39b9..28118183 100644 --- a/gastos/src/test/java/io/santander/gastos/base/AlertBaseTest.java +++ b/gastos/src/test/java/io/santander/gastos/base/SpentBaseTest.java @@ -27,7 +27,7 @@ @ActiveProfiles("test") @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = RANDOM_PORT) -public abstract class AlertBaseTest { +public abstract class SpentBaseTest { protected static final String PATH_TEMPLATE = "./src/test/resources/json/%s.json";