From 1c23cbe9cd5cee9d4f686fd9bedfc2235479abea Mon Sep 17 00:00:00 2001 From: kaka-jaques Date: Mon, 3 Oct 2022 19:33:17 -0300 Subject: [PATCH] UPDATE! RECENT QUOTE BY USER! --- .../TMSProject/controllers/QuoteController.java | 10 ++++++---- .../interfaces/RecentQuoteRepository.java | 11 +++++++++++ .../teamroxo/TMSProject/template/SystemLink.java | 13 +++++++++++++ frontend/main/src/app/loginservice.service.ts | 7 ++++++- 4 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java index 4f3f5a1..5ce2670 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,16 +31,17 @@ public class QuoteController { @PostMapping("/recent") public RecentQuote recentPackage(@RequestBody RecentQuote quote) { - return recentQuoteRepository.save(quote); - } @PostMapping("/register") public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { - return registerQuoteRepository.save(quote); - + } + + @GetMapping("/recent/{id}") + public List recentQuote(@PathVariable("id") int id){ + return recentQuoteRepository.findOwnQuote(id); } @GetMapping("/go") diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java index 2530b5e..296ad11 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RecentQuoteRepository.java @@ -1,9 +1,20 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.RecentQuote; +@Repository +@EnableJpaRepositories public interface RecentQuoteRepository extends JpaRepository { + @Query("FROM RecentQuote WHERE pessoa_id = :idUser") + List findOwnQuote(@Param("idUser") int idUser); + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java new file mode 100644 index 0000000..5344a13 --- /dev/null +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java @@ -0,0 +1,13 @@ +package br.com.entra21.teamroxo.TMSProject.template; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +public class SystemLink { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + +} diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 32a64b6..656cd3c 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -8,17 +8,21 @@ import { LoginComponent } from './login/login.component'; @Injectable({ providedIn: 'root' }) + export class LoginserviceService implements CanActivate { readonly TMSLoginAPI: string = "http://localhost:8080" readonly APIBounceInit: string = "http://localhost:8080/login/init" + //DADOS BÁSICOS nome!: string user!: string email!: string password!: string birth!: Date document!: string + + //DADOS DE CONTROLE succeed!: boolean progress!: boolean admin!: boolean @@ -26,6 +30,7 @@ export class LoginserviceService implements CanActivate { pessoaID!: number adminEnter:boolean = false + //DADOS ESTATÍSTICOS idBounce!: number userBounce!: string dateBounce!: string @@ -79,7 +84,7 @@ export class LoginserviceService implements CanActivate { this.email = resp.email this.password = response[0].senha }) - + let bounce: any = { "user": response[0].user }