diff --git a/WebService/pom.xml b/WebService/pom.xml index acc5c27..9e32818 100644 --- a/WebService/pom.xml +++ b/WebService/pom.xml @@ -42,6 +42,22 @@ jakarta.persistence jakarta.persistence-api + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + runtime + + + + org.projectlombok + lombok + provided + 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 9de95af..6d3d037 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/model/Article.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/model/Article.java @@ -3,16 +3,19 @@ package SAE.ApiREST.WebService.model; import java.time.LocalDate; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; +import lombok.*; @Entity +@Table(name = "Article") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder public class Article { @Id @GeneratedValue(strategy = GenerationType.AUTO) - Integer id; String title; String URL; @@ -22,80 +25,5 @@ public class Article { Integer type; // ArrayList keywords = new ArrayList<>(); - public Article() {} - - public Article(String title, String URL, LocalDate dateAdded, LocalDate datePublished, Boolean visibility, Integer type) { - this.id = 1; - this.title = title; - this.URL = URL; - this.dateAdded = dateAdded; - this.datePublished = datePublished; - this.isVisible = visibility; - this.type = type; - } - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getURL() { - return this.URL; - } - - public void setURL(String URL) { - this.URL = URL; - } - - public LocalDate getDateAdded() { - return this.dateAdded; - } - - public void setDateAdded(LocalDate dateAdded) { - this.dateAdded = dateAdded; - } - - public LocalDate getDatePublished() { - return this.datePublished; - } - - public void setDatePublished(LocalDate datePublished) { - this.datePublished = datePublished; - } - - public Boolean isVisible() { - return this.isVisible; - } - - public void setVisibility(Boolean isVisible) { - this.isVisible = isVisible; - } - - public Integer getType() { - return this.type; - } - - public void setType(Integer type) { - this.type = type; - } -/* - public List getKeywords() { - return this.keywords; - } - public void setKeywords(List keywords) { - this.keywords = keywords; - } -*/ } 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 d153cd7..b5cfd59 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java @@ -1,13 +1,14 @@ package SAE.ApiREST.WebService.model; import jakarta.persistence.Entity; import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Date; @Entity - +@Table(name = "Teacher") public class Teacher { @Id private Integer id; 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 189b545..39718d8 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/repository/ITeacherRepository.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/repository/ITeacherRepository.java @@ -16,5 +16,4 @@ public interface ITeacherRepository extends JpaRepository< Teacher, Integer> { Teacher findByMail(String mail); - Teacher findByDate(LocalDate date); } diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubArticleService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubArticleService.java index 2ea238a..64aa3c9 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubArticleService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubArticleService.java @@ -17,15 +17,15 @@ public class StubArticleService implements IArticleService { public List
getAllArticles() { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.now().minusMonths(1), LocalDate.now().minusMonths(2), - true, + true, 1) ); - articles.add(new Article( + articles.add(new Article(null, "moi", "zaeaeaeazeza", LocalDate.now().minusMonths(2), @@ -33,7 +33,7 @@ public class StubArticleService implements IArticleService { false, 1) ); - articles.add(new Article( + articles.add(new Article(null, "eux", "erfdhdh", LocalDate.now().minusMonths(3), @@ -41,7 +41,7 @@ public class StubArticleService implements IArticleService { true, 1) ); - articles.add(new Article( + articles.add(new Article(null, "tout ceux qui le veulent", "azersdfgg", LocalDate.now().minusMonths(4), @@ -55,7 +55,7 @@ public class StubArticleService implements IArticleService { @Override public Article getArticlesById(Integer id) { - return new Article( + return new Article(1, "azeaeaze", "azezeaea", LocalDate.now().minusMonths(1), @@ -68,7 +68,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesByTitle(String title) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(1, title, "azezeaea", LocalDate.now().minusMonths(1), @@ -84,7 +84,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesByType(Integer type) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(1, "aeazeazeaz", "azezeaea", LocalDate.now().minusMonths(1), @@ -100,7 +100,7 @@ public class StubArticleService implements IArticleService { public List
getVisibleArticles() { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(1, "toi", "azezeaea", LocalDate.now().minusMonths(1), @@ -116,7 +116,7 @@ public class StubArticleService implements IArticleService { public List
getInvisibleArticles() { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(1, "toi", "azezeaea", LocalDate.now().minusMonths(1), @@ -132,7 +132,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesAddedBefore(String dateAdded) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.parse(dateAdded, DateTimeFormatter.ISO_DATE).minusMonths(1), @@ -148,7 +148,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesAddedAfter(String dateAdded) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.parse(dateAdded, DateTimeFormatter.ISO_DATE).plusMonths(1), @@ -164,7 +164,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesAddedBetween(String beginning, String end) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.parse(beginning, DateTimeFormatter.ISO_DATE), @@ -180,7 +180,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesPublishedBefore(String datePublished) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.now().minusMonths(1), @@ -196,7 +196,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesPublishedAfter(String datePublished) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.now().minusMonths(1), @@ -212,7 +212,7 @@ public class StubArticleService implements IArticleService { public List
getArticlesPublishedBetween(String beginning, String end) { List
articles = new ArrayList<>(); - articles.add(new Article( + articles.add(new Article(null, "toi", "azezeaea", LocalDate.now().minusMonths(1), 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 6a6abb4..df2880e 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherService.java @@ -16,7 +16,7 @@ public class TeacherService { private final ITeacherRepository teachRep; - @Autowired + public TeacherService(ITeacherRepository teachRep) { this.teachRep = teachRep; @@ -44,10 +44,11 @@ public class TeacherService { } + /* public Teacher getTeacherByDate(String date) { LocalDate d = LocalDate.parse(date, DateTimeFormatter.ofPattern("dd-MM-yyyy")); return teachRep.findByDate(d); - } + }*/ public List addTeacher(Teacher t) { diff --git a/WebService/src/main/resources/application.properties b/WebService/src/main/resources/application.properties index 8b13789..12cf8dc 100644 --- a/WebService/src/main/resources/application.properties +++ b/WebService/src/main/resources/application.properties @@ -1 +1,24 @@ +/* +#Todo adapter a une de nos BD choisir le langage bd +spring.datasource.url=nomBD:mysql://localhost:8889/XXXXXX?createDatabaseIfNotExist=true +spring.datasource.username=test +spring.datasource.password=test + +spring.jpa.open-in-view=false + + +# Hibernate properties +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect +spring.jpa.hibernate.ddl-auto=update +spring.jpa.generate-ddl=true +#spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true +# Logging SQL statements (optional, but useful for debugging) +spring.jpa.show-sql=true +*/ + +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect