From 2f96c8b82237b1ad58ebf5e857d639684856efdb Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Wed, 10 May 2023 10:15:12 +0200
Subject: [PATCH] Verschiebe Klasse Studie in Paket dto

---
 .../DNPM/analyzer/TherapieplanAnalyzer.java   |  4 +--
 .../java/DNPM/{services => dto}/Studie.java   | 26 ++++++++++++++++++-
 .../DNPM/services/DefaultStudienService.java  |  1 +
 .../java/DNPM/services/StudienService.java    |  2 ++
 src/test/java/DNPM/services/StudieTest.java   |  1 +
 5 files changed, 31 insertions(+), 3 deletions(-)
 rename src/main/java/DNPM/{services => dto}/Studie.java (58%)

diff --git a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
index 3024125..780a571 100644
--- a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
+++ b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
@@ -1,11 +1,11 @@
 package DNPM.analyzer;
 
+import DNPM.dto.Studie;
 import DNPM.security.DelegatingDataBasedPermissionEvaluator;
 import DNPM.security.PermissionType;
-import DNPM.services.Studie;
 import DNPM.services.StudienService;
-import DNPM.services.therapieplan.TherapieplanServiceFactory;
 import DNPM.services.mtb.MtbService;
+import DNPM.services.therapieplan.TherapieplanServiceFactory;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.Procedure;
 import de.itc.onkostar.api.analysis.AnalyseTriggerEvent;
diff --git a/src/main/java/DNPM/services/Studie.java b/src/main/java/DNPM/dto/Studie.java
similarity index 58%
rename from src/main/java/DNPM/services/Studie.java
rename to src/main/java/DNPM/dto/Studie.java
index 2c5d5be..877cdd0 100644
--- a/src/main/java/DNPM/services/Studie.java
+++ b/src/main/java/DNPM/dto/Studie.java
@@ -1,4 +1,28 @@
-package DNPM.services;
+/*
+ * MIT License
+ *
+ * 2023 Comprehensive Cancer Center Mainfranken
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package DNPM.dto;
 
 public class Studie {
     private final String kategorieName;
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/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 {
diff --git a/src/test/java/DNPM/services/StudieTest.java b/src/test/java/DNPM/services/StudieTest.java
index e4b6af6..e9bdf25 100644
--- a/src/test/java/DNPM/services/StudieTest.java
+++ b/src/test/java/DNPM/services/StudieTest.java
@@ -1,5 +1,6 @@
 package DNPM.services;
 
+import DNPM.dto.Studie;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;