From d8267944042bf25a6062828c76272b4e8563bf3c Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 20 Apr 2018 13:57:57 -0400
Subject: [PATCH] getBlock written need to test

---
 blockExplorerApi/handler.go    | 14 +++++++++--
 blockExplorerApi/routes.go     |  6 +++++
 shyftdb/shyft_database_util.go | 46 ++++++++++++++++++++++++----------
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/blockExplorerApi/handler.go b/blockExplorerApi/handler.go
index 3e7f1af80f..33cc098a42 100644
--- a/blockExplorerApi/handler.go
+++ b/blockExplorerApi/handler.go
@@ -2,10 +2,13 @@ package main
 
 ///@NOTE Shyft handler functions when endpoints are hit
 import (
+	"database/sql"
 	"fmt"
 	logger "log"
 	"net/http"
 
+	_ "github.com/lib/pq"
+
 	shyftdb "github.com/ethereum/shyft_go-ethereum/shyftdb"
 	"github.com/gorilla/mux"
 	"github.com/syndtr/goleveldb/leveldb"
@@ -57,12 +60,19 @@ func GetBalances(w http.ResponseWriter, r *http.Request) {
 
 //GetBlock returns block json
 func GetBlock(w http.ResponseWriter, r *http.Request) {
-	//block := shyftdb.GetBlock()
+
+	connStr := "user=postgres dbname=shyftdb sslmode=disable"
+	blockExplorerDb, err := sql.Open("postgres", connStr)
+	if err != nil {
+		return
+	}
+
+	block3 := shyftdb.GetBlock(blockExplorerDb)
 
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	//fmt.Fprintln(w, "block", block)
+	fmt.Fprintln(w, "block", block3)
 }
 
 // GetAllBlocks response
diff --git a/blockExplorerApi/routes.go b/blockExplorerApi/routes.go
index 7aedd4f691..fadd46ea94 100644
--- a/blockExplorerApi/routes.go
+++ b/blockExplorerApi/routes.go
@@ -33,6 +33,12 @@ var routes = Routes{
 		"/api/get_all_blocks",
 		GetAllBlocks,
 	},
+	Route{
+		"GetBlock",
+		"GET",
+		"/api/get_block",
+		GetBlock,
+	},
 	Route{
 		"GetAllTransactions",
 		"GET",
diff --git a/shyftdb/shyft_database_util.go b/shyftdb/shyft_database_util.go
index 9401b93c8a..7b3be296b3 100644
--- a/shyftdb/shyft_database_util.go
+++ b/shyftdb/shyft_database_util.go
@@ -17,11 +17,13 @@ import (
 	_ "github.com/lib/pq"
 )
 
+//SBlock type
 type SBlock struct {
 	hash string
 	txes []string
 }
 
+//ShyftTxEntry structure
 type ShyftTxEntry struct {
 	TxHash    common.Hash
 	To        *common.Address
@@ -98,11 +100,16 @@ func WriteBlock(sqldb *sql.DB, block *types.Block) error {
 
 	//sqldb.Exec("INSERT INTO block(hash, miner) VALUES ($1)", block)
 	//qerr := sqldb.QueryRow(`INSERT INTO block(hash, miner) VALUES('bark', 'willow')`).Scan(&fun)
-	res, qerr := sqldb.Exec(`INSERT INTO blocks(hash, coinbase, number) VALUES(($1), ($2), ($3))`, block.Header().Hash().Hex(), coinbase, number) //.Scan(&fun)
-	fmt.Println("insert ERROR")
-	fmt.Println(qerr)
-	fmt.Println(res)
-	fmt.Println(number)
+	sqlStatement := `INSERT INTO blocks(hash, coinbase, number) VALUES(($1), ($2), ($3)) RETURNING number`
+	qerr := sqldb.QueryRow(sqlStatement, block.Header().Hash().Hex(), coinbase, number).Scan(&number) //.Scan(&fun)
+	if qerr != nil {
+		panic(qerr)
+	}
+	fmt.Println("New record ID is:", number)
+	// fmt.Println("insert ERROR")
+	// fmt.Println(qerr)
+	// fmt.Println(res)
+	// fmt.Println(number)
 
 	return nil
 }
@@ -278,15 +285,28 @@ func GetAllBlocks(db *leveldb.DB) []SBlock {
 	return arr
 }
 
-func GetBlock(db *leveldb.DB, block *types.Block) []byte {
-	hash := block.Header().Hash().Bytes()
-	key := append([]byte("bk-")[:], hash[:]...)
-	data, err := db.Get(key, nil)
-	if err != nil {
-		log.Crit("Could not retrieve block", "err", err)
+//GetBlock queries to send single block info
+//TODO provide blockHash arg passed from handler.go
+func GetBlock(sqldb *sql.DB) []SBlock {
+	var block []SBlock
+	var number string
+	var hash string
+	var coinbase string
+
+	sqlStatement := `SELECT * FROM blocks WHERE number=$1;`
+	row := sqldb.QueryRow(sqlStatement, 3)
+	err := row.Scan(&number, &hash, &coinbase)
+	switch err {
+	case sql.ErrNoRows:
+		fmt.Println("No rows were returned")
+		return block
+	case nil:
+		fmt.Println("nil")
+	default:
+		panic(err)
 	}
-	fmt.Println("\nBLOCK Value: " + string(data))
-	return data
+	fmt.Println("this is a query", row)
+	return block
 }
 
 func GetAllTransactions(db *leveldb.DB) []ShyftTxEntryPretty {