Issue #4: Studiennummer und Erkennung des Studientyps hinzugefügt

Der Studientyp wird anhand der Studiennummer erkannt

* `NCT`: Beginnt mit `NCT` (Groß-/Kleinschreibung ignioriert)
* `EUDRA_CT`: Entspricht: `YYYY-NNNNNN-CC`, dabei aufgeteilt in
  (Jahres-)Zahl, sechstelliger sequenzieller Nummer und zweistelliger Prüfziffer
* `UNKNOWN`: Keine Studiennummer angegeben oder entspricht keinem bekannten Schema

1 files changed, 8 insertions, 10 deletions

diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/DNPM/services/DefaultStudienService.java
index 2994917..9f2ca05 100644
--- a/src/main/java/DNPM/services/DefaultStudienService.java
+++ b/src/main/java/DNPM/services/DefaultStudienService.java
@@ -17,31 +17,28 @@ public class DefaultStudienService implements StudienService {
 
     @Override
     public List<Studie> findAll() {
-        var sql = "SELECT property_catalogue_version.version_number, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
+        var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
         + "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 "
-        + "JOIN studie ON studie.property_version_entry = pcve.id "
-        + "WHERE property_catalogue.name = 'OS.Studien' "
-        + "AND studie.aktiv;";
+        + "LEFT JOIN studie ON pcve.id = studie.property_version_entry "
+        + "WHERE property_catalogue.name = 'OS.Studien' AND s.aktiv;";
 
         return this.jdbcTemplate.query(sql, (resultSet, i) -> new Studie(
                 resultSet.getString(1),
                 resultSet.getString(2),
                 resultSet.getString(3),
+                resultSet.getString(4),
                 resultSet.getInt(0)
         ));
     }
 
     @Override
     public List<Studie> findByQuery(String query) {
-        var sql = "SELECT property_catalogue_version.version_number, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
+        var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue "
                 + "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 "
-                + "JOIN studie ON studie.property_version_entry = pcve.id "
-                + "WHERE property_catalogue.name = 'OS.Studien' "
-                + "AND studie.aktiv "
-                + "AND (pcve.shortdesc LIKE ? "
-                + "OR pcve.description LIKE ?);";
+                + "LEFT JOIN studie ON pcve.id = studie.property_version_entry "
+                + "WHERE property_catalogue.name = 'OS.Studien' AND studie.aktiv AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ?);";
 
         var like = String.format("%%%s%%", query);
 
@@ -49,6 +46,7 @@ public class DefaultStudienService implements StudienService {
                 resultSet.getString(1),
                 resultSet.getString(2),
                 resultSet.getString(3),
+                resultSet.getString(4),
                 resultSet.getInt(0)
         ));
     }