diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c8a398a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +create_tables.sql diff --git a/go.mod b/go.mod index 159d227..729edcb 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,10 @@ module streifling.com/jason/sicherheitsunterweisung go 1.21.1 + +require ( + github.com/go-sql-driver/mysql v1.7.1 + golang.org/x/term v0.13.0 +) + +require golang.org/x/sys v0.13.0 // indirect diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..009f59d --- /dev/null +++ b/go.sum @@ -0,0 +1,6 @@ +github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= +github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= diff --git a/main.go b/main.go index fe552d4..946afbd 100644 --- a/main.go +++ b/main.go @@ -1,68 +1,38 @@ package main import ( - "fmt" - "html/template" "log" "net/http" + + "streifling.com/jason/sicherheitsunterweisung/packages/db" + "streifling.com/jason/sicherheitsunterweisung/packages/server" + "streifling.com/jason/sicherheitsunterweisung/packages/types" ) -type Person struct { - FirstName string - LastName string -} - -type Instructor Person - -type Participant struct { - ID int64 - Person - Company string -} - -type Briefing struct { - Instructor - Date string - Time string - State string - Location string - Participants []Participant +func writeBriefing(ch chan *types.Briefing, db *db.DB) { + for b := range ch { + db.WriteBriefing(b) + } } func main() { var i, j int64 - var b Briefing + i, j = 1, 1 mux := http.NewServeMux() - i = 1 + cb := make(chan *types.Briefing) + + db, err := db.Open("sicherheitsunterweisung") + if err != nil { + log.Fatalln(err) + } mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/")))) - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - template.Must(template.ParseFiles("templates/index.html")).Execute(w, i) - }) - mux.HandleFunc("/add-participant/", func(w http.ResponseWriter, r *http.Request) { - i++ - template.Must(template.ParseFiles("templates/index.html", "templates/participant.html")).ExecuteTemplate(w, "participant", i) - }) - mux.HandleFunc("/submit/", func(w http.ResponseWriter, r *http.Request) { - b.Instructor.FirstName = r.PostFormValue("instructor-first") - b.Instructor.LastName = r.PostFormValue("instructor-last") - b.Date = r.PostFormValue("date") - b.Time = r.PostFormValue("time") - b.State = r.PostFormValue("state") - b.Location = r.PostFormValue("location") - for j = 1; j <= i; j++ { - b.Participants = append(b.Participants, Participant{ - ID: j, - Person: Person{ - FirstName: r.PostFormValue("participant-first-" + fmt.Sprint(j)), - LastName: r.PostFormValue(("participant-last-" + fmt.Sprint(j))), - }, - Company: r.PostFormValue(("participant-company-" + fmt.Sprint(j))), - }) - } - fmt.Println(b) - }) + mux.HandleFunc("/", server.DisplayForm(&i)) + mux.HandleFunc("/add-participant/", server.AddParticipant(&i)) + mux.HandleFunc("/submit/", server.SubmitForm(cb, &i, &j)) + + go writeBriefing(cb, db) log.Fatalln(http.ListenAndServe(":8080", mux)) } diff --git a/packages/db/db.go b/packages/db/db.go new file mode 100644 index 0000000..4a82091 --- /dev/null +++ b/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 +} diff --git a/packages/server/server.go b/packages/server/server.go new file mode 100644 index 0000000..dbab18e --- /dev/null +++ b/packages/server/server.go @@ -0,0 +1,49 @@ +package server + +import ( + "fmt" + "html/template" + "log" + "net/http" + "streifling.com/jason/sicherheitsunterweisung/packages/types" +) + +func DisplayForm(i *int64) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + template.Must(template.ParseFiles("templates/index.html")).Execute(w, i) + } +} + +func AddParticipant(i *int64) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + *i++ + template.Must(template.ParseFiles("templates/index.html", "templates/participant.html")).ExecuteTemplate(w, "participant", i) + } +} + +func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + b := new(types.Briefing) + + b.FirstName = r.PostFormValue("instructor-first") + b.LastName = r.PostFormValue("instructor-last") + b.Date = r.PostFormValue("date") + b.Time = r.PostFormValue("time") + b.State = r.PostFormValue("state") + b.Location = r.PostFormValue("location") + + for ; *j <= *i; *j++ { + b.Participants = append(b.Participants, types.Participant{ + ID: *j, + Person: types.Person{ + FirstName: r.PostFormValue("participant-first-" + fmt.Sprint(*j)), + LastName: r.PostFormValue(("participant-last-" + fmt.Sprint(*j))), + }, + Company: r.PostFormValue(("participant-company-" + fmt.Sprint(*j))), + }) + } + + log.Println(b) + ch <- b + } +} diff --git a/packages/types/types.go b/packages/types/types.go new file mode 100644 index 0000000..baf87ee --- /dev/null +++ b/packages/types/types.go @@ -0,0 +1,23 @@ +package types + +type Person struct { + FirstName string + LastName string +} + +type Instructor Person + +type Participant struct { + ID int64 + Person + Company string +} + +type Briefing struct { + Instructor + Date string + Time string + State string + Location string + Participants []Participant +}