fix: use uuid for capture id when matching captures in wallet for map

Greenstand · Mar 4, 2021 · 902cb1b · 902cb1b
1 parent c902676
commit 902cb1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/server/models/sqls/SQLCase2.js b/server/models/sqls/SQLCase2.js
@@ -111,7 +111,7 @@ class SQLCase2{
   getJoin(){
     let result = "";
     if(this.wallet){
-      result += 'INNER JOIN wallet.token ON wallet.token.tree_id = trees.id \n';
+      result += 'INNER JOIN wallet.token ON wallet.token.capture_id = trees.uuid \n';
       result += 'INNER JOIN wallet.wallet ON wallet.wallet.id = wallet.token.entity_id \n';
     }
     if(this.flavor){

diff --git a/server/models/sqls/SQLCase3.js b/server/models/sqls/SQLCase3.js
@@ -82,7 +82,7 @@ class SQLCase3{
   getJoin(){
     let result = "";
     if(this.wallet){
-      result += 'INNER JOIN wallet.token ON wallet.token.tree_id = trees.id \n';
+      result += 'INNER JOIN wallet.token ON wallet.token.capture_id = trees.uuid \n';
       result += 'INNER JOIN wallet.wallet ON wallet.wallet.id = wallet.token.entity_id \n';
     }
     if(this.flavor){

diff --git a/server/models/sqls/SQLTree.js b/server/models/sqls/SQLTree.js
@@ -25,7 +25,7 @@ class SQLTree{
         ON planter.id = trees.planter_id
         LEFT JOIN tree_species ON
           trees.species_id = tree_species.id
-        LEFT JOIN token ON token.tree_id = trees.id 
+        LEFT JOIN token ON token.capture_id = trees.uuid
         LEFT JOIN entity ON entity.id = token.entity_id 
         WHERE
           trees.id = $1 AND trees.active = true