소스 검색

deleted unused codes

EduLascala 1 개월 전
부모
커밋
9e0fa8fce8
35개의 변경된 파일23개의 추가작업 그리고 961개의 파일을 삭제
  1. 3 9
      routes.md
  2. 0 5
      src/main/java/com/platform2easy/genesis/domain/enums/TipoCommodity.java
  3. 0 5
      src/main/java/com/platform2easy/genesis/domain/enums/UserRole.java
  4. 0 68
      src/main/java/com/platform2easy/genesis/domain/mock/DatabaseFake.java
  5. 0 73
      src/main/java/com/platform2easy/genesis/domain/model/User2Easy.java
  6. 0 36
      src/main/java/com/platform2easy/genesis/domain/model/cerc/AgenteCpr.java
  7. 0 37
      src/main/java/com/platform2easy/genesis/domain/model/cerc/Area.java
  8. 0 35
      src/main/java/com/platform2easy/genesis/domain/model/cerc/AreaProduto.java
  9. 0 46
      src/main/java/com/platform2easy/genesis/domain/model/cerc/ContratoValorCpr.java
  10. 0 25
      src/main/java/com/platform2easy/genesis/domain/model/cerc/Credor.java
  11. 0 29
      src/main/java/com/platform2easy/genesis/domain/model/cerc/Devedor.java
  12. 0 32
      src/main/java/com/platform2easy/genesis/domain/model/cerc/EmissaoCpr.java
  13. 0 25
      src/main/java/com/platform2easy/genesis/domain/model/cerc/Garantia.java
  14. 0 30
      src/main/java/com/platform2easy/genesis/domain/model/cerc/Garantidor.java
  15. 0 30
      src/main/java/com/platform2easy/genesis/domain/model/cerc/ParcelaCpr.java
  16. 0 45
      src/main/java/com/platform2easy/genesis/domain/model/cerc/Produto.java
  17. 0 46
      src/main/java/com/platform2easy/genesis/domain/model/cerc/ProdutoArea.java
  18. 0 45
      src/main/java/com/platform2easy/genesis/domain/model/cerc/SolicitacaoRegistroCpr.java
  19. 0 5
      src/main/java/com/platform2easy/genesis/domain/model/cerc/StatusSolicitacaoRegistroCpr.java
  20. 0 5
      src/main/java/com/platform2easy/genesis/domain/model/cerc/TipoCpr.java
  21. 2 4
      src/main/java/com/platform2easy/genesis/domain/repository/UserRepository.java
  22. 0 7
      src/main/java/com/platform2easy/genesis/domain/repository/cerc/ContratoValorCprRepository.java
  23. 0 7
      src/main/java/com/platform2easy/genesis/domain/repository/cerc/EmissaoCprRepository.java
  24. 0 7
      src/main/java/com/platform2easy/genesis/domain/repository/cerc/SolicitacaoRegistroCprRepository.java
  25. 12 6
      src/main/java/com/platform2easy/genesis/domain/service/UserService.java
  26. 0 34
      src/main/java/com/platform2easy/genesis/domain/service/cerc/ContratoValorCprService.java
  27. 0 33
      src/main/java/com/platform2easy/genesis/domain/service/cerc/EmissaoCprService.java
  28. 0 37
      src/main/java/com/platform2easy/genesis/domain/service/cerc/SolicitacaoRegistroCprService.java
  29. 2 8
      src/main/java/com/platform2easy/genesis/security/config/SecurityConfiguration.java
  30. 2 3
      src/main/java/com/platform2easy/genesis/security/service/TokenService.java
  31. 1 2
      src/main/java/com/platform2easy/genesis/web/api/AuthenticationController.java
  32. 0 56
      src/main/java/com/platform2easy/genesis/web/controller/cerc/ContratoValorCprController.java
  33. 0 59
      src/main/java/com/platform2easy/genesis/web/controller/cerc/EmissaoCprController.java
  34. 0 66
      src/main/java/com/platform2easy/genesis/web/controller/cerc/SolicitacaoRegistroCprController.java
  35. 1 1
      src/main/resources/db/migration/postgresql/V1__init.sql

+ 3 - 9
routes.md

@@ -82,13 +82,8 @@ POST {{baseUrl}}/auth/register/default
   - Body — entity `Commoditiy` (`domain/model/Commoditiy.java`):
 ```json
 {
-  "tipoCommodity": "SACA_GRAOS",
-  "descricao": "Soja",
-  "quantidade": 100,
-  "preco": 125.50,
-  "vencimentoPagamento": "2025-12-31",
-  "dataLimiteEntrega": "2026-01-15",
-  "cedulaProdutoRural": "CPR-123456"
+  "name": "Soja",
+  "flag": "ACTIVE"
 }
 ```
 
@@ -98,8 +93,7 @@ POST {{baseUrl}}/auth/register/default
 #### - DELETE {{baseUrl}}/api/commodity/{id}
 
 Notes:
-- `tipoCommodity` enum values: see `domain/enums/TipoCommodity.java` (e.g., "SACA_GRAOS").
-- Dates use ISO-8601: LocalDate `yyyy-MM-dd`.
+- Fields: `name` (String), `flag` (String).
 
 
 ## Compra API (`com.platform2easy.genesis.web.controller.CompraController`)

+ 0 - 5
src/main/java/com/platform2easy/genesis/domain/enums/TipoCommodity.java

@@ -1,5 +0,0 @@
-package com.platform2easy.genesis.domain.enums;
-
-public enum TipoCommodity {
-    SACA_GRAOS
-}

+ 0 - 5
src/main/java/com/platform2easy/genesis/domain/enums/UserRole.java

@@ -1,5 +0,0 @@
-package com.platform2easy.genesis.domain.enums;
-
-public enum UserRole {
-    ADMIN, ESCROW_USER, TRADER_USER, BROKER_USER
-}

+ 0 - 68
src/main/java/com/platform2easy/genesis/domain/mock/DatabaseFake.java

@@ -1,68 +0,0 @@
-package com.platform2easy.genesis.domain.mock;
-
-import com.platform2easy.genesis.domain.enums.UserRole;
-import com.platform2easy.genesis.domain.model.User2Easy;
-import com.platform2easy.genesis.domain.model.cerc.ContratoValorCpr;
-import com.platform2easy.genesis.domain.model.cerc.EmissaoCpr;
-import com.platform2easy.genesis.domain.model.cerc.SolicitacaoRegistroCpr;
-import com.platform2easy.genesis.domain.model.cerc.StatusSolicitacaoRegistroCpr;
-import com.platform2easy.genesis.domain.model.cerc.TipoCpr;
-import com.platform2easy.genesis.domain.repository.UserRepository;
-import com.platform2easy.genesis.domain.repository.cerc.ContratoValorCprRepository;
-import com.platform2easy.genesis.domain.repository.cerc.EmissaoCprRepository;
-import com.platform2easy.genesis.domain.repository.cerc.SolicitacaoRegistroCprRepository;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
-@Component
-@Order(1)
-public class DatabaseFake implements CommandLineRunner {
-
-    private final UserRepository userRepository;
-    private final EmissaoCprRepository emissaoCprRepository;
-    private final ContratoValorCprRepository contratoValorCprRepository;
-    private final SolicitacaoRegistroCprRepository solicitacaoRegistroCprRepository;
-
-    public DatabaseFake(UserRepository userRepository, EmissaoCprRepository emissaoCprRepository, ContratoValorCprRepository contratoValorCprRepository, SolicitacaoRegistroCprRepository solicitacaoRegistroCprRepository) {
-        this.userRepository = userRepository;
-        this.emissaoCprRepository = emissaoCprRepository;
-        this.contratoValorCprRepository = contratoValorCprRepository;
-        this.solicitacaoRegistroCprRepository = solicitacaoRegistroCprRepository;
-    }
-
-
-    @Override
-    public void run(String... args) {
-        var contrato = new ContratoValorCpr();
-        contrato.setCodigoContratoOperacaoCredito("TF123");
-        contrato.setValorTotalCredito(new BigDecimal(10000));
-        contrato.setValorLiquidoCredito(new BigDecimal(10000));
-        contrato.setNaturezaOperacao("YU899");
-        contrato.setDataTransacao(LocalDate.now());
-        contratoValorCprRepository.save(contrato);
-
-        var emissao = new EmissaoCpr();
-        emissao.setLocalEmissao("Paraná");
-        emissao.setDataEntrega(LocalDate.now());
-        emissao.setRazaoSocialEmissor("TOO EASY TRADING COMMODITIES LTDA");
-        emissao.setTipoCpr(TipoCpr.FINANCEIRO);
-        emissaoCprRepository.save(emissao);
-
-        var registro = new SolicitacaoRegistroCpr();
-        registro.setStatus(StatusSolicitacaoRegistroCpr.NOVO);
-        registro.setAditivo("Milho seco em grãos, padrão comercial tipo exportação");
-        registro.setContratoValorCpr(contrato);
-        registro.setEmissaoCpr(emissao);
-        solicitacaoRegistroCprRepository.save(registro);
-
-        userRepository.save(new User2Easy(null, "admin", new BCryptPasswordEncoder().encode("admin"), "Administrador", UserRole.ADMIN));
-        userRepository.save(new User2Easy(null, "operador", new BCryptPasswordEncoder().encode("1234"), "Operador Escrow", UserRole.ESCROW_USER));
-        userRepository.save(new User2Easy(null, "produtor", new BCryptPasswordEncoder().encode("1234"), "Produtor", UserRole.TRADER_USER));
-        userRepository.save(new User2Easy(null, "corretor", new BCryptPasswordEncoder().encode("1234"), "Corretor", UserRole.BROKER_USER));
-    }
-}

+ 0 - 73
src/main/java/com/platform2easy/genesis/domain/model/User2Easy.java

@@ -1,73 +0,0 @@
-package com.platform2easy.genesis.domain.model;
-
-import com.platform2easy.genesis.domain.enums.UserRole;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.Collections;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@Table(name = "USER_2EASY")
-public class User2Easy implements UserDetails {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private String login;
-    private String password;
-    private String nome;
-
-    @Enumerated(EnumType.STRING)
-    private UserRole role;
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Collections.singletonList(new SimpleGrantedAuthority(this.role.equals(UserRole.ADMIN) ? "ROLE_ADMIN" : "ROLE_USER"));
-    }
-
-    @Override
-    public String getUsername() {
-        return login;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return UserDetails.super.isAccountNonExpired();
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return UserDetails.super.isAccountNonLocked();
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return UserDetails.super.isCredentialsNonExpired();
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return UserDetails.super.isEnabled();
-    }
-}

+ 0 - 36
src/main/java/com/platform2easy/genesis/domain/model/cerc/AgenteCpr.java

@@ -1,36 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class AgenteCpr {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private String celularEmissor;
-    private String cepEmissor;
-    private List<Credor> credores;
-    private String detentorCarteira;
-    private String detentorCnpj;
-    private List<Devedor> devedores;
-    private String emailEmissor;
-    private String emissorAgenciaCredito;
-    private String emissorBancoCredito;
-    private String emissorContaCorrenteCredito;
-    private List<Garantidor> garantidores;
-    private String numeroDocumentoEmissor;
-    private Integer tipoPessoaEmissor;
-}

+ 0 - 37
src/main/java/com/platform2easy/genesis/domain/model/cerc/Area.java

@@ -1,37 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Area {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private BigDecimal areaTotal;
-    private String cartorio;
-    private String cep;
-    private String endereco;
-    private String fracaoUnitariaImovel;
-    private BigDecimal latitude;
-    private BigDecimal longitude;
-    private String matricula;
-    private String nomeFazenda;
-    private List<Produto> produtos;
-    private String proprietario;
-    private BigDecimal reservaLegal;
-    private Boolean status;
-}

+ 0 - 35
src/main/java/com/platform2easy/genesis/domain/model/cerc/AreaProduto.java

@@ -1,35 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.*;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class AreaProduto {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private BigDecimal areaTotal;
-    private String cartorio;
-    private String cep;
-    private String endereco;
-    private String fracaoUnitariaImovel;
-    private BigDecimal latitude;
-    private BigDecimal longitude;
-    private String matricula;
-    private String nomeFazenda;
-    private String proprietario;
-    private BigDecimal reservaLegal;
-    private Boolean status;
-
-
-
-}

+ 0 - 46
src/main/java/com/platform2easy/genesis/domain/model/cerc/ContratoValorCpr.java

@@ -1,46 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class ContratoValorCpr {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private Boolean autorizoRegistroEDeclaroQueFoiDadoBaixaNoRegistroEmQuaisquerOutrasIf;
-    private String codigoContratoOperacaoCredito;
-    private String codigoContratoScr;
-    private String codigoMoeda;
-
-    private LocalDateTime dataBaixaOutraIf;
-    private LocalDateTime dataContratoSistemaIF;
-    private LocalDateTime dataRegistroOriginal;
-    private LocalDate dataTransacao;
-
-    private String identificacaoPadronizadaOperacaoCredito;
-    private String indexacao;
-    private String naturezaOperacao;
-    private BigDecimal percentualIndexador;
-    private Integer quantidadeParcelaContratada;
-    private String referenciaExterna;
-    private BigDecimal taxaJurosOperacao;
-    private String tipoAtivo;
-    private BigDecimal valorFinanciadoContrato;
-    private BigDecimal valorLiquidoCredito;
-    private BigDecimal valorTotalCredito;
-}

+ 0 - 25
src/main/java/com/platform2easy/genesis/domain/model/cerc/Credor.java

@@ -1,25 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Credor {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private String credorNumeroDocumento;
-    private Boolean credorStatus;
-    private Integer credorTipoPessoa;
-    private LocalDateTime dataEndosso;
-    private Boolean endossatario;
-
-}

+ 0 - 29
src/main/java/com/platform2easy/genesis/domain/model/cerc/Devedor.java

@@ -1,29 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Devedor {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private String devedorCep;
-    private String devedorEmail;
-    private String devedorNomeRazaoSocial;
-    private String devedorNumeroCelular;
-    private String devedorNumeroDocumento;
-    private Boolean devedorStatus;
-    private Integer devedorTipoPessoa;
-}

+ 0 - 32
src/main/java/com/platform2easy/genesis/domain/model/cerc/EmissaoCpr.java

@@ -1,32 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDate;
-
-@Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class EmissaoCpr {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private LocalDate dataEntrega;
-    private String localEmissao;
-    private String razaoSocialEmissor;
-
-    @Enumerated(EnumType.STRING)
-    private TipoCpr tipoCpr;
-}

+ 0 - 25
src/main/java/com/platform2easy/genesis/domain/model/cerc/Garantia.java

@@ -1,25 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-@Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Garantia {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Integer id;
-
-    private Boolean garantia_status;
-    private String tipoGarantia;
-
-}

+ 0 - 30
src/main/java/com/platform2easy/genesis/domain/model/cerc/Garantidor.java

@@ -1,30 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Garantidor {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-
-    private String celularGarantidor;
-    private String emailGarantidor;
-    private String garantidorCep;
-    private String garantidorNumeroDocumento;
-    private Boolean garantidorStatus;
-    private Integer garantidorTipoPessoa;
-    private Integer tipoGarantidor;
-
-}

+ 0 - 30
src/main/java/com/platform2easy/genesis/domain/model/cerc/ParcelaCpr.java

@@ -1,30 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-@Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class ParcelaCpr {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Integer id;
-
-    private Integer numeroParcela;
-    private String codigoControleParcelaContratoIf;
-    private String dataVencimentoParcela;
-    private BigDecimal precoCessaoParcela;
-    private Integer status;
-    private BigDecimal valorParcela;
-    private BigDecimal valorPrincipalParcela;
-}

+ 0 - 45
src/main/java/com/platform2easy/genesis/domain/model/cerc/Produto.java

@@ -1,45 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Produto {
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private BigDecimal areaNecessariaCpr;
-    private BigDecimal areaProdutivaTotal;
-    private String classeTipoPh;
-    private String cultura;
-    private String especificidadeCultura;
-    private String formaAcondicionamento;
-    private String indiceApuracaoProduto;
-    private String instituicaoResponsavelIndice;
-    private String localEntregaCidade;
-    private String localEntregaRegional;
-    private String localEntregaUf;
-    private BigDecimal precoVolume;
-    private String producao;
-    private String produtividade;
-    private String safra;
-    private String situacao;
-    private Boolean status;
-    private String unidadeMedidaVolume;
-    private BigDecimal valorRegistro;
-    private String volumeQuantidade;
-
-
-}

+ 0 - 46
src/main/java/com/platform2easy/genesis/domain/model/cerc/ProdutoArea.java

@@ -1,46 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-//todo @Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class ProdutoArea {
-
-    //todo @Id
-    //todo @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Integer id;
-
-    private BigDecimal areaNecessariaCpr;
-    private BigDecimal areaProdutivaTotal;
-    private List<AreaProduto> areas;
-    private String classeTipoPh;
-    private String cultura;
-    private String especificidadeCultura;
-    private String formaAcondicionamento;
-    private String indiceApuracaoProduto;
-    private String instituicaoResponsavelIndice;
-    private String localEntregaCidade;
-    private String localEntregaRegional;
-    private String localEntregaUf;
-    private BigDecimal precoVolume;
-    private String producao;
-    private String produtividade;
-    private String safra;
-    private String situacao;
-    private Boolean status;
-    private String unidadeMedidaVolume;
-    private BigDecimal valorRegistro;
-    private String volumeQuantidade;
-}

+ 0 - 45
src/main/java/com/platform2easy/genesis/domain/model/cerc/SolicitacaoRegistroCpr.java

@@ -1,45 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Entity
-@Getter
-@Setter
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class SolicitacaoRegistroCpr {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @EqualsAndHashCode.Include
-    private Long id;
-
-    private String aditivo;
-
-    //todo private AgenteCpr agenteCpr;
-    //todo private List<Area> areas;
-
-    @ManyToOne
-    private ContratoValorCpr contratoValorCpr;
-
-    @ManyToOne
-    private EmissaoCpr emissaoCpr;
-
-    //todo private List<Garantia> garantias;
-    //todo private List<ParcelaCpr> parcelas;
-    //todo private List<ProdutoArea> produtos;
-
-    @Enumerated(EnumType.STRING)
-    private StatusSolicitacaoRegistroCpr status;
-}

+ 0 - 5
src/main/java/com/platform2easy/genesis/domain/model/cerc/StatusSolicitacaoRegistroCpr.java

@@ -1,5 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-public enum StatusSolicitacaoRegistroCpr {
-    NOVO, ACEITO, LIQUIDADO, RECUSADO, CANCELADO
-}

+ 0 - 5
src/main/java/com/platform2easy/genesis/domain/model/cerc/TipoCpr.java

@@ -1,5 +0,0 @@
-package com.platform2easy.genesis.domain.model.cerc;
-
-public enum TipoCpr {
-    FISICO, FINANCEIRO
-}

+ 2 - 4
src/main/java/com/platform2easy/genesis/domain/repository/UserRepository.java

@@ -1,9 +1,7 @@
 package com.platform2easy.genesis.domain.repository;
 
-import com.platform2easy.genesis.domain.model.User2Easy;
+import com.platform2easy.genesis.domain.model.AppUser;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.security.core.userdetails.UserDetails;
 
-public interface UserRepository extends JpaRepository<User2Easy,Long> {
-    UserDetails findByLogin(String login);
+public interface UserRepository extends JpaRepository<AppUser, Long> {
 }

+ 0 - 7
src/main/java/com/platform2easy/genesis/domain/repository/cerc/ContratoValorCprRepository.java

@@ -1,7 +0,0 @@
-package com.platform2easy.genesis.domain.repository.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.ContratoValorCpr;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface ContratoValorCprRepository extends JpaRepository<ContratoValorCpr, Long> {
-}

+ 0 - 7
src/main/java/com/platform2easy/genesis/domain/repository/cerc/EmissaoCprRepository.java

@@ -1,7 +0,0 @@
-package com.platform2easy.genesis.domain.repository.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.EmissaoCpr;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface EmissaoCprRepository extends JpaRepository<EmissaoCpr, Long> {
-}

+ 0 - 7
src/main/java/com/platform2easy/genesis/domain/repository/cerc/SolicitacaoRegistroCprRepository.java

@@ -1,7 +0,0 @@
-package com.platform2easy.genesis.domain.repository.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.SolicitacaoRegistroCpr;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface SolicitacaoRegistroCprRepository extends JpaRepository<SolicitacaoRegistroCpr, Long> {
-}

+ 12 - 6
src/main/java/com/platform2easy/genesis/domain/service/UserService.java

@@ -1,7 +1,7 @@
 package com.platform2easy.genesis.domain.service;
 
-import com.platform2easy.genesis.domain.model.User2Easy;
-import com.platform2easy.genesis.domain.repository.UserRepository;
+import com.platform2easy.genesis.domain.model.AppUser;
+import com.platform2easy.genesis.domain.repository.AppUserRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -9,19 +9,25 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Collections;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
 
 @Service
 @AllArgsConstructor
 public class UserService implements UserDetailsService {
 
-    private final UserRepository userRepository;
+    private final AppUserRepository appUserRepository;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        return userRepository.findByLogin(username);
+        AppUser appUser = appUserRepository.findByUserEmail(username)
+                .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username));
+        return new User(appUser.getUserEmail(), appUser.getUserPassword(),
+                Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")));
     }
 
-    public List<User2Easy> listAll(){
-        return userRepository.findAll();
+    public List<AppUser> listAll(){
+        return appUserRepository.findAll();
     }
 }

+ 0 - 34
src/main/java/com/platform2easy/genesis/domain/service/cerc/ContratoValorCprService.java

@@ -1,34 +0,0 @@
-package com.platform2easy.genesis.domain.service.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.ContratoValorCpr;
-import com.platform2easy.genesis.domain.repository.cerc.ContratoValorCprRepository;
-import jakarta.transaction.Transactional;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class ContratoValorCprService {
-
-    private final ContratoValorCprRepository repository;
-
-    @Transactional
-    public ContratoValorCpr save(ContratoValorCpr entity) {
-        repository.save(entity);
-        return entity;
-    }
-    public ContratoValorCpr getById(Long id) {
-        return repository.findById(id).orElse(new ContratoValorCpr());
-    }
-
-    public void delete(Long id) {
-        repository.deleteById(id);
-    }
-
-    public List<ContratoValorCpr> listAll() {
-        return repository.findAll();
-    }
-
-}

+ 0 - 33
src/main/java/com/platform2easy/genesis/domain/service/cerc/EmissaoCprService.java

@@ -1,33 +0,0 @@
-package com.platform2easy.genesis.domain.service.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.EmissaoCpr;
-import com.platform2easy.genesis.domain.repository.cerc.EmissaoCprRepository;
-import jakarta.transaction.Transactional;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class EmissaoCprService {
-
-    private final EmissaoCprRepository repository;
-
-    @Transactional
-    public EmissaoCpr save(EmissaoCpr enity) {
-        repository.save(enity);
-        return enity;
-    }
-    public EmissaoCpr getById(Long id) {
-        return repository.findById(id).orElse(new EmissaoCpr());
-    }
-
-    public void delete(Long id) {
-        repository.deleteById(id);
-    }
-
-    public List<EmissaoCpr> listAll() {
-        return repository.findAll();
-    }
-}

+ 0 - 37
src/main/java/com/platform2easy/genesis/domain/service/cerc/SolicitacaoRegistroCprService.java

@@ -1,37 +0,0 @@
-package com.platform2easy.genesis.domain.service.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.SolicitacaoRegistroCpr;
-import com.platform2easy.genesis.domain.model.cerc.StatusSolicitacaoRegistroCpr;
-import com.platform2easy.genesis.domain.repository.cerc.SolicitacaoRegistroCprRepository;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class SolicitacaoRegistroCprService {
-
-    private final SolicitacaoRegistroCprRepository repository;
-
-    @Transactional
-    public SolicitacaoRegistroCpr save(SolicitacaoRegistroCpr entity) {
-        if (entity.getId() == null) entity.setStatus(StatusSolicitacaoRegistroCpr.NOVO);
-
-        repository.save(entity);
-        return entity;
-    }
-
-    public SolicitacaoRegistroCpr getById(Long id) {
-        return repository.findById(id).orElse(new SolicitacaoRegistroCpr());
-    }
-
-    public void delete(Long id) {
-        repository.deleteById(id);
-    }
-
-    public List<SolicitacaoRegistroCpr> listAll() {
-        return repository.findAll();
-    }
-}

+ 2 - 8
src/main/java/com/platform2easy/genesis/security/config/SecurityConfiguration.java

@@ -1,19 +1,15 @@
 package com.platform2easy.genesis.security.config;
 
-
-import com.platform2easy.genesis.domain.enums.UserRole;
 import com.platform2easy.genesis.domain.service.UserService;
 import com.platform2easy.genesis.security.filter.AuthorizationFilter;
 import com.platform2easy.genesis.security.service.TokenService;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -21,10 +17,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-@Configuration
-@EnableWebSecurity
 @AllArgsConstructor
-public class SecurityConfiguration {
+class SecurityConfiguration {
 
     private final TokenService tokenService;
     private final UserService userService;
@@ -47,7 +41,7 @@ public class SecurityConfiguration {
                         .requestMatchers(HttpMethod.POST, "/authentication/login").permitAll()
                         .requestMatchers("/auth/**").permitAll()
                         .requestMatchers("/api/**").authenticated()
-                        .requestMatchers("/compra", "/compra/**").hasRole(UserRole.ADMIN.toString())
+                        .requestMatchers("/compra", "/compra/**").hasRole("ADMIN")
                         .anyRequest().authenticated())
                 .addFilterBefore(authorizationFilter(), UsernamePasswordAuthenticationFilter.class)
                 .formLogin(form -> form

+ 2 - 3
src/main/java/com/platform2easy/genesis/security/service/TokenService.java

@@ -4,7 +4,6 @@ import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
 import com.auth0.jwt.exceptions.JWTVerificationException;
-import com.platform2easy.genesis.domain.model.User2Easy;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -17,12 +16,12 @@ public class TokenService {
     @Value("${api.security.token.secret}")
     private String secret;
 
-    public String generateToken(User2Easy user) {
+    public String generateToken(String username) {
         try {
             var algorithm = Algorithm.HMAC256(secret);
             return JWT.create()
                     .withIssuer("auth-api")
-                    .withSubject(user.getLogin())
+                    .withSubject(username)
                     .withExpiresAt(genExpirationDate())
                     .sign(algorithm);
         } catch (JWTCreationException exception) {

+ 1 - 2
src/main/java/com/platform2easy/genesis/web/api/AuthenticationController.java

@@ -1,6 +1,5 @@
 package com.platform2easy.genesis.web.api;
 
-import com.platform2easy.genesis.domain.model.User2Easy;
 import com.platform2easy.genesis.security.service.TokenService;
 import com.platform2easy.genesis.web.dto.authentication.AuthenticationDTO;
 import com.platform2easy.genesis.web.dto.authentication.LoginResponseDTO;
@@ -26,7 +25,7 @@ public class AuthenticationController {
     public ResponseEntity login(@RequestBody @Valid AuthenticationDTO data) {
         var usernamePassword = new UsernamePasswordAuthenticationToken(data.login(), data.password());
         var auth = this.authenticationManager.authenticate(usernamePassword);
-        var token = tokenService.generateToken((User2Easy) auth.getPrincipal());
+        var token = tokenService.generateToken(auth.getName());
         return ResponseEntity.ok(new LoginResponseDTO(token));
     }
 

+ 0 - 56
src/main/java/com/platform2easy/genesis/web/controller/cerc/ContratoValorCprController.java

@@ -1,56 +0,0 @@
-package com.platform2easy.genesis.web.controller.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.ContratoValorCpr;
-import com.platform2easy.genesis.domain.service.cerc.ContratoValorCprService;
-import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/cpr/contract")
-@AllArgsConstructor
-public class ContratoValorCprController {
-
-    private final ContratoValorCprService service;
-
-    // GET /api/cpr/contract: Lista todos os contratos
-    @GetMapping
-    @ResponseStatus(HttpStatus.OK)
-    public List<ContratoValorCpr> listAll() {
-        return service.listAll();
-    }
-
-    // Antiga lógica de 'edit' (busca por ID)
-    // GET /api/cpr/contract/{id}: Busca um contrato por ID
-    @GetMapping("/{id}")
-    @ResponseStatus(HttpStatus.OK)
-    public ContratoValorCpr getById(@PathVariable Long id) {
-        // Mapeia a lógica do antigo método 'edit'
-        return service.getById(id);
-    }
-
-    // POST /api/cpr/contract: Cria um novo contrato
-    @PostMapping
-    @ResponseStatus(HttpStatus.CREATED)
-    public ContratoValorCpr create(@RequestBody ContratoValorCpr cprContract) {
-        cprContract.setId(null);
-        return service.save(cprContract);
-    }
-
-    // PUT /api/cpr/contract/{id}:
-    @PutMapping("/{id}")
-    @ResponseStatus(HttpStatus.OK)
-    public ContratoValorCpr update(@PathVariable Long id, @RequestBody ContratoValorCpr cprContract) {
-        cprContract.setId(id);
-        return service.save(cprContract);
-    }
-
-    // DELETE /api/cpr/contract/{id}: Deleta um contrato
-    @DeleteMapping("/{id}")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void delete(@PathVariable Long id) {
-        service.delete(id);
-    }
-}

+ 0 - 59
src/main/java/com/platform2easy/genesis/web/controller/cerc/EmissaoCprController.java

@@ -1,59 +0,0 @@
-package com.platform2easy.genesis.web.controller.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.EmissaoCpr;
-import com.platform2easy.genesis.domain.service.cerc.EmissaoCprService;
-import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-// 1. Mudar para @RestController para retornar JSON
-@RestController
-// 2. Rota base da API
-@RequestMapping("/api/cpr/emission")
-@AllArgsConstructor
-public class EmissaoCprController {
-
-    private final EmissaoCprService service; // Injeção de dependência mantida [cite: 13]
-
-    // GET /api/cpr/emission: Lista todas as emissões
-    @GetMapping
-    @ResponseStatus(HttpStatus.OK)
-    public List<EmissaoCpr> listAll() {
-        return service.listAll();
-    }
-
-    // GET /api/cpr/emission/{id}: Busca uma emissão por ID
-    @GetMapping("/{id}")
-    @ResponseStatus(HttpStatus.OK)
-    public EmissaoCpr getById(@PathVariable Long id) {
-        return service.getById(id);
-    }
-
-    // POST /api/cpr/emission: Cria uma nova emissão
-    @PostMapping
-    @ResponseStatus(HttpStatus.CREATED) // Retorna 201 Created
-    public EmissaoCpr create(@RequestBody EmissaoCpr cprEmission) {
-        // Assume que service.save() foi ajustado para retornar EmissaoCpr (como discutido anteriormente)
-        cprEmission.setId(null);
-        return service.save(cprEmission);
-    }
-
-    // PUT /api/cpr/emission/{id}: Atualiza uma emissão existente
-    @PutMapping("/{id}")
-    @ResponseStatus(HttpStatus.OK)
-    public EmissaoCpr update(@PathVariable Long id, @RequestBody EmissaoCpr cprEmission) {
-        // Garante que o ID do caminho seja usado para a atualização
-        cprEmission.setId(id);
-        return service.save(cprEmission);
-    }
-
-    // DELETE /api/cpr/emission/{id}: Deleta uma emissão
-    @DeleteMapping("/{id}")
-    // Retorna 204 (No Content) após exclusão
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void delete(@PathVariable Long id) {
-        service.delete(id);
-    }
-}

+ 0 - 66
src/main/java/com/platform2easy/genesis/web/controller/cerc/SolicitacaoRegistroCprController.java

@@ -1,66 +0,0 @@
-package com.platform2easy.genesis.web.controller.cerc;
-
-import com.platform2easy.genesis.domain.model.cerc.SolicitacaoRegistroCpr;
-import com.platform2easy.genesis.domain.model.cerc.StatusSolicitacaoRegistroCpr;
-import com.platform2easy.genesis.domain.service.cerc.ContratoValorCprService;
-import com.platform2easy.genesis.domain.service.cerc.EmissaoCprService;
-import com.platform2easy.genesis.domain.service.cerc.SolicitacaoRegistroCprService;
-import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/cpr/register")
-@AllArgsConstructor
-public class SolicitacaoRegistroCprController {
-
-    private final SolicitacaoRegistroCprService service;
-
-    // GET /api/cpr/register: Lista todos os registros
-    @GetMapping
-    @ResponseStatus(HttpStatus.OK)
-    public List<SolicitacaoRegistroCpr> listAll() {
-        return service.listAll();
-    }
-
-    // GET /api/cpr/register/{id}: Busca um registro por ID
-    @GetMapping("/{id}")
-    @ResponseStatus(HttpStatus.OK)
-    public SolicitacaoRegistroCpr getById(@PathVariable Long id) {
-        return service.getById(id);
-    }
-
-    // POST /api/cpr/register: Cria um novo registro
-    @PostMapping
-    @ResponseStatus(HttpStatus.CREATED) // Retorna 201 Created
-    public SolicitacaoRegistroCpr create(@RequestBody SolicitacaoRegistroCpr cprRegister) {
-        cprRegister.setId(null);
-        return service.save(cprRegister);
-    }
-
-
-    // PUT /api/cpr/register/{id}: Atualiza um registro existente
-    @PutMapping("/{id}")
-    @ResponseStatus(HttpStatus.OK)
-    public SolicitacaoRegistroCpr update(@PathVariable Long id, @RequestBody SolicitacaoRegistroCpr cprRegister) {
-        cprRegister.setId(id);
-        return service.save(cprRegister);
-    }
-
-    @PostMapping("/{id}/send")
-    @ResponseStatus(HttpStatus.OK) // Retorna 200 OK após a modificação
-    public SolicitacaoRegistroCpr send(@PathVariable Long id) {
-        var registro = service.getById(id);
-        registro.setStatus(StatusSolicitacaoRegistroCpr.ACEITO);
-        return service.save(registro);
-    }
-
-    // DELETE /api/cpr/register/{id}: Deleta um registro
-    @DeleteMapping("/{id}")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void delete(@PathVariable Long id) {
-        service.delete(id);
-    }
-}

+ 1 - 1
src/main/resources/db/migration/postgresql/V1__init.sql

@@ -121,7 +121,7 @@ CREATE TABLE "orderbook" (
     "orderbook_id" SERIAL PRIMARY KEY,
     "orderbook_flag" TEXT NOT NULL,
     "orderbook_ts" INTEGER NOT NULL,
-    "orderbook_is_token" BOOLEAN NOT NULL,
+    "orderbook_is_token" BOOLEAN NOT NULL, -- true = venda, false = compra
     "orderbook_amount" TEXT NOT NULL,
     "status_id" INTEGER NOT NULL,
     "user_id" INTEGER NOT NULL,