From 0fd56b63d6d2863df17154fa6e6167b9b2d61857 Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Sun, 9 Oct 2022 23:11:21 -0300 Subject: [PATCH] UPDATE I THINK --- backend/TMSProject/pom.xml | 6 +++++- .../TMSProject/controllers/CarriersControllers.java | 8 ++++++-- .../teamroxo/TMSProject/controllers/LoginController.java | 6 ++++++ .../TMSProject/controllers/PessoaController.java | 7 +++++-- frontend/main/src/app/ship-qt/ship-qt.component.ts | 9 +++++++-- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/backend/TMSProject/pom.xml b/backend/TMSProject/pom.xml index 5735092..35a9c86 100644 --- a/backend/TMSProject/pom.xml +++ b/backend/TMSProject/pom.xml @@ -22,7 +22,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-devtools @@ -61,6 +60,11 @@ spring-security-test test + + javax.mail + javax.mail-api + 1.6.2 + diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java index cbf2618..1ce3157 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/CarriersControllers.java @@ -9,6 +9,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; @@ -39,14 +40,17 @@ public Carriers carrier(@PathVariable("id") int id) { @PostMapping() @ResponseStatus(code = HttpStatus.CREATED) public Carriers register(@RequestBody Carriers dados) { - return carriersRepository.save(dados); - } @DeleteMapping("/{id}") public void deleteCarrier(@PathVariable("id") int id){ carriersRepository.deleteById(id); } + + @PutMapping() + public Carriers attCarrier(@RequestBody Carriers body) { + return carriersRepository.save(body); + } } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java index ef9bcdf..bc66695 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/LoginController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -63,6 +64,11 @@ public List listAll() { return response; } + + @PutMapping() + public Login attLogin(@RequestBody Login body) { + return loginRepository.save(body); + } @PostMapping("/init") public CountVisitors bounce(@RequestBody CountVisitors visitor) { diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java index 00f8cef..ffb61c5 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java @@ -104,13 +104,16 @@ public Pessoa register(@RequestBody Pessoa dados) { return pessoaRepository.save(dados); } + @PutMapping() + public Pessoa attPessoa(@RequestBody Pessoa body) { + return pessoaRepository.save(body); + } + @DeleteMapping("/{id}") public void deletePessoa(@PathVariable("id") int id){ pessoaRepository.deleteById(id); } - - private List obterListaCompleta() { List response = pessoaRepository.findAll(); diff --git a/frontend/main/src/app/ship-qt/ship-qt.component.ts b/frontend/main/src/app/ship-qt/ship-qt.component.ts index d304b9f..4372f53 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -47,7 +47,7 @@ export class ShipQtComponent implements OnInit { ngOnInit(): void { - + //this.quotes.push({ precoFrete: 45.50, tempo: 3, trackid: "BR23154546TR", cepOrigem: 88058086, cepDestino: 88058086, comprimento: 50, largura: 50, altura: 50, peso: 10 }) //this.quotes.push({ precoFrete: 94.50, tempo: 6, trackid: "BR22315445TR", cepOrigem: 46513265, cepDestino: 65898454, comprimento: 100, largura: 200, altura: 10, peso: 25 }) @@ -75,7 +75,12 @@ export class ShipQtComponent implements OnInit { if (this.cepOrigem != null && this.cepDestino != null && this.comprimento != null, this.altura != null, this.largura != null, this.peso != null) { this.quoteService.quote(this.cepOrigem, this.cepDestino) - .pipe() + .pipe( + catchError((error)=>{ + // adicionar função caso dê erro + return error + } + )) .subscribe((response: any) => { console.log(response);