Merge pull request #40 from CCC-MF/issue_37

Issue #37: Anzeige, ob Studie (technisch) in Onkostar aktiv ist

2 files changed, 29 insertions, 8 deletions

diff --git a/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java b/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java
index 8812442..2967733 100644
--- a/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java
+++ b/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java
@@ -62,24 +62,42 @@ class EinzelempfehlungAnalyzerTest {
         var input = Map.of("q", (Object) "   ");
         this.analyzer.getStudien(input);
 
-        verify(studienService, times(1)).findAll();
+        verify(studienService, times(1)).findActive();
     }
 
     @Test
-    void shouldRequestAllStudienForEmptyInputMap() {
+    void shouldRequestActiveStudienForEmptyInputMap() {
         var input = new HashMap<String, Object>();
         this.analyzer.getStudien(input);
 
-        verify(studienService, times(1)).findAll();
+        verify(studienService, times(1)).findActive();
     }
 
     @Test
-    void shouldRequestFilteredStudien() {
+    void shouldRequestFilteredActiveStudien() {
         var input = Map.of("q", (Object) "NCT-123");
         this.analyzer.getStudien(input);
 
         var captor = ArgumentCaptor.forClass(String.class);
-        verify(studienService, times(1)).findByQuery(captor.capture());
+        verify(studienService, times(1)).findActiveByQuery(captor.capture());
+        assertThat(captor.getValue()).isEqualTo("NCT-123");
+    }
+
+    @Test
+    void shouldRequestActiveStudien() {
+        var input = Map.of("q", (Object) "");
+        this.analyzer.getStudien(input);
+
+        verify(studienService, times(1)).findActive();
+    }
+
+    @Test
+    void shouldRequestAllFilteredtudien() {
+        var input = Map.of("q", (Object) "NCT-123");
+        this.analyzer.getStudien(input);
+
+        var captor = ArgumentCaptor.forClass(String.class);
+        verify(studienService, times(1)).findActiveByQuery(captor.capture());
         assertThat(captor.getValue()).isEqualTo("NCT-123");
     }
 
diff --git a/src/test/java/DNPM/services/StudieTest.java b/src/test/java/DNPM/services/StudieTest.java
index e9bdf25..a6b8ccf 100644
--- a/src/test/java/DNPM/services/StudieTest.java
+++ b/src/test/java/DNPM/services/StudieTest.java
@@ -15,7 +15,8 @@ class StudieTest {
                 null,
                 "Nct-12345678",
                 "Teststudie 1",
-                "Teststudie 1"
+                "Teststudie 1",
+                true
         );
 
         assertThat(studie.getType()).isEqualTo(Studie.Type.NCT);
@@ -29,7 +30,8 @@ class StudieTest {
                 null,
                 "2023-012345-12",
                 "Teststudie 1",
-                "Teststudie 1"
+                "Teststudie 1",
+                true
         );
 
         assertThat(studie.getType()).isEqualTo(Studie.Type.EUDRA_CT);
@@ -43,7 +45,8 @@ class StudieTest {
                 "teststudie1",
                 null,
                 "Teststudie 1",
-                "Teststudie 1"
+                "Teststudie 1",
+                true
         );
 
         assertThat(studie.getType()).isEqualTo(Studie.Type.UNKNOWN);