Merge pull request #404 from thecsw/Fixing384

Fixing #384: Uninitialized Networth API Variable

api/firm/firm.go

@@ -1,16 +1,15 @@
 package firm
 
 import (
+	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"regexp"
-
-	"../utils"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/gorilla/mux"
 )
 
 type firm struct {
@@ -19,16 +18,13 @@ type firm struct {
 	Balance    int64  `json:"balance"`
 	Size       int    `json:"size"`
 	Execs      int    `json:"execs"`
-	Assocs     int    `json:"assocs"`
-	Coo        int    `json:"coo"`
-	Cfo        int    `json:"cfo"`
 	Tax        int    `json:"tax"`
 	Rank       int    `json:"rank"`
 	Private    bool   `json:"private"`
 	LastPayout int    `json:"last_payout"`
 }
 
-type investor struct {
+type investorNet struct {
 	Id        int      `json:"id"`
 	Name      string   `json:"name"`
 	Balance   int64    `json:"balance"`
@@ -40,6 +36,17 @@ type investor struct {
 	NetWorth  int64    `json:"networth"`
 }
 
+type investor struct {
+	Id        int      `json:"id"`
+	Name      string   `json:"name"`
+	Balance   int64    `json:"balance"`
+	Completed int      `json:"completed"`
+	Broke     int      `json:"broke"`
+	Badges    []string `json:"badges"`
+	Firm      int      `json:"firm"`
+	Firm_role string   `json:"firm_role"`
+}
+
 // Investments on time
 func Firm() func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -64,8 +71,8 @@ func Firm() func(w http.ResponseWriter, r *http.Request) {
 		}
 		defer conn.Close()
 		query := fmt.Sprintf(`
-SELECT id, name, balance, size, execs, assocs, 
-coo, cfo, tax, rank, private, last_payout
+SELECT id, name, balance, size, execs,
+tax, rank, private, last_payout
 FROM Firms
 WHERE id = %s
 ORDER BY balance DESC 
@@ -85,9 +92,6 @@ LIMIT 1;`, firm_id)
 				&temp.Balance,
 				&temp.Size,
 				&temp.Execs,
-				&temp.Assocs,
-				&temp.Coo,
-				&temp.Cfo,
 				&temp.Tax,
 				&temp.Rank,
 				&temp.Private,
@@ -207,8 +211,8 @@ LIMIT %d OFFSET %d;`, firm_id, per_page, per_page*page)
 			return
 		}
 		defer rows.Close()
-		wrapper := make([]investor, 0, per_page)
-		temp := investor{}
+		wrapper := make([]investorNet, 0, per_page)
+		temp := investorNet{}
 		var badges_temp string
 		for rows.Next() {
 			err := rows.Scan(