Merge branch 'release/0.15.0'

dermatologist · May 19, 2021 · f266a9d · f266a9d
2 parents 5f5b333 + c7c7617
commit f266a9d
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,6 +13,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
     - uses: actions/checkout@v1

diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@
                  \/        \/        \/
 </pre>
 ![omopfhirmap](https://forthebadge.com/images/badges/made-with-java.svg)
-![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/dermatologist/ckblib)
 
 [![ckblib](https://github.com/dermatologist/ckblib/blob/develop/notes/dermml.jpg)](https://nuchange.ca)
 

diff --git a/application/pom.xml b/application/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>ckblib-application</artifactId>
-	<version>0.14.0</version>
+	<version>0.15.0</version>
 	<name>ckblib-application</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>

diff --git a/graph/pom.xml b/graph/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>graph</artifactId>
-	<version>0.14.0</version>
+	<version>0.15.0</version>
 	<name>ckblib-graph</name>
 	<description>Demo project for Spring Boot</description>
 

diff --git a/graph/src/main/java/com/canehealth/ckblib/graph/BaseRelationRepository.java b/graph/src/main/java/com/canehealth/ckblib/graph/BaseRelationRepository.java
@@ -27,9 +27,4 @@ public interface BaseRelationRepository extends ReactiveNeo4jRepository<BaseRela
 	)
     Mono<Object> updateRelationshipAttributes(String dcui, String scui, int c, int u, int d);
 
-    @Query(""
-		+ "MATCH (d {cui: $cui}) -[r]- (s)\n"
-        + "RETURN sum(r.upvote) - sum(r.downvote) as lift, d.name as name, d.cui as cui \n"
-	)
-    Mono<Object> getLift(String cui);
 }
diff --git a/graph/src/main/java/com/canehealth/ckblib/graph/BaseRelationService.java b/graph/src/main/java/com/canehealth/ckblib/graph/BaseRelationService.java
@@ -36,4 +36,14 @@ public Mono<Object> addAttributes(String dcui, String scui, int confidence, int
         return baseRelationRepository.updateRelationshipAttributes(dcui, scui, confidence, upvote, downvote);
 
     }
+
+
+    public String getLift(String cui) {
+        String query = ""
+		+ "MATCH (d {cui: '"+ cui + "'}) -[r]- (s)\n"
+        + "RETURN (sum(r.upvote) - sum(r.downvote)) / (sum(r.upvote) + sum(r.downvote) + 1) as lift \n";
+        D3Map d3Map = new D3Map.Builder(driver).withQuery(query).build();
+        return d3Map.fetch();
+    }
+
 }
diff --git a/graph/src/main/java/com/canehealth/ckblib/graph/model/DiseaseDisorderMention.java b/graph/src/main/java/com/canehealth/ckblib/graph/model/DiseaseDisorderMention.java
@@ -4,7 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.neo4j.core.schema.Id;
 import org.springframework.data.neo4j.core.schema.Node;
@@ -30,6 +30,7 @@ public class DiseaseDisorderMention {
     private List<ConceptAttributes> attributes = new ArrayList<>();
 
     // target is in differential diagnosis
+    @JsonIgnore
     @Relationship(type = "ASSOCIATED_WITH", direction = INCOMING)
     private List<BaseRelation> differentials = new ArrayList<>();
 

diff --git a/graph/src/test/java/com/canehealth/ckblib/graph/BaseRelationServiceTest.java b/graph/src/test/java/com/canehealth/ckblib/graph/BaseRelationServiceTest.java
@@ -99,6 +99,8 @@ void shouldRetrieveDiseases() {
         String after = baseRelationService.getRelationsByCui("C0041834");
         assertNotEquals(before, after);
 
+        String lift = baseRelationService.getLift("C0041834");
+        assertFalse(lift.length()<10);
     }
 
 }
diff --git a/library/pom.xml b/library/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>library</artifactId>
-	<version>0.14.0</version>
+	<version>0.15.0</version>
 	<name>ckblib-library</name>
 	<description>Demo project for Spring Boot</description>
 

diff --git a/notes/dermml.jpg b/notes/dermml.jpg
diff --git a/pom-deploy.xml b/pom-deploy.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.canehealth.ckblib</groupId>
     <artifactId>cklib-core</artifactId>
-    <version>0.14.0</version>
+    <version>0.15.0</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.canehealth.ckblib</groupId>
     <artifactId>cklib-core</artifactId>
-    <version>0.14.0</version>
+    <version>0.15.0</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/qtakes/pom.xml b/qtakes/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>qtakes</artifactId>
-	<version>0.14.0</version>
+	<version>0.15.0</version>
 	<name>ckblib-qtakes</name>
 	<description>Demo project for Spring Boot</description>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ jobs: @@
       build:
         runs-on: ubuntu-latest
+        timeout-minutes: 10
         steps:
         - uses: actions/checkout@v1
@@ Expand Down @@