From ed52d7af509dccc3d1d6b2c0526a34f71b2cfac1 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Tue, 19 Feb 2019 00:24:49 -0300 Subject: [PATCH 01/12] Adicionando base project. --- .gitignore | 4 + pom.xml | 83 +++++++++++++++++++ .../res/api/configuration/Application.java | 20 +++++ .../res/api/controller/GastoController.java | 44 ++++++++++ .../camaroti/alex/res/api/model/Gasto.java | 22 +++++ .../res/api/repository/GastoRepository.java | 11 +++ src/main/resources/application.properties | 14 ++++ 7 files changed, 198 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java create mode 100644 src/main/resources/application.properties diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..579cb537 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +*.classpath +*.project +.settings/ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..31d9243f --- /dev/null +++ b/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + br.com.camaroti.alex.rest.api + expense-management + 0.0.1-SNAPSHOT + expense-management + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + provided + + + + org.springframework.data + spring-data-redis + + + + redis.clients + jedis + jar + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.jayway.jsonpath + json-path + test + + + + org.springframework.boot + spring-boot-devtools + true + runtime + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java b/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java new file mode 100644 index 00000000..d103e572 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java @@ -0,0 +1,20 @@ +package br.com.camaroti.alex.res.api.configuration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@SpringBootApplication +@EnableAutoConfiguration +@EntityScan(basePackages = {"br.com.camaroti.alex.res.api.model"}) +@ComponentScan(basePackages = {"br.com.camaroti.alex.res.api.controller"}) +@EnableJpaRepositories("br.com.camaroti.alex.res.api.repository") +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java new file mode 100644 index 00000000..087cbf00 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java @@ -0,0 +1,44 @@ +package br.com.camaroti.alex.res.api.controller; + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.res.api.model.Gasto; +import br.com.camaroti.alex.res.api.repository.GastoRepository; + +@RestController +public class GastoController { + + @Autowired + private GastoRepository gastoRepository; + + @PostMapping(path="/gastos") // Map ONLY GET Requests + public @ResponseBody Gasto add(@RequestParam int codigousuario + , @RequestParam String descricao, @RequestParam double valor) { + // @ResponseBody means the returned String is the response, not a view name + // @RequestParam means it is a parameter from the GET or POST request + + Gasto n = new Gasto(); + n.setCodigousuario(codigousuario); + n.setData(new Date()); + n.setDescricao(descricao); + n.setValor(valor); + Gasto newG = gastoRepository.save(n); + return newG; + } + + @RequestMapping(path="/gastos") + public @ResponseBody Iterable getAll() { + // This returns a JSON or XML with the users + return gastoRepository.findAll(); + } + + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java b/src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java new file mode 100644 index 00000000..39354021 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java @@ -0,0 +1,22 @@ +package br.com.camaroti.alex.res.api.model; + +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +import lombok.Data; + +@Entity +public @Data class Gasto { + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int codigo; + private String descricao; + private double valor; + private int codigousuario; + private Date data; +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java new file mode 100644 index 00000000..ffab8a63 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java @@ -0,0 +1,11 @@ +package br.com.camaroti.alex.res.api.repository; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +import br.com.camaroti.alex.res.api.model.Gasto; + +@Repository +public interface GastoRepository extends CrudRepository { + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..2ce0241f --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,14 @@ + +#mysql config +spring.jpa.hibernate.ddl-auto=create +spring.datasource.driverClassName=com.mysql.jdbc.Driver +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +spring.datasource.url=jdbc:mysql://localhost:3306/db_example?useLegacyDatetimeCode=false&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=password + + +#Pools +spring.datasource.tomcat.max-active=100000 +spring.datasource.tomcat.max-wait=10000 + From 60adbdb73c672570824fcda235a1cc5b3f328eb0 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Sun, 3 Mar 2019 02:50:22 -0300 Subject: [PATCH 02/12] Changing variables, configuration structure, adding some features as search for expenses by user and search for expenses by user in a specific date. --- pom.xml | 173 +++++++++--------- .../res/api/configuration/Application.java | 40 ++-- .../res/api/configuration/RedisConfig.java | 26 +++ .../res/api/controller/ExpenseController.java | 60 ++++++ .../res/api/controller/GastoController.java | 44 ----- .../api/model/{Gasto.java => Expense.java} | 50 ++--- .../res/api/repository/ExpenseRepository.java | 17 ++ .../res/api/repository/GastoRepository.java | 11 -- .../alex/res/api/service/ExpenseService.java | 20 ++ .../res/api/service/ExpenseServiceImpl.java | 54 ++++++ src/main/resources/application.properties | 28 +-- .../api/service/ExpenseServiceImplTest.java | 51 ++++++ 12 files changed, 381 insertions(+), 193 deletions(-) create mode 100644 src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java rename src/main/java/br/com/camaroti/alex/res/api/model/{Gasto.java => Expense.java} (54%) create mode 100644 src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java create mode 100644 src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java diff --git a/pom.xml b/pom.xml index 31d9243f..3b05d147 100644 --- a/pom.xml +++ b/pom.xml @@ -1,83 +1,92 @@ - - 4.0.0 - br.com.camaroti.alex.rest.api - expense-management - 0.0.1-SNAPSHOT - expense-management - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.projectlombok - lombok - provided - - - - org.springframework.data - spring-data-redis - - - - redis.clients - jedis - jar - - - - mysql - mysql-connector-java - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - com.jayway.jsonpath - json-path - test - - - - org.springframework.boot - spring-boot-devtools - true - runtime - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + 4.0.0 + br.com.camaroti.alex.rest.api + expense-management + 0.0.1-SNAPSHOT + expense-management + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + provided + + + + org.springframework.data + spring-data-redis + + + + redis.clients + jedis + jar + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.jayway.jsonpath + json-path + test + + + + org.springframework.boot + spring-boot-devtools + true + runtime + + + + + org.mockito + mockito-all + 1.10.19 + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java b/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java index d103e572..a24c1748 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java +++ b/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java @@ -1,20 +1,20 @@ -package br.com.camaroti.alex.res.api.configuration; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@SpringBootApplication -@EnableAutoConfiguration -@EntityScan(basePackages = {"br.com.camaroti.alex.res.api.model"}) -@ComponentScan(basePackages = {"br.com.camaroti.alex.res.api.controller"}) -@EnableJpaRepositories("br.com.camaroti.alex.res.api.repository") -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} +package br.com.camaroti.alex.res.api.configuration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@SpringBootApplication +@EnableAutoConfiguration +@EntityScan(basePackages = {"br.com.camaroti.alex.res.api.model"}) +@ComponentScan(basePackages = {"br.com.camaroti.alex.res.api.controller", "br.com.camaroti.alex.res.api.service"}) +@EnableJpaRepositories("br.com.camaroti.alex.res.api.repository") +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java b/src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java new file mode 100644 index 00000000..31003284 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java @@ -0,0 +1,26 @@ +package br.com.camaroti.alex.res.api.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.GenericToStringSerializer; + +@Configuration +public class RedisConfig { + + @Bean + JedisConnectionFactory jedisConnectionFactory() { + return new JedisConnectionFactory(); + + } + + @Bean + public RedisTemplate redisTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(jedisConnectionFactory()); + template.setValueSerializer(new GenericToStringSerializer(Object.class)); + return template; + + } +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java new file mode 100644 index 00000000..edca4b2c --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java @@ -0,0 +1,60 @@ +package br.com.camaroti.alex.res.api.controller; + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.service.ExpenseService; + +@RestController +public class ExpenseController { + + @Autowired + private ExpenseService expenseService; + + @PostMapping(path="/expenses") // Map ONLY GET Requests + public @ResponseBody Expense add(@RequestParam int codUser + , @RequestParam String description, @RequestParam double cost) { + // @ResponseBody means the returned String is the response, not a view name + // @RequestParam means it is a parameter from the GET or POST request + + Expense n = new Expense(); + n.setCodUser(codUser); + n.setDate(new Date()); + n.setDescription(description); + n.setValue(cost); + Expense newG = expenseService.save(n); + return newG; + } + + @RequestMapping(path="/expenses") + public @ResponseBody Iterable getAll() { + return expenseService.findAll(); + } + + @GetMapping(path="/expenses/{codUser}") + public @ResponseBody Iterable findByCodUserOrderByDateDesc(@PathVariable int codUser) { + return expenseService.findByCodUserOrderByDateDesc(codUser); + } + + @GetMapping(path="/expenses/{codUser}/{date}") + public @ResponseBody Iterable findByCodUserAndDateOrderByDateDesc(@PathVariable int codUser, + @PathVariable @DateTimeFormat(pattern="yyyy-MM-dd") Long date) { + Date start = new Date(date); + Date end = new Date(date + 86399999L); + System.out.println(start); + System.out.println(end); + return expenseService.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java deleted file mode 100644 index 087cbf00..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/GastoController.java +++ /dev/null @@ -1,44 +0,0 @@ -package br.com.camaroti.alex.res.api.controller; - -import java.util.Date; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import br.com.camaroti.alex.res.api.model.Gasto; -import br.com.camaroti.alex.res.api.repository.GastoRepository; - -@RestController -public class GastoController { - - @Autowired - private GastoRepository gastoRepository; - - @PostMapping(path="/gastos") // Map ONLY GET Requests - public @ResponseBody Gasto add(@RequestParam int codigousuario - , @RequestParam String descricao, @RequestParam double valor) { - // @ResponseBody means the returned String is the response, not a view name - // @RequestParam means it is a parameter from the GET or POST request - - Gasto n = new Gasto(); - n.setCodigousuario(codigousuario); - n.setData(new Date()); - n.setDescricao(descricao); - n.setValor(valor); - Gasto newG = gastoRepository.save(n); - return newG; - } - - @RequestMapping(path="/gastos") - public @ResponseBody Iterable getAll() { - // This returns a JSON or XML with the users - return gastoRepository.findAll(); - } - - -} diff --git a/src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java b/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java similarity index 54% rename from src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java rename to src/main/java/br/com/camaroti/alex/res/api/model/Expense.java index 39354021..d21e7246 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/model/Gasto.java +++ b/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java @@ -1,22 +1,28 @@ -package br.com.camaroti.alex.res.api.model; - -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -import lombok.Data; - -@Entity -public @Data class Gasto { - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int codigo; - private String descricao; - private double valor; - private int codigousuario; - private Date data; -} +package br.com.camaroti.alex.res.api.model; + +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Entity +@AllArgsConstructor +public @Data class Expense { + + public Expense() { + + } + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String description; + private double value; + private int codUser; + private Date date; +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java new file mode 100644 index 00000000..fa3fe20f --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java @@ -0,0 +1,17 @@ +package br.com.camaroti.alex.res.api.repository; + +import java.util.Date; +import java.util.List; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +import br.com.camaroti.alex.res.api.model.Expense; + +@Repository +public interface ExpenseRepository extends CrudRepository { + + ListfindByCodUserOrderByDateDesc(int codUser); + ListfindByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java deleted file mode 100644 index ffab8a63..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/repository/GastoRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package br.com.camaroti.alex.res.api.repository; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; - -import br.com.camaroti.alex.res.api.model.Gasto; - -@Repository -public interface GastoRepository extends CrudRepository { - -} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java new file mode 100644 index 00000000..482265c1 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java @@ -0,0 +1,20 @@ +package br.com.camaroti.alex.res.api.service; + +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import br.com.camaroti.alex.res.api.model.Expense; + +public interface ExpenseService { + + Expense save(Expense expense); + Expense update(Expense expense); + void remove(int id); + Optional findById(int id); + Iterable findAll(); + List findByCodUserOrderByDateDesc(int codUser); + List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); + + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java new file mode 100644 index 00000000..2973a595 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java @@ -0,0 +1,54 @@ +package br.com.camaroti.alex.res.api.service; + +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.repository.ExpenseRepository; + +@Service +public class ExpenseServiceImpl implements ExpenseService{ + + @Autowired + private ExpenseRepository repository; + + @Override + public Expense save(Expense expense) { + return repository.save(expense); + } + + @Override + public Expense update(Expense expense) { + return repository.save(expense); + } + + @Override + public void remove(int id) { + repository.deleteById(id); + } + + @Override + public Optional findById(int id) { + return repository.findById(id); + } + + @Override + public Iterable findAll() { + return repository.findAll(); + } + + @Override + public List findByCodUserOrderByDateDesc(int codUser) { + return repository.findByCodUserOrderByDateDesc(codUser); + } + + @Override + public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { + return repository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2ce0241f..14d3660e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,14 +1,14 @@ - -#mysql config -spring.jpa.hibernate.ddl-auto=create -spring.datasource.driverClassName=com.mysql.jdbc.Driver -spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect -spring.datasource.url=jdbc:mysql://localhost:3306/db_example?useLegacyDatetimeCode=false&serverTimezone=UTC -spring.datasource.username=root -spring.datasource.password=password - - -#Pools -spring.datasource.tomcat.max-active=100000 -spring.datasource.tomcat.max-wait=10000 - + +#mysql config +spring.jpa.hibernate.ddl-auto=update +spring.datasource.driverClassName=com.mysql.jdbc.Driver +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +spring.datasource.url=jdbc:mysql://localhost:3306/db_example?useLegacyDatetimeCode=false&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=password + + +#Pools +spring.datasource.tomcat.max-active=100000 +spring.datasource.tomcat.max-wait=10000 + diff --git a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java b/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java new file mode 100644 index 00000000..2f4cbd13 --- /dev/null +++ b/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java @@ -0,0 +1,51 @@ +package br.com.camaroti.alex.res.api.service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.concurrent.ThreadLocalRandom; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.springframework.test.context.junit4.SpringRunner; + +import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.repository.ExpenseRepository; + +@RunWith(SpringRunner.class) +public class ExpenseServiceImplTest { + + private List expenses; + + @InjectMocks + private ExpenseServiceImpl expenseService; + + @Mock + private ExpenseRepository expenseRepository; + + + @Before + public void setUp() { + + expenses = new ArrayList<>(); + for (int i = 0; i < 10000; i++) { + int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; + double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); + expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); + } + } + + + @Test + public void insertTenThousandExpense() { + for (Expense expense : expenses) { + expenseService.save(expense); + System.out.println(expense); + } + } + + +} From c8d62f226e7bb5c334309cf53c96534ae358b42c Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Mon, 11 Mar 2019 07:34:04 -0300 Subject: [PATCH 03/12] Adding category structure, implementing put request, category is optional. --- .../res/api/controller/ExpenseController.java | 59 +++++++++++++++---- .../camaroti/alex/res/api/model/Category.java | 25 ++++++++ .../camaroti/alex/res/api/model/Expense.java | 3 + .../api/repository/CategoryRepository.java | 10 ++++ .../alex/res/api/service/CategoryService.java | 9 +++ .../res/api/service/CategoryServiceImpl.java | 25 ++++++++ .../api/service/ExpenseServiceImplTest.java | 2 +- 7 files changed, 122 insertions(+), 11 deletions(-) create mode 100644 src/main/java/br/com/camaroti/alex/res/api/model/Category.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java index edca4b2c..fde330dd 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java @@ -7,12 +7,15 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import br.com.camaroti.alex.res.api.model.Category; import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.service.CategoryService; import br.com.camaroti.alex.res.api.service.ExpenseService; @RestController @@ -21,19 +24,55 @@ public class ExpenseController { @Autowired private ExpenseService expenseService; - @PostMapping(path="/expenses") // Map ONLY GET Requests - public @ResponseBody Expense add(@RequestParam int codUser - , @RequestParam String description, @RequestParam double cost) { + @Autowired + private CategoryService categoryService; + + @PostMapping(path="/expenses") // Map ONLY POST Request + public @ResponseBody Expense addExpense(@RequestParam int codUser + , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { // @ResponseBody means the returned String is the response, not a view name // @RequestParam means it is a parameter from the GET or POST request + Expense expense = new Expense(); + expense.setCodUser(codUser); + expense.setDate(new Date()); + expense.setDescription(description); + expense.setValue(cost); + checkIfParamIsNull(category, expense); + return expenseService.save(expense); + } + + @PutMapping(path="/expenses") // Map ONLY PUT Request + public @ResponseBody Expense add(@RequestParam int cod, @RequestParam int codUser + , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { + // @ResponseBody means the returned String is the response, not a view name + // @RequestParam means it is a parameter from the GET or POST request + Expense expense = new Expense(); + expense.setCod(cod); + expense.setCodUser(codUser); + expense.setDate(new Date()); + expense.setDescription(description); + expense.setValue(cost); + checkIfParamIsNull(category, expense); + return expenseService.update(expense); + } + + private void checkIfParamIsNull(String category, Expense expense) { + if(category != null && !category.isEmpty()) { + saveCategoryIfNotExists(category, expense); + } else { + expense.setCategory(null); + } + } - Expense n = new Expense(); - n.setCodUser(codUser); - n.setDate(new Date()); - n.setDescription(description); - n.setValue(cost); - Expense newG = expenseService.save(n); - return newG; + private void saveCategoryIfNotExists(String category, Expense expense) { + Category categoryObj = categoryService.findByName(category); + if(categoryObj != null) { + expense.setCategory(categoryObj); + } else { + Category newCategory = new Category(category); + categoryService.save(newCategory); + expense.setCategory(newCategory); + } } @RequestMapping(path="/expenses") diff --git a/src/main/java/br/com/camaroti/alex/res/api/model/Category.java b/src/main/java/br/com/camaroti/alex/res/api/model/Category.java new file mode 100644 index 00000000..efb793fc --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/model/Category.java @@ -0,0 +1,25 @@ +package br.com.camaroti.alex.res.api.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +import lombok.Data; + +@Entity +public @Data class Category { + + public Category() { + + } + + public Category(String name) { + this.name = name; + } + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String name; +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java b/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java index d21e7246..99d91ff1 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java +++ b/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java @@ -6,6 +6,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.ManyToOne; import lombok.AllArgsConstructor; import lombok.Data; @@ -25,4 +26,6 @@ public Expense() { private double value; private int codUser; private Date date; + @ManyToOne(optional = true) + private Category category; } diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java new file mode 100644 index 00000000..28574836 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java @@ -0,0 +1,10 @@ +package br.com.camaroti.alex.res.api.repository; + +import org.springframework.data.repository.CrudRepository; + +import br.com.camaroti.alex.res.api.model.Category; + +public interface CategoryRepository extends CrudRepository { + + Category findByNameIgnoreCase(String name); +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java new file mode 100644 index 00000000..f689ae63 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java @@ -0,0 +1,9 @@ +package br.com.camaroti.alex.res.api.service; + +import br.com.camaroti.alex.res.api.model.Category; + +public interface CategoryService { + + Category findByName(String name); + Category save(Category category); +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java new file mode 100644 index 00000000..297e3fa8 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java @@ -0,0 +1,25 @@ +package br.com.camaroti.alex.res.api.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.camaroti.alex.res.api.model.Category; +import br.com.camaroti.alex.res.api.repository.CategoryRepository; + +@Service +public class CategoryServiceImpl implements CategoryService { + + @Autowired + private CategoryRepository repository; + + @Override + public Category findByName(String name) { + return repository.findByNameIgnoreCase(name); + } + + @Override + public Category save(Category category) { + return repository.save(category); + } + +} diff --git a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java b/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java index 2f4cbd13..a80ac6ef 100644 --- a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java +++ b/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java @@ -34,7 +34,7 @@ public void setUp() { for (int i = 0; i < 10000; i++) { int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); - expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); + // expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); } } From d9df7e46f8f55713b3a97d695a3efdfb23a4c555 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Tue, 12 Mar 2019 00:40:17 -0300 Subject: [PATCH 04/12] Changing put structure on expenseController. Adding categories suggested to be used as a autocomplete. --- .../api/controller/CategoryController.java | 25 +++++++++++++++++++ .../res/api/controller/ExpenseController.java | 7 ++++-- .../api/repository/CategoryRepository.java | 3 +++ .../alex/res/api/service/CategoryService.java | 3 +++ .../res/api/service/CategoryServiceImpl.java | 11 ++++++-- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java new file mode 100644 index 00000000..cd3d682d --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java @@ -0,0 +1,25 @@ +package br.com.camaroti.alex.res.api.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.res.api.model.Category; +import br.com.camaroti.alex.res.api.service.CategoryService; + +@RestController +public class CategoryController { + + @Autowired + private CategoryService categoryService; + + @GetMapping(path="/categories/suggest") + public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) { + return categoryService.findByNameContaining(name); + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java index fde330dd..42eecd62 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java @@ -41,8 +41,8 @@ public class ExpenseController { return expenseService.save(expense); } - @PutMapping(path="/expenses") // Map ONLY PUT Request - public @ResponseBody Expense add(@RequestParam int cod, @RequestParam int codUser + @PutMapping(path="/expenses/{cod}") // Map ONLY PUT Request + public @ResponseBody Expense add(@PathVariable int cod, @RequestParam int codUser , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { // @ResponseBody means the returned String is the response, not a view name // @RequestParam means it is a parameter from the GET or POST request @@ -55,6 +55,9 @@ public class ExpenseController { checkIfParamIsNull(category, expense); return expenseService.update(expense); } + + @GetMapping(path="") + private void checkIfParamIsNull(String category, Expense expense) { if(category != null && !category.isEmpty()) { diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java index 28574836..3a749412 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java +++ b/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java @@ -1,5 +1,7 @@ package br.com.camaroti.alex.res.api.repository; +import java.util.List; + import org.springframework.data.repository.CrudRepository; import br.com.camaroti.alex.res.api.model.Category; @@ -7,4 +9,5 @@ public interface CategoryRepository extends CrudRepository { Category findByNameIgnoreCase(String name); + List findByNameContainingIgnoreCase(String name); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java index f689ae63..73e3a474 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java +++ b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java @@ -1,9 +1,12 @@ package br.com.camaroti.alex.res.api.service; +import java.util.List; + import br.com.camaroti.alex.res.api.model.Category; public interface CategoryService { Category findByName(String name); + List findByNameContaining(String name); Category save(Category category); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java index 297e3fa8..a03dddfd 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java +++ b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java @@ -1,5 +1,7 @@ package br.com.camaroti.alex.res.api.service; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,8 +15,8 @@ public class CategoryServiceImpl implements CategoryService { private CategoryRepository repository; @Override - public Category findByName(String name) { - return repository.findByNameIgnoreCase(name); + public List findByNameContaining(String name) { + return repository.findByNameContainingIgnoreCase(name); } @Override @@ -22,4 +24,9 @@ public Category save(Category category) { return repository.save(category); } + @Override + public Category findByName(String name) { + return repository.findByNameIgnoreCase(name); + } + } From 006f06e73333e6f260f4227ae593fa380a45e469 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Thu, 21 Mar 2019 02:22:02 -0300 Subject: [PATCH 05/12] Changing structure, adding REDIS config, implementing functionalities rules. --- .../res/api/configuration/Application.java | 34 ++++- .../res/api/configuration/RedisConfig.java | 26 ---- .../api/controller/CategoryController.java | 5 +- .../res/api/controller/ExpenseController.java | 49 +------ .../alex/res/api/domain/Category.java | 121 ++++++++++++++++ .../camaroti/alex/res/api/domain/Expense.java | 134 ++++++++++++++++++ .../alex/res/api/helper/ExpenseHelper.java | 22 +++ .../camaroti/alex/res/api/model/Category.java | 25 ---- .../camaroti/alex/res/api/model/Expense.java | 31 ---- .../api/repository/CategoryRepository.java | 4 +- .../res/api/repository/ExpenseRepository.java | 3 +- .../alex/res/api/service/CategoryService.java | 7 +- .../res/api/service/CategoryServiceImpl.java | 36 +++-- .../alex/res/api/service/ExpenseService.java | 7 +- .../res/api/service/ExpenseServiceImpl.java | 32 +++-- src/main/resources/application.properties | 4 + .../api/service/ExpenseServiceImplTest.java | 11 +- 17 files changed, 389 insertions(+), 162 deletions(-) delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/domain/Category.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java create mode 100644 src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/model/Category.java delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/model/Expense.java diff --git a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java b/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java index a24c1748..b39f9397 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java +++ b/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java @@ -4,16 +4,46 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; +import org.springframework.data.redis.serializer.StringRedisSerializer; @SpringBootApplication @EnableAutoConfiguration -@EntityScan(basePackages = {"br.com.camaroti.alex.res.api.model"}) -@ComponentScan(basePackages = {"br.com.camaroti.alex.res.api.controller", "br.com.camaroti.alex.res.api.service"}) +@EntityScan(basePackages = {"br.com.camaroti.alex.res.api.domain"}) +@ComponentScan(basePackages = {"br.com.camaroti.alex.res.api.controller", "br.com.camaroti.alex.res.api.service", "class br.com.camaroti.alex.res.api.domain"}) @EnableJpaRepositories("br.com.camaroti.alex.res.api.repository") +@EnableRedisRepositories("br.com.camaroti.alex.res.api.service") public class Application { + @Bean + JedisConnectionFactory jedisConnectionFactory() { + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + return new JedisConnectionFactory(config); + } + + @Bean + public RedisTemplate redisTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(jedisConnectionFactory()); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new StringRedisSerializer()); + + // the following is not required + template.setHashValueSerializer(new StringRedisSerializer()); + //template.setHashKeySerializer(new StringRedisSerializer()); + template.afterPropertiesSet(); + return template; + + } + + + public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java b/src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java deleted file mode 100644 index 31003284..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/configuration/RedisConfig.java +++ /dev/null @@ -1,26 +0,0 @@ -package br.com.camaroti.alex.res.api.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.GenericToStringSerializer; - -@Configuration -public class RedisConfig { - - @Bean - JedisConnectionFactory jedisConnectionFactory() { - return new JedisConnectionFactory(); - - } - - @Bean - public RedisTemplate redisTemplate() { - final RedisTemplate template = new RedisTemplate(); - template.setConnectionFactory(jedisConnectionFactory()); - template.setValueSerializer(new GenericToStringSerializer(Object.class)); - return template; - - } -} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java index cd3d682d..d50eb07b 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java @@ -1,5 +1,6 @@ package br.com.camaroti.alex.res.api.controller; +import java.io.IOException; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,7 +9,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import br.com.camaroti.alex.res.api.model.Category; +import br.com.camaroti.alex.res.api.domain.Category; import br.com.camaroti.alex.res.api.service.CategoryService; @RestController @@ -18,7 +19,7 @@ public class CategoryController { private CategoryService categoryService; @GetMapping(path="/categories/suggest") - public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) { + public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) throws IOException { return categoryService.findByNameContaining(name); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java index 42eecd62..8edcbd0f 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java +++ b/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java @@ -1,5 +1,6 @@ package br.com.camaroti.alex.res.api.controller; +import java.io.IOException; import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; @@ -13,9 +14,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import br.com.camaroti.alex.res.api.model.Category; -import br.com.camaroti.alex.res.api.model.Expense; -import br.com.camaroti.alex.res.api.service.CategoryService; +import br.com.camaroti.alex.res.api.domain.Expense; +import br.com.camaroti.alex.res.api.helper.ExpenseHelper; import br.com.camaroti.alex.res.api.service.ExpenseService; @RestController @@ -24,59 +24,22 @@ public class ExpenseController { @Autowired private ExpenseService expenseService; - @Autowired - private CategoryService categoryService; - @PostMapping(path="/expenses") // Map ONLY POST Request public @ResponseBody Expense addExpense(@RequestParam int codUser - , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { + , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) throws IOException { // @ResponseBody means the returned String is the response, not a view name // @RequestParam means it is a parameter from the GET or POST request - Expense expense = new Expense(); - expense.setCodUser(codUser); - expense.setDate(new Date()); - expense.setDescription(description); - expense.setValue(cost); - checkIfParamIsNull(category, expense); + Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); return expenseService.save(expense); } @PutMapping(path="/expenses/{cod}") // Map ONLY PUT Request public @ResponseBody Expense add(@PathVariable int cod, @RequestParam int codUser , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { - // @ResponseBody means the returned String is the response, not a view name - // @RequestParam means it is a parameter from the GET or POST request - Expense expense = new Expense(); + Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); expense.setCod(cod); - expense.setCodUser(codUser); - expense.setDate(new Date()); - expense.setDescription(description); - expense.setValue(cost); - checkIfParamIsNull(category, expense); return expenseService.update(expense); } - - @GetMapping(path="") - - - private void checkIfParamIsNull(String category, Expense expense) { - if(category != null && !category.isEmpty()) { - saveCategoryIfNotExists(category, expense); - } else { - expense.setCategory(null); - } - } - - private void saveCategoryIfNotExists(String category, Expense expense) { - Category categoryObj = categoryService.findByName(category); - if(categoryObj != null) { - expense.setCategory(categoryObj); - } else { - Category newCategory = new Category(category); - categoryService.save(newCategory); - expense.setCategory(newCategory); - } - } @RequestMapping(path="/expenses") public @ResponseBody Iterable getAll() { diff --git a/src/main/java/br/com/camaroti/alex/res/api/domain/Category.java b/src/main/java/br/com/camaroti/alex/res/api/domain/Category.java new file mode 100644 index 00000000..7dc2f41f --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/domain/Category.java @@ -0,0 +1,121 @@ +package br.com.camaroti.alex.res.api.domain; + +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Transient; + +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisHash; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import br.com.camaroti.alex.res.api.repository.CategoryRepository; +import lombok.AccessLevel; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Entity +@RedisHash("category") +public @Data class Category implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1L; + public Category() { + + } + + public Category(String name) { + this.name = name; + } + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String name; + + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private CategoryRepository categoryRepository; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private HashOperations hashOperations; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private String KEY; + + public Category(CategoryRepository categoryRepository, HashOperations hashOperations, String KEY) { + this.categoryRepository = categoryRepository; + this.hashOperations = hashOperations; + this.KEY = KEY; + } + + public Category(CategoryRepository categoryRepository) { + this.categoryRepository = categoryRepository; + } + + + public Category save(Category category) throws IOException { + Category newCategory = categoryRepository.save(category); + updateRedisCategoriesList(newCategory); + return newCategory; + } + + public Category findByNameIgnoreCase(String name) { + return categoryRepository.findByNameIgnoreCase(name); + } + + public List findByNameContaining(String name) throws IOException { + ObjectMapper objectMapper = checkIfRedisIsEmpty(); + Object listCategories = hashOperations.get(KEY, "1"); + List categoriesFound = new ArrayList<>(); + List categories = Arrays.asList(objectMapper.readValue(listCategories.toString(), Category[].class)); + //Verify the categories list and return the similar ones. + for (Category category : categories) { + if(category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { + categoriesFound.add(category); + } + } + return categoriesFound; + } + + private void updateRedisCategoriesList(Category newCategory) + throws IOException, JsonParseException, JsonMappingException, JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + //Recover categories from Redis + String redisCategories = hashOperations.get(KEY, "1").toString(); + //Convert the string to list of objects + List categories = new ArrayList<>(Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); + //Add a new Object + categories.add(newCategory); + //Convert and update Redis with the new data. + String categoriesUpdated = objectMapper.writeValueAsString(categories); + hashOperations.put(KEY, "1", categoriesUpdated); + } + + + private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + if (hashOperations.size(KEY) == null || hashOperations.size(KEY) == 0) { + Iterable categories = categoryRepository.findAll(); + String json = objectMapper.writeValueAsString(categories); + hashOperations.put(KEY, "1", json); + } + + return objectMapper; + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java b/src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java new file mode 100644 index 00000000..d2136079 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java @@ -0,0 +1,134 @@ +package br.com.camaroti.alex.res.api.domain; + +import java.io.IOException; +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Transient; + +import org.springframework.data.redis.core.RedisHash; + +import br.com.camaroti.alex.res.api.repository.CategoryRepository; +import br.com.camaroti.alex.res.api.repository.ExpenseRepository; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Entity +@AllArgsConstructor +@RedisHash("expense") +public @Data class Expense implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public Expense() { + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int cod; + private String description; + private double value; + private int codUser; + private Date date; + @ManyToOne(optional = true) + private Category category; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private ExpenseRepository expenseRepository; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private CategoryRepository categoryRepository; + + + public Expense(ExpenseRepository expenseRepository, CategoryRepository categoryRepository) { + this.expenseRepository = expenseRepository; + this.categoryRepository = categoryRepository; + } + + + public Expense save(Expense expense) throws IOException { + checkCategoryInformation(expense); + return expenseRepository.save(expense); + + } + + public Expense update(Expense expense) { + return expenseRepository.save(expense); + } + + public void remove(int id) { + expenseRepository.deleteById(id); + } + + public Optional findById(int id) { + return expenseRepository.findById(id); + } + + public Iterable findAll() { + return expenseRepository.findAll(); + } + + public List findByCodUserOrderByDateDesc(int codUser) { + return expenseRepository.findByCodUserOrderByDateDesc(codUser); + } + + public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { + return expenseRepository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc( + String description) { + return expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); + } + + private void checkCategoryInformation(Expense expense) throws IOException { + String category = expense.getCategory().getName(); + if (category != null && !category.isEmpty()) { + saveCategoryIfNotExists(category, expense); + } else { + // Category is null, define automatically a category by a similar description + setSameCategoryBySimilarExpenseDescription(expense); + } + } + + private void setSameCategoryBySimilarExpenseDescription(Expense expense) { + Expense similarExpense = expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense.getDescription()); + if (similarExpense != null) { + expense.setCategory(similarExpense.getCategory()); + } else { + expense.setCategory(null); + } + } + + private void saveCategoryIfNotExists(String category, Expense expense) throws IOException { + Category categoryObj = categoryRepository.findByNameIgnoreCase(category); + if (categoryObj != null) { + expense.setCategory(categoryObj); + } else { + // Category not found. Try to set category By similar Description + setSameCategoryBySimilarExpenseDescription(expense); + // If you dont find a similar description, just add a new Category + if (expense.getCategory() == null) { + Category newCategory = new Category(category); + categoryRepository.save(newCategory); + expense.setCategory(newCategory); + } + } + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java b/src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java new file mode 100644 index 00000000..c6414b26 --- /dev/null +++ b/src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java @@ -0,0 +1,22 @@ +package br.com.camaroti.alex.res.api.helper; + +import java.util.Date; + +import br.com.camaroti.alex.res.api.domain.Category; +import br.com.camaroti.alex.res.api.domain.Expense; + +public class ExpenseHelper { + + public static Expense convertExpense(int codUser, String description, double cost, String category) { + Expense expense = new Expense(); + Category categoryObj = new Category(); + expense.setCodUser(codUser); + expense.setDate(new Date()); + expense.setDescription(description); + expense.setValue(cost); + categoryObj.setName(category); + expense.setCategory(categoryObj); + return expense; + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/model/Category.java b/src/main/java/br/com/camaroti/alex/res/api/model/Category.java deleted file mode 100644 index efb793fc..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/model/Category.java +++ /dev/null @@ -1,25 +0,0 @@ -package br.com.camaroti.alex.res.api.model; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -import lombok.Data; - -@Entity -public @Data class Category { - - public Category() { - - } - - public Category(String name) { - this.name = name; - } - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int cod; - private String name; -} diff --git a/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java b/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java deleted file mode 100644 index 99d91ff1..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/model/Expense.java +++ /dev/null @@ -1,31 +0,0 @@ -package br.com.camaroti.alex.res.api.model; - -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -import lombok.AllArgsConstructor; -import lombok.Data; - -@Entity -@AllArgsConstructor -public @Data class Expense { - - public Expense() { - - } - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int cod; - private String description; - private double value; - private int codUser; - private Date date; - @ManyToOne(optional = true) - private Category category; -} diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java index 3a749412..7b239e7b 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java +++ b/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java @@ -4,10 +4,10 @@ import org.springframework.data.repository.CrudRepository; -import br.com.camaroti.alex.res.api.model.Category; +import br.com.camaroti.alex.res.api.domain.Category; public interface CategoryRepository extends CrudRepository { Category findByNameIgnoreCase(String name); - List findByNameContainingIgnoreCase(String name); + List findByNameContainingIgnoreCase(String name); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java b/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java index fa3fe20f..aef79cdb 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java +++ b/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java @@ -6,12 +6,13 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.domain.Expense; @Repository public interface ExpenseRepository extends CrudRepository { ListfindByCodUserOrderByDateDesc(int codUser); ListfindByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); + Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java index 73e3a474..8b667cdc 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java +++ b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java @@ -1,12 +1,13 @@ package br.com.camaroti.alex.res.api.service; +import java.io.IOException; import java.util.List; -import br.com.camaroti.alex.res.api.model.Category; +import br.com.camaroti.alex.res.api.domain.Category; public interface CategoryService { Category findByName(String name); - List findByNameContaining(String name); - Category save(Category category); + List findByNameContaining(String name) throws IOException; + Category save(Category category) throws IOException; } diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java index a03dddfd..dc164bbe 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java +++ b/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java @@ -1,32 +1,52 @@ package br.com.camaroti.alex.res.api.service; +import java.io.IOException; import java.util.List; +import javax.annotation.PostConstruct; +import javax.annotation.Resource; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import br.com.camaroti.alex.res.api.model.Category; +import br.com.camaroti.alex.res.api.domain.Category; import br.com.camaroti.alex.res.api.repository.CategoryRepository; @Service public class CategoryServiceImpl implements CategoryService { + private static final String KEY = "category"; + @Autowired - private CategoryRepository repository; - + private RedisTemplate redisTemplate; + @Resource(name = "redisTemplate") + private HashOperations hashOperations; + + @PostConstruct + private void init() { + hashOperations = redisTemplate.opsForHash(); + } + + @Autowired + private CategoryRepository categoryRepository; + @Override - public List findByNameContaining(String name) { - return repository.findByNameContainingIgnoreCase(name); + public List findByNameContaining(String name) throws IOException { + return new Category(categoryRepository, hashOperations, KEY).findByNameContaining(name); } + @Override - public Category save(Category category) { - return repository.save(category); + public Category save(Category category) throws IOException { + return new Category(categoryRepository, hashOperations, KEY).save(category); } + @Override public Category findByName(String name) { - return repository.findByNameIgnoreCase(name); + return new Category(categoryRepository).findByNameIgnoreCase(name); } } diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java index 482265c1..ac3c8bf6 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java +++ b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java @@ -1,20 +1,21 @@ package br.com.camaroti.alex.res.api.service; +import java.io.IOException; import java.util.Date; import java.util.List; import java.util.Optional; -import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.domain.Expense; public interface ExpenseService { - Expense save(Expense expense); + Expense save(Expense expense) throws IOException; Expense update(Expense expense); void remove(int id); Optional findById(int id); Iterable findAll(); List findByCodUserOrderByDateDesc(int codUser); List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); - + Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); } diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java index 2973a595..c9794995 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java +++ b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java @@ -1,5 +1,6 @@ package br.com.camaroti.alex.res.api.service; +import java.io.IOException; import java.util.Date; import java.util.List; import java.util.Optional; @@ -7,48 +8,59 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.domain.Expense; +import br.com.camaroti.alex.res.api.repository.CategoryRepository; import br.com.camaroti.alex.res.api.repository.ExpenseRepository; @Service public class ExpenseServiceImpl implements ExpenseService{ @Autowired - private ExpenseRepository repository; + private ExpenseRepository expenseRepository; + + @Autowired + private CategoryRepository categoryRepository; + @Override - public Expense save(Expense expense) { - return repository.save(expense); + public Expense save(Expense expense) throws IOException { + return new Expense(expenseRepository, categoryRepository).save(expense); } @Override public Expense update(Expense expense) { - return repository.save(expense); + return new Expense(expenseRepository, categoryRepository).update(expense); } @Override public void remove(int id) { - repository.deleteById(id); + new Expense(expenseRepository, categoryRepository).remove(id); } @Override public Optional findById(int id) { - return repository.findById(id); + return new Expense(expenseRepository, categoryRepository).findById(id); } @Override public Iterable findAll() { - return repository.findAll(); + return new Expense(expenseRepository, categoryRepository).findAll(); } @Override public List findByCodUserOrderByDateDesc(int codUser) { - return repository.findByCodUserOrderByDateDesc(codUser); + return new Expense(expenseRepository, categoryRepository).findByCodUserOrderByDateDesc(codUser); } @Override public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { - return repository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + return new Expense(expenseRepository, categoryRepository).findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); } + @Override + public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description) { + return new Expense(expenseRepository, categoryRepository).findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); + } + + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 14d3660e..981b8aa8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,3 +12,7 @@ spring.datasource.password=password spring.datasource.tomcat.max-active=100000 spring.datasource.tomcat.max-wait=10000 +#redis +spring.redis.host=localhost +spring.redis.port=6379 + diff --git a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java b/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java index a80ac6ef..aefaa028 100644 --- a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java +++ b/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java @@ -1,9 +1,8 @@ package br.com.camaroti.alex.res.api.service; +import java.io.IOException; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.concurrent.ThreadLocalRandom; import org.junit.Before; import org.junit.Test; @@ -12,7 +11,7 @@ import org.mockito.Mock; import org.springframework.test.context.junit4.SpringRunner; -import br.com.camaroti.alex.res.api.model.Expense; +import br.com.camaroti.alex.res.api.domain.Expense; import br.com.camaroti.alex.res.api.repository.ExpenseRepository; @RunWith(SpringRunner.class) @@ -32,15 +31,15 @@ public void setUp() { expenses = new ArrayList<>(); for (int i = 0; i < 10000; i++) { - int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; - double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); + //int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; + //double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); // expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); } } @Test - public void insertTenThousandExpense() { + public void insertTenThousandExpense() throws IOException { for (Expense expense : expenses) { expenseService.save(expense); System.out.println(expense); From dab9e5cf01d41e065ce145b7c319240ac8a1009c Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Sat, 6 Apr 2019 21:52:10 -0300 Subject: [PATCH 06/12] Changing strucutre. Creating category module, implementing feign on expense-management to consume categogory-management services. --- .gitignore => category-management/.gitignore | 0 README.md => category-management/README.md | 0 pom.xml => category-management/pom.xml | 190 +++++++------ .../category}/configuration/Application.java | 102 +++---- .../controller/CategoryController.java | 47 ++++ .../rest/api/category}/domain/Category.java | 244 ++++++++-------- .../repository/CategoryRepository.java | 26 +- .../category}/service/CategoryService.java | 26 +- .../service/CategoryServiceImpl.java | 107 +++---- .../main/resources/application.properties | 39 +-- expense-management/.gitignore | 4 + expense-management/README.md | 76 +++++ expense-management/pom.xml | 108 +++++++ .../api/expense/client/CategoryClient.java | 20 ++ .../expense/configuration/Application.java | 54 ++++ .../controller/ExpenseController.java | 129 +++++---- .../rest/api/expense/domain/Category.java | 20 ++ .../rest/api/expense}/domain/Expense.java | 266 +++++++++--------- .../api/expense}/helper/ExpenseHelper.java | 44 +-- .../repository/ExpenseRepository.java | 36 +-- .../api/expense}/service/ExpenseService.java | 41 ++- .../expense/service/ExpenseServiceImpl.java | 65 +++++ .../src/main/resources/application.properties | 21 ++ .../service/ExpenseServiceImplTest.java | 104 +++---- .../api/controller/CategoryController.java | 26 -- .../res/api/service/ExpenseServiceImpl.java | 66 ----- 26 files changed, 1101 insertions(+), 760 deletions(-) rename .gitignore => category-management/.gitignore (100%) rename README.md => category-management/README.md (100%) rename pom.xml => category-management/pom.xml (85%) rename {src/main/java/br/com/camaroti/alex/res/api => category-management/src/main/java/br/com/camaroti/alex/rest/api/category}/configuration/Application.java (75%) create mode 100644 category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java rename {src/main/java/br/com/camaroti/alex/res/api => category-management/src/main/java/br/com/camaroti/alex/rest/api/category}/domain/Category.java (94%) rename {src/main/java/br/com/camaroti/alex/res/api => category-management/src/main/java/br/com/camaroti/alex/rest/api/category}/repository/CategoryRepository.java (69%) rename {src/main/java/br/com/camaroti/alex/res/api => category-management/src/main/java/br/com/camaroti/alex/rest/api/category}/service/CategoryService.java (56%) rename {src/main/java/br/com/camaroti/alex/res/api => category-management/src/main/java/br/com/camaroti/alex/rest/api/category}/service/CategoryServiceImpl.java (82%) rename {src => category-management/src}/main/resources/application.properties (90%) create mode 100644 expense-management/.gitignore create mode 100644 expense-management/README.md create mode 100644 expense-management/pom.xml create mode 100644 expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java create mode 100644 expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java rename {src/main/java/br/com/camaroti/alex/res/api => expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense}/controller/ExpenseController.java (87%) create mode 100644 expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java rename {src/main/java/br/com/camaroti/alex/res/api => expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense}/domain/Expense.java (79%) rename {src/main/java/br/com/camaroti/alex/res/api => expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense}/helper/ExpenseHelper.java (72%) rename {src/main/java/br/com/camaroti/alex/res/api => expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense}/repository/ExpenseRepository.java (81%) rename {src/main/java/br/com/camaroti/alex/res/api => expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense}/service/ExpenseService.java (71%) create mode 100644 expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java create mode 100644 expense-management/src/main/resources/application.properties rename {src/test/java/br/com/camaroti/alex/res/api => expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense}/service/ExpenseServiceImplTest.java (68%) delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java delete mode 100644 src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java diff --git a/.gitignore b/category-management/.gitignore similarity index 100% rename from .gitignore rename to category-management/.gitignore diff --git a/README.md b/category-management/README.md similarity index 100% rename from README.md rename to category-management/README.md diff --git a/pom.xml b/category-management/pom.xml similarity index 85% rename from pom.xml rename to category-management/pom.xml index 3b05d147..d5b1852a 100644 --- a/pom.xml +++ b/category-management/pom.xml @@ -1,92 +1,100 @@ - - 4.0.0 - br.com.camaroti.alex.rest.api - expense-management - 0.0.1-SNAPSHOT - expense-management - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.projectlombok - lombok - provided - - - - org.springframework.data - spring-data-redis - - - - redis.clients - jedis - jar - - - - mysql - mysql-connector-java - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - com.jayway.jsonpath - json-path - test - - - - org.springframework.boot - spring-boot-devtools - true - runtime - - - - - org.mockito - mockito-all - 1.10.19 - test - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + 4.0.0 + br.com.camaroti.alex.rest.api + category-management + 0.0.1-SNAPSHOT + category-management + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + provided + + + + org.springframework.data + spring-data-redis + + + + redis.clients + jedis + jar + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.jayway.jsonpath + json-path + test + + + + org.springframework.boot + spring-boot-devtools + true + runtime + + + + + org.mockito + mockito-all + 1.10.19 + test + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.1.1.RELEASE + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java similarity index 75% rename from src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java rename to category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java index b39f9397..a37f4d42 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/configuration/Application.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java @@ -1,50 +1,52 @@ -package br.com.camaroti.alex.res.api.configuration; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.data.redis.connection.RedisStandaloneConfiguration; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -@SpringBootApplication -@EnableAutoConfiguration -@EntityScan(basePackages = {"br.com.camaroti.alex.res.api.domain"}) -@ComponentScan(basePackages = {"br.com.camaroti.alex.res.api.controller", "br.com.camaroti.alex.res.api.service", "class br.com.camaroti.alex.res.api.domain"}) -@EnableJpaRepositories("br.com.camaroti.alex.res.api.repository") -@EnableRedisRepositories("br.com.camaroti.alex.res.api.service") -public class Application { - - @Bean - JedisConnectionFactory jedisConnectionFactory() { - RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); - return new JedisConnectionFactory(config); - } - - @Bean - public RedisTemplate redisTemplate() { - final RedisTemplate template = new RedisTemplate(); - template.setConnectionFactory(jedisConnectionFactory()); - template.setKeySerializer(new StringRedisSerializer()); - template.setValueSerializer(new StringRedisSerializer()); - - // the following is not required - template.setHashValueSerializer(new StringRedisSerializer()); - //template.setHashKeySerializer(new StringRedisSerializer()); - template.afterPropertiesSet(); - return template; - - } - - - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} +package br.com.camaroti.alex.rest.api.category.configuration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@SpringBootApplication +@EnableAutoConfiguration +@EntityScan(basePackages = {"br.com.camaroti.alex.rest.api.category.domain"}) +@ComponentScan(basePackages = {"br.com.camaroti.alex.rest.api.category.controller", "br.com.camaroti.alex.rest.api.category.service", "class br.com.camaroti.alex.rest.api.category.domain"}) +@EnableJpaRepositories("br.com.camaroti.alex.rest.api.category.repository") +@EnableRedisRepositories("br.com.camaroti.alex.rest.api.category.service") +@EnableDiscoveryClient +public class Application { + + @Bean + JedisConnectionFactory jedisConnectionFactory() { + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + return new JedisConnectionFactory(config); + } + + @Bean + public RedisTemplate redisTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(jedisConnectionFactory()); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new StringRedisSerializer()); + + // the following is not required + template.setHashValueSerializer(new StringRedisSerializer()); + //template.setHashKeySerializer(new StringRedisSerializer()); + template.afterPropertiesSet(); + return template; + + } + + + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java new file mode 100644 index 00000000..8264be15 --- /dev/null +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java @@ -0,0 +1,47 @@ +package br.com.camaroti.alex.rest.api.category.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.rest.api.category.domain.Category; +import br.com.camaroti.alex.rest.api.category.service.CategoryService; + +@RestController +public class CategoryController { + + @Autowired + private CategoryService categoryService; + + @GetMapping(path="/categories/suggest") + public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) throws Exception { + return categoryService.findByNameContaining(name); + } + + @GetMapping(path="/category/{name}") + public @ResponseBody Category findByNameIgnoreCase(@PathVariable(value="name", required = true) String name) throws Exception { + return categoryService.findByNameIgnoreCase(name); + } + + @PostMapping(path="/categories") + public @ResponseBody Category addCategory(@RequestParam(value="name") String name) throws Exception { + Category category = new Category(); + category.setName(name); + return categoryService.save(category); + } + @PutMapping(path="/categories/{cod}") + public @ResponseBody Category updateCategory(@PathVariable(value="cod")int cod, @RequestParam(value="name") String name) throws Exception { + Category category = new Category(); + category.setCod(cod); + category.setName(name); + return categoryService.save(category); + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/domain/Category.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java similarity index 94% rename from src/main/java/br/com/camaroti/alex/res/api/domain/Category.java rename to category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java index 7dc2f41f..e95cbdce 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/domain/Category.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java @@ -1,121 +1,123 @@ -package br.com.camaroti.alex.res.api.domain; - -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Transient; - -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisHash; - -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import br.com.camaroti.alex.res.api.repository.CategoryRepository; -import lombok.AccessLevel; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -@Entity -@RedisHash("category") -public @Data class Category implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 1L; - public Category() { - - } - - public Category(String name) { - this.name = name; - } - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int cod; - private String name; - - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private CategoryRepository categoryRepository; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private HashOperations hashOperations; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private String KEY; - - public Category(CategoryRepository categoryRepository, HashOperations hashOperations, String KEY) { - this.categoryRepository = categoryRepository; - this.hashOperations = hashOperations; - this.KEY = KEY; - } - - public Category(CategoryRepository categoryRepository) { - this.categoryRepository = categoryRepository; - } - - - public Category save(Category category) throws IOException { - Category newCategory = categoryRepository.save(category); - updateRedisCategoriesList(newCategory); - return newCategory; - } - - public Category findByNameIgnoreCase(String name) { - return categoryRepository.findByNameIgnoreCase(name); - } - - public List findByNameContaining(String name) throws IOException { - ObjectMapper objectMapper = checkIfRedisIsEmpty(); - Object listCategories = hashOperations.get(KEY, "1"); - List categoriesFound = new ArrayList<>(); - List categories = Arrays.asList(objectMapper.readValue(listCategories.toString(), Category[].class)); - //Verify the categories list and return the similar ones. - for (Category category : categories) { - if(category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { - categoriesFound.add(category); - } - } - return categoriesFound; - } - - private void updateRedisCategoriesList(Category newCategory) - throws IOException, JsonParseException, JsonMappingException, JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - //Recover categories from Redis - String redisCategories = hashOperations.get(KEY, "1").toString(); - //Convert the string to list of objects - List categories = new ArrayList<>(Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); - //Add a new Object - categories.add(newCategory); - //Convert and update Redis with the new data. - String categoriesUpdated = objectMapper.writeValueAsString(categories); - hashOperations.put(KEY, "1", categoriesUpdated); - } - - - private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - if (hashOperations.size(KEY) == null || hashOperations.size(KEY) == 0) { - Iterable categories = categoryRepository.findAll(); - String json = objectMapper.writeValueAsString(categories); - hashOperations.put(KEY, "1", json); - } - - return objectMapper; - } - -} +package br.com.camaroti.alex.rest.api.category.domain; + +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisHash; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import br.com.camaroti.alex.rest.api.category.repository.CategoryRepository; +import lombok.AccessLevel; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Entity +@Table(name = "category") +@RedisHash("category") +public @Data class Category implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1L; + public Category() { + + } + + public Category(String name) { + this.name = name; + } + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String name; + + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private CategoryRepository categoryRepository; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private HashOperations hashOperations; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private String KEY; + + public Category(CategoryRepository categoryRepository, HashOperations hashOperations, String KEY) { + this.categoryRepository = categoryRepository; + this.hashOperations = hashOperations; + this.KEY = KEY; + } + + public Category(CategoryRepository categoryRepository) { + this.categoryRepository = categoryRepository; + } + + + public Category save(Category category) throws IOException { + Category newCategory = categoryRepository.save(category); + updateRedisCategoriesList(newCategory); + return newCategory; + } + + public Category findByNameIgnoreCase(String name) { + return categoryRepository.findByNameIgnoreCase(name); + } + + public List findByNameContaining(String name) throws IOException { + ObjectMapper objectMapper = checkIfRedisIsEmpty(); + Object listCategories = hashOperations.get(KEY, "1"); + List categoriesFound = new ArrayList<>(); + List categories = Arrays.asList(objectMapper.readValue(listCategories.toString(), Category[].class)); + //Verify the categories list and return the similar ones. + for (Category category : categories) { + if(category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { + categoriesFound.add(category); + } + } + return categoriesFound; + } + + private void updateRedisCategoriesList(Category newCategory) + throws IOException, JsonParseException, JsonMappingException, JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + //Recover categories from Redis + String redisCategories = hashOperations.get(KEY, "1").toString(); + //Convert the string to list of objects + List categories = new ArrayList<>(Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); + //Add a new Object + categories.add(newCategory); + //Convert and update Redis with the new data. + String categoriesUpdated = objectMapper.writeValueAsString(categories); + hashOperations.put(KEY, "1", categoriesUpdated); + } + + + private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + if (hashOperations.size(KEY) == null || hashOperations.size(KEY) == 0) { + Iterable categories = categoryRepository.findAll(); + String json = objectMapper.writeValueAsString(categories); + hashOperations.put(KEY, "1", json); + } + + return objectMapper; + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/repository/CategoryRepository.java similarity index 69% rename from src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java rename to category-management/src/main/java/br/com/camaroti/alex/rest/api/category/repository/CategoryRepository.java index 7b239e7b..1d67b775 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/repository/CategoryRepository.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/repository/CategoryRepository.java @@ -1,13 +1,13 @@ -package br.com.camaroti.alex.res.api.repository; - -import java.util.List; - -import org.springframework.data.repository.CrudRepository; - -import br.com.camaroti.alex.res.api.domain.Category; - -public interface CategoryRepository extends CrudRepository { - - Category findByNameIgnoreCase(String name); - List findByNameContainingIgnoreCase(String name); -} +package br.com.camaroti.alex.rest.api.category.repository; + +import java.util.List; + +import org.springframework.data.repository.CrudRepository; + +import br.com.camaroti.alex.rest.api.category.domain.Category; + +public interface CategoryRepository extends CrudRepository { + + Category findByNameIgnoreCase(String name); + List findByNameContainingIgnoreCase(String name); +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryService.java similarity index 56% rename from src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java rename to category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryService.java index 8b667cdc..a8b973b8 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryService.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryService.java @@ -1,13 +1,13 @@ -package br.com.camaroti.alex.res.api.service; - -import java.io.IOException; -import java.util.List; - -import br.com.camaroti.alex.res.api.domain.Category; - -public interface CategoryService { - - Category findByName(String name); - List findByNameContaining(String name) throws IOException; - Category save(Category category) throws IOException; -} +package br.com.camaroti.alex.rest.api.category.service; + +import java.io.IOException; +import java.util.List; + +import br.com.camaroti.alex.rest.api.category.domain.Category; + +public interface CategoryService { + + Category findByNameIgnoreCase(String name); + List findByNameContaining(String name) throws IOException; + Category save(Category category) throws IOException; +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java similarity index 82% rename from src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java rename to category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java index dc164bbe..ad97a57a 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/CategoryServiceImpl.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java @@ -1,52 +1,55 @@ -package br.com.camaroti.alex.res.api.service; - -import java.io.IOException; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import br.com.camaroti.alex.res.api.domain.Category; -import br.com.camaroti.alex.res.api.repository.CategoryRepository; - -@Service -public class CategoryServiceImpl implements CategoryService { - - private static final String KEY = "category"; - - @Autowired - private RedisTemplate redisTemplate; - @Resource(name = "redisTemplate") - private HashOperations hashOperations; - - @PostConstruct - private void init() { - hashOperations = redisTemplate.opsForHash(); - } - - @Autowired - private CategoryRepository categoryRepository; - - @Override - public List findByNameContaining(String name) throws IOException { - return new Category(categoryRepository, hashOperations, KEY).findByNameContaining(name); - } - - - @Override - public Category save(Category category) throws IOException { - return new Category(categoryRepository, hashOperations, KEY).save(category); - } - - - @Override - public Category findByName(String name) { - return new Category(categoryRepository).findByNameIgnoreCase(name); - } - -} +package br.com.camaroti.alex.rest.api.category.service; + +import java.io.IOException; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import br.com.camaroti.alex.rest.api.category.domain.Category; +import br.com.camaroti.alex.rest.api.category.repository.CategoryRepository; + +@Service +public class CategoryServiceImpl implements CategoryService { + + private static final String KEY = "category"; + + @Autowired + private RedisTemplate redisTemplate; + @Resource(name = "redisTemplate") + private HashOperations hashOperations; + + @PostConstruct + private void init() { + hashOperations = redisTemplate.opsForHash(); + } + + @Autowired + private CategoryRepository categoryRepository; + + @Override + public List findByNameContaining(String name) throws IOException { + return new Category(categoryRepository, hashOperations, KEY).findByNameContaining(name); + } + + + @Override + public Category save(Category category) throws IOException { + return new Category(categoryRepository, hashOperations, KEY).save(category); + } + + + @Override + public Category findByNameIgnoreCase(String name) { + return new Category(categoryRepository).findByNameIgnoreCase(name); + } + + + + +} diff --git a/src/main/resources/application.properties b/category-management/src/main/resources/application.properties similarity index 90% rename from src/main/resources/application.properties rename to category-management/src/main/resources/application.properties index 981b8aa8..4d3dd09d 100644 --- a/src/main/resources/application.properties +++ b/category-management/src/main/resources/application.properties @@ -1,18 +1,21 @@ - -#mysql config -spring.jpa.hibernate.ddl-auto=update -spring.datasource.driverClassName=com.mysql.jdbc.Driver -spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect -spring.datasource.url=jdbc:mysql://localhost:3306/db_example?useLegacyDatetimeCode=false&serverTimezone=UTC -spring.datasource.username=root -spring.datasource.password=password - - -#Pools -spring.datasource.tomcat.max-active=100000 -spring.datasource.tomcat.max-wait=10000 - -#redis -spring.redis.host=localhost -spring.redis.port=6379 - + +#mysql config +spring.jpa.hibernate.ddl-auto=update +spring.datasource.driverClassName=com.mysql.jdbc.Driver +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +spring.datasource.url=jdbc:mysql://localhost:3306/db_example?useLegacyDatetimeCode=false&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=password + + +#Pools +spring.datasource.tomcat.max-active=100000 +spring.datasource.tomcat.max-wait=10000 + +#redis +spring.redis.host=localhost +spring.redis.port=6379 + +#Spring +spring.application.name=category-management + diff --git a/expense-management/.gitignore b/expense-management/.gitignore new file mode 100644 index 00000000..579cb537 --- /dev/null +++ b/expense-management/.gitignore @@ -0,0 +1,4 @@ +/target/ +*.classpath +*.project +.settings/ diff --git a/expense-management/README.md b/expense-management/README.md new file mode 100644 index 00000000..15d8f685 --- /dev/null +++ b/expense-management/README.md @@ -0,0 +1,76 @@ +# Show me the code + +### # DESAFIO: + +API REST para Gestão de Gastos! + +``` +Funcionalidade: Integração de gastos por cartão + Apenas sistemas credenciados poderão incluir novos gastos + É esperado um volume de 100.000 inclusões por segundo + Os gastos, serão informados atraves do protoloco JSON, seguindo padrão: + { "descricao": "alfanumerico", "valor": double americano, "codigousuario": numerico, "data": Data dem formato UTC } +``` +``` +Funcionalidade: Listagem de gastos* + Dado que acesso como um cliente autenticado que pode visualizar os gastos do cartão + Quando acesso a interface de listagem de gastos + Então gostaria de ver meus gastos mais atuais. + +*Para esta funcionalidade é esperado 2.000 acessos por segundo. +*O cliente espera ver gastos realizados a 5 segundos atrás. +``` +``` +Funcionalidade: Filtro de gastos + Dado que acesso como um cliente autenticado + E acessei a interface de listagem de gastos + E configure o filtro de data igual a 27/03/1992 + Então gostaria de ver meus gastos apenas deste dia. +``` +``` +Funcionalidade: Categorização de gastos + Dado que acesso como um cliente autenticado + Quando acesso o detalhe de um gasto + E este não possui uma categoria + Então devo conseguir incluir uma categoria para este +``` +``` +Funcionalidade: Sugestão de categoria + Dado que acesso como um cliente autenticado + Quando acesso o detalhe do gasto que não possui categoria + E começo a digitar a categoria que desejo + Então uma lista de sugestões de categoria deve ser exibida, estas baseadas em categorias já informadas por outro usuários. +``` +``` +Funcionalidade: Categorização automatica de gasto + No processo de integração de gastos, a categoria deve ser incluida automaticamente + caso a descrição de um gasto seja igual a descrição de qualquer outro gasto já categorizado pelo cliente + o mesmo deve receber esta categoria no momento da inclusão do mesmo +``` +### # Avaliação + +Você será avaliado pela usabilidade, por respeitar o design e pela arquitetura da API. +É esperado que você consiga explicar as decisões que tomou durante o desenvolvimento através de commits. + +* Springboot - Java - Maven (preferêncialmente) ([https://projects.spring.io/spring-boot/](https://projects.spring.io/spring-boot/)) +* RESTFul ([https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/](https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/)) +* DDD ([https://airbrake.io/blog/software-design/domain-driven-design](https://airbrake.io/blog/software-design/domain-driven-design)) +* Microservices ([https://martinfowler.com/microservices/](https://martinfowler.com/microservices/)) +* Testes unitários, teste o que achar importante (De preferência JUnit + Mockito). Mas pode usar o que você tem mais experiência, só nos explique o que ele tem de bom. +* SOAPUI para testes de carga ([https://www.soapui.org/load-testing/concept.html](https://www.soapui.org/load-testing/concept.html)) +* Uso de diferentes formas de armazenamento de dados (REDIS, Cassandra, Solr/Lucene) +* Uso do git +* Diferencial: Criptografia de comunicação, com troca de chaves. ([http://noiseprotocol.org/](http://noiseprotocol.org/)) +* Diferencial: CQRS ([https://martinfowler.com/bliki/CQRS.html](https://martinfowler.com/bliki/CQRS.html)) +* Diferencial: Docker File + Docker Compose (com dbs) para rodar seus jars. + +### # Observações gerais + +Adicione um arquivo [README.md](http://README.md) com os procedimentos para executar o projeto. +Pedimos que trabalhe sozinho e não divulgue o resultado na internet. + +Faça um fork desse desse repositório em seu Github e nos envie um Pull Request com o resultado, por favor informe por qual empresa você esta se candidatando. + +### # Importante: não há prazo de entrega, faça com qualidade! + +# BOA SORTE! diff --git a/expense-management/pom.xml b/expense-management/pom.xml new file mode 100644 index 00000000..6279e351 --- /dev/null +++ b/expense-management/pom.xml @@ -0,0 +1,108 @@ + + 4.0.0 + br.com.camaroti.alex.rest.api + expense-management + 0.0.1-SNAPSHOT + expense-management + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + provided + + + + org.springframework.data + spring-data-redis + + + + redis.clients + jedis + jar + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.jayway.jsonpath + json-path + test + + + + org.springframework.boot + spring-boot-devtools + true + runtime + + + + + org.mockito + mockito-all + 1.10.19 + test + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.1.1.RELEASE + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.1.1.RELEASE + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java new file mode 100644 index 00000000..681495ef --- /dev/null +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java @@ -0,0 +1,20 @@ +package br.com.camaroti.alex.rest.api.expense.client; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import br.com.camaroti.alex.rest.api.expense.domain.Category; + +@FeignClient("category-management") +public interface CategoryClient { + + @PostMapping(path="/categories") + public @ResponseBody Category save(@RequestParam(value="name") String name) throws Exception; + + @GetMapping(path="/category/{name}") + public @ResponseBody Category findByNameIgnoreCase(@PathVariable(value="name", required = true) String name)throws Exception; + +} \ No newline at end of file diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java new file mode 100644 index 00000000..2c3d0dfd --- /dev/null +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java @@ -0,0 +1,54 @@ +package br.com.camaroti.alex.rest.api.expense.configuration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@SpringBootApplication +@EnableAutoConfiguration +@EntityScan(basePackages = {"br.com.camaroti.alex.rest.api.expense.domain"}) +@ComponentScan(basePackages = {"br.com.camaroti.alex.rest.api.expense.client", "br.com.camaroti.alex.rest.api.expense.controller", "br.com.camaroti.alex.rest.api.expense.service"}) +@EnableJpaRepositories("br.com.camaroti.alex.rest.api.expense.repository") +@EnableRedisRepositories("br.com.camaroti.alex.rest.api.expense.service") +@EnableFeignClients(basePackages = {"br.com.camaroti.alex.rest.api.expense.client"}) +@EnableDiscoveryClient +public class Application { + + @Bean + JedisConnectionFactory jedisConnectionFactory() { + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + return new JedisConnectionFactory(config); + } + + @Bean + public RedisTemplate redisTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(jedisConnectionFactory()); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new StringRedisSerializer()); + + // the following is not required + template.setHashValueSerializer(new StringRedisSerializer()); + //template.setHashKeySerializer(new StringRedisSerializer()); + template.afterPropertiesSet(); + return template; + + } + + + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java similarity index 87% rename from src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java rename to expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java index 8edcbd0f..96c57fe6 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/ExpenseController.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java @@ -1,65 +1,64 @@ -package br.com.camaroti.alex.res.api.controller; - -import java.io.IOException; -import java.util.Date; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import br.com.camaroti.alex.res.api.domain.Expense; -import br.com.camaroti.alex.res.api.helper.ExpenseHelper; -import br.com.camaroti.alex.res.api.service.ExpenseService; - -@RestController -public class ExpenseController { - - @Autowired - private ExpenseService expenseService; - - @PostMapping(path="/expenses") // Map ONLY POST Request - public @ResponseBody Expense addExpense(@RequestParam int codUser - , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) throws IOException { - // @ResponseBody means the returned String is the response, not a view name - // @RequestParam means it is a parameter from the GET or POST request - Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); - return expenseService.save(expense); - } - - @PutMapping(path="/expenses/{cod}") // Map ONLY PUT Request - public @ResponseBody Expense add(@PathVariable int cod, @RequestParam int codUser - , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { - Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); - expense.setCod(cod); - return expenseService.update(expense); - } - - @RequestMapping(path="/expenses") - public @ResponseBody Iterable getAll() { - return expenseService.findAll(); - } - - @GetMapping(path="/expenses/{codUser}") - public @ResponseBody Iterable findByCodUserOrderByDateDesc(@PathVariable int codUser) { - return expenseService.findByCodUserOrderByDateDesc(codUser); - } - - @GetMapping(path="/expenses/{codUser}/{date}") - public @ResponseBody Iterable findByCodUserAndDateOrderByDateDesc(@PathVariable int codUser, - @PathVariable @DateTimeFormat(pattern="yyyy-MM-dd") Long date) { - Date start = new Date(date); - Date end = new Date(date + 86399999L); - System.out.println(start); - System.out.println(end); - return expenseService.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); - } - - -} +package br.com.camaroti.alex.rest.api.expense.controller; + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.rest.api.expense.domain.Expense; +import br.com.camaroti.alex.rest.api.expense.helper.ExpenseHelper; +import br.com.camaroti.alex.rest.api.expense.service.ExpenseService; + +@RestController +public class ExpenseController { + + @Autowired + private ExpenseService expenseService; + + @PostMapping(path="/expenses") // Map ONLY POST Request + public @ResponseBody Expense addExpense(@RequestParam int codUser + , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) throws Exception { + // @ResponseBody means the returned String is the response, not a view name + // @RequestParam means it is a parameter from the GET or POST request + Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); + return expenseService.save(expense); + } + + @PutMapping(path="/expenses/{cod}") // Map ONLY PUT Request + public @ResponseBody Expense add(@PathVariable int cod, @RequestParam int codUser + , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { + Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); + expense.setCod(cod); + return expenseService.update(expense); + } + + @RequestMapping(path="/expenses") + public @ResponseBody Iterable getAll() { + return expenseService.findAll(); + } + + @GetMapping(path="/expenses/{codUser}") + public @ResponseBody Iterable findByCodUserOrderByDateDesc(@PathVariable int codUser) { + return expenseService.findByCodUserOrderByDateDesc(codUser); + } + + @GetMapping(path="/expenses/{codUser}/{date}") + public @ResponseBody Iterable findByCodUserAndDateOrderByDateDesc(@PathVariable int codUser, + @PathVariable @DateTimeFormat(pattern="yyyy-MM-dd") Long date) { + Date start = new Date(date); + Date end = new Date(date + 86399999L); + System.out.println(start); + System.out.println(end); + return expenseService.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java new file mode 100644 index 00000000..af25a3c1 --- /dev/null +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java @@ -0,0 +1,20 @@ +package br.com.camaroti.alex.rest.api.expense.domain; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import lombok.Data; + +@Entity +@Table(name = "category") +public @Data class Category { + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String name; + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java similarity index 79% rename from src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java rename to expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java index d2136079..0a6f0a11 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/domain/Expense.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java @@ -1,134 +1,132 @@ -package br.com.camaroti.alex.res.api.domain; - -import java.io.IOException; -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import java.util.Optional; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; - -import org.springframework.data.redis.core.RedisHash; - -import br.com.camaroti.alex.res.api.repository.CategoryRepository; -import br.com.camaroti.alex.res.api.repository.ExpenseRepository; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -@Entity -@AllArgsConstructor -@RedisHash("expense") -public @Data class Expense implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public Expense() { - } - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private int cod; - private String description; - private double value; - private int codUser; - private Date date; - @ManyToOne(optional = true) - private Category category; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private ExpenseRepository expenseRepository; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private CategoryRepository categoryRepository; - - - public Expense(ExpenseRepository expenseRepository, CategoryRepository categoryRepository) { - this.expenseRepository = expenseRepository; - this.categoryRepository = categoryRepository; - } - - - public Expense save(Expense expense) throws IOException { - checkCategoryInformation(expense); - return expenseRepository.save(expense); - - } - - public Expense update(Expense expense) { - return expenseRepository.save(expense); - } - - public void remove(int id) { - expenseRepository.deleteById(id); - } - - public Optional findById(int id) { - return expenseRepository.findById(id); - } - - public Iterable findAll() { - return expenseRepository.findAll(); - } - - public List findByCodUserOrderByDateDesc(int codUser) { - return expenseRepository.findByCodUserOrderByDateDesc(codUser); - } - - public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { - return expenseRepository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); - } - - public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc( - String description) { - return expenseRepository - .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); - } - - private void checkCategoryInformation(Expense expense) throws IOException { - String category = expense.getCategory().getName(); - if (category != null && !category.isEmpty()) { - saveCategoryIfNotExists(category, expense); - } else { - // Category is null, define automatically a category by a similar description - setSameCategoryBySimilarExpenseDescription(expense); - } - } - - private void setSameCategoryBySimilarExpenseDescription(Expense expense) { - Expense similarExpense = expenseRepository - .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense.getDescription()); - if (similarExpense != null) { - expense.setCategory(similarExpense.getCategory()); - } else { - expense.setCategory(null); - } - } - - private void saveCategoryIfNotExists(String category, Expense expense) throws IOException { - Category categoryObj = categoryRepository.findByNameIgnoreCase(category); - if (categoryObj != null) { - expense.setCategory(categoryObj); - } else { - // Category not found. Try to set category By similar Description - setSameCategoryBySimilarExpenseDescription(expense); - // If you dont find a similar description, just add a new Category - if (expense.getCategory() == null) { - Category newCategory = new Category(category); - categoryRepository.save(newCategory); - expense.setCategory(newCategory); - } - } - } - -} +package br.com.camaroti.alex.rest.api.expense.domain; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Transient; + +import org.springframework.data.redis.core.RedisHash; + +import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; +import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Entity +@AllArgsConstructor +@RedisHash("expense") +public @Data class Expense implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public Expense() { + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int cod; + private String description; + private double value; + private int codUser; + private Date date; + @ManyToOne(optional = true) + private Category category; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private ExpenseRepository expenseRepository; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private CategoryClient categoryClient; + + + public Expense(ExpenseRepository expenseRepository, CategoryClient categoryClient) { + this.expenseRepository = expenseRepository; + this.categoryClient = categoryClient; + } + + + public Expense save(Expense expense) throws Exception { + checkCategoryInformation(expense); + return expenseRepository.save(expense); + + } + + public Expense update(Expense expense) { + return expenseRepository.save(expense); + } + + public void remove(int id) { + expenseRepository.deleteById(id); + } + + public Optional findById(int id) { + return expenseRepository.findById(id); + } + + public Iterable findAll() { + return expenseRepository.findAll(); + } + + public List findByCodUserOrderByDateDesc(int codUser) { + return expenseRepository.findByCodUserOrderByDateDesc(codUser); + } + + public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { + return expenseRepository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc( + String description) { + return expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); + } + + private void checkCategoryInformation(Expense expense) throws Exception { + String category = expense.getCategory().getName(); + if (category != null && !category.isEmpty()) { + saveCategoryIfNotExists(category, expense); + } else { + // Category is null, define automatically a category by a similar description + setSameCategoryBySimilarExpenseDescription(expense); + } + } + + private void setSameCategoryBySimilarExpenseDescription(Expense expense) { + Expense similarExpense = expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense.getDescription()); + if (similarExpense != null) { + expense.setCategory(similarExpense.getCategory()); + } else { + expense.setCategory(null); + } + } + + private void saveCategoryIfNotExists(String category, Expense expense) throws Exception { + Category categoryObj = categoryClient.findByNameIgnoreCase(category); + if (categoryObj != null) { + expense.setCategory(categoryObj); + } else { + // Category not found. Try to set category By similar Description + setSameCategoryBySimilarExpenseDescription(expense); + // If you dont find a similar description, just add a new Category + if (expense.getCategory() == null) { + Category newCategory = categoryClient.save(category); + expense.setCategory(newCategory); + } + } + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/helper/ExpenseHelper.java similarity index 72% rename from src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java rename to expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/helper/ExpenseHelper.java index c6414b26..c77d90ca 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/helper/ExpenseHelper.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/helper/ExpenseHelper.java @@ -1,22 +1,22 @@ -package br.com.camaroti.alex.res.api.helper; - -import java.util.Date; - -import br.com.camaroti.alex.res.api.domain.Category; -import br.com.camaroti.alex.res.api.domain.Expense; - -public class ExpenseHelper { - - public static Expense convertExpense(int codUser, String description, double cost, String category) { - Expense expense = new Expense(); - Category categoryObj = new Category(); - expense.setCodUser(codUser); - expense.setDate(new Date()); - expense.setDescription(description); - expense.setValue(cost); - categoryObj.setName(category); - expense.setCategory(categoryObj); - return expense; - } - -} +package br.com.camaroti.alex.rest.api.expense.helper; + +import java.util.Date; + +import br.com.camaroti.alex.rest.api.expense.domain.Category; +import br.com.camaroti.alex.rest.api.expense.domain.Expense; + +public class ExpenseHelper { + + public static Expense convertExpense(int codUser, String description, double cost, String category) { + Expense expense = new Expense(); + Category categoryObj = new Category(); + expense.setCodUser(codUser); + expense.setDate(new Date()); + expense.setDescription(description); + expense.setValue(cost); + categoryObj.setName(category); + expense.setCategory(categoryObj); + return expense; + } + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/repository/ExpenseRepository.java similarity index 81% rename from src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java rename to expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/repository/ExpenseRepository.java index aef79cdb..1c603618 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/repository/ExpenseRepository.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/repository/ExpenseRepository.java @@ -1,18 +1,18 @@ -package br.com.camaroti.alex.res.api.repository; - -import java.util.Date; -import java.util.List; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; - -import br.com.camaroti.alex.res.api.domain.Expense; - -@Repository -public interface ExpenseRepository extends CrudRepository { - - ListfindByCodUserOrderByDateDesc(int codUser); - ListfindByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); - Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); - -} +package br.com.camaroti.alex.rest.api.expense.repository; + +import java.util.Date; +import java.util.List; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +import br.com.camaroti.alex.rest.api.expense.domain.Expense; + +@Repository +public interface ExpenseRepository extends CrudRepository { + + ListfindByCodUserOrderByDateDesc(int codUser); + ListfindByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); + Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java similarity index 71% rename from src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java rename to expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java index ac3c8bf6..3c36ae0d 100644 --- a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseService.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java @@ -1,21 +1,20 @@ -package br.com.camaroti.alex.res.api.service; - -import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.Optional; - -import br.com.camaroti.alex.res.api.domain.Expense; - -public interface ExpenseService { - - Expense save(Expense expense) throws IOException; - Expense update(Expense expense); - void remove(int id); - Optional findById(int id); - Iterable findAll(); - List findByCodUserOrderByDateDesc(int codUser); - List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); - Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); - -} +package br.com.camaroti.alex.rest.api.expense.service; + +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import br.com.camaroti.alex.rest.api.expense.domain.Expense; + +public interface ExpenseService { + + Expense save(Expense expense) throws Exception; + Expense update(Expense expense); + void remove(int id); + Optional findById(int id); + Iterable findAll(); + List findByCodUserOrderByDateDesc(int codUser); + List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); + Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java new file mode 100644 index 00000000..77c22f47 --- /dev/null +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java @@ -0,0 +1,65 @@ +package br.com.camaroti.alex.rest.api.expense.service; + +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; +import br.com.camaroti.alex.rest.api.expense.domain.Expense; +import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; + +@Service +public class ExpenseServiceImpl implements ExpenseService{ + + @Autowired + private ExpenseRepository expenseRepository; + + @Autowired + private CategoryClient categoryClient; + + + @Override + public Expense save(Expense expense) throws Exception { + return new Expense(expenseRepository, categoryClient).save(expense); + } + + @Override + public Expense update(Expense expense) { + return new Expense(expenseRepository, categoryClient).update(expense); + } + + @Override + public void remove(int id) { + new Expense(expenseRepository, categoryClient).remove(id); + } + + @Override + public Optional findById(int id) { + return new Expense(expenseRepository, categoryClient).findById(id); + } + + @Override + public Iterable findAll() { + return new Expense(expenseRepository, categoryClient).findAll(); + } + + @Override + public List findByCodUserOrderByDateDesc(int codUser) { + return new Expense(expenseRepository, categoryClient).findByCodUserOrderByDateDesc(codUser); + } + + @Override + public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { + return new Expense(expenseRepository, categoryClient).findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + @Override + public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description) { + return new Expense(expenseRepository, categoryClient).findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); + } + + +} diff --git a/expense-management/src/main/resources/application.properties b/expense-management/src/main/resources/application.properties new file mode 100644 index 00000000..479b8c86 --- /dev/null +++ b/expense-management/src/main/resources/application.properties @@ -0,0 +1,21 @@ +server.port=8081 +#mysql config +spring.jpa.hibernate.ddl-auto=update +spring.datasource.driverClassName=com.mysql.jdbc.Driver +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect +spring.datasource.url=jdbc:mysql://localhost:3306/db_example?useLegacyDatetimeCode=false&serverTimezone=UTC +spring.datasource.username=root +spring.datasource.password=password + + +#Pools +spring.datasource.tomcat.max-active=100000 +spring.datasource.tomcat.max-wait=10000 + +#redis +spring.redis.host=localhost +spring.redis.port=6379 + +#Spring +spring.application.name=expense-management + diff --git a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java similarity index 68% rename from src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java rename to expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java index aefaa028..c7b600d9 100644 --- a/src/test/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImplTest.java +++ b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java @@ -1,50 +1,54 @@ -package br.com.camaroti.alex.res.api.service; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.springframework.test.context.junit4.SpringRunner; - -import br.com.camaroti.alex.res.api.domain.Expense; -import br.com.camaroti.alex.res.api.repository.ExpenseRepository; - -@RunWith(SpringRunner.class) -public class ExpenseServiceImplTest { - - private List expenses; - - @InjectMocks - private ExpenseServiceImpl expenseService; - - @Mock - private ExpenseRepository expenseRepository; - - - @Before - public void setUp() { - - expenses = new ArrayList<>(); - for (int i = 0; i < 10000; i++) { - //int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; - //double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); - // expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); - } - } - - - @Test - public void insertTenThousandExpense() throws IOException { - for (Expense expense : expenses) { - expenseService.save(expense); - System.out.println(expense); - } - } - - -} +package br.com.camaroti.alex.rest.api.expense.service; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.springframework.test.context.junit4.SpringRunner; + +import br.com.camaroti.alex.rest.api.expense.domain.Expense; +import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; +import br.com.camaroti.alex.rest.api.expense.service.ExpenseServiceImpl; + +@RunWith(SpringRunner.class) +public class ExpenseServiceImplTest { + + private List expenses; + + @InjectMocks + private ExpenseServiceImpl expenseService; + + @Mock + private ExpenseRepository expenseRepository; + + + @Before + public void setUp() { + + expenses = new ArrayList<>(); + for (int i = 0; i < 10000; i++) { + //int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; + //double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); + // expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); + } + } + + + @Test + public void insertTenThousandExpense() throws IOException { + try { + for (Expense expense : expenses) { + expenseService.save(expense); + System.out.println(expense); + } + } catch (Exception e) { + } + } + + +} diff --git a/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java b/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java deleted file mode 100644 index d50eb07b..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/controller/CategoryController.java +++ /dev/null @@ -1,26 +0,0 @@ -package br.com.camaroti.alex.res.api.controller; - -import java.io.IOException; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import br.com.camaroti.alex.res.api.domain.Category; -import br.com.camaroti.alex.res.api.service.CategoryService; - -@RestController -public class CategoryController { - - @Autowired - private CategoryService categoryService; - - @GetMapping(path="/categories/suggest") - public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) throws IOException { - return categoryService.findByNameContaining(name); - } - -} diff --git a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java b/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java deleted file mode 100644 index c9794995..00000000 --- a/src/main/java/br/com/camaroti/alex/res/api/service/ExpenseServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package br.com.camaroti.alex.res.api.service; - -import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import br.com.camaroti.alex.res.api.domain.Expense; -import br.com.camaroti.alex.res.api.repository.CategoryRepository; -import br.com.camaroti.alex.res.api.repository.ExpenseRepository; - -@Service -public class ExpenseServiceImpl implements ExpenseService{ - - @Autowired - private ExpenseRepository expenseRepository; - - @Autowired - private CategoryRepository categoryRepository; - - - @Override - public Expense save(Expense expense) throws IOException { - return new Expense(expenseRepository, categoryRepository).save(expense); - } - - @Override - public Expense update(Expense expense) { - return new Expense(expenseRepository, categoryRepository).update(expense); - } - - @Override - public void remove(int id) { - new Expense(expenseRepository, categoryRepository).remove(id); - } - - @Override - public Optional findById(int id) { - return new Expense(expenseRepository, categoryRepository).findById(id); - } - - @Override - public Iterable findAll() { - return new Expense(expenseRepository, categoryRepository).findAll(); - } - - @Override - public List findByCodUserOrderByDateDesc(int codUser) { - return new Expense(expenseRepository, categoryRepository).findByCodUserOrderByDateDesc(codUser); - } - - @Override - public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { - return new Expense(expenseRepository, categoryRepository).findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); - } - - @Override - public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description) { - return new Expense(expenseRepository, categoryRepository).findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); - } - - -} From 48c106e3f714bbc89be0716004648f1b086fe63b Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Sat, 6 Apr 2019 21:57:32 -0300 Subject: [PATCH 07/12] removing readme from each project folder. Adding zuul and eureka server. --- category-management/README.md | 76 ----- eurekaserver/.gitignore | 29 ++ .../.mvn/wrapper/MavenWrapperDownloader.java | 114 +++++++ eurekaserver/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + eurekaserver/mvnw | 286 ++++++++++++++++++ eurekaserver/mvnw.cmd | 161 ++++++++++ eurekaserver/pom.xml | 56 ++++ .../eurekaserver/EurekaserverApplication.java | 15 + .../src/main/resources/application.properties | 4 + .../EurekaserverApplicationTests.java | 16 + expense-management/README.md | 76 ----- zuul/.gitignore | 29 ++ zuul/.mvn/wrapper/MavenWrapperDownloader.java | 114 +++++++ zuul/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes zuul/.mvn/wrapper/maven-wrapper.properties | 1 + zuul/mvnw | 286 ++++++++++++++++++ zuul/mvnw.cmd | 161 ++++++++++ zuul/pom.xml | 64 ++++ .../camaroti/alex/zuul/ZuulApplication.java | 17 ++ .../src/main/resources/application.properties | 12 + .../alex/zuul/ZuulApplicationTests.java | 16 + 22 files changed, 1382 insertions(+), 152 deletions(-) delete mode 100644 category-management/README.md create mode 100644 eurekaserver/.gitignore create mode 100644 eurekaserver/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 eurekaserver/.mvn/wrapper/maven-wrapper.jar create mode 100644 eurekaserver/.mvn/wrapper/maven-wrapper.properties create mode 100644 eurekaserver/mvnw create mode 100644 eurekaserver/mvnw.cmd create mode 100644 eurekaserver/pom.xml create mode 100644 eurekaserver/src/main/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplication.java create mode 100644 eurekaserver/src/main/resources/application.properties create mode 100644 eurekaserver/src/test/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplicationTests.java delete mode 100644 expense-management/README.md create mode 100644 zuul/.gitignore create mode 100644 zuul/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 zuul/.mvn/wrapper/maven-wrapper.jar create mode 100644 zuul/.mvn/wrapper/maven-wrapper.properties create mode 100644 zuul/mvnw create mode 100644 zuul/mvnw.cmd create mode 100644 zuul/pom.xml create mode 100644 zuul/src/main/java/br/com/camaroti/alex/zuul/ZuulApplication.java create mode 100644 zuul/src/main/resources/application.properties create mode 100644 zuul/src/test/java/br/com/camaroti/alex/zuul/ZuulApplicationTests.java diff --git a/category-management/README.md b/category-management/README.md deleted file mode 100644 index 15d8f685..00000000 --- a/category-management/README.md +++ /dev/null @@ -1,76 +0,0 @@ -# Show me the code - -### # DESAFIO: - -API REST para Gestão de Gastos! - -``` -Funcionalidade: Integração de gastos por cartão - Apenas sistemas credenciados poderão incluir novos gastos - É esperado um volume de 100.000 inclusões por segundo - Os gastos, serão informados atraves do protoloco JSON, seguindo padrão: - { "descricao": "alfanumerico", "valor": double americano, "codigousuario": numerico, "data": Data dem formato UTC } -``` -``` -Funcionalidade: Listagem de gastos* - Dado que acesso como um cliente autenticado que pode visualizar os gastos do cartão - Quando acesso a interface de listagem de gastos - Então gostaria de ver meus gastos mais atuais. - -*Para esta funcionalidade é esperado 2.000 acessos por segundo. -*O cliente espera ver gastos realizados a 5 segundos atrás. -``` -``` -Funcionalidade: Filtro de gastos - Dado que acesso como um cliente autenticado - E acessei a interface de listagem de gastos - E configure o filtro de data igual a 27/03/1992 - Então gostaria de ver meus gastos apenas deste dia. -``` -``` -Funcionalidade: Categorização de gastos - Dado que acesso como um cliente autenticado - Quando acesso o detalhe de um gasto - E este não possui uma categoria - Então devo conseguir incluir uma categoria para este -``` -``` -Funcionalidade: Sugestão de categoria - Dado que acesso como um cliente autenticado - Quando acesso o detalhe do gasto que não possui categoria - E começo a digitar a categoria que desejo - Então uma lista de sugestões de categoria deve ser exibida, estas baseadas em categorias já informadas por outro usuários. -``` -``` -Funcionalidade: Categorização automatica de gasto - No processo de integração de gastos, a categoria deve ser incluida automaticamente - caso a descrição de um gasto seja igual a descrição de qualquer outro gasto já categorizado pelo cliente - o mesmo deve receber esta categoria no momento da inclusão do mesmo -``` -### # Avaliação - -Você será avaliado pela usabilidade, por respeitar o design e pela arquitetura da API. -É esperado que você consiga explicar as decisões que tomou durante o desenvolvimento através de commits. - -* Springboot - Java - Maven (preferêncialmente) ([https://projects.spring.io/spring-boot/](https://projects.spring.io/spring-boot/)) -* RESTFul ([https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/](https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/)) -* DDD ([https://airbrake.io/blog/software-design/domain-driven-design](https://airbrake.io/blog/software-design/domain-driven-design)) -* Microservices ([https://martinfowler.com/microservices/](https://martinfowler.com/microservices/)) -* Testes unitários, teste o que achar importante (De preferência JUnit + Mockito). Mas pode usar o que você tem mais experiência, só nos explique o que ele tem de bom. -* SOAPUI para testes de carga ([https://www.soapui.org/load-testing/concept.html](https://www.soapui.org/load-testing/concept.html)) -* Uso de diferentes formas de armazenamento de dados (REDIS, Cassandra, Solr/Lucene) -* Uso do git -* Diferencial: Criptografia de comunicação, com troca de chaves. ([http://noiseprotocol.org/](http://noiseprotocol.org/)) -* Diferencial: CQRS ([https://martinfowler.com/bliki/CQRS.html](https://martinfowler.com/bliki/CQRS.html)) -* Diferencial: Docker File + Docker Compose (com dbs) para rodar seus jars. - -### # Observações gerais - -Adicione um arquivo [README.md](http://README.md) com os procedimentos para executar o projeto. -Pedimos que trabalhe sozinho e não divulgue o resultado na internet. - -Faça um fork desse desse repositório em seu Github e nos envie um Pull Request com o resultado, por favor informe por qual empresa você esta se candidatando. - -### # Importante: não há prazo de entrega, faça com qualidade! - -# BOA SORTE! diff --git a/eurekaserver/.gitignore b/eurekaserver/.gitignore new file mode 100644 index 00000000..153c9335 --- /dev/null +++ b/eurekaserver/.gitignore @@ -0,0 +1,29 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ diff --git a/eurekaserver/.mvn/wrapper/MavenWrapperDownloader.java b/eurekaserver/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..72308aa4 --- /dev/null +++ b/eurekaserver/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,114 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: : " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/eurekaserver/.mvn/wrapper/maven-wrapper.jar b/eurekaserver/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/eurekaserver/mvnw.cmd b/eurekaserver/mvnw.cmd new file mode 100644 index 00000000..fef5a8f7 --- /dev/null +++ b/eurekaserver/mvnw.cmd @@ -0,0 +1,161 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/eurekaserver/pom.xml b/eurekaserver/pom.xml new file mode 100644 index 00000000..2688f7a2 --- /dev/null +++ b/eurekaserver/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + br.com.camaroti.alex + eurekaserver + 0.0.1-SNAPSHOT + eurekaserver + Eureka project for Spring Boot + + + 1.8 + Greenwich.SR1 + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/eurekaserver/src/main/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplication.java b/eurekaserver/src/main/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplication.java new file mode 100644 index 00000000..03a71c75 --- /dev/null +++ b/eurekaserver/src/main/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplication.java @@ -0,0 +1,15 @@ +package br.com.camaroti.alex.eurekaserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +@SpringBootApplication +@EnableEurekaServer +public class EurekaserverApplication { + + public static void main(String[] args) { + SpringApplication.run(EurekaserverApplication.class, args); + } + +} diff --git a/eurekaserver/src/main/resources/application.properties b/eurekaserver/src/main/resources/application.properties new file mode 100644 index 00000000..b02576c9 --- /dev/null +++ b/eurekaserver/src/main/resources/application.properties @@ -0,0 +1,4 @@ +server.port=8761 +spring.application.name=eureka-server +eureka.client.registerWithEureka=false +eureka.client.fetchRegistry=false diff --git a/eurekaserver/src/test/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplicationTests.java b/eurekaserver/src/test/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplicationTests.java new file mode 100644 index 00000000..c9f69b8b --- /dev/null +++ b/eurekaserver/src/test/java/br/com/camaroti/alex/eurekaserver/EurekaserverApplicationTests.java @@ -0,0 +1,16 @@ +package br.com.camaroti.alex.eurekaserver; + +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 EurekaserverApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/expense-management/README.md b/expense-management/README.md deleted file mode 100644 index 15d8f685..00000000 --- a/expense-management/README.md +++ /dev/null @@ -1,76 +0,0 @@ -# Show me the code - -### # DESAFIO: - -API REST para Gestão de Gastos! - -``` -Funcionalidade: Integração de gastos por cartão - Apenas sistemas credenciados poderão incluir novos gastos - É esperado um volume de 100.000 inclusões por segundo - Os gastos, serão informados atraves do protoloco JSON, seguindo padrão: - { "descricao": "alfanumerico", "valor": double americano, "codigousuario": numerico, "data": Data dem formato UTC } -``` -``` -Funcionalidade: Listagem de gastos* - Dado que acesso como um cliente autenticado que pode visualizar os gastos do cartão - Quando acesso a interface de listagem de gastos - Então gostaria de ver meus gastos mais atuais. - -*Para esta funcionalidade é esperado 2.000 acessos por segundo. -*O cliente espera ver gastos realizados a 5 segundos atrás. -``` -``` -Funcionalidade: Filtro de gastos - Dado que acesso como um cliente autenticado - E acessei a interface de listagem de gastos - E configure o filtro de data igual a 27/03/1992 - Então gostaria de ver meus gastos apenas deste dia. -``` -``` -Funcionalidade: Categorização de gastos - Dado que acesso como um cliente autenticado - Quando acesso o detalhe de um gasto - E este não possui uma categoria - Então devo conseguir incluir uma categoria para este -``` -``` -Funcionalidade: Sugestão de categoria - Dado que acesso como um cliente autenticado - Quando acesso o detalhe do gasto que não possui categoria - E começo a digitar a categoria que desejo - Então uma lista de sugestões de categoria deve ser exibida, estas baseadas em categorias já informadas por outro usuários. -``` -``` -Funcionalidade: Categorização automatica de gasto - No processo de integração de gastos, a categoria deve ser incluida automaticamente - caso a descrição de um gasto seja igual a descrição de qualquer outro gasto já categorizado pelo cliente - o mesmo deve receber esta categoria no momento da inclusão do mesmo -``` -### # Avaliação - -Você será avaliado pela usabilidade, por respeitar o design e pela arquitetura da API. -É esperado que você consiga explicar as decisões que tomou durante o desenvolvimento através de commits. - -* Springboot - Java - Maven (preferêncialmente) ([https://projects.spring.io/spring-boot/](https://projects.spring.io/spring-boot/)) -* RESTFul ([https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/](https://blog.mwaysolutions.com/2014/06/05/10-best-practices-for-better-restful-api/)) -* DDD ([https://airbrake.io/blog/software-design/domain-driven-design](https://airbrake.io/blog/software-design/domain-driven-design)) -* Microservices ([https://martinfowler.com/microservices/](https://martinfowler.com/microservices/)) -* Testes unitários, teste o que achar importante (De preferência JUnit + Mockito). Mas pode usar o que você tem mais experiência, só nos explique o que ele tem de bom. -* SOAPUI para testes de carga ([https://www.soapui.org/load-testing/concept.html](https://www.soapui.org/load-testing/concept.html)) -* Uso de diferentes formas de armazenamento de dados (REDIS, Cassandra, Solr/Lucene) -* Uso do git -* Diferencial: Criptografia de comunicação, com troca de chaves. ([http://noiseprotocol.org/](http://noiseprotocol.org/)) -* Diferencial: CQRS ([https://martinfowler.com/bliki/CQRS.html](https://martinfowler.com/bliki/CQRS.html)) -* Diferencial: Docker File + Docker Compose (com dbs) para rodar seus jars. - -### # Observações gerais - -Adicione um arquivo [README.md](http://README.md) com os procedimentos para executar o projeto. -Pedimos que trabalhe sozinho e não divulgue o resultado na internet. - -Faça um fork desse desse repositório em seu Github e nos envie um Pull Request com o resultado, por favor informe por qual empresa você esta se candidatando. - -### # Importante: não há prazo de entrega, faça com qualidade! - -# BOA SORTE! diff --git a/zuul/.gitignore b/zuul/.gitignore new file mode 100644 index 00000000..153c9335 --- /dev/null +++ b/zuul/.gitignore @@ -0,0 +1,29 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ diff --git a/zuul/.mvn/wrapper/MavenWrapperDownloader.java b/zuul/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..72308aa4 --- /dev/null +++ b/zuul/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,114 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: : " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/zuul/.mvn/wrapper/maven-wrapper.jar b/zuul/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/zuul/mvnw.cmd b/zuul/mvnw.cmd new file mode 100644 index 00000000..fef5a8f7 --- /dev/null +++ b/zuul/mvnw.cmd @@ -0,0 +1,161 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" +FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/zuul/pom.xml b/zuul/pom.xml new file mode 100644 index 00000000..1b5ee6f6 --- /dev/null +++ b/zuul/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.4.RELEASE + + + br.com.camaroti.alex + zuul + 0.0.1-SNAPSHOT + zuul + Demo project for Spring Boot + + + 1.8 + Greenwich.SR1 + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.cloud + spring-cloud-starter-netflix-zuul + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/zuul/src/main/java/br/com/camaroti/alex/zuul/ZuulApplication.java b/zuul/src/main/java/br/com/camaroti/alex/zuul/ZuulApplication.java new file mode 100644 index 00000000..641e1061 --- /dev/null +++ b/zuul/src/main/java/br/com/camaroti/alex/zuul/ZuulApplication.java @@ -0,0 +1,17 @@ +package br.com.camaroti.alex.zuul; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; + +@EnableZuulProxy +@SpringBootApplication +@EnableDiscoveryClient +public class ZuulApplication { + + public static void main(String[] args) { + SpringApplication.run(ZuulApplication.class, args); + } + +} diff --git a/zuul/src/main/resources/application.properties b/zuul/src/main/resources/application.properties new file mode 100644 index 00000000..02314828 --- /dev/null +++ b/zuul/src/main/resources/application.properties @@ -0,0 +1,12 @@ +server.port=8762 +#Spring +spring.application.name=zuul + +#eureka +eureka.instance.preferIpAddress=false +eureka.serviceurl.defaultzone=http://localhost:8761/ +eureka.client.fetchRegistry=true +eureka.instance.hostname=localhost + +#actuator endpoint +management.endpoints.web.exposure.include=* \ No newline at end of file diff --git a/zuul/src/test/java/br/com/camaroti/alex/zuul/ZuulApplicationTests.java b/zuul/src/test/java/br/com/camaroti/alex/zuul/ZuulApplicationTests.java new file mode 100644 index 00000000..dd1c44bc --- /dev/null +++ b/zuul/src/test/java/br/com/camaroti/alex/zuul/ZuulApplicationTests.java @@ -0,0 +1,16 @@ +package br.com.camaroti.alex.zuul; + +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 ZuulApplicationTests { + + @Test + public void contextLoads() { + } + +} From 5df61d9ef3d8176df94c802bb1152f0907a3bd8e Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Sat, 6 Apr 2019 22:43:02 -0300 Subject: [PATCH 08/12] Updating readme. --- README.md | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..2095f91e --- /dev/null +++ b/README.md @@ -0,0 +1,89 @@ +# Springboot + Eureka + Zuul + Feign + +API REST for Expense Management! + +###Enviroment Configuration +Redis: https://redis.io/download +Lombok: https://projectlombok.org/setup/eclipse +Lombok Tutorial: https://projectlombok.org/setup/eclipse +MySQL: https://dev.mysql.com/downloads/ +Postman: https://www.getpostman.com/downloads/ + +Order to run the applications: 1. eurekaserver / 2. category-management / 3. expense-management / 4. zuul + +Note: Before you use all endpoints, I personally suggest to add some expenses first and use the same as well to search for what you need. +I didn't populated the base and all of the values below are merely illustrative. + +How to use cURL code: +``` +1. Open postman.exe +2. CTRL + O +3. Choose: Past Raw Text +4. Paste the cURL code below. +5. Click on button send to run the endpoint. +``` + +Endpoints: +Expense: +``` +* Add a new expense +POST http:localhost:8762/expense-management/expenses +cURL: +curl -X POST \ + http://http:localhost:8762/expense-management/expenses \ + -H 'Postman-Token: c79ad816-5fe0-4ea2-8647-cb4251931543' \ + -H 'cache-control: no-cache' \ + -H 'content-type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW' \ + -F 'description=O homem mais rico da babilonia' \ + -F cost=30.4 \ + -F category=Leitura + +* Update a new expense +PUT http:localhost:8762/expense-management/expenses/1 +cURL: +curl -X POST \ + http://http:localhost:8762/expense-management/expenses/1 \ + -H 'Postman-Token: de311b6c-9101-4133-ae76-05f9efc6578c' \ + -H 'cache-control: no-cache' \ + -H 'content-type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW' \ + -F codUser=1 \ + -F 'description=O homem mais rico da babilonia' \ + -F cost=30.4 \ + -F category=Leitura + +* Search for expenses by user +GET http:localhost:8762/expense-management/expenses/1 + +* Search for expenses by user in a specific date +http:localhost:8762/expense-management/expenses/1/2019-04-06 +``` + + + +Category: +``` +* Searching for similar name: Autocomplete usability +GET http:localhost:8762/category-management/categories/suggest?name=Roup +* Search by exact name +GET http:localhost:8762/category-management/category/Comida +* Add Category +POST http:localhost:8762/category-management/categories +cURL: +curl -X POST \ + http://http:localhost:8762/category-management/categories \ + -H 'Postman-Token: 87f38883-4711-4d4a-a185-87425fa7b2ac' \ + -H 'cache-control: no-cache' \ + -H 'content-type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW' \ + -F name=Saques + +* Update category +http:localhost:8762/category-management/categories/1 +cURL: +curl -X POST \ + http://http:localhost:8762/category-management/categories/1 \ + -H 'Postman-Token: 86de2127-2c50-4e35-9094-af4c07bbf4e8' \ + -H 'cache-control: no-cache' \ + -H 'content-type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW' \ + -F name=Saques +``` + From 3f4b57b82a88b28ed9805a79d9301f8dba787049 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Mon, 15 Apr 2019 22:11:49 -0300 Subject: [PATCH 09/12] Removing comments and methods that are not used. --- category-management/pom.xml | 196 +++++++------- .../category/configuration/Application.java | 103 ++++---- .../controller/CategoryController.java | 86 +++---- .../rest/api/category/domain/Category.java | 241 +++++++++-------- expense-management/pom.xml | 210 ++++++++------- .../expense/configuration/Application.java | 107 ++++---- .../expense/controller/ExpenseController.java | 111 ++++---- .../alex/rest/api/expense/domain/Expense.java | 243 ++++++++---------- .../api/expense/service/ExpenseService.java | 34 +-- .../expense/service/ExpenseServiceImpl.java | 104 +++----- 10 files changed, 672 insertions(+), 763 deletions(-) diff --git a/category-management/pom.xml b/category-management/pom.xml index d5b1852a..2a9dce6f 100644 --- a/category-management/pom.xml +++ b/category-management/pom.xml @@ -1,100 +1,98 @@ - - 4.0.0 - br.com.camaroti.alex.rest.api - category-management - 0.0.1-SNAPSHOT - category-management - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.projectlombok - lombok - provided - - - - org.springframework.data - spring-data-redis - - - - redis.clients - jedis - jar - - - - mysql - mysql-connector-java - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - com.jayway.jsonpath - json-path - test - - - - org.springframework.boot - spring-boot-devtools - true - runtime - - - - - org.mockito - mockito-all - 1.10.19 - test - - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - 2.1.1.RELEASE - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + 4.0.0 + br.com.camaroti.alex.rest.api + category-management + 0.0.1-SNAPSHOT + category-management + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + provided + + + + org.springframework.data + spring-data-redis + + + + redis.clients + jedis + jar + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.jayway.jsonpath + json-path + test + + + + org.springframework.boot + spring-boot-devtools + true + runtime + + + + org.mockito + mockito-all + 1.10.19 + test + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.1.1.RELEASE + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java index a37f4d42..897b4359 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java @@ -1,52 +1,51 @@ -package br.com.camaroti.alex.rest.api.category.configuration; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.data.redis.connection.RedisStandaloneConfiguration; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -@SpringBootApplication -@EnableAutoConfiguration -@EntityScan(basePackages = {"br.com.camaroti.alex.rest.api.category.domain"}) -@ComponentScan(basePackages = {"br.com.camaroti.alex.rest.api.category.controller", "br.com.camaroti.alex.rest.api.category.service", "class br.com.camaroti.alex.rest.api.category.domain"}) -@EnableJpaRepositories("br.com.camaroti.alex.rest.api.category.repository") -@EnableRedisRepositories("br.com.camaroti.alex.rest.api.category.service") -@EnableDiscoveryClient -public class Application { - - @Bean - JedisConnectionFactory jedisConnectionFactory() { - RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); - return new JedisConnectionFactory(config); - } - - @Bean - public RedisTemplate redisTemplate() { - final RedisTemplate template = new RedisTemplate(); - template.setConnectionFactory(jedisConnectionFactory()); - template.setKeySerializer(new StringRedisSerializer()); - template.setValueSerializer(new StringRedisSerializer()); - - // the following is not required - template.setHashValueSerializer(new StringRedisSerializer()); - //template.setHashKeySerializer(new StringRedisSerializer()); - template.afterPropertiesSet(); - return template; - - } - - - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} +package br.com.camaroti.alex.rest.api.category.configuration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@SpringBootApplication +@EnableAutoConfiguration +@EntityScan(basePackages = { "br.com.camaroti.alex.rest.api.category.domain" }) +@ComponentScan(basePackages = { "br.com.camaroti.alex.rest.api.category.controller", + "br.com.camaroti.alex.rest.api.category.service", "class br.com.camaroti.alex.rest.api.category.domain" }) +@EnableJpaRepositories("br.com.camaroti.alex.rest.api.category.repository") +@EnableRedisRepositories("br.com.camaroti.alex.rest.api.category.service") +@EnableDiscoveryClient +public class Application { + + @Bean + JedisConnectionFactory jedisConnectionFactory() { + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + return new JedisConnectionFactory(config); + } + + @Bean + public RedisTemplate redisTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(jedisConnectionFactory()); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new StringRedisSerializer()); + + // the following is not required + template.setHashValueSerializer(new StringRedisSerializer()); + // template.setHashKeySerializer(new StringRedisSerializer()); + template.afterPropertiesSet(); + return template; + + } + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java index 8264be15..e9cb2e5a 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/controller/CategoryController.java @@ -1,47 +1,39 @@ -package br.com.camaroti.alex.rest.api.category.controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import br.com.camaroti.alex.rest.api.category.domain.Category; -import br.com.camaroti.alex.rest.api.category.service.CategoryService; - -@RestController -public class CategoryController { - - @Autowired - private CategoryService categoryService; - - @GetMapping(path="/categories/suggest") - public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) throws Exception { - return categoryService.findByNameContaining(name); - } - - @GetMapping(path="/category/{name}") - public @ResponseBody Category findByNameIgnoreCase(@PathVariable(value="name", required = true) String name) throws Exception { - return categoryService.findByNameIgnoreCase(name); - } - - @PostMapping(path="/categories") - public @ResponseBody Category addCategory(@RequestParam(value="name") String name) throws Exception { - Category category = new Category(); - category.setName(name); - return categoryService.save(category); - } - @PutMapping(path="/categories/{cod}") - public @ResponseBody Category updateCategory(@PathVariable(value="cod")int cod, @RequestParam(value="name") String name) throws Exception { - Category category = new Category(); - category.setCod(cod); - category.setName(name); - return categoryService.save(category); - } - -} +package br.com.camaroti.alex.rest.api.category.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.rest.api.category.domain.Category; +import br.com.camaroti.alex.rest.api.category.service.CategoryService; + +@RestController +public class CategoryController { + + @Autowired + private CategoryService categoryService; + + @GetMapping(path="/categories/suggest") + public @ResponseBody List suggestCategory(@RequestParam(value="name", required = false, defaultValue = "") String name) throws Exception { + return categoryService.findByNameContaining(name); + } + + @GetMapping(path="/category/{name}") + public @ResponseBody Category findByNameIgnoreCase(@PathVariable(value="name", required = true) String name) throws Exception { + return categoryService.findByNameIgnoreCase(name); + } + + @PostMapping(path="/categories") + public @ResponseBody Category addCategory(@RequestParam(value="name") String name) throws Exception { + Category category = new Category(); + category.setName(name); + return categoryService.save(category); + } + +} diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java index e95cbdce..3f3a8228 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java @@ -1,123 +1,118 @@ -package br.com.camaroti.alex.rest.api.category.domain; - -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisHash; - -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import br.com.camaroti.alex.rest.api.category.repository.CategoryRepository; -import lombok.AccessLevel; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -@Entity -@Table(name = "category") -@RedisHash("category") -public @Data class Category implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 1L; - public Category() { - - } - - public Category(String name) { - this.name = name; - } - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int cod; - private String name; - - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private CategoryRepository categoryRepository; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private HashOperations hashOperations; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private String KEY; - - public Category(CategoryRepository categoryRepository, HashOperations hashOperations, String KEY) { - this.categoryRepository = categoryRepository; - this.hashOperations = hashOperations; - this.KEY = KEY; - } - - public Category(CategoryRepository categoryRepository) { - this.categoryRepository = categoryRepository; - } - - - public Category save(Category category) throws IOException { - Category newCategory = categoryRepository.save(category); - updateRedisCategoriesList(newCategory); - return newCategory; - } - - public Category findByNameIgnoreCase(String name) { - return categoryRepository.findByNameIgnoreCase(name); - } - - public List findByNameContaining(String name) throws IOException { - ObjectMapper objectMapper = checkIfRedisIsEmpty(); - Object listCategories = hashOperations.get(KEY, "1"); - List categoriesFound = new ArrayList<>(); - List categories = Arrays.asList(objectMapper.readValue(listCategories.toString(), Category[].class)); - //Verify the categories list and return the similar ones. - for (Category category : categories) { - if(category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { - categoriesFound.add(category); - } - } - return categoriesFound; - } - - private void updateRedisCategoriesList(Category newCategory) - throws IOException, JsonParseException, JsonMappingException, JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - //Recover categories from Redis - String redisCategories = hashOperations.get(KEY, "1").toString(); - //Convert the string to list of objects - List categories = new ArrayList<>(Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); - //Add a new Object - categories.add(newCategory); - //Convert and update Redis with the new data. - String categoriesUpdated = objectMapper.writeValueAsString(categories); - hashOperations.put(KEY, "1", categoriesUpdated); - } - - - private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - if (hashOperations.size(KEY) == null || hashOperations.size(KEY) == 0) { - Iterable categories = categoryRepository.findAll(); - String json = objectMapper.writeValueAsString(categories); - hashOperations.put(KEY, "1", json); - } - - return objectMapper; - } - -} +package br.com.camaroti.alex.rest.api.category.domain; + +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisHash; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import br.com.camaroti.alex.rest.api.category.repository.CategoryRepository; +import lombok.AccessLevel; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Entity +@Table(name = "category") +@RedisHash("category") +public @Data class Category implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1L; + public Category() { + + } + + public Category(String name) { + this.name = name; + } + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String name; + + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private CategoryRepository categoryRepository; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private HashOperations hashOperations; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private String KEY; + + public Category(CategoryRepository categoryRepository, HashOperations hashOperations, String KEY) { + this.categoryRepository = categoryRepository; + this.hashOperations = hashOperations; + this.KEY = KEY; + } + + public Category(CategoryRepository categoryRepository) { + this.categoryRepository = categoryRepository; + } + + + public Category save(Category category) throws IOException { + Category newCategory = categoryRepository.save(category); + updateRedisCategoriesList(newCategory); + return newCategory; + } + + public Category findByNameIgnoreCase(String name) { + return categoryRepository.findByNameIgnoreCase(name); + } + + public List findByNameContaining(String name) throws IOException { + ObjectMapper objectMapper = checkIfRedisIsEmpty(); + Object listCategories = hashOperations.get(KEY, "1"); + List categoriesFound = new ArrayList<>(); + List categories = Arrays.asList(objectMapper.readValue(listCategories.toString(), Category[].class)); + for (Category category : categories) { + if(category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { + categoriesFound.add(category); + } + } + return categoriesFound; + } + + private void updateRedisCategoriesList(Category newCategory) + throws IOException, JsonParseException, JsonMappingException, JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + String redisCategories = hashOperations.get(KEY, "1").toString(); + List categories = new ArrayList<>(Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); + categories.add(newCategory); + String categoriesUpdated = objectMapper.writeValueAsString(categories); + hashOperations.put(KEY, "1", categoriesUpdated); + } + + + private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { + ObjectMapper objectMapper = new ObjectMapper(); + if (hashOperations.size(KEY) == null || hashOperations.size(KEY) == 0) { + Iterable categories = categoryRepository.findAll(); + String json = objectMapper.writeValueAsString(categories); + hashOperations.put(KEY, "1", json); + } + + return objectMapper; + } + +} diff --git a/expense-management/pom.xml b/expense-management/pom.xml index 6279e351..da8dad46 100644 --- a/expense-management/pom.xml +++ b/expense-management/pom.xml @@ -1,108 +1,104 @@ - - 4.0.0 - br.com.camaroti.alex.rest.api - expense-management - 0.0.1-SNAPSHOT - expense-management - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.projectlombok - lombok - provided - - - - org.springframework.data - spring-data-redis - - - - redis.clients - jedis - jar - - - - mysql - mysql-connector-java - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - com.jayway.jsonpath - json-path - test - - - - org.springframework.boot - spring-boot-devtools - true - runtime - - - - - org.mockito - mockito-all - 1.10.19 - test - - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - 2.1.1.RELEASE - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - 2.1.1.RELEASE - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + 4.0.0 + br.com.camaroti.alex.rest.api + expense-management + 0.0.1-SNAPSHOT + expense-management + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + provided + + + + org.springframework.data + spring-data-redis + + + + redis.clients + jedis + jar + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.jayway.jsonpath + json-path + test + + + + org.springframework.boot + spring-boot-devtools + true + runtime + + + + org.mockito + mockito-all + 1.10.19 + test + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.1.1.RELEASE + + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.1.1.RELEASE + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java index 2c3d0dfd..65b814d1 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java @@ -1,54 +1,53 @@ -package br.com.camaroti.alex.rest.api.expense.configuration; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.data.redis.connection.RedisStandaloneConfiguration; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -@SpringBootApplication -@EnableAutoConfiguration -@EntityScan(basePackages = {"br.com.camaroti.alex.rest.api.expense.domain"}) -@ComponentScan(basePackages = {"br.com.camaroti.alex.rest.api.expense.client", "br.com.camaroti.alex.rest.api.expense.controller", "br.com.camaroti.alex.rest.api.expense.service"}) -@EnableJpaRepositories("br.com.camaroti.alex.rest.api.expense.repository") -@EnableRedisRepositories("br.com.camaroti.alex.rest.api.expense.service") -@EnableFeignClients(basePackages = {"br.com.camaroti.alex.rest.api.expense.client"}) -@EnableDiscoveryClient -public class Application { - - @Bean - JedisConnectionFactory jedisConnectionFactory() { - RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); - return new JedisConnectionFactory(config); - } - - @Bean - public RedisTemplate redisTemplate() { - final RedisTemplate template = new RedisTemplate(); - template.setConnectionFactory(jedisConnectionFactory()); - template.setKeySerializer(new StringRedisSerializer()); - template.setValueSerializer(new StringRedisSerializer()); - - // the following is not required - template.setHashValueSerializer(new StringRedisSerializer()); - //template.setHashKeySerializer(new StringRedisSerializer()); - template.afterPropertiesSet(); - return template; - - } - - - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} +package br.com.camaroti.alex.rest.api.expense.configuration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@SpringBootApplication +@EnableAutoConfiguration +@EntityScan(basePackages = { "br.com.camaroti.alex.rest.api.expense.domain" }) +@ComponentScan(basePackages = { "br.com.camaroti.alex.rest.api.expense.client", + "br.com.camaroti.alex.rest.api.expense.controller", "br.com.camaroti.alex.rest.api.expense.service" }) +@EnableJpaRepositories("br.com.camaroti.alex.rest.api.expense.repository") +@EnableRedisRepositories("br.com.camaroti.alex.rest.api.expense.service") +@EnableFeignClients(basePackages = { "br.com.camaroti.alex.rest.api.expense.client" }) +@EnableDiscoveryClient +public class Application { + + @Bean + JedisConnectionFactory jedisConnectionFactory() { + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + return new JedisConnectionFactory(config); + } + + @Bean + public RedisTemplate redisTemplate() { + final RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(jedisConnectionFactory()); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new StringRedisSerializer()); + + // the following is not required + template.setHashValueSerializer(new StringRedisSerializer()); + // template.setHashKeySerializer(new StringRedisSerializer()); + template.afterPropertiesSet(); + return template; + + } + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java index 96c57fe6..fa3f9ffa 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java @@ -1,64 +1,47 @@ -package br.com.camaroti.alex.rest.api.expense.controller; - -import java.util.Date; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import br.com.camaroti.alex.rest.api.expense.domain.Expense; -import br.com.camaroti.alex.rest.api.expense.helper.ExpenseHelper; -import br.com.camaroti.alex.rest.api.expense.service.ExpenseService; - -@RestController -public class ExpenseController { - - @Autowired - private ExpenseService expenseService; - - @PostMapping(path="/expenses") // Map ONLY POST Request - public @ResponseBody Expense addExpense(@RequestParam int codUser - , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) throws Exception { - // @ResponseBody means the returned String is the response, not a view name - // @RequestParam means it is a parameter from the GET or POST request - Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); - return expenseService.save(expense); - } - - @PutMapping(path="/expenses/{cod}") // Map ONLY PUT Request - public @ResponseBody Expense add(@PathVariable int cod, @RequestParam int codUser - , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) { - Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); - expense.setCod(cod); - return expenseService.update(expense); - } - - @RequestMapping(path="/expenses") - public @ResponseBody Iterable getAll() { - return expenseService.findAll(); - } - - @GetMapping(path="/expenses/{codUser}") - public @ResponseBody Iterable findByCodUserOrderByDateDesc(@PathVariable int codUser) { - return expenseService.findByCodUserOrderByDateDesc(codUser); - } - - @GetMapping(path="/expenses/{codUser}/{date}") - public @ResponseBody Iterable findByCodUserAndDateOrderByDateDesc(@PathVariable int codUser, - @PathVariable @DateTimeFormat(pattern="yyyy-MM-dd") Long date) { - Date start = new Date(date); - Date end = new Date(date + 86399999L); - System.out.println(start); - System.out.println(end); - return expenseService.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); - } - - -} +package br.com.camaroti.alex.rest.api.expense.controller; + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import br.com.camaroti.alex.rest.api.expense.domain.Expense; +import br.com.camaroti.alex.rest.api.expense.helper.ExpenseHelper; +import br.com.camaroti.alex.rest.api.expense.service.ExpenseService; + +@RestController +public class ExpenseController { + + @Autowired + private ExpenseService expenseService; + + @PostMapping(path="/expenses") + public @ResponseBody Expense addExpense(@RequestParam int codUser + , @RequestParam String description, @RequestParam double cost, @RequestParam(value = "category", required = false) String category) throws Exception { + Expense expense = ExpenseHelper.convertExpense(codUser, description, cost, category); + return expenseService.save(expense); + } + + @GetMapping(path="/expenses/{codUser}") + public @ResponseBody Iterable findByCodUserOrderByDateDesc(@PathVariable int codUser) { + return expenseService.findByCodUserOrderByDateDesc(codUser); + } + + @GetMapping(path="/expenses/{codUser}/{date}") + public @ResponseBody Iterable findByCodUserAndDateOrderByDateDesc(@PathVariable int codUser, + @PathVariable @DateTimeFormat(pattern="yyyy-MM-dd") Long date) { + Date start = new Date(date); + Date end = new Date(date + 86399999L); + System.out.println(start); + System.out.println(end); + return expenseService.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java index 0a6f0a11..1a86b71f 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java @@ -1,132 +1,111 @@ -package br.com.camaroti.alex.rest.api.expense.domain; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import java.util.Optional; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; - -import org.springframework.data.redis.core.RedisHash; - -import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; -import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -@Entity -@AllArgsConstructor -@RedisHash("expense") -public @Data class Expense implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public Expense() { - } - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private int cod; - private String description; - private double value; - private int codUser; - private Date date; - @ManyToOne(optional = true) - private Category category; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private ExpenseRepository expenseRepository; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private CategoryClient categoryClient; - - - public Expense(ExpenseRepository expenseRepository, CategoryClient categoryClient) { - this.expenseRepository = expenseRepository; - this.categoryClient = categoryClient; - } - - - public Expense save(Expense expense) throws Exception { - checkCategoryInformation(expense); - return expenseRepository.save(expense); - - } - - public Expense update(Expense expense) { - return expenseRepository.save(expense); - } - - public void remove(int id) { - expenseRepository.deleteById(id); - } - - public Optional findById(int id) { - return expenseRepository.findById(id); - } - - public Iterable findAll() { - return expenseRepository.findAll(); - } - - public List findByCodUserOrderByDateDesc(int codUser) { - return expenseRepository.findByCodUserOrderByDateDesc(codUser); - } - - public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { - return expenseRepository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); - } - - public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc( - String description) { - return expenseRepository - .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); - } - - private void checkCategoryInformation(Expense expense) throws Exception { - String category = expense.getCategory().getName(); - if (category != null && !category.isEmpty()) { - saveCategoryIfNotExists(category, expense); - } else { - // Category is null, define automatically a category by a similar description - setSameCategoryBySimilarExpenseDescription(expense); - } - } - - private void setSameCategoryBySimilarExpenseDescription(Expense expense) { - Expense similarExpense = expenseRepository - .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense.getDescription()); - if (similarExpense != null) { - expense.setCategory(similarExpense.getCategory()); - } else { - expense.setCategory(null); - } - } - - private void saveCategoryIfNotExists(String category, Expense expense) throws Exception { - Category categoryObj = categoryClient.findByNameIgnoreCase(category); - if (categoryObj != null) { - expense.setCategory(categoryObj); - } else { - // Category not found. Try to set category By similar Description - setSameCategoryBySimilarExpenseDescription(expense); - // If you dont find a similar description, just add a new Category - if (expense.getCategory() == null) { - Category newCategory = categoryClient.save(category); - expense.setCategory(newCategory); - } - } - } - -} +package br.com.camaroti.alex.rest.api.expense.domain; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Transient; + +import org.springframework.data.redis.core.RedisHash; + +import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; +import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Entity +@AllArgsConstructor +@RedisHash("expense") +public @Data class Expense implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public Expense() { + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int cod; + private String description; + private double value; + private int codUser; + private Date date; + @ManyToOne(optional = true) + private Category category; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private ExpenseRepository expenseRepository; + + @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + private CategoryClient categoryClient; + + + public Expense(ExpenseRepository expenseRepository, CategoryClient categoryClient) { + this.expenseRepository = expenseRepository; + this.categoryClient = categoryClient; + } + + + public Expense save(Expense expense) throws Exception { + checkCategoryInformation(expense); + return expenseRepository.save(expense); + } + + public List findByCodUserOrderByDateDesc(int codUser) { + return expenseRepository.findByCodUserOrderByDateDesc(codUser); + } + + public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { + return expenseRepository.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc( + String description) { + return expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); + } + + private void checkCategoryInformation(Expense expense) throws Exception { + String category = expense.getCategory().getName(); + if (category != null && !category.isEmpty()) { + saveCategoryIfNotExists(category, expense); + } else { + setSameCategoryBySimilarExpenseDescription(expense); + } + } + + private void setSameCategoryBySimilarExpenseDescription(Expense expense) { + Expense similarExpense = expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense.getDescription()); + if (similarExpense != null) { + expense.setCategory(similarExpense.getCategory()); + } else { + expense.setCategory(null); + } + } + + private void saveCategoryIfNotExists(String category, Expense expense) throws Exception { + Category categoryObj = categoryClient.findByNameIgnoreCase(category); + if (categoryObj != null) { + expense.setCategory(categoryObj); + } else { + setSameCategoryBySimilarExpenseDescription(expense); + if (expense.getCategory() == null) { + Category newCategory = categoryClient.save(category); + expense.setCategory(newCategory); + } + } + } + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java index 3c36ae0d..66db5ef5 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseService.java @@ -1,20 +1,14 @@ -package br.com.camaroti.alex.rest.api.expense.service; - -import java.util.Date; -import java.util.List; -import java.util.Optional; - -import br.com.camaroti.alex.rest.api.expense.domain.Expense; - -public interface ExpenseService { - - Expense save(Expense expense) throws Exception; - Expense update(Expense expense); - void remove(int id); - Optional findById(int id); - Iterable findAll(); - List findByCodUserOrderByDateDesc(int codUser); - List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); - Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description); - -} +package br.com.camaroti.alex.rest.api.expense.service; + +import java.util.Date; +import java.util.List; + +import br.com.camaroti.alex.rest.api.expense.domain.Expense; + +public interface ExpenseService { + + Expense save(Expense expense) throws Exception; + List findByCodUserOrderByDateDesc(int codUser); + List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end); + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java index 77c22f47..b89ca32b 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImpl.java @@ -1,65 +1,39 @@ -package br.com.camaroti.alex.rest.api.expense.service; - -import java.util.Date; -import java.util.List; -import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; -import br.com.camaroti.alex.rest.api.expense.domain.Expense; -import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; - -@Service -public class ExpenseServiceImpl implements ExpenseService{ - - @Autowired - private ExpenseRepository expenseRepository; - - @Autowired - private CategoryClient categoryClient; - - - @Override - public Expense save(Expense expense) throws Exception { - return new Expense(expenseRepository, categoryClient).save(expense); - } - - @Override - public Expense update(Expense expense) { - return new Expense(expenseRepository, categoryClient).update(expense); - } - - @Override - public void remove(int id) { - new Expense(expenseRepository, categoryClient).remove(id); - } - - @Override - public Optional findById(int id) { - return new Expense(expenseRepository, categoryClient).findById(id); - } - - @Override - public Iterable findAll() { - return new Expense(expenseRepository, categoryClient).findAll(); - } - - @Override - public List findByCodUserOrderByDateDesc(int codUser) { - return new Expense(expenseRepository, categoryClient).findByCodUserOrderByDateDesc(codUser); - } - - @Override - public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { - return new Expense(expenseRepository, categoryClient).findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); - } - - @Override - public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(String description) { - return new Expense(expenseRepository, categoryClient).findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(description); - } - - -} +package br.com.camaroti.alex.rest.api.expense.service; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; +import br.com.camaroti.alex.rest.api.expense.domain.Expense; +import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; + +@Service +public class ExpenseServiceImpl implements ExpenseService{ + + @Autowired + private ExpenseRepository expenseRepository; + + @Autowired + private CategoryClient categoryClient; + + + @Override + public Expense save(Expense expense) throws Exception { + return new Expense(expenseRepository, categoryClient).save(expense); + } + + @Override + public List findByCodUserOrderByDateDesc(int codUser) { + return new Expense(expenseRepository, categoryClient).findByCodUserOrderByDateDesc(codUser); + } + + @Override + public List findByCodUserAndDateBetweenOrderByDateDesc(int codUser, Date start, Date end) { + return new Expense(expenseRepository, categoryClient).findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); + } + + +} From 6ebab9414797c594ff3823d803719e82d615455f Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Tue, 16 Apr 2019 01:56:47 -0300 Subject: [PATCH 10/12] Doing some tests using junit and mockito. --- .../rest/api/category/domain/Category.java | 3 +- .../rest/api/expense/domain/Category.java | 49 ++++--- .../alex/rest/api/expense/domain/Expense.java | 20 ++- .../service/ExpenseServiceImplTest.java | 135 +++++++++++------- 4 files changed, 127 insertions(+), 80 deletions(-) diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java index 3f3a8228..65c91a1b 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java @@ -40,7 +40,8 @@ public Category() { } - public Category(String name) { + public Category(int cod, String name) { + this.cod = cod; this.name = name; } diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java index af25a3c1..d5c4658e 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java @@ -1,20 +1,29 @@ -package br.com.camaroti.alex.rest.api.expense.domain; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -import lombok.Data; - -@Entity -@Table(name = "category") -public @Data class Category { - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int cod; - private String name; - -} +package br.com.camaroti.alex.rest.api.expense.domain; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Entity +@Table(name = "category") +@AllArgsConstructor +public @Data class Category { + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private int cod; + private String name; + + public Category() { + super(); + } + + + + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java index 1a86b71f..3a9b4806 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java @@ -16,13 +16,11 @@ import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; import lombok.AccessLevel; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; import lombok.Setter; @Entity -@AllArgsConstructor @RedisHash("expense") public @Data class Expense implements Serializable { @@ -51,6 +49,7 @@ public Expense() { private CategoryClient categoryClient; + public Expense(ExpenseRepository expenseRepository, CategoryClient categoryClient) { this.expenseRepository = expenseRepository; this.categoryClient = categoryClient; @@ -77,9 +76,9 @@ public Expense findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrder } private void checkCategoryInformation(Expense expense) throws Exception { - String category = expense.getCategory().getName(); - if (category != null && !category.isEmpty()) { - saveCategoryIfNotExists(category, expense); + Category category = expense.getCategory(); + if (category != null && !category.getName().isEmpty()) { + saveCategoryIfNotExists(category.getName(), expense); } else { setSameCategoryBySimilarExpenseDescription(expense); } @@ -108,4 +107,15 @@ private void saveCategoryIfNotExists(String category, Expense expense) throws Ex } } + + public Expense(int cod, String description, double value, int codUser, Date date, Category category) { + super(); + this.cod = cod; + this.description = description; + this.value = value; + this.codUser = codUser; + this.date = date; + this.category = category; + } + } diff --git a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java index c7b600d9..69d49ab4 100644 --- a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java +++ b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java @@ -1,54 +1,81 @@ -package br.com.camaroti.alex.rest.api.expense.service; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.springframework.test.context.junit4.SpringRunner; - -import br.com.camaroti.alex.rest.api.expense.domain.Expense; -import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; -import br.com.camaroti.alex.rest.api.expense.service.ExpenseServiceImpl; - -@RunWith(SpringRunner.class) -public class ExpenseServiceImplTest { - - private List expenses; - - @InjectMocks - private ExpenseServiceImpl expenseService; - - @Mock - private ExpenseRepository expenseRepository; - - - @Before - public void setUp() { - - expenses = new ArrayList<>(); - for (int i = 0; i < 10000; i++) { - //int codUser = (i / 100) < 1 ? 1 : (i / 100) + 1; - //double random = ThreadLocalRandom.current().nextDouble(10.0, 100.0); - // expenses.add(new Expense(i, "Comida" + i, random, codUser, new Date())); - } - } - - - @Test - public void insertTenThousandExpense() throws IOException { - try { - for (Expense expense : expenses) { - expenseService.save(expense); - System.out.println(expense); - } - } catch (Exception e) { - } - } - - -} +package br.com.camaroti.alex.rest.api.expense.service; + +import static org.junit.Assert.assertEquals; + +import java.util.Date; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; + +import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; +import br.com.camaroti.alex.rest.api.expense.domain.Category; +import br.com.camaroti.alex.rest.api.expense.domain.Expense; +import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; + +@RunWith(SpringRunner.class) +public class ExpenseServiceImplTest { + + + @InjectMocks + private ExpenseServiceImpl expenseService; + + @Mock + private CategoryClient categoryClient; + + @Mock + private ExpenseRepository expenseRepository; + + + private Expense expense1, expense2, expense3, expense4; + private Category category1, category2, category3, category4; + + @Before + public void setUp() { + category1 = new Category(1, "Food"); + expense1 = new Expense(1, "Mc Lanche Feliz", 25.90, 1, new Date(), category1); + category2 = new Category(2, "Toys"); + expense2 = new Expense(2, "Mc Lanche Feliz", 15.0, 1, new Date(), null); + category3 = new Category(3, "Entertainment"); + expense3 = new Expense(3, "Cinema: Avengers: endgame", 35.0, 2, new Date(), category3); + category4 = new Category(4, "Entertainment"); + expense4 = new Expense(4, "Cinema: Shazam!", 35.0, 1, new Date(), category4); + + } + + + @Test + public void saveExpenseWithNewCategory() throws Exception { + Mockito.when(categoryClient.findByNameIgnoreCase(expense1.getCategory().getName())).thenReturn(null); + Mockito.when(expenseRepository.save(expense1)).thenReturn(expense1); + Mockito.when(categoryClient.save(expense1.getCategory().getName())).thenReturn(expense1.getCategory()); + Expense expenseSaved = expenseService.save(expense1); + assertEquals(expense1, expenseSaved); + Mockito.verify(categoryClient, Mockito.times(1)).save(expense1.getCategory().getName()); + } + + @Test + public void saveExpenseBySimilarDescription() throws Exception { + Mockito.when(expenseRepository + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense2.getDescription())).thenReturn(expense1); + Mockito.when(expenseRepository.save(expense2)).thenReturn(expense2); + Expense expenseSavedWithoutCategory = expenseService.save(expense2); + assertEquals(expense1.getCategory(), expenseSavedWithoutCategory.getCategory()); + } + + @Test + public void saveExpenseBySimilarCategoryDescription() throws Exception { + Mockito.when(categoryClient.findByNameIgnoreCase(expense4.getCategory().getName())).thenReturn(category3); + expenseService.save(expense4); + Mockito.verify(categoryClient, Mockito.times(1)).findByNameIgnoreCase(expense4.getCategory().getName()); + assertEquals(category3, expense4.getCategory()); + } + + + + +} From 4be3927791d0026b44edc0c168d74b63eab22903 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Mon, 22 Apr 2019 03:06:20 -0300 Subject: [PATCH 11/12] Removing comments, adding test data builder classes, implementing on test cases. --- .../category/configuration/Application.java | 3 - .../rest/api/category/domain/Category.java | 60 +++++----- .../category/service/CategoryServiceImpl.java | 109 +++++++++--------- .../expense/configuration/Application.java | 3 - .../expense/controller/ExpenseController.java | 2 - .../rest/api/expense/domain/Category.java | 6 - .../alex/rest/api/expense/domain/Expense.java | 11 -- .../api/expense/builder/CategoryBuilder.java | 34 ++++++ .../api/expense/builder/ExpenseBuilder.java | 70 +++++++++++ .../service/ExpenseServiceImplTest.java | 46 ++++---- 10 files changed, 209 insertions(+), 135 deletions(-) create mode 100644 expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/CategoryBuilder.java create mode 100644 expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/ExpenseBuilder.java diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java index 897b4359..88aad49f 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/configuration/Application.java @@ -36,10 +36,7 @@ public RedisTemplate redisTemplate() { template.setConnectionFactory(jedisConnectionFactory()); template.setKeySerializer(new StringRedisSerializer()); template.setValueSerializer(new StringRedisSerializer()); - - // the following is not required template.setHashValueSerializer(new StringRedisSerializer()); - // template.setHashKeySerializer(new StringRedisSerializer()); template.afterPropertiesSet(); return template; diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java index 65c91a1b..c61bb6cf 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/domain/Category.java @@ -30,80 +30,76 @@ @Entity @Table(name = "category") @RedisHash("category") -public @Data class Category implements Serializable{ - +public @Data class Category implements Serializable { + + private final String KEY = "category"; + /** * */ private static final long serialVersionUID = 1L; + public Category() { - - } - - public Category(int cod, String name) { - this.cod = cod; - this.name = name; + } @Id - @GeneratedValue(strategy=GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.AUTO) private int cod; private String name; - - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + + @Transient + @Getter(value = AccessLevel.NONE) + @Setter(value = AccessLevel.NONE) private CategoryRepository categoryRepository; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) + + @Transient + @Getter(value = AccessLevel.NONE) + @Setter(value = AccessLevel.NONE) private HashOperations hashOperations; - - @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) - private String KEY; - - public Category(CategoryRepository categoryRepository, HashOperations hashOperations, String KEY) { + + public Category(CategoryRepository categoryRepository, HashOperations hashOperations) { this.categoryRepository = categoryRepository; this.hashOperations = hashOperations; - this.KEY = KEY; } - + public Category(CategoryRepository categoryRepository) { this.categoryRepository = categoryRepository; } - - + public Category save(Category category) throws IOException { Category newCategory = categoryRepository.save(category); updateRedisCategoriesList(newCategory); return newCategory; } - + public Category findByNameIgnoreCase(String name) { return categoryRepository.findByNameIgnoreCase(name); } - + public List findByNameContaining(String name) throws IOException { ObjectMapper objectMapper = checkIfRedisIsEmpty(); Object listCategories = hashOperations.get(KEY, "1"); List categoriesFound = new ArrayList<>(); List categories = Arrays.asList(objectMapper.readValue(listCategories.toString(), Category[].class)); for (Category category : categories) { - if(category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { + if (category.getName().trim().toLowerCase().contains(name.trim().toLowerCase())) { categoriesFound.add(category); } } return categoriesFound; } - + private void updateRedisCategoriesList(Category newCategory) throws IOException, JsonParseException, JsonMappingException, JsonProcessingException { ObjectMapper objectMapper = new ObjectMapper(); String redisCategories = hashOperations.get(KEY, "1").toString(); - List categories = new ArrayList<>(Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); + List categories = new ArrayList<>( + Arrays.asList(objectMapper.readValue(redisCategories, Category[].class))); categories.add(newCategory); - String categoriesUpdated = objectMapper.writeValueAsString(categories); + String categoriesUpdated = objectMapper.writeValueAsString(categories); hashOperations.put(KEY, "1", categoriesUpdated); } - private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { ObjectMapper objectMapper = new ObjectMapper(); @@ -112,8 +108,8 @@ private ObjectMapper checkIfRedisIsEmpty() throws JsonProcessingException { String json = objectMapper.writeValueAsString(categories); hashOperations.put(KEY, "1", json); } - + return objectMapper; } - + } diff --git a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java index ad97a57a..ec46a6d6 100644 --- a/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java +++ b/category-management/src/main/java/br/com/camaroti/alex/rest/api/category/service/CategoryServiceImpl.java @@ -1,55 +1,54 @@ -package br.com.camaroti.alex.rest.api.category.service; - -import java.io.IOException; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import br.com.camaroti.alex.rest.api.category.domain.Category; -import br.com.camaroti.alex.rest.api.category.repository.CategoryRepository; - -@Service -public class CategoryServiceImpl implements CategoryService { - - private static final String KEY = "category"; - - @Autowired - private RedisTemplate redisTemplate; - @Resource(name = "redisTemplate") - private HashOperations hashOperations; - - @PostConstruct - private void init() { - hashOperations = redisTemplate.opsForHash(); - } - - @Autowired - private CategoryRepository categoryRepository; - - @Override - public List findByNameContaining(String name) throws IOException { - return new Category(categoryRepository, hashOperations, KEY).findByNameContaining(name); - } - - - @Override - public Category save(Category category) throws IOException { - return new Category(categoryRepository, hashOperations, KEY).save(category); - } - - - @Override - public Category findByNameIgnoreCase(String name) { - return new Category(categoryRepository).findByNameIgnoreCase(name); - } - - - - -} +package br.com.camaroti.alex.rest.api.category.service; + +import java.io.IOException; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import br.com.camaroti.alex.rest.api.category.domain.Category; +import br.com.camaroti.alex.rest.api.category.repository.CategoryRepository; + +@Service +public class CategoryServiceImpl implements CategoryService { + + + @Autowired + private RedisTemplate redisTemplate; + @Resource(name = "redisTemplate") + private HashOperations hashOperations; + + @PostConstruct + private void init() { + hashOperations = redisTemplate.opsForHash(); + } + + @Autowired + private CategoryRepository categoryRepository; + + @Override + public List findByNameContaining(String name) throws IOException { + return new Category(categoryRepository, hashOperations).findByNameContaining(name); + } + + + @Override + public Category save(Category category) throws IOException { + return new Category(categoryRepository, hashOperations).save(category); + } + + + @Override + public Category findByNameIgnoreCase(String name) { + return new Category(categoryRepository).findByNameIgnoreCase(name); + } + + + + +} diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java index 65b814d1..0a3ac14e 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/configuration/Application.java @@ -38,10 +38,7 @@ public RedisTemplate redisTemplate() { template.setConnectionFactory(jedisConnectionFactory()); template.setKeySerializer(new StringRedisSerializer()); template.setValueSerializer(new StringRedisSerializer()); - - // the following is not required template.setHashValueSerializer(new StringRedisSerializer()); - // template.setHashKeySerializer(new StringRedisSerializer()); template.afterPropertiesSet(); return template; diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java index fa3f9ffa..ee828b2d 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/controller/ExpenseController.java @@ -38,8 +38,6 @@ public class ExpenseController { @PathVariable @DateTimeFormat(pattern="yyyy-MM-dd") Long date) { Date start = new Date(date); Date end = new Date(date + 86399999L); - System.out.println(start); - System.out.println(end); return expenseService.findByCodUserAndDateBetweenOrderByDateDesc(codUser, start, end); } diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java index d5c4658e..cf3f8e42 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java @@ -1,17 +1,11 @@ package br.com.camaroti.alex.rest.api.expense.domain; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.Table; -import lombok.AllArgsConstructor; import lombok.Data; -@Entity -@Table(name = "category") -@AllArgsConstructor public @Data class Category { @Id diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java index 3a9b4806..88aeebda 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java @@ -107,15 +107,4 @@ private void saveCategoryIfNotExists(String category, Expense expense) throws Ex } } - - public Expense(int cod, String description, double value, int codUser, Date date, Category category) { - super(); - this.cod = cod; - this.description = description; - this.value = value; - this.codUser = codUser; - this.date = date; - this.category = category; - } - } diff --git a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/CategoryBuilder.java b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/CategoryBuilder.java new file mode 100644 index 00000000..3fbf73f0 --- /dev/null +++ b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/CategoryBuilder.java @@ -0,0 +1,34 @@ +package br.com.camaroti.alex.rest.api.expense.builder; + +import br.com.camaroti.alex.rest.api.expense.domain.Category; + +public class CategoryBuilder { + + public static final int DEFAULT_COD = 1; + public static final String DEFAULT_NAME = "Category Name"; + + private int cod = DEFAULT_COD; + private String name = DEFAULT_NAME; + + public static CategoryBuilder aCategory() { + return new CategoryBuilder(); + } + + public CategoryBuilder withCod(int cod) { + this.cod = cod; + return this; + } + + public CategoryBuilder withName(String name) { + this.name = name; + return this; + } + + public Category build() { + Category c = new Category(); + c.setCod(cod); + c.setName(name); + return c; + } + +} diff --git a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/ExpenseBuilder.java b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/ExpenseBuilder.java new file mode 100644 index 00000000..00adbf32 --- /dev/null +++ b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/builder/ExpenseBuilder.java @@ -0,0 +1,70 @@ +package br.com.camaroti.alex.rest.api.expense.builder; + +import java.util.Date; + +import br.com.camaroti.alex.rest.api.expense.domain.Category; +import br.com.camaroti.alex.rest.api.expense.domain.Expense; + +public class ExpenseBuilder { + + public static final int DEFAULT_COD = 1; + public static final int DEFAULT_CODUSER = 1; + public static final Date DEFAULT_DATE = new Date(); + public static final String DEFAULT_DESCRIPTION = "Expense Description Test"; + public static final double DEFAULT_VALUE = 20.5; + public static final Category DEFAULT_CATEGORY = CategoryBuilder.aCategory().build(); + + private int cod = DEFAULT_COD; + private int codUser = DEFAULT_CODUSER; + private Date date = DEFAULT_DATE; + private String description = DEFAULT_DESCRIPTION; + private double value = DEFAULT_VALUE; + private Category category = DEFAULT_CATEGORY; + + public static ExpenseBuilder anExpense() { + return new ExpenseBuilder(); + } + + public ExpenseBuilder withCod(int cod) { + this.cod = cod; + return this; + } + + public ExpenseBuilder withCodUser(int codUser) { + this.codUser = codUser; + return this; + } + + public ExpenseBuilder withDescription(String description) { + this.description = description; + return this; + } + + public ExpenseBuilder withValue(double value) { + this.value = value; + return this; + } + + public ExpenseBuilder withCategory(Category category) { + this.category = category; + return this; + } + + public ExpenseBuilder withoutCategory() { + this.category = null; + return this; + } + + public Expense build() { + Expense e = new Expense(); + e.setCod(cod); + e.setCodUser(codUser); + e.setDate(date); + e.setDescription(description); + e.setValue(value); + e.setCategory(category); + return e; + } + + +} diff --git a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java index 69d49ab4..61f38852 100644 --- a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java +++ b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java @@ -12,6 +12,8 @@ import org.mockito.Mockito; import org.springframework.test.context.junit4.SpringRunner; +import br.com.camaroti.alex.rest.api.expense.builder.CategoryBuilder; +import br.com.camaroti.alex.rest.api.expense.builder.ExpenseBuilder; import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; import br.com.camaroti.alex.rest.api.expense.domain.Category; import br.com.camaroti.alex.rest.api.expense.domain.Expense; @@ -19,34 +21,34 @@ @RunWith(SpringRunner.class) public class ExpenseServiceImplTest { - @InjectMocks private ExpenseServiceImpl expenseService; - + @Mock private CategoryClient categoryClient; @Mock private ExpenseRepository expenseRepository; - - - private Expense expense1, expense2, expense3, expense4; - private Category category1, category2, category3, category4; - + + private Expense expense1, expense2, expense4; + private Category category3; + @Before public void setUp() { - category1 = new Category(1, "Food"); - expense1 = new Expense(1, "Mc Lanche Feliz", 25.90, 1, new Date(), category1); - category2 = new Category(2, "Toys"); - expense2 = new Expense(2, "Mc Lanche Feliz", 15.0, 1, new Date(), null); - category3 = new Category(3, "Entertainment"); - expense3 = new Expense(3, "Cinema: Avengers: endgame", 35.0, 2, new Date(), category3); - category4 = new Category(4, "Entertainment"); - expense4 = new Expense(4, "Cinema: Shazam!", 35.0, 1, new Date(), category4); - + expense1 = ExpenseBuilder.anExpense() + .withDescription("Mc Lanche Feliz") + .withValue(25.90) + .withCategory( + CategoryBuilder.aCategory() + .withName("Food").build()) + .build(); + expense2 = ExpenseBuilder.anExpense().withoutCategory().build(); + category3 = CategoryBuilder.aCategory().withCod(2).withName("Entertainment").build(); + expense4 = ExpenseBuilder.anExpense().withCod(4).withDescription("Cinema: Shazam!").withValue(35.0).withCategory( + CategoryBuilder.aCategory().withCod(3).withName("Entertainment").build()).build(); + } - @Test public void saveExpenseWithNewCategory() throws Exception { @@ -57,16 +59,17 @@ public void saveExpenseWithNewCategory() throws Exception { assertEquals(expense1, expenseSaved); Mockito.verify(categoryClient, Mockito.times(1)).save(expense1.getCategory().getName()); } - + @Test public void saveExpenseBySimilarDescription() throws Exception { Mockito.when(expenseRepository - .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense2.getDescription())).thenReturn(expense1); + .findFirstByDescriptionContainingIgnoreCaseAndCategoryNotNullOrderByDateDesc(expense2.getDescription())) + .thenReturn(expense1); Mockito.when(expenseRepository.save(expense2)).thenReturn(expense2); Expense expenseSavedWithoutCategory = expenseService.save(expense2); assertEquals(expense1.getCategory(), expenseSavedWithoutCategory.getCategory()); } - + @Test public void saveExpenseBySimilarCategoryDescription() throws Exception { Mockito.when(categoryClient.findByNameIgnoreCase(expense4.getCategory().getName())).thenReturn(category3); @@ -74,8 +77,5 @@ public void saveExpenseBySimilarCategoryDescription() throws Exception { Mockito.verify(categoryClient, Mockito.times(1)).findByNameIgnoreCase(expense4.getCategory().getName()); assertEquals(category3, expense4.getCategory()); } - - - } From f248206f0143a85be12f33dd2e4878c30da67e23 Mon Sep 17 00:00:00 2001 From: Alex Camaroti Date: Thu, 25 Apr 2019 23:31:26 -0300 Subject: [PATCH 12/12] Fine adjustments --- .../api/expense/client/CategoryClient.java | 38 +++++++++---------- .../rest/api/expense/domain/Category.java | 22 +++-------- .../alex/rest/api/expense/domain/Expense.java | 14 ++----- .../service/ExpenseServiceImplTest.java | 8 +--- 4 files changed, 29 insertions(+), 53 deletions(-) diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java index 681495ef..0ac62301 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/client/CategoryClient.java @@ -1,20 +1,20 @@ -package br.com.camaroti.alex.rest.api.expense.client; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import br.com.camaroti.alex.rest.api.expense.domain.Category; - -@FeignClient("category-management") -public interface CategoryClient { - - @PostMapping(path="/categories") - public @ResponseBody Category save(@RequestParam(value="name") String name) throws Exception; - - @GetMapping(path="/category/{name}") - public @ResponseBody Category findByNameIgnoreCase(@PathVariable(value="name", required = true) String name)throws Exception; - +package br.com.camaroti.alex.rest.api.expense.client; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import br.com.camaroti.alex.rest.api.expense.domain.Category; + +@FeignClient("category-management") +public interface CategoryClient { + + @PostMapping(path="/categories") + @ResponseBody Category save(@RequestParam(value="name") String name) throws Exception; + + @GetMapping(path="/category/{name}") + @ResponseBody Category findByNameIgnoreCase(@PathVariable(value="name", required = true) String name)throws Exception; + } \ No newline at end of file diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java index cf3f8e42..7e2594fb 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Category.java @@ -1,23 +1,11 @@ package br.com.camaroti.alex.rest.api.expense.domain; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import lombok.Getter; +import lombok.Setter; -import lombok.Data; - -public @Data class Category { - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) +@Getter @Setter +public class Category { + private int cod; private String name; - - public Category() { - super(); - } - - - - } diff --git a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java index 88aeebda..2cbbf56c 100644 --- a/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java +++ b/expense-management/src/main/java/br/com/camaroti/alex/rest/api/expense/domain/Expense.java @@ -16,22 +16,17 @@ import br.com.camaroti.alex.rest.api.expense.client.CategoryClient; import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; import lombok.AccessLevel; -import lombok.Data; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Entity @RedisHash("expense") -public @Data class Expense implements Serializable { +@Getter @Setter @NoArgsConstructor +public class Expense implements Serializable { - /** - * - */ private static final long serialVersionUID = 1L; - public Expense() { - } - @Id @GeneratedValue(strategy = GenerationType.AUTO) private int cod; @@ -48,14 +43,11 @@ public Expense() { @Transient @Getter(value = AccessLevel.NONE) @Setter(value = AccessLevel.NONE) private CategoryClient categoryClient; - - public Expense(ExpenseRepository expenseRepository, CategoryClient categoryClient) { this.expenseRepository = expenseRepository; this.categoryClient = categoryClient; } - public Expense save(Expense expense) throws Exception { checkCategoryInformation(expense); return expenseRepository.save(expense); diff --git a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java index 61f38852..a4661391 100644 --- a/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java +++ b/expense-management/src/test/java/br/com/camaroti/alex/rest/api/expense/service/ExpenseServiceImplTest.java @@ -2,15 +2,13 @@ import static org.junit.Assert.assertEquals; -import java.util.Date; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.springframework.test.context.junit4.SpringRunner; +import org.mockito.junit.MockitoJUnitRunner; import br.com.camaroti.alex.rest.api.expense.builder.CategoryBuilder; import br.com.camaroti.alex.rest.api.expense.builder.ExpenseBuilder; @@ -19,7 +17,7 @@ import br.com.camaroti.alex.rest.api.expense.domain.Expense; import br.com.camaroti.alex.rest.api.expense.repository.ExpenseRepository; -@RunWith(SpringRunner.class) +@RunWith(MockitoJUnitRunner.class) public class ExpenseServiceImplTest { @InjectMocks @@ -47,7 +45,6 @@ public void setUp() { category3 = CategoryBuilder.aCategory().withCod(2).withName("Entertainment").build(); expense4 = ExpenseBuilder.anExpense().withCod(4).withDescription("Cinema: Shazam!").withValue(35.0).withCategory( CategoryBuilder.aCategory().withCod(3).withName("Entertainment").build()).build(); - } @Test @@ -77,5 +74,4 @@ public void saveExpenseBySimilarCategoryDescription() throws Exception { Mockito.verify(categoryClient, Mockito.times(1)).findByNameIgnoreCase(expense4.getCategory().getName()); assertEquals(category3, expense4.getCategory()); } - }