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 61ae14b..57576d2 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 @@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import br.com.entra21.teamroxo.TMSProject.TmsProjectApplication; +import br.com.entra21.teamroxo.TMSProject.interfaces.LoginRepository; import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; import br.com.entra21.teamroxo.TMSProject.template.ItemNivel3; import br.com.entra21.teamroxo.TMSProject.template.Login; @@ -34,11 +35,14 @@ public class LoginController { @Autowired private PessoaRepository pessoaRepository; + @Autowired + private LoginRepository loginRepository; + @PostMapping() @ResponseStatus(code = HttpStatus.OK) public @ResponseBody List login(@RequestBody Login credentials){ - List response = new ArrayList(pessoaRepository.findAll()).stream() + List response = new ArrayList(loginRepository.findAll()).stream() .filter(login -> (login.getUser().equals(credentials.getUser())) && login.getSenha().equals(credentials.getSenha())) .toList(); 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 7e34830..b7a8ed9 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 @@ -16,6 +16,8 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import br.com.entra21.teamroxo.TMSProject.TmsProjectApplication; import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; @@ -60,6 +62,8 @@ private void setMaturidadeNivel3(Pessoa pessoa) { headers.add("Accept : application/json"); headers.add("Content-type : application/json"); ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JavaTimeModule()); + mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); mapper.setSerializationInclusion(Include.NON_NULL); try { diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/RegisterController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/RegisterController.java new file mode 100644 index 0000000..da9c759 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/RegisterController.java @@ -0,0 +1,32 @@ +package br.com.entra21.teamroxo.TMSProject.controllers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository; +import br.com.entra21.teamroxo.TMSProject.template.Pessoa; + +@RestController +@CrossOrigin(origins = "*") +@RequestMapping("/register") +public class RegisterController { + + private final String PATH = "http://localhost:8080/register"; + + @Autowired + private PessoaRepository pessoaRepository; + + @PostMapping() + @ResponseStatus(code = HttpStatus.CREATED) + public @ResponseBody Pessoa register(@RequestBody Pessoa credentials){ + return pessoaRepository.save(credentials); + } + +} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java new file mode 100644 index 0000000..9f23f4c --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/LoginRepository.java @@ -0,0 +1,9 @@ +package br.com.entra21.teamroxo.TMSProject.interfaces; + +import org.springframework.data.jpa.repository.JpaRepository; + +import br.com.entra21.teamroxo.TMSProject.template.Login; + +public interface LoginRepository extends JpaRepository { + +} diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java index c1f46da..4200137 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java @@ -1,7 +1,18 @@ package br.com.entra21.teamroxo.TMSProject.template; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "login") public class Login extends MaturidadeNivel3Richardson { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; private String user; private String senha; private boolean admin; @@ -11,13 +22,22 @@ public Login() { super(); } - public Login(String user, String senha, boolean admin, boolean enterprise) { + public Login(Integer id, String user, String senha, boolean admin, boolean enterprise) { super(); + this.id = id; this.user = user; this.senha = senha; this.admin = admin; this.enterprise = enterprise; } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } public String getUser() { return user; diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Pessoa.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Pessoa.java index 68bbefe..c282a8f 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Pessoa.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Pessoa.java @@ -8,9 +8,12 @@ import javax.persistence.Id; import javax.persistence.Table; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + @Entity @Table(name = "pessoa") -public class Pessoa extends Login { +public class Pessoa extends MaturidadeNivel3Richardson { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -18,13 +21,13 @@ public class Pessoa extends Login { private String nome; private String email; private LocalDate birth; - private long document; + private String document; public Pessoa() { super(); } - public Pessoa(Integer id, String nome, String email, LocalDate birth, long document) { + public Pessoa(Integer id, String nome, String email, LocalDate birth, String document) { super(); this.id = id; this.nome = nome; @@ -65,11 +68,11 @@ public void setBirth(LocalDate birth) { this.birth = birth; } - public long getDocument() { + public String getDocument() { return document; } - public void setDocument(long document) { + public void setDocument(String document) { this.document = document; } 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 817205a..22e3139 100644 --- a/frontend/main/src/app/ship-qt/ship-qt.component.ts +++ b/frontend/main/src/app/ship-qt/ship-qt.component.ts @@ -27,8 +27,7 @@ export class ShipQtComponent implements OnInit { distanceKm!:string constructor( - public quoteService: QuoteService, - private activatedRoute: ActivatedRoute + public quoteService: QuoteService, private activatedRoute: ActivatedRoute ) { } ngOnInit(): void { @@ -54,7 +53,7 @@ export class ShipQtComponent implements OnInit { this.startAdress = response.routes[0].legs[0].start_address; this.endAdress = response.routes[0].legs[0].end_address; - + this.precoFrete = (parseFloat(this.distanceKm)/1000) * 0.081; console.log(this.precoFrete); @@ -66,7 +65,7 @@ export class ShipQtComponent implements OnInit { } else { alert('DIGITE TODOS OS DADOS!') } - + } }