Merge pull request #10 from datasektionen/fix-mungus-bungus

tog bort bra kod som fungerade förut

internal/database/loader.go

@@ -3,8 +3,9 @@ package database
 import (
 	"database/sql"
 	"fmt"
-	"github.com/datasektionen/GOrdian/internal/excel"
 	"io"
+
+	"github.com/datasektionen/GOrdian/internal/excel"
 )
 
 func SaveBudget(fileReader io.Reader, db *sql.DB) error {
@@ -36,11 +37,6 @@ func SaveBudget(fileReader io.Reader, db *sql.DB) error {
 		return fmt.Errorf("error inserting budget lines in database: %v", err)
 	}
 
-	err = Close(db)
-	if err != nil {
-		return fmt.Errorf("error inserting budget in database: %v", err)
-	}
-
 	//fmt.Println(budgetLines)
 	//fmt.Println(budgetLines[0].CostCentreName)
 	return nil

internal/database/postgres.go

@@ -3,6 +3,7 @@ package database
 import (
 	"database/sql"
 	"fmt"
+
 	_ "github.com/lib/pq"
 )
 
@@ -23,6 +24,7 @@ func Connect(psqlconnString string) (*sql.DB, error) {
 	return db, nil
 }
 
+// unused for now
 func Close(db *sql.DB) error {
 	err := db.Close()
 	if err != nil {

internal/web/report.go

@@ -94,6 +94,7 @@ func getCCList(db *sql.DB) ([]string, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get CCList from database: %v", err)
 	}
+	defer result.Close()
 
 	var CCList []string
 
@@ -120,6 +121,7 @@ func getReportLines(db *sql.DB, year string, cc string) ([]ReportLine, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get reportlines from database: %v", err)
 	}
+	defer result.Close()
 
 	var reportLines []ReportLine