From 56158fa2ee409522b723524977d231d9603d5751 Mon Sep 17 00:00:00 2001 From: Rossetto Date: Fri, 8 Mar 2024 15:20:59 +0100 Subject: [PATCH] A lot of modification to run repository --- .../controller/TeacherController.java | 4 +- .../SAE/ApiREST/WebService/model/Article.java | 1 - .../SAE/ApiREST/WebService/model/Collect.java | 64 +++---------------- .../SAE/ApiREST/WebService/model/Teacher.java | 56 +++------------- .../repository/IArticleRepository.java | 4 ++ .../repository/ICollectRepository.java | 4 ++ .../repository/ITeacherRepository.java | 4 +- .../service/StubCollectionService.java | 15 +++-- .../WebService/service/TeacherService.java | 4 +- 9 files changed, 42 insertions(+), 114 deletions(-) create mode 100644 WebService/src/main/java/SAE/ApiREST/WebService/repository/IArticleRepository.java create mode 100644 WebService/src/main/java/SAE/ApiREST/WebService/repository/ICollectRepository.java diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java b/WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java index 68947bc..67de45c 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java @@ -25,9 +25,9 @@ public class TeacherController { private TeacherService teacherServ; - public void setiTeacherServ(TeacherService iTeacherS) { + /*public void setiTeacherServ(TeacherService iTeacherS) { this.teacherServ = iTeacherS; - } + }*/ @GetMapping(value = "/all", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/model/Article.java b/WebService/src/main/java/SAE/ApiREST/WebService/model/Article.java index 6d3d037..aff141b 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/model/Article.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/model/Article.java @@ -7,7 +7,6 @@ import jakarta.persistence.*; import lombok.*; @Entity -@Table(name = "Article") @Getter @Setter @NoArgsConstructor diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/model/Collect.java b/WebService/src/main/java/SAE/ApiREST/WebService/model/Collect.java index 2c8e85e..e71b1f3 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/model/Collect.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/model/Collect.java @@ -1,70 +1,26 @@ package SAE.ApiREST.WebService.model; import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.Cascade; import java.util.ArrayList; import java.util.List; @Entity +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder public class Collect { @Id @GeneratedValue(strategy= GenerationType.AUTO) private final long isbn = 0; - @Column(name = "articles") + + @JoinColumn(name = "articles") @OneToMany(cascade = CascadeType.DETACH) private ArrayList
articles; @Column(name = "name") private String name; - @Column(name = "teacher") + @JoinColumn(name = "teacher") @ManyToOne private Teacher teacher; - - public Collect(String name, Teacher teacher){ - this.name = name; - this.teacher = teacher; - this.articles = new ArrayList
(); - } - - public Collect() { - } - - // region Article - public long getId(){ - return isbn; - } - // endregion - - // region Article - public List
getAllArticles(){ - return articles; - } - - // region addArticle - public void addArticle(Article article){ - if(!this.articles.contains(article)){ - this.articles.add(article); - } - } - public void addArticles(List
articles){ - for(Article article : articles){ - addArticle(article); - } - } - // endregion - - // region removeArticle - public void removeArticle(Article article){ - this.articles.remove(article); - } - public void removeArticles(List
articles){ - this.articles.removeAll(articles); - } - // endregion - // endregion - - // region name - public String getName(){ - return name; - } - public void setName(String name){ - this.name = name; - } - // endregion } \ No newline at end of file diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java b/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java index b5cfd59..c05fb5c 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java @@ -1,61 +1,23 @@ package SAE.ApiREST.WebService.model; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import jakarta.persistence.*; +import lombok.*; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Date; @Entity -@Table(name = "Teacher") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder + public class Teacher { @Id + @GeneratedValue(strategy = GenerationType.AUTO) private Integer id; private LocalDate date; private String mail; private String username; - - public Teacher() { - - } - - public Teacher(Integer id, String date, String mail, String username) { - this.id = id; - this.date = LocalDate.parse(date, DateTimeFormatter.ofPattern("dd-MM-yyyy")); - this.mail = mail; - this.username = username; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public LocalDate getDate() { - return date; - } - - public void setDate(String date) { - this.date = LocalDate.parse(date, DateTimeFormatter.ofPattern("dd-MM-yyyy")); - } - - public String getMail() { - return mail; - } - - public void setMail(String mail) { - this.mail = mail; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } } diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/repository/IArticleRepository.java b/WebService/src/main/java/SAE/ApiREST/WebService/repository/IArticleRepository.java new file mode 100644 index 0000000..d75cb6e --- /dev/null +++ b/WebService/src/main/java/SAE/ApiREST/WebService/repository/IArticleRepository.java @@ -0,0 +1,4 @@ +package SAE.ApiREST.WebService.repository; + +public interface IArticleRepository { +} diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/repository/ICollectRepository.java b/WebService/src/main/java/SAE/ApiREST/WebService/repository/ICollectRepository.java new file mode 100644 index 0000000..46f395c --- /dev/null +++ b/WebService/src/main/java/SAE/ApiREST/WebService/repository/ICollectRepository.java @@ -0,0 +1,4 @@ +package SAE.ApiREST.WebService.repository; + +public interface ICollectRepository { +} diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/repository/ITeacherRepository.java b/WebService/src/main/java/SAE/ApiREST/WebService/repository/ITeacherRepository.java index 39718d8..dc8fb44 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/repository/ITeacherRepository.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/repository/ITeacherRepository.java @@ -12,8 +12,8 @@ import java.util.List; public interface ITeacherRepository extends JpaRepository< Teacher, Integer> { - Teacher findByUsername(String username); + Teacher findByusername(String username); - Teacher findByMail(String mail); + Teacher findBymail(String mail); } diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java index 60e8e1e..182ab65 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java @@ -1,4 +1,5 @@ package SAE.ApiREST.WebService.service; +import SAE.ApiREST.WebService.controller.ArticleControler; import SAE.ApiREST.WebService.model.Collect; import java.util.ArrayList; @@ -19,7 +20,7 @@ public class StubCollectionService implements ICollectionService { // region GET public Collect getCollectionById(long isbn){ for(Collect collection : this.collections){ - if(collection.getId() == isbn) { + if(collection.getIsbn() == isbn) { return collection; } } @@ -76,14 +77,16 @@ public class StubCollectionService implements ICollectionService { // endregion // region Article - public List
getAllArticles(Collect collect){ - return collect.getAllArticles(); + public List
getAllArticles(Collect collect) + { + return collect.getArticles(); } public void addArticle(Collect collect, Article article){ - collect.addArticle(article); + List
lA = collect.getArticles(); + lA.add(article); + collect.setArticles((ArrayList
) lA); } public void deleteArticle(Collect collect, Article article){ - collect.removeArticle(article); + collect.getArticles().remove(article); } - // endregion } \ No newline at end of file diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherService.java index df2880e..91eddf4 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherService.java @@ -35,12 +35,12 @@ public class TeacherService { public Teacher getTeacherByUsername(String username) { - return teachRep.findByUsername(username); + return teachRep.findByusername(username); } public Teacher getTeacherByMail(String mail) { - return teachRep.findByMail(mail); + return teachRep.findBymail(mail); }