From b80109e0937fb3c9f26d08e7340e235dc7d959a6 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Sat, 12 May 2018 17:13:50 -0400
Subject: [PATCH] routes fixing

---
 blockExplorerApi/handler.go    |  6 +++++-
 blockExplorerApi/routes.go     |  2 +-
 shyftdb/shyft_database_util.go | 18 +++---------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/blockExplorerApi/handler.go b/blockExplorerApi/handler.go
index 3c2c6d9943..abdc9acd31 100644
--- a/blockExplorerApi/handler.go
+++ b/blockExplorerApi/handler.go
@@ -14,13 +14,17 @@ import (
 
 // GetTransaction gets txs
 func GetTransaction(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	txHash := vars["txHash"]
+	fmt.Println(txHash)
 	connStr := "user=postgres dbname=shyftdb sslmode=disable"
 	blockExplorerDb, err := sql.Open("postgres", connStr)
 	if err != nil {
 		return
 	}
 
-	getTxResponse := shyftdb.GetTransaction(blockExplorerDb)
+	getTxResponse := shyftdb.GetTransaction(blockExplorerDb, txHash)
+	fmt.Println(getTxResponse)
 
 	if err != nil {
 		http.Error(w, err.Error(), 500)
diff --git a/blockExplorerApi/routes.go b/blockExplorerApi/routes.go
index 28a49fdd19..58d0d3ebf9 100644
--- a/blockExplorerApi/routes.go
+++ b/blockExplorerApi/routes.go
@@ -48,7 +48,7 @@ var routes = Routes{
 	Route{
 		"GetTransaction",
 		"GET",
-		"/api/get_transaction",
+		"/api/get_transaction/{txHash}",
 		GetTransaction,
 	},
 	Route{
diff --git a/shyftdb/shyft_database_util.go b/shyftdb/shyft_database_util.go
index 35822688d0..1c5d34d8c5 100644
--- a/shyftdb/shyft_database_util.go
+++ b/shyftdb/shyft_database_util.go
@@ -513,20 +513,9 @@ func GetAllTransactions(sqldb *sql.DB) string {
 }
 
 //GetTransaction fn returns single tx
-func GetTransaction(sqldb *sql.DB) string {
-	sqlStatement := `SELECT
-		txhash,
-			to_addr,
-			from_addr,
-			blockhash,
-			blocknumber,
-			amount,
-			gasprice,
-			gas,
-			txfee,
-			nonce
-	FROM txs WHERE nonce=$1;`
-	row := sqldb.QueryRow(sqlStatement, 1)
+func GetTransaction(sqldb *sql.DB, TxHash string) string {
+	sqlStatement := `SELECT * FROM txs WHERE txhash=$1;`
+	row := sqldb.QueryRow(sqlStatement, TxHash)
 		var txhash string
 		var to_addr string
 		var from_addr string
@@ -546,7 +535,6 @@ func GetTransaction(sqldb *sql.DB) string {
 		&gas,
 		&txfee,
 		&nonce)
-
 	tx := ShyftTxEntryPretty{
 		TxHash:    txhash,
 		To:        to_addr,