From fcb7e6c14d98db3bced722f231aa4c7686594526 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 14 Mar 2023 14:15:30 +0100 Subject: Issue #4: Backend-Service-Methode zum Abfragen von Studien hinzugefügt --- src/main/java/DNPM/services/DefaultStudienService.java | 9 +++++++-- src/main/java/DNPM/services/StudienService.java | 11 +++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/main/java/DNPM/services') diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/DNPM/services/DefaultStudienService.java index 99af071..8dbdb32 100644 --- a/src/main/java/DNPM/services/DefaultStudienService.java +++ b/src/main/java/DNPM/services/DefaultStudienService.java @@ -6,6 +6,11 @@ import org.springframework.stereotype.Service; import javax.sql.DataSource; import java.util.List; +/** + * Standardimplementierung zum Ermitteln von Studien + * + * @since 0.0.2 + */ @Service public class DefaultStudienService implements StudienService { @@ -38,11 +43,11 @@ public class DefaultStudienService implements StudienService { + "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id " + "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id " + "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv " - + "WHERE property_catalogue.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ?);"; + + "WHERE property_catalogue.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ? OR studie.studien_nummer LIKE ?);"; var like = String.format("%%%s%%", query); - return this.jdbcTemplate.query(sql, new Object[]{like, like}, (resultSet, i) -> new Studie( + return this.jdbcTemplate.query(sql, new Object[]{like, like, like}, (resultSet, i) -> new Studie( resultSet.getString(1), resultSet.getString(2), resultSet.getString(3), diff --git a/src/main/java/DNPM/services/StudienService.java b/src/main/java/DNPM/services/StudienService.java index 0bac130..f6245de 100644 --- a/src/main/java/DNPM/services/StudienService.java +++ b/src/main/java/DNPM/services/StudienService.java @@ -4,8 +4,19 @@ import java.util.List; public interface StudienService { + /** + * Übergibt eine Liste mit allen Studien + * + * @return Liste mit allen Studien + */ List findAll(); + /** + * Übergibt eine Liste mit Studien, deren (Kurz-)Beschreibung oder Studiennummer den übergebenen Wert enthalten + * + * @param query Wert der enthalten sein muss + * @return Gefilterte Liste mit Studien + */ List findByQuery(String query); } -- cgit v1.2.3