Nach Suchbegriff aus Datenbank lesen implementiert, außerdem structs mit new() instanziiert

.gitignore

@@ -0,0 +1 @@
+create_tables.sql

db/db.go

@@ -1,72 +0,0 @@
-package db
-
-import (
-	"bufio"
-	"database/sql"
-	"fmt"
-	"os"
-	"strings"
-	"syscall"
-
-	"streifling.com/jason/sicherheitsunterweisung/types"
-
-	"github.com/go-sql-driver/mysql"
-	"golang.org/x/term"
-)
-
-type DB struct {
-	*sql.DB
-	Name string
-}
-
-func getCredentials() (string, string, error) {
-	fmt.Printf("DB Benutzer: ")
-	user, err := bufio.NewReader(os.Stdin).ReadString('\n')
-	if err != nil {
-		return "", "", fmt.Errorf("getCredentials: bufio.NewReader(os.Stdin).ReadString('\n'): %v", err)
-	}
-
-	fmt.Printf("DB Passwort: ")
-	bytePass, err := term.ReadPassword(int(syscall.Stdin))
-	if err != nil {
-		return "", "", fmt.Errorf("getCredentials: term.ReadPassword(int(syscall.Stdin)): %v", err)
-	}
-	fmt.Println()
-	pass := string(bytePass)
-
-	return strings.TrimSpace(user), strings.TrimSpace(pass), nil
-}
-
-func OpenDB(dbName string) (*DB, error) {
-	var db *DB
-	var err error
-
-	cfg := mysql.NewConfig()
-	cfg.DBName = dbName
-	cfg.User, cfg.Passwd, err = getCredentials()
-	if err != nil {
-		return nil, fmt.Errorf("OpenDB: getCredentials(): %v\n", err)
-	}
-
-	db.Name = dbName
-	db.DB, err = sql.Open("mysql", cfg.FormatDSN())
-	if err != nil {
-		return nil, fmt.Errorf("newDB: sql.Open(\"mysql\", cfg.FormatDSN()): %v\n", err)
-	}
-	if err := db.Ping(); err != nil {
-		return nil, fmt.Errorf("newDB: db.Ping(): %v\n", err)
-	}
-
-	return db, nil
-}
-
-func (db *DB) WriteBriefing(b *types.Briefing) error {
-	for i := 1; i < len(b.Participants); i++ {
-		_, err := db.Exec("INSERT INTO ? (instructor_first, instructor_last, date, time, state, location, participant_first, participant_last, company) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", db.Name, b.FirstName, b.LastName, b.Date, b.Time, b.State, b.Location, b.Participants[i].FirstName, b.Participants[i].LastName, b.Participants[i].Company)
-		if err != nil {
-			return fmt.Errorf("*DB.WriteBriefing: db.Exec(\"INSERT INTO ? (instructor_first, instructor_last, date, time, state, location, participant_first, participant_last, company) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)\", db.Name, b.FirstName, b.LastName, b.Date, b.Time, b.State, b.Location, b.Participants[i].FirstName, b.Participants[i].LastName, b.Participants[i].Company): %v\n", err)
-		}
-	}
-
-	return nil
-}

main.go

@@ -4,11 +4,17 @@ import (
 	"log"
 	"net/http"
 
-	"streifling.com/jason/sicherheitsunterweisung/db"
-	"streifling.com/jason/sicherheitsunterweisung/server"
-	"streifling.com/jason/sicherheitsunterweisung/types"
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
+	"streifling.com/jason/sicherheitsunterweisung/packages/server"
+	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
+func writeBriefing(ch chan *types.Briefing, db *db.DB) {
+	for b := range ch {
+		db.WriteBriefing(b)
+	}
+}
+
 func main() {
 	var i, j int64
 
@@ -16,7 +22,7 @@ func main() {
 	mux := http.NewServeMux()
 	cb := make(chan *types.Briefing)
 
-	db, err := db.OpenDB("sicherheitsunterweisung")
+	db, err := db.Open("sicherheitsunterweisung")
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -26,11 +32,7 @@ func main() {
 	mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
 	mux.HandleFunc("/submit/", server.SubmitForm(cb, &i, &j))
 
-	go func() {
-		for b := range cb {
-			db.WriteBriefing(b)
-		}
-	}()
+	go writeBriefing(cb, db)
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

packages/db/db.go

@@ -0,0 +1,124 @@
+package db
+
+import (
+	"bufio"
+	"database/sql"
+	"fmt"
+	"os"
+	"strings"
+	"syscall"
+
+	"streifling.com/jason/sicherheitsunterweisung/packages/types"
+
+	"github.com/go-sql-driver/mysql"
+	"golang.org/x/term"
+)
+
+type DB struct {
+	*sql.DB
+	Name string
+}
+
+func getCredentials() (string, string, error) {
+	fmt.Printf("DB Benutzer: ")
+	user, err := bufio.NewReader(os.Stdin).ReadString('\n')
+	if err != nil {
+		return "", "", fmt.Errorf("getCredentials: bufio.NewReader(os.Stdin).ReadString('\n'): %v", err)
+	}
+
+	fmt.Printf("DB Passwort: ")
+	bytePass, err := term.ReadPassword(int(syscall.Stdin))
+	if err != nil {
+		return "", "", fmt.Errorf("getCredentials: term.ReadPassword(int(syscall.Stdin)): %v", err)
+	}
+	fmt.Println()
+	pass := string(bytePass)
+
+	return strings.TrimSpace(user), strings.TrimSpace(pass), nil
+}
+
+func Open(dbName string) (*DB, error) {
+	var err error
+	db := new(DB)
+
+	cfg := mysql.NewConfig()
+	cfg.DBName = dbName
+	cfg.User, cfg.Passwd, err = getCredentials()
+	if err != nil {
+		return nil, fmt.Errorf("Open: getCredentials(): %v\n", err)
+	}
+
+	db.Name = dbName
+	db.DB, err = sql.Open("mysql", cfg.FormatDSN())
+	if err != nil {
+		return nil, fmt.Errorf("Open: sql.Open(\"mysql\", cfg.FormatDSN()): %v\n", err)
+	}
+	if err := db.Ping(); err != nil {
+		return nil, fmt.Errorf("Open: db.Ping(): %v\n", err)
+	}
+
+	return db, nil
+}
+
+func (db *DB) WriteBriefing(b *types.Briefing) error {
+	for i := 0; i < len(b.Participants); i++ {
+		result, err := db.Exec("INSERT INTO "+db.Name+" (instructor_first,"+
+			"instructor_last, date, time, state, location, participant_first,"+
+			"participant_last, company) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+			b.FirstName, b.LastName, b.Date, b.Time, b.State, b.Location,
+			b.Participants[i].FirstName, b.Participants[i].LastName,
+			b.Participants[i].Company)
+		if err != nil {
+			return fmt.Errorf("*DB.WriteBriefing: db.Exec(\"INSERT INTO"+
+				"\"+db.Name+\" (instructor_first, instructor_last, date, time, state,"+
+				"location, participant_first, participant_last, company) VALUES (?, ?,"+
+				"?, ?, ?, ?, ?, ?, ?)\", b.FirstName, b.LastName, b.Date, b.Time,"+
+				"b.State, b.Location, b.Participants[i].FirstName,"+
+				"b.Participants[i].LastName, b.Participants[i].Company): %v\n", err)
+		}
+
+		_, err = result.LastInsertId()
+		if err != nil {
+			return fmt.Errorf("*DB.WriteBriefing: result.LastInsertId(): %v\n", err)
+		}
+	}
+
+	return nil
+}
+
+func (db *DB) ReadByName(name string) (*[]types.Briefing, error) {
+	bs := make([]types.Briefing, 0)
+
+	rows, err := db.Query("SELECT *"+
+		" FROM "+db.Name+
+		" WHERE instructor_first LIKE ?"+
+		" OR instructor_last LIKE ?"+
+		" OR participant_first LIKE ?"+
+		" OR participant_last LIKE ?",
+		"%"+name+"%", "%"+name+"%", "%"+name+"%", "%"+name+"%")
+	if err != nil {
+		return nil, fmt.Errorf("*DB.ReadByName: db.Query(\"SELECT *"+
+			" FROM \"+db.Name+"+
+			" WHERE instructor_first LIKE ?"+
+			" OR instructor_last LIKE ?"+
+			" OR participant_first LIKE ?"+
+			" OR participant_last LIKE ?\"): %v\n", err)
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		b := new(types.Briefing)
+		p := new(types.Participant)
+
+		if err := rows.Scan(&p.ID, &b.FirstName, &b.LastName, &b.Date, &b.Time, &b.State,
+			&b.Location, &p.FirstName, &p.LastName, &p.Company); err != nil {
+			return nil, fmt.Errorf("*DB.ReadByName: rows.Scan(&p.ID, &b.FirstName,"+
+				" &b.LastName, &b.Date, &b.Time, &b.State, &b.Location, &p.FirstName,"+
+				" &p.LastName, &p.Company): %v\n", err)
+		}
+		b.Participants = append(b.Participants, *p)
+		bs = append(bs, *b)
+	}
+
+	return &bs, nil
+}

packages/server/server.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"streifling.com/jason/sicherheitsunterweisung/types"
+	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
 func DisplayForm(i *int64) http.HandlerFunc {
@@ -23,7 +23,7 @@ func AddParticipant(i *int64) http.HandlerFunc {
 
 func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var b types.Briefing
+		b := new(types.Briefing)
 
 		b.FirstName = r.PostFormValue("instructor-first")
 		b.LastName = r.PostFormValue("instructor-last")
@@ -44,6 +44,6 @@ func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc {
 		}
 
 		log.Println(b)
-		ch <- &b
+		ch <- b
 	}
 }