now make query based on timestamp and source. all queries seem to be …

…working
dondi · Feb 26, 2025 · ec6906a · ec6906a
1 parent 87709ff
commit ec6906a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/server/dals/network-dal.js b/server/dals/network-dal.js
@@ -22,7 +22,9 @@ const buildNetworkSourceQuery = function () {
 
 const buildNetworkGeneFromSourceQuery = function (gene, source, timestamp) {
     const namespace = `${timestampNamespace(timestamp, true)}.gene`;
-    const timestampQuery = isTimestampOld(timestamp) ?  "" : `AND gene.time_stamp='${timestamp}'`;
+    const timestampQuery = isTimestampOld(timestamp)
+            ?  ""
+            : `AND gene.time_stamp='${timestamp}' AND gene.source='${source}'`;
 
     return `SELECT DISTINCT gene_id, display_gene_id FROM
             ${namespace} WHERE (gene.gene_id ='${gene}'

diff --git a/server/dals/protein-dal.js b/server/dals/protein-dal.js
@@ -20,9 +20,11 @@ const buildNetworkSourceQuery = function () {
             ORDER BY time_stamp DESC;`;
 };
 
-const buildNetworkFromGeneProteinQuery = function (geneProtein, timestamp) {
+const buildNetworkFromGeneProteinQuery = function (geneProtein, source, timestamp) {
     const namespace = timestampNamespace(timestamp, false);
-    const timestampQuery = isTimestampOld(timestamp) ? "" : `AND gene.time_stamp='${timestamp}'`;
+    const timestampQuery = isTimestampOld(timestamp)
+            ? ""
+            : `AND gene.time_stamp='${timestamp}' AND gene.source='${source}'`;
     console.log("timestampquery", timestampQuery);
     return `SELECT DISTINCT gene_id, display_gene_id, standard_name, length, molecular_weight, PI FROM
     ${namespace}.gene, ${namespace}.protein WHERE
@@ -54,7 +56,7 @@ const buildGenerateProteinNetworkQuery = function (proteins, timestamp, source)
 const buildQueryByType = function (query) {
     const networkQueries = {
         NetworkSource: () => buildNetworkSourceQuery(),
-        NetworkFromGeneProtein: () => buildNetworkFromGeneProteinQuery(query.geneProtein),
+        NetworkFromGeneProtein: () => buildNetworkFromGeneProteinQuery(query.geneProtein, query.timestamp, query.source),
         GenerateProteinNetwork: () => buildGenerateProteinNetworkQuery(query.proteins, query.timestamp, query.source),
     };
     if (Object.keys(networkQueries).includes(query.type)) {