From 09f685eef88fdd6e09ac0efccd224657f088751c Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Mon, 17 Jun 2024 15:10:43 +0200 Subject: [PATCH] chore: Rename type.java to Type.java and update references, add default constructor to dataset --- .../DataDash/model/{type.java => Type.java} | 2 +- .../group3/DataDash/model/dataRepository.java | 18 +++++++++++++++++- .../PADAS/group3/DataDash/model/dataset.java | 11 +++++++---- 3 files changed, 25 insertions(+), 6 deletions(-) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/{type.java => Type.java} (79%) diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/type.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java similarity index 79% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/type.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java index 5cf0585..8f72c12 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/type.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java @@ -1,6 +1,6 @@ package de.uni_passau.fim.PADAS.group3.DataDash.model; -public enum type { +public enum Type { DATASET, API } \ No newline at end of file diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java index 91fcc38..955f0a2 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java @@ -1,8 +1,24 @@ package de.uni_passau.fim.PADAS.group3.DataDash.model; +import java.util.List; import java.util.UUID; +import java.sql.Date; import org.springframework.data.jpa.repository.JpaRepository; public interface dataRepository extends JpaRepository{ + + List findByTitle(String title); + List findByTitleLike(String title); + List findByAuthorLike(String author); + List findByType(Type type); + List findByAutor(String author); + List findByAbstLike(String abst); + List findByDescriptionLike(String description); + List findByCategoriesContainingIgnoreCase(String[] categories); + List findByRaitingGreaterThan(float raiting); + List findByVotesGreaterThan(int votes); + List findByDateAfter(Date date); + List findByDateBefore(Date date); + List findByDateBetween(Date date1, Date date2); -} +} \ No newline at end of file diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java index 955c5d5..6d62d3e 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java @@ -17,7 +17,7 @@ public class dataset { private UUID id; @Enumerated(EnumType.STRING) - private type type; + private Type type; private String title; @@ -35,7 +35,7 @@ public class dataset { private String[] Categories; - public dataset(String title, String abst, String description, String author, Date date, String[] categories, type type) { + public dataset(String title, String abst, String description, String author, Date date, String[] categories, Type type) { this.raiting = 0; this.votes = 0; @@ -49,6 +49,9 @@ public class dataset { } + public dataset() { + } + public String getAbst() { return abst; @@ -82,7 +85,7 @@ public class dataset { return title; } - public type getType() { + public Type getType() { return type; } @@ -114,7 +117,7 @@ public class dataset { this.title = title; } - public void setType(type type) { + public void setType(Type type) { this.type = type; }