From b189a8f0221b6fde37fd40f838516bc0aea5393c Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Fri, 14 Jun 2024 15:30:12 +0200 Subject: [PATCH 1/6] chore: Add dataset and type classes --- .../PADAS/group3/DataDash/model/dataset.java | 111 ++++++++++++++++++ .../fim/PADAS/group3/DataDash/model/type.java | 6 + 2 files changed, 117 insertions(+) create mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java create mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/type.java 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 new file mode 100644 index 0000000..b291edb --- /dev/null +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java @@ -0,0 +1,111 @@ +package de.uni_passau.fim.PADAS.group3.DataDash.model; + +import java.sql.Date; +import java.util.UUID; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +@Entity +public class dataset { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private UUID id; + + @Enumerated(EnumType.STRING) + private type type; + + private String title; + + private String abst; + + private String description; + + private String author; + + private Date date; + + private float raiting; + + private int votes; + + private String[] Categories; + + + public String getAbst() { + return abst; + } + + public String getAuthor() { + return author; + } + + public String[] getCategories() { + return Categories; + } + + public Date getDate() { + return date; + } + + public String getDescription() { + return description; + } + + public UUID getId() { + return id; + } + + public float getRaiting() { + return raiting; + } + + public String getTitle() { + return title; + } + + public type getType() { + return type; + } + + public int getVotes() { + return votes; + } + + public void setAbst(String abst) { + this.abst = abst.substring(0, Math.min(abst.length(), 100)); + } + + public void setAuthor(String author) { + this.author = author; + } + + public void setCategories(String[] categories) { + Categories = categories; + } + + public void setDate(Date date) { + this.date = date; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setType(type type) { + this.type = type; + } + + public void vote(int stars) { + raiting = (raiting*votes + stars) / (++votes); + } + +} 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 new file mode 100644 index 0000000..5cf0585 --- /dev/null +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/type.java @@ -0,0 +1,6 @@ +package de.uni_passau.fim.PADAS.group3.DataDash.model; + +public enum type { + DATASET, + API +} \ No newline at end of file From 14a9bbd56a13e9c0bfedea8f3bf1c9ff51d3afd3 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Fri, 14 Jun 2024 16:47:51 +0200 Subject: [PATCH 2/6] feat: Add dataRepository interface and dataset class --- .../group3/DataDash/model/dataRepository.java | 8 ++++++++ .../fim/PADAS/group3/DataDash/model/dataset.java | 14 ++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java 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 new file mode 100644 index 0000000..91fcc38 --- /dev/null +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java @@ -0,0 +1,8 @@ +package de.uni_passau.fim.PADAS.group3.DataDash.model; + +import java.util.UUID; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface dataRepository extends JpaRepository{ + +} 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 b291edb..955c5d5 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 @@ -35,6 +35,20 @@ public class dataset { private String[] Categories; + public dataset(String title, String abst, String description, String author, Date date, String[] categories, type type) { + + this.raiting = 0; + this.votes = 0; + this.title = title; + this.abst = abst; + this.description = description; + this.author = author; + this.date = date; + this.Categories = categories; + this.type = type; + + } + public String getAbst() { return abst; From 09f685eef88fdd6e09ac0efccd224657f088751c Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Mon, 17 Jun 2024 15:10:43 +0200 Subject: [PATCH 3/6] 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; } From b607b4a1099521f8d24c8e47bde27f71738570fe Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Mon, 17 Jun 2024 15:17:37 +0200 Subject: [PATCH 4/6] chore: Refactor dataset class and dataRepository interface - Rename dataset.java to Dataset.java - Update references to Dataset class --- .../model/{dataset.java => Dataset.java} | 23 ++++++++------- .../group3/DataDash/model/dataRepository.java | 28 +++++++++---------- 2 files changed, 25 insertions(+), 26 deletions(-) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/{dataset.java => Dataset.java} (83%) 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 similarity index 83% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataset.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java index 6d62d3e..bff1002 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 @@ -10,7 +10,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; @Entity -public class dataset { +public class Dataset { @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -35,21 +35,20 @@ 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; - this.title = title; - this.abst = abst; - this.description = description; - this.author = author; - this.date = date; - this.Categories = categories; - this.type = type; - + setTitle(title); + setAbst(abst); + setDescription(description); + setAuthor(author); + setDate(date); + setCategories(categories); + setType(type); } - public dataset() { + public Dataset() { } @@ -114,7 +113,7 @@ public class dataset { } public void setTitle(String title) { - this.title = title; + this.title = title.substring(0, Math.min(title.length(), 50)); } public void setType(Type type) { 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 955f0a2..647e1f4 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 @@ -5,20 +5,20 @@ import java.util.UUID; import java.sql.Date; import org.springframework.data.jpa.repository.JpaRepository; -public interface dataRepository extends 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); + 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 From bad9855dcecf8689765e66662665357ea32d8971 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Mon, 17 Jun 2024 15:22:12 +0200 Subject: [PATCH 5/6] feat: Update dataRepository findByAuthor method name The `findByAutor` method in the `dataRepository` interface has been renamed to `findByAuthor` to align with the naming convention. This change improves code readability and consistency. --- .../fim/PADAS/group3/DataDash/model/dataRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 647e1f4..f08cdd8 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 @@ -11,10 +11,10 @@ public interface dataRepository extends JpaRepository{ List findByTitleLike(String title); List findByAuthorLike(String author); List findByType(Type type); - List findByAutor(String author); + List findByAuthor(String author); List findByAbstLike(String abst); List findByDescriptionLike(String description); - List findByCategoriesContainingIgnoreCase(String[] categories); + //List findByCategoriesContainingIgnoreCase(String[] categories); List findByRaitingGreaterThan(float raiting); List findByVotesGreaterThan(int votes); List findByDateAfter(Date date); From 909a9021fe8ee0203bc1b8d0d999fb113f54afc4 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Mon, 17 Jun 2024 15:32:05 +0200 Subject: [PATCH 6/6] chore: Rename variable in Dataset class for consistency The variable `Categories` in the `Dataset` class has been renamed to `categories` to follow the naming convention. This change improves code readability and consistency. --- .../uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java | 6 +++--- .../fim/PADAS/group3/DataDash/model/dataRepository.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 bff1002..09bc384 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 @@ -33,7 +33,7 @@ public class Dataset { private int votes; - private String[] Categories; + private String[] categories; public Dataset(String title, String abst, String description, String author, Date date, String[] categories, Type type) { @@ -61,7 +61,7 @@ public class Dataset { } public String[] getCategories() { - return Categories; + return categories; } public Date getDate() { @@ -101,7 +101,7 @@ public class Dataset { } public void setCategories(String[] categories) { - Categories = categories; + this.categories = categories; } public void setDate(Date date) { 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 f08cdd8..46fd8d4 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 @@ -14,7 +14,7 @@ public interface dataRepository extends JpaRepository{ List findByAuthor(String author); List findByAbstLike(String abst); List findByDescriptionLike(String description); - //List findByCategoriesContainingIgnoreCase(String[] categories); + List findByCategories(String[] categories); List findByRaitingGreaterThan(float raiting); List findByVotesGreaterThan(int votes); List findByDateAfter(Date date);