Merge branch 'main' into fix-drug-chemical

biothings · Mar 23, 2021 · d258b0d · d258b0d
2 parents febae20 + e3929aa
commit d258b0d
Show file tree

Hide file tree

Showing 17 changed files with 870 additions and 257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.0.0](https://github.com/kevinxin90/bte_trapi_query_graph_handler/compare/v0.7.0...v1.0.0) (2021-03-23)
+
+### Features
+
+* :sparkles: support query graph with explain type of query ([2d767fd](https://github.com/kevinxin90/bte_trapi_query_graph_handler/commit/2d767fd67d04c8956e3d55c2438def12b79ec104))
+
 ## [0.8.0](https://github.com/kevinxin90/bte_trapi_query_graph_handler/compare/v0.7.0...v0.8.0) (2021-03-23)
 
 

diff --git a/__test__/integration/BatchEdgeQueryHandler.test.js b/__test__/integration/BatchEdgeQueryHandler.test.js
@@ -1,5 +1,6 @@
 const QNode = require("../../src/query_node");
 const QEdge = require("../../src/query_edge");
+const QExeEdge = require("../../src/query_execution_edge")
 const BatchEdgeQueryHandler = require("../../src/batch_edge_query");
 const meta_kg = require("@biothings-explorer/smartapi-kg");
 
@@ -8,17 +9,18 @@ describe("Testing BatchEdgeQueryHandler Module", () => {
     kg.constructMetaKGSync();
 
     describe("Testing query function", () => {
-        test("test with one query edge", async () => {
-            let gene_node1 = new QNode("n1", { category: "Gene", id: "NCBIGENE:1017" });
-            let chemical_node1 = new QNode("n3", { category: "ChemicalSubstance" });
-            const edge1 = new QEdge("e01", { subject: gene_node1, object: chemical_node1 });
-            const batchHandler = new BatchEdgeQueryHandler(kg);
-            batchHandler.setEdges([edge1]);
-            expect(chemical_node1.hasEquivalentIDs()).toEqual(false);
-            const res = await batchHandler.query([edge1]);
-            expect(res.length).toBeGreaterThan(1);
-            expect(chemical_node1.hasEquivalentIDs()).toEqual(true);
-        })
+        // test("test with one query edge", async () => {
+        //     let gene_node1 = new QNode("n1", { category: "Gene", id: "NCBIGENE:1017" });
+        //     let chemical_node1 = new QNode("n3", { category: "ChemicalSubstance" });
+        //     const edge1 = new QEdge("e01", { subject: gene_node1, object: chemical_node1 });
+        //     const exeEdge1 = new QExeEdge(edge1, false, undefined);
+        //     const batchHandler = new BatchEdgeQueryHandler(kg);
+        //     batchHandler.setEdges([edge1]);
+        //     expect(chemical_node1.hasEquivalentIDs()).toEqual(false);
+        //     const res = await batchHandler.query([edge1]);
+        //     expect(res.length).toBeGreaterThan(1);
+        //     expect(chemical_node1.hasEquivalentIDs()).toEqual(true);
+        // })
 
         test("test subscribe and unsubscribe function", () => {
             const batchHandler = new BatchEdgeQueryHandler(kg);

diff --git a/__test__/integration/NodeUpdateHandler.test.js b/__test__/integration/NodeUpdateHandler.test.js
diff --git a/__test__/integration/QEdge2BTEEdgeHandler.test.js b/__test__/integration/QEdge2BTEEdgeHandler.test.js
@@ -82,37 +82,4 @@ describe("Testing NodeUpdateHandler Module", () => {
         })
     })
 
-    describe("Testing setEquivalentIDs function", () => {
-        test("test edge with one curie input should be annotated", async () => {
-            const node = new QNode("n1", { category: "Gene", id: "NCBIGene:1017" });
-            const edge = new QEdge("e01", { subject: node, object: chemical_node1 });
-            const nodeUpdater = new NodeUpdateHandler([edge]);
-            expect(node.hasEquivalentIDs()).toBeFalsy();
-            const res = await nodeUpdater.setEquivalentIDs([edge]);
-            expect(node.hasEquivalentIDs()).toBeTruthy();
-        })
-
-        test("test edge with multiple curie input should be annotated", async () => {
-            const node = new QNode("n1", { category: "Gene", id: ["NCBIGene:1017", "NCBIGene:1018"] });
-            const edge = new QEdge("e01", { subject: node, object: chemical_node1 });
-            const nodeUpdater = new NodeUpdateHandler([edge]);
-            expect(node.hasEquivalentIDs()).toBeFalsy();
-            const res = await nodeUpdater.setEquivalentIDs([edge]);
-            expect(node.hasEquivalentIDs()).toBeTruthy();
-            expect(node.getEquivalentIDs()).toHaveProperty("NCBIGene:1017");
-            expect(node.getEquivalentIDs()).toHaveProperty("NCBIGene:1018");
-        })
-
-        test("test edge with one curie input on object end return an array of one", async () => {
-            const node = new QNode("n1", { category: "Gene", id: "NCBIGene:1017" });
-            const edge = new QEdge("e01", { object: node, subject: chemical_node1 });
-            const nodeUpdater = new NodeUpdateHandler([edge]);
-            expect(node.hasEquivalentIDs()).toBeFalsy();
-            const res = await nodeUpdater.setEquivalentIDs([edge]);
-            expect(node.hasEquivalentIDs()).toBeTruthy();
-            expect(node.getEquivalentIDs()).toHaveProperty("NCBIGene:1017");
-            expect(chemical_node1.hasEquivalentIDs()).toBeFalsy();
-        })
-
-    })
 })