Merge pull request #24 from Joaquimborges/dev

Dev
mathwillock · Nov 1, 2021 · a072d6e · a072d6e
2 parents 997022b + 2440135
commit a072d6e
Show file tree

Hide file tree

Showing 20 changed files with 489 additions and 47 deletions.
diff --git a/src/main/java/com/bootcamp_w3_g3/controller/ArmazemController.java b/src/main/java/com/bootcamp_w3_g3/controller/ArmazemController.java
@@ -5,7 +5,6 @@
 import com.bootcamp_w3_g3.model.entity.Armazem;
 import com.bootcamp_w3_g3.service.ArmazemService;
 import com.bootcamp_w3_g3.service.RepresentanteService;
-import com.bootcamp_w3_g3.service.SetorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -14,7 +13,7 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("armazem")
+@RequestMapping("armazem/")
 public class ArmazemController {
 
     @Autowired
@@ -23,12 +22,10 @@ public class ArmazemController {
     @Autowired
     private RepresentanteService representanteService;
 
-    @Autowired
-    private SetorService setorService;
 
     @PostMapping("/criar")
     public ResponseEntity<ArmazemDTO> criarArmazem(@RequestBody ArmazemForm armazemForm) {
-        Armazem armazem = armazemService.criarArmazem(armazemForm.converte(representanteService, setorService));
+        Armazem armazem = armazemService.criarArmazem(armazemForm.converte(representanteService));
 
         return new ResponseEntity<>(ArmazemDTO.converter(armazem), HttpStatus.CREATED);
     }

diff --git a/src/main/java/com/bootcamp_w3_g3/controller/ProdutoController.java b/src/main/java/com/bootcamp_w3_g3/controller/ProdutoController.java
@@ -63,9 +63,10 @@ public ResponseEntity<ProdutoDTO> alterar(@RequestBody ProdutoForm produtoForm)
      * @return produtoDTO
      */
     @DeleteMapping(value="/deletar/{cod}")
-    public Produto apagar(@PathVariable Long cod)
+    public ResponseEntity<Produto> apagar(@PathVariable Long cod)
     {
-        return produtoService.apagar(cod);
+        produtoService.apagar(cod);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     /**

diff --git a/src/main/java/com/bootcamp_w3_g3/controller/RepresentanteController.java b/src/main/java/com/bootcamp_w3_g3/controller/RepresentanteController.java
@@ -13,7 +13,7 @@
 import java.util.NoSuchElementException;
 
 @RestController
-@RequestMapping("representante")
+@RequestMapping("representante/")
 public class RepresentanteController {
 
         @Autowired

diff --git a/src/main/java/com/bootcamp_w3_g3/controller/SetorController.java b/src/main/java/com/bootcamp_w3_g3/controller/SetorController.java
@@ -16,7 +16,7 @@
  * @author hugo damm
  */
 @RestController
-@RequestMapping("setor")
+@RequestMapping("setor/")
 public class SetorController {
 
     @Autowired
@@ -31,22 +31,22 @@ public ResponseEntity<SetorDTO> salvar(@RequestBody SetorForm setorForm){
         return new ResponseEntity<>(SetorDTO.converter(setor), HttpStatus.CREATED);
     }
 
-    @DeleteMapping("/remover")
-    public String remover(@PathVariable String codigo) {
-        setorService.removerSetor(codigo);
+    @DeleteMapping("/remover/{id}")
+    public String remover(@PathVariable Long id) {
+        setorService.removerSetor(id);
 
         return "Setor removido";
     }
 
-    @GetMapping("/obter/{id}")
+    @GetMapping("/obter/{codigo}")
     public ResponseEntity<SetorDTO> obter(@PathVariable String codigo){
         Setor setor = setorService.obterSetor(codigo);
         return new ResponseEntity<>(SetorDTO.converter(setor), HttpStatus.OK);
     }
 
-    @GetMapping("/listar")
-    public ResponseEntity<List<SetorDTO>> listar(){
-        List<Setor> setores = setorService.listarSetores();
+    @GetMapping("/listar/{armazem_id}")
+    public ResponseEntity<List<SetorDTO>> listar(@PathVariable Long armazem_id){
+        List<Setor> setores = setorService.lista(armazem_id);
         return new ResponseEntity<>(SetorDTO.converterLista(setores), HttpStatus.OK);
     }
 

diff --git a/src/main/java/com/bootcamp_w3_g3/model/dtos/request/ArmazemForm.java b/src/main/java/com/bootcamp_w3_g3/model/dtos/request/ArmazemForm.java
@@ -2,14 +2,11 @@
 
 import com.bootcamp_w3_g3.model.entity.Armazem;
 import com.bootcamp_w3_g3.model.entity.Representante;
-import com.bootcamp_w3_g3.model.entity.Setor;
 import com.bootcamp_w3_g3.service.RepresentanteService;
 import com.bootcamp_w3_g3.service.SetorService;
 import lombok.*;
 
 
-import java.util.ArrayList;
-import java.util.List;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -25,7 +22,7 @@ public class ArmazemForm {
     private String uf;
     private RepresentanteForm representanteForm;
 
-    public Armazem converte(RepresentanteService representanteService, SetorService setorService) {
+    public Armazem converte(RepresentanteService representanteService) {
         Representante representante = representanteService.obter(representanteForm.getCodigo());
 
         return Armazem.builder()

diff --git a/src/main/java/com/bootcamp_w3_g3/model/dtos/request/SetorForm.java b/src/main/java/com/bootcamp_w3_g3/model/dtos/request/SetorForm.java
@@ -7,10 +7,10 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
 
 /**
  * @author hugo damm
+ * @autor Joaquim Borges
  */
 
 @NoArgsConstructor
@@ -24,18 +24,18 @@ public class SetorForm {
     private String tipoProduto;
     private ArmazemForm armazem;
     private Integer espacoDisponivel = 100;
-    private List<LoteForm> lote;
 
 
-    //private List<Lote> lote;
+
 
     public Setor converte(ArmazemService armazemService){
         Armazem armazem = armazemService.obterArmazem(this.armazem.getCodArmazem());
         return Setor.builder()
                 .codigo(codigo)
                 .nome(nome)
                 .tipoProduto(tipoProduto)
-                .armazem(armazem).build();
+                .armazem(armazem)
+                .build();
     }
 
 

diff --git a/src/main/java/com/bootcamp_w3_g3/model/dtos/response/ArmazemDTO.java b/src/main/java/com/bootcamp_w3_g3/model/dtos/response/ArmazemDTO.java
@@ -21,7 +21,7 @@ public class ArmazemDTO {
     private String nome;
     private String endereco;
     private String uf;
-    private Representante representante;
+    private RepresentanteDTO representanteDTO;
 
     public static ArmazemDTO converter(Armazem armazem) {
 
@@ -30,15 +30,15 @@ public static ArmazemDTO converter(Armazem armazem) {
                 armazem.getNome(),
                 armazem.getEndereco(),
                 armazem.getUf(),
-                armazem.getRepresentante()
+                RepresentanteDTO.converteEmRepresentanteDTO(armazem.getRepresentante())
+
         );
 
     }
 
 
     public static List<ArmazemDTO> armazemDTOListConverte(List<Armazem> armazemList) {
         List<ArmazemDTO> armazemDTOList = new ArrayList<>();
-
         for (Armazem armazem : armazemList) {
 
             armazemDTOList.add(
@@ -47,7 +47,7 @@ public static List<ArmazemDTO> armazemDTOListConverte(List<Armazem> armazemList)
                             armazem.getNome(),
                             armazem.getEndereco(),
                             armazem.getUf(),
-                            armazem.getRepresentante()
+                            RepresentanteDTO.converteEmRepresentanteDTO(armazem.getRepresentante())
                     )
             );
         }

diff --git a/src/main/java/com/bootcamp_w3_g3/model/dtos/response/SetorDTO.java b/src/main/java/com/bootcamp_w3_g3/model/dtos/response/SetorDTO.java
@@ -19,15 +19,14 @@ public class SetorDTO {
     private String codigo;
     private String nome;
     private String tipoProduto;
-    private Armazem armazem;
-    private List<Lote> lote;
+    private ArmazemDTO armazemDTO;
 
     public static SetorDTO converter(Setor setor){
         return SetorDTO.builder()
                 .codigo(setor.getCodigo())
                 .nome(setor.getNome())
                 .tipoProduto(setor.getTipoProduto())
-                .armazem(setor.getArmazem()).build();
+                .armazemDTO(ArmazemDTO.converter(setor.getArmazem())).build();
     }
 
     public static List<SetorDTO> converterLista(List<Setor> setorList){
@@ -37,8 +36,7 @@ public static List<SetorDTO> converterLista(List<Setor> setorList){
                     .codigo(setor.getCodigo())
                     .nome(setor.getNome())
                     .tipoProduto(setor.getTipoProduto())
-                    .armazem(setor.getArmazem())
-                    .build());
+                    .armazemDTO(ArmazemDTO.converter(setor.getArmazem())).build());
         }
         return setorDTOList;
     }

diff --git a/src/main/java/com/bootcamp_w3_g3/model/entity/Armazem.java b/src/main/java/com/bootcamp_w3_g3/model/entity/Armazem.java
@@ -14,8 +14,7 @@
 
 
 import javax.persistence.*;
-import java.util.ArrayList;
-import java.util.List;
+
 
 @Getter
 @Setter

diff --git a/src/main/java/com/bootcamp_w3_g3/model/entity/Representante.java b/src/main/java/com/bootcamp_w3_g3/model/entity/Representante.java
@@ -17,7 +17,7 @@
 @Getter
 @Setter
 @Entity
-@SuperBuilder
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class Representante {

diff --git a/src/main/java/com/bootcamp_w3_g3/model/entity/Setor.java b/src/main/java/com/bootcamp_w3_g3/model/entity/Setor.java
@@ -5,7 +5,7 @@
 
 
 import javax.persistence.*;
-import java.util.List;
+
 
 /**
  * @author hugo damm

diff --git a/src/main/java/com/bootcamp_w3_g3/service/ArmazemService.java b/src/main/java/com/bootcamp_w3_g3/service/ArmazemService.java
@@ -37,8 +37,9 @@ public Armazem obterArmazem(String cod) {
         return armazemRepository.findByCodArmazem(cod);
     }
 
-    public Armazem deletarArmazem(String cod){
-        return armazemRepository.deleteByCodArmazem(cod);
+    public Armazem deletarArmazem(Long id){
+        armazemRepository.deleteById(id);
+        return null;
     }
 
     public Armazem atualizarArmazem(Armazem armazem) {

diff --git a/src/main/java/com/bootcamp_w3_g3/service/RepresentanteService.java b/src/main/java/com/bootcamp_w3_g3/service/RepresentanteService.java
@@ -38,6 +38,8 @@ public List<Representante> listar() {
 
     public Representante atualizar(Representante representante) {
         Representante representanteEdited = representanteRepository.getByCodigo(representante.getCodigo());
+        representanteEdited.setNome(representante.getNome());
+        representanteEdited.setSobrenome(representante.getSobrenome());
         representanteEdited.setTelefone(representante.getTelefone());
         representanteEdited.setEndereco(representante.getEndereco());
 

diff --git a/src/main/java/com/bootcamp_w3_g3/service/SetorService.java b/src/main/java/com/bootcamp_w3_g3/service/SetorService.java
@@ -35,8 +35,8 @@ public Setor get(Long id){
     }
 
     public Setor obterSetor(String codigo){
-        Setor setor = setorRepository.findByCodigo(codigo);
-        return setor;
+       return setorRepository.findByCodigo(codigo);
+
     }
 
     public List<Setor> listarSetores(){
@@ -51,16 +51,16 @@ public List<Setor> lista(Long armazemId){
     public Setor atualizarSetor(Setor setor){
         Setor editedSetor = setorRepository.findByCodigo(setor.getCodigo());
 
-        editedSetor.setCodigo(setor.getCodigo());
         editedSetor.setNome(setor.getNome());
         editedSetor.setTipoProduto(setor.getTipoProduto());
         editedSetor.setArmazem(setor.getArmazem());
 
         return setorRepository.save(editedSetor);
     }
 
-    public Setor removerSetor(String codigo) {
-        return setorRepository.deleteByCodigo(codigo);
+    public Setor removerSetor(Long id) {
+        setorRepository.deleteById(id);
+        return null;
     }
 
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -4,7 +4,7 @@
 spring.datasource.url=jdbc:postgresql://localhost:5432/armazem-w3
 spring.datasource.username= postgres
 spring.datasource.password= lUk3nyb@
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=create-drop
 
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect