update searchTransaction on /v1/status

Author: PhyrexTsai

db/models/searchTransaction.js

@@ -11,11 +11,25 @@ SearchTransaction.prototype.read = function(txHash) {
 };
 
 SearchTransaction.prototype.create = function(entity) {
-    return null;
+    return pool.query('INSERT INTO searchtransaction (txHash, network, createTimestamp, fromAddress, status)' +
+        ' VALUES ($1, $2, now(), $3, $4)', 
+        [entity.txHash, 'testnet', entity.fromAddress, entity.status]).then(function(result) {
+        return result.rows[0].id;
+    }).catch(function(err) {
+        console.log(err.message, err.stack);
+        return null;
+    });
 };
 
 SearchTransaction.prototype.update = function(entity) {
-    return null;
+    return pool.query('UPDATE searchtransaction SET status = $1, WHERE txHash = $2', 
+        [entity.status, entity.txHash]).then(function(result) {
+        console.log(result);
+        return true;
+    }).catch(function(err) {
+        console.log(err.message, err.stack);
+        return false;
+    });
 };
 
 SearchTransaction.prototype.delete = function(id) {

routes/api.js

@@ -1,10 +1,15 @@
 // TODO 這邊還要補齊 /v1/status，與測試程式
 var express = require('express');
 var transactionData = require('../db/models/transactionData.js');
+var searchTransaction = require('../db/models/searchTransaction.js');
 var producer = require('../kafka/producer/producer.js');
+var Web3 = require('web3');
+var web3 = new Web3();
 var router = express.Router();
 
 var kafkaTopic = "InsertQueue";
+web3.setProvider(new web3.providers.HttpProvider(process.env.ENODE_BASE || 'http://localhost:8545'));
+
 /**
  * 把基本服務的 API 都放在這邊
  */
@@ -46,14 +51,19 @@ router.get('/v1/status', function(req, res, next) {
         transactionData.read(req.query.txHash).then(function(result){
             console.log(result);
             // FIXME 這邊要看狀態把資料丟出去
+            var transaction = {txHash: req.query.txHash, fromAddress: web3.eth.coinbase};
             if (result.rowCount > 0) {
+                transaction[status] = result.rows[0].status;
+                searchTransaction.create(transaction);
                 res.json({'data': {
                     'txHash': result.rows[0].txHash,
                     'status': result.rows[0].status,
                     'txTimestamp': result.rows[0].txTimestamp,
                     'tx': result.rows[0].transactionHash}
                 });
             } else {
+                transaction[status] = 'ERROR';
+                searchTransaction.create(transaction);
                 res.json({'error': {'message': 'invalid txHash'}});
             }
         }).catch(function (err) {

routes/ethereum.js

@@ -5,19 +5,22 @@ var web3 = new Web3();
 var router = express.Router();
 
 web3.setProvider(new web3.providers.HttpProvider(process.env.ENODE_BASE || 'http://localhost:8545'));
-var coinbase = web3.eth.coinbase;
 
 /**
  * GET ethereum coinbase
  */
 router.get('/coinbase', function(req, res, next) {
-  res.json({'data' :{'coinbase': coinbase}});
+  res.json({'data' :{'coinbase': web3.eth.coinbase}});
 });
 
 /**
  * GET ethereum account balance
  */
 router.get('/balance', function(req, res, next) {
+  var coinbase = web3.eth.coinbase;
+  if (req.query.address != null && req.query.address != '' && req.query.address != undefined) {
+    coinbase = req.query.address;
+  }
   var balance = web3.fromWei(web3.eth.getBalance(coinbase), "ether").toString(10) + ' ether';
   res.json({'data' :{'coinbase': coinbase, 'balance': balance}});
 });
@@ -60,6 +63,18 @@ router.get('/transaction', function(req, res, next) {
   res.json({'data' :{"txHash": txHash}});
 });
 
+/**
+ * GET transactionReceipt
+ * https://github.com/ethereum/wiki/wiki/JavaScript-API#web3ethgettransactionreceipt
+ */
+router.get('/transactionReceipt', function(req, res, next) {
+  var transactionHash = req.query.transactionHash;
+  if (transactionHash == null || transactionHash == '' || transactionHash == undefined) {
+    res.json({'error': {'code': 102, 'message': 'transactionHash is null'}});
+  }
+  res.json({'data': web3.eth.getTransactionReceipt(transactionHash)});
+});
+
 /**
  * GET estimate gas
  * https://github.com/ethereum/wiki/wiki/JavaScript-API#web3ethestimategas