Specify branch and user id in queries

skouter.go

@@ -108,13 +108,17 @@ func match(path, pattern string, args *[]string) bool {
 	return true
 }
 
-func getLoanType(db *sql.DB, id int, isUser bool) ([]LoanType, error) {
+func getLoanType(
+	db *sql.DB,
+	user int,
+	branch int,
+	isUser bool) ([]LoanType, error) {
 	var loans []LoanType
 
 	// Should be changed to specify user
 	rows, err :=
-	db.Query("SELECT * FROM loan_type WHERE user_id = ? " +
-	"OR (user_id = 0 AND branch_id = 0)", id)
+	db.Query(`SELECT * FROM loan_type WHERE user_id = ? AND branch_id = ? ` +
+	"OR (user_id = 0 AND branch_id = 0)", user, branch)
 
 	if err != nil {
 		return nil, fmt.Errorf("loan_type error: %v", err)
@@ -147,7 +151,10 @@ func getFees(db *sql.DB, user int) ([]FeeTemplate, error) {
 	var fees []FeeTemplate
 
 	// Should be changed to specify user
-	rows, err := db.Query("SELECT * FROM fee_template")
+	rows, err := db.Query(
+		"SELECT * FROM fee_template " +
+		"WHERE user_id = ? OR user_id = 0",
+	user)
 	if err != nil {
 		return nil, fmt.Errorf("Fee error %v", err)
 	}
@@ -175,7 +182,6 @@ func getFees(db *sql.DB, user int) ([]FeeTemplate, error) {
 		fees = append(fees, fee)
 	}
 
-	// fmt.Print("the fees: %v", fees)
 	return fees, nil
 }
 
@@ -221,7 +227,7 @@ func api(w http.ResponseWriter, r *http.Request) {
 
 	switch {
 	case match(p, "/api/loans", &args):
-		resp, err := getLoanType(db, 0, true)
+		resp, err := getLoanType(db, 0, 0, true)
 
 		if resp != nil {
 			json.NewEncoder(w).Encode(resp)