Correção de erros e estabilização da aplicação. Ajustes para usar comando encadeado no Dockerfile e subir o serviço do solr e do java ao mesmo tempo

Author: jonatassantoszup

testeSantanderWay/Dockerfile

@@ -3,11 +3,13 @@ LABEL maintainer="[email protected]"
 VOLUME /tmp
 COPY target/app-1.0.0.jar /app.jar
 COPY target/classes/solr-cores /solr-cores
+COPY target/classes/docker-entrypoint.sh /docker-entrypoint.sh
 RUN apk --update add zip
 RUN apk --update add bash
 RUN wget https://archive.apache.org/dist/lucene/solr/8.1.1/solr-8.1.1.zip
 RUN unzip solr-8.1.1.zip
 RUN cp -R ./solr-cores/* solr-8.1.1/server/solr/
-RUN bash /solr-8.1.1/bin/solr start -p 8983 -force
-EXPOSE 8080 8983
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+EXPOSE 8080
+EXPOSE 8983
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.jar"]
+CMD ["; nohup ./solr-8.1.1/bin/solr start -force &>/dev/null &"]

testeSantanderWay/src/main/java/br/com/testesantanderway/config/security/ConfigSeguranca.java

@@ -48,8 +48,8 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers(HttpMethod.POST, "/auth/**").permitAll()
-                .antMatchers("/user/**").hasAnyAuthority("USUARIO")
-                .antMatchers("/sistema/**").hasAnyAuthority("SISTEMA")
+                .antMatchers("**/user/**").hasAnyAuthority("USUARIO")
+                .antMatchers("**/sistema/**").hasAnyAuthority("SISTEMA")
                 .antMatchers(
                         "/v2/api-docs", "/swagger-resources/**", "/swagger-ui.html", "/webjars/**",
                         "/swagger.json")

testeSantanderWay/src/main/java/br/com/testesantanderway/config/security/ServicoDeToken.java

@@ -6,7 +6,6 @@
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.actuate.trace.http.HttpTrace;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 

testeSantanderWay/src/main/java/br/com/testesantanderway/controller/AuthController.java

@@ -37,7 +37,7 @@ public ResponseEntity<TokenDTO> sistemaLogin(@RequestBody AuthForm form) {
 
     @PostMapping
     public ResponseEntity<TokenDTO> login(@RequestBody AuthForm form) {
-        UsernamePasswordAuthenticationToken dadosLogin = form.ciarAutenticacaoUsuario();
+        UsernamePasswordAuthenticationToken dadosLogin = form.criarAutenticacaoUsuario();
         try {
             Authentication authentication = authManager.authenticate(dadosLogin);
             String token = servicoDeToken.gerarToken(authentication, "USUARIO");

testeSantanderWay/src/main/java/br/com/testesantanderway/controller/GastoController.java

@@ -16,7 +16,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @RestController
@@ -51,7 +52,8 @@ public Page<GastoDTO> filtro(HttpServletRequest request,
                                  @PathVariable String dataCriacao,
                                  @PageableDefault(sort = "dataCriacao", direction = Sort.Direction.DESC) Pageable paginacao) {
         String codigoUsuario = servicoDeToken.getCodigo(AutenticacaoViaTokenFilter.recuperarToken(request));
-        return GastoDTO.converter(gastoService.encontrarGastosDoDia(codigoUsuario, LocalDate.parse(dataCriacao), paginacao));
+        return GastoDTO.converter(gastoService.encontrarGastosDoDia(codigoUsuario,
+                LocalDateTime.parse(dataCriacao, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")), paginacao));
     }
 
     //TODO permitir apenas USUARIO categorizar gasto

testeSantanderWay/src/main/java/br/com/testesantanderway/controller/form/AuthForm.java

@@ -24,7 +24,7 @@ public void setSenha(String senha) {
         this.senha = senha;
     }
 
-    public UsernamePasswordAuthenticationToken ciarAutenticacaoUsuario() {
+    public UsernamePasswordAuthenticationToken criarAutenticacaoUsuario() {
         return new UsernamePasswordAuthenticationToken(email, senha, Arrays.asList(() -> "USUARIO"));
     }
 

testeSantanderWay/src/main/java/br/com/testesantanderway/repository/GastoRepository.java

@@ -6,15 +6,14 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.solr.repository.SolrCrudRepository;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
 public interface GastoRepository extends SolrCrudRepository<Gasto, String>{
-        List<Gasto> findByCodigoUsuarioAndDataCriacaoAfter(String codigoUsuario, Date dataCriacao);
+        List<Gasto> findByCodigoUsuarioAndDataCriacaoAfter(String codigoUsuario, String dataCriacao);
 
         @Cacheable("gastoUsuario")
-        Page<Gasto> findByCodigoUsuarioAndDataCriacaoBetween(String codigoUsuario, Date inicio, Date fim, Pageable paginacao);
+        Page<Gasto> findByCodigoUsuarioAndDataCriacaoBetween(String codigoUsuario, String inicio, String fim, Pageable paginacao);
 
         @Cacheable("categoria")
         Optional<String> findCategoriaByDescricao(String descricao);

testeSantanderWay/src/main/java/br/com/testesantanderway/service/GastoService.java

@@ -7,8 +7,10 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.sql.Date;
-import java.time.*;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
 
@@ -25,30 +27,31 @@ public void lancar(Gasto gasto) {
 
     public List<Gasto> listarGastosMaisRecentes(String codigoUsuario) {
         ZonedDateTime ultimosCincoSegundos = ZonedDateTime.now().minusSeconds(5);
-        return gastoRepository.findByCodigoUsuarioAndDataCriacaoAfter(codigoUsuario, Date.from(ultimosCincoSegundos.toInstant()));
+        return gastoRepository.findByCodigoUsuarioAndDataCriacaoAfter(codigoUsuario, ultimosCincoSegundos.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")));
     }
 
-    public Page<Gasto> encontrarGastosDoDia(String codigoUsuario, LocalDate dia, Pageable paginacao){
-        ZonedDateTime inicio = dia.atStartOfDay(ZoneOffset.UTC).plusSeconds(1);
-        ZonedDateTime fim = dia.plusDays(1).atStartOfDay(ZoneOffset.UTC).minusSeconds(1);
-        return gastoRepository.findByCodigoUsuarioAndDataCriacaoBetween(codigoUsuario, Date.from(inicio.toInstant()), Date.from(fim.toInstant()), paginacao);
+    public Page<Gasto> encontrarGastosDoDia(String codigoUsuario, LocalDateTime dia, Pageable paginacao) {
+        ZonedDateTime inicio = dia.toLocalDate().atStartOfDay(ZoneOffset.UTC).plusSeconds(1);
+        ZonedDateTime fim = dia.toLocalDate().plusDays(1).atStartOfDay(ZoneOffset.UTC).minusSeconds(1);
+        return gastoRepository.findByCodigoUsuarioAndDataCriacaoBetween(codigoUsuario, inicio.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")),
+                fim.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")), paginacao);
     }
 
     public void categorizarGasto(Gasto gasto) {
         Optional<Gasto> categoriaASerAlterada = gastoRepository.findById(gasto.getCodigoUsuario());
-        if(!categoriaASerAlterada.isPresent() || categoriaASerAlterada.get().getCategoria() != null){
+        if (!categoriaASerAlterada.isPresent() || categoriaASerAlterada.get().getCategoria() != null) {
             throw new IllegalArgumentException("Operação não permitida");
         }
         categoriaASerAlterada.get().setCategoria(gasto.getCategoria());
         gastoRepository.save(categoriaASerAlterada.get());
     }
 
-    private void integrarCategoria(Gasto gasto){
-        if(gasto.getCategoria() == null){
+    private void integrarCategoria(Gasto gasto) {
+        if (gasto.getCategoria() == null) {
             Optional<String> categoria = gastoRepository.findCategoriaByDescricao(gasto.getDescricao());
-            if(categoria.isPresent()){
+            if (categoria.isPresent()) {
                 gasto.setCategoria(categoria.get());
             }
         }
     }
-}
+}

testeSantanderWay/src/main/resources/docker-entrypoint.sh

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Solr managed schema - automatically generated - DO NOT EDIT -->
 <schema name="default-config" version="1.6">
-  <uniqueKey>codigo</uniqueKey>
-  <fieldType name="_nest_path_" class="solr.NestPathField" maxCharsForDocValues="-1" omitNorms="true" omitTermFreqAndPositions="true" stored="false"/>
+  <uniqueKey>id</uniqueKey>
+  <fieldType name="_nest_path_" class="solr.NestPathField" omitTermFreqAndPositions="true" omitNorms="true" maxCharsForDocValues="-1" stored="false"/>
   <fieldType name="ancestor_path" class="solr.TextField">
     <analyzer type="index">
       <tokenizer class="solr.KeywordTokenizerFactory"/>
@@ -442,13 +442,12 @@
   <field name="_root_" type="string" docValues="false" indexed="true" stored="false"/>
   <field name="_text_" type="text_general" multiValued="true" indexed="true" stored="false"/>
   <field name="_version_" type="plong" indexed="false" stored="false"/>
-  <field name="categoria" type="text_general"/>
-  <field name="codigo" type="string"/>
-  <field name="codigoSistema" type="string"/>
-  <field name="codigoUsuario" type="string"/>
+  <field name="codigo" type="text_general"/>
   <field name="dataCriacao" type="pdates"/>
-  <field name="descricao" type="text_general"/>
-  <field name="valor" type="pdoubles"/>
+  <field name="email" type="text_general"/>
+  <field name="id" type="string" multiValued="false" indexed="true" required="true" stored="true"/>
+  <field name="nome" type="text_general"/>
+  <field name="senha" type="text_general"/>
   <dynamicField name="*_txt_en_split_tight" type="text_en_splitting_tight" indexed="true" stored="true"/>
   <dynamicField name="*_descendent_path" type="descendent_path" indexed="true" stored="true"/>
   <dynamicField name="*_ancestor_path" type="ancestor_path" indexed="true" stored="true"/>
@@ -517,6 +516,8 @@
   <dynamicField name="*_f" type="pfloat" indexed="true" stored="true"/>
   <dynamicField name="*_d" type="pdouble" indexed="true" stored="true"/>
   <dynamicField name="*_p" type="location" indexed="true" stored="true"/>
-  <copyField source="descricao" dest="descricao_str" maxChars="256"/>
-  <copyField source="categoria" dest="categoria_str" maxChars="256"/>
+  <copyField source="senha" dest="senha_str" maxChars="256"/>
+  <copyField source="codigo" dest="codigo_str" maxChars="256"/>
+  <copyField source="nome" dest="nome_str" maxChars="256"/>
+  <copyField source="email" dest="email_str" maxChars="256"/>
 </schema>