A lot of modification to run repository

feature/ProfSection
Roxane ROSSETTO 1 year ago
parent c999ea26af
commit 56158fa2ee

@ -25,9 +25,9 @@ public class TeacherController {
private TeacherService teacherServ; private TeacherService teacherServ;
public void setiTeacherServ(TeacherService iTeacherS) { /*public void setiTeacherServ(TeacherService iTeacherS) {
this.teacherServ = iTeacherS; this.teacherServ = iTeacherS;
} }*/
@GetMapping(value = "/all", produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "/all", produces = MediaType.APPLICATION_JSON_VALUE)

@ -7,7 +7,6 @@ import jakarta.persistence.*;
import lombok.*; import lombok.*;
@Entity @Entity
@Table(name = "Article")
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor

@ -1,70 +1,26 @@
package SAE.ApiREST.WebService.model; package SAE.ApiREST.WebService.model;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.Cascade;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Entity @Entity
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class Collect { public class Collect {
@Id @Id
@GeneratedValue(strategy= GenerationType.AUTO) @GeneratedValue(strategy= GenerationType.AUTO)
private final long isbn = 0; private final long isbn = 0;
@Column(name = "articles")
@JoinColumn(name = "articles") @OneToMany(cascade = CascadeType.DETACH)
private ArrayList<Article> articles; private ArrayList<Article> articles;
@Column(name = "name") @Column(name = "name")
private String name; private String name;
@Column(name = "teacher") @JoinColumn(name = "teacher") @ManyToOne
private Teacher teacher; private Teacher teacher;
public Collect(String name, Teacher teacher){
this.name = name;
this.teacher = teacher;
this.articles = new ArrayList<Article>();
}
public Collect() {
}
// region Article
public long getId(){
return isbn;
}
// endregion
// region Article
public List<Article> getAllArticles(){
return articles;
}
// region addArticle
public void addArticle(Article article){
if(!this.articles.contains(article)){
this.articles.add(article);
}
}
public void addArticles(List<Article> articles){
for(Article article : articles){
addArticle(article);
}
}
// endregion
// region removeArticle
public void removeArticle(Article article){
this.articles.remove(article);
}
public void removeArticles(List<Article> articles){
this.articles.removeAll(articles);
}
// endregion
// endregion
// region name
public String getName(){
return name;
}
public void setName(String name){
this.name = name;
}
// endregion
} }

@ -1,61 +1,23 @@
package SAE.ApiREST.WebService.model; package SAE.ApiREST.WebService.model;
import jakarta.persistence.Entity; import jakarta.persistence.*;
import jakarta.persistence.Id; import lombok.*;
import jakarta.persistence.Table;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
@Entity @Entity
@Table(name = "Teacher") @Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class Teacher { public class Teacher {
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Integer id; private Integer id;
private LocalDate date; private LocalDate date;
private String mail; private String mail;
private String username; 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;
}
} }

@ -0,0 +1,4 @@
package SAE.ApiREST.WebService.repository;
public interface IArticleRepository {
}

@ -0,0 +1,4 @@
package SAE.ApiREST.WebService.repository;
public interface ICollectRepository {
}

@ -12,8 +12,8 @@ import java.util.List;
public interface ITeacherRepository extends JpaRepository< Teacher, Integer> { public interface ITeacherRepository extends JpaRepository< Teacher, Integer> {
Teacher findByUsername(String username); Teacher findByusername(String username);
Teacher findByMail(String mail); Teacher findBymail(String mail);
} }

@ -1,4 +1,5 @@
package SAE.ApiREST.WebService.service; package SAE.ApiREST.WebService.service;
import SAE.ApiREST.WebService.controller.ArticleControler;
import SAE.ApiREST.WebService.model.Collect; import SAE.ApiREST.WebService.model.Collect;
import java.util.ArrayList; import java.util.ArrayList;
@ -19,7 +20,7 @@ public class StubCollectionService implements ICollectionService {
// region GET // region GET
public Collect getCollectionById(long isbn){ public Collect getCollectionById(long isbn){
for(Collect collection : this.collections){ for(Collect collection : this.collections){
if(collection.getId() == isbn) { if(collection.getIsbn() == isbn) {
return collection; return collection;
} }
} }
@ -76,14 +77,16 @@ public class StubCollectionService implements ICollectionService {
// endregion // endregion
// region Article // region Article
public List<Article> getAllArticles(Collect collect){ public List<Article> getAllArticles(Collect collect)
return collect.getAllArticles(); {
return collect.getArticles();
} }
public void addArticle(Collect collect, Article article){ public void addArticle(Collect collect, Article article){
collect.addArticle(article); List<Article> lA = collect.getArticles();
lA.add(article);
collect.setArticles((ArrayList<Article>) lA);
} }
public void deleteArticle(Collect collect, Article article){ public void deleteArticle(Collect collect, Article article){
collect.removeArticle(article); collect.getArticles().remove(article);
} }
// endregion
} }

@ -35,12 +35,12 @@ public class TeacherService {
public Teacher getTeacherByUsername(String username) { public Teacher getTeacherByUsername(String username) {
return teachRep.findByUsername(username); return teachRep.findByusername(username);
} }
public Teacher getTeacherByMail(String mail) { public Teacher getTeacherByMail(String mail) {
return teachRep.findByMail(mail); return teachRep.findBymail(mail);
} }

Loading…
Cancel
Save