Verschiebe Klasse Studie in Paket dto

3 files changed, 3 insertions, 67 deletions

diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/DNPM/services/DefaultStudienService.java
index a4aa328..1f704c4 100644
--- a/src/main/java/DNPM/services/DefaultStudienService.java
+++ b/src/main/java/DNPM/services/DefaultStudienService.java
@@ -1,5 +1,6 @@
 package DNPM.services;
 
+import DNPM.dto.Studie;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/DNPM/services/Studie.java b/src/main/java/DNPM/services/Studie.java
deleted file mode 100644
index 2c5d5be..0000000
--- a/src/main/java/DNPM/services/Studie.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package DNPM.services;
-
-public class Studie {
-    private final String kategorieName;
-    private final String code;
-    private final String studiennummer;
-    private final String shortDesc;
-    private final String description;
-    private final int version;
-
-    public Studie(final String kategorieName, final int version, final String code, final String studiennummer, final String shortDesc, final String description) {
-        this.kategorieName = kategorieName;
-        this.version = version;
-        this.code = code;
-        this.studiennummer = studiennummer;
-        this.shortDesc = shortDesc;
-        this.description = description;
-    }
-
-    public String getKategorieName() {
-        return kategorieName;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getStudiennummer() {
-        return studiennummer;
-    }
-
-    public String getShortDesc() {
-        return shortDesc;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Type getType() {
-        if (this.hasNctNumber()) {
-            return Type.NCT;
-        } else if (this.hasEudraCtNumber()) {
-            return Type.EUDRA_CT;
-        } else {
-            return Type.UNKNOWN;
-        }
-    }
-
-    private boolean hasNctNumber() {
-        return null != studiennummer && studiennummer.toLowerCase().startsWith("nct");
-    }
-
-    private boolean hasEudraCtNumber() {
-        return null != studiennummer && studiennummer.matches("[0-9]{4}-[0-9]{6}-[0-9]{2}");
-    }
-
-    public enum Type {
-        NCT,
-        EUDRA_CT,
-        UNKNOWN
-    }
-}
diff --git a/src/main/java/DNPM/services/StudienService.java b/src/main/java/DNPM/services/StudienService.java
index f6245de..dc0187e 100644
--- a/src/main/java/DNPM/services/StudienService.java
+++ b/src/main/java/DNPM/services/StudienService.java
@@ -1,5 +1,7 @@
 package DNPM.services;
 
+import DNPM.dto.Studie;
+
 import java.util.List;
 
 public interface StudienService {