Noch ein Bisschen aufgeräumt
This commit is contained in:
@ -60,12 +60,6 @@ func getCredentials() (string, string, error) {
|
||||
return user, pass, nil
|
||||
}
|
||||
|
||||
func reverseOrder(bs []*types.Briefing) {
|
||||
for i, j := 0, len(bs)-1; i < j; i, j = i+1, j-1 {
|
||||
bs[i], bs[j] = bs[j], bs[i]
|
||||
}
|
||||
}
|
||||
|
||||
func OpenDB(dbName string) (*DB, error) {
|
||||
var err error
|
||||
db := new(DB)
|
||||
@ -89,7 +83,7 @@ func OpenDB(dbName string) (*DB, error) {
|
||||
return db, nil
|
||||
}
|
||||
|
||||
func (db *DB) writeBriefing(b *types.Briefing) error {
|
||||
func (db *DB) WriteBriefing(b *types.Briefing) error {
|
||||
result, err := db.Exec(`
|
||||
INSERT INTO briefings
|
||||
(date, time, location, document_name, as_of, instructor_id)
|
||||
@ -100,7 +94,7 @@ func (db *DB) writeBriefing(b *types.Briefing) error {
|
||||
return fmt.Errorf("*DB.writeBriefing: db.Exec(): %v\n", err)
|
||||
}
|
||||
|
||||
_, err = result.LastInsertId()
|
||||
b.ID, err = result.LastInsertId()
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeBriefing: result.LastInsertId(): %v\n", err)
|
||||
}
|
||||
@ -108,61 +102,54 @@ func (db *DB) writeBriefing(b *types.Briefing) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) writeParticipants(sp *[]*types.Participant) error {
|
||||
for _, p := range *sp {
|
||||
result, err := db.Exec(`
|
||||
INSERT INTO participants
|
||||
(first_name, last_name, company)
|
||||
VALUES
|
||||
(?, ?, ?)
|
||||
`, p.FirstName, p.LastName, p.Company)
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeParticipants: db.Exec(): %v\n", err)
|
||||
}
|
||||
func (db *DB) WriteParticipant(p *types.Participant) error {
|
||||
result, err := db.Exec(`
|
||||
INSERT INTO participants
|
||||
(first_name, last_name, company)
|
||||
VALUES
|
||||
(?, ?, ?)
|
||||
`, p.FirstName, p.LastName, p.Company)
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeParticipants: db.Exec(): %v\n", err)
|
||||
}
|
||||
|
||||
_, err = result.LastInsertId()
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeParticipants: result.LastInsertId(): %v\n", err)
|
||||
}
|
||||
p.ID, err = result.LastInsertId()
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeParticipants: result.LastInsertId(): %v\n", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) writeGivenAnswers(b *types.Briefing, sp *[]*types.Participant, sq *[]*types.Question, sg *[]*types.GivenAnswer) error {
|
||||
for _, p := range *sp {
|
||||
for i, q := range *sq {
|
||||
result, err := db.Exec(`
|
||||
INSERT INTO given_answers
|
||||
(briefing_id, participant_id, question_id, given_answer)
|
||||
VALUES
|
||||
(?, ?, ?, ?)
|
||||
`, b.ID, p.ID, q.ID, (*sg)[i])
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeGivenAnswers: db.Exec(): %v\n", err)
|
||||
}
|
||||
|
||||
_, err = result.LastInsertId()
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeGivenAnswers: result.LastInsertId(): %v\n", err)
|
||||
}
|
||||
}
|
||||
func (db *DB) WriteGivenAnswer(b *types.Briefing, p *types.Participant, q *types.Question, g *types.GivenAnswer) error {
|
||||
_, err := db.Exec(`
|
||||
INSERT INTO given_answers
|
||||
(briefing_id, participant_id, question_id, given_answer)
|
||||
VALUES
|
||||
(?, ?, ?, ?)
|
||||
`, b.ID, p.ID, q.ID, g)
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeGivenAnswers: db.Exec(): %v\n", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) WriteAllDataOfBriefing(b *types.Briefing, sp *[]*types.Participant, sq *[]*types.Question, sg *[]*types.GivenAnswer) error {
|
||||
if err := db.writeBriefing(b); err != nil {
|
||||
if err := db.WriteBriefing(b); err != nil {
|
||||
return fmt.Errorf("*DB.WriteAllDataOfBriefing: db.writeBriefing(): %v\n", err)
|
||||
}
|
||||
|
||||
if err := db.writeParticipants(sp); err != nil {
|
||||
return fmt.Errorf("*DB.WriteAllDataOfBriefing: db.writeParticipants(): %v\n", err)
|
||||
for _, p := range *sp {
|
||||
if err := db.WriteParticipant(p); err != nil {
|
||||
return fmt.Errorf("*DB.WriteAllDataOfBriefing: db.writeParticipants(): %v\n", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := db.writeGivenAnswers(b, sp, sq, sg); err != nil {
|
||||
return fmt.Errorf("*DB.WriteAllDataOfBriefing: db.writeGivenAnswers(): %v\n", err)
|
||||
for _, p := range *sp {
|
||||
for i, q := range *sq {
|
||||
db.WriteGivenAnswer(b, p, q, (*sg)[i])
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
@ -320,22 +307,3 @@ func (db *DB) GetInstructors() (*[]*types.Instructor, error) {
|
||||
|
||||
return &instructors, nil
|
||||
}
|
||||
|
||||
func (db *DB) WriteParticipant(p *types.Participant) error {
|
||||
result, err := db.Exec(`
|
||||
INSERT INTO participants
|
||||
(first_name, last_name, company)
|
||||
VALUES
|
||||
(?, ?, ?)
|
||||
`, p.FirstName, p.LastName, p.Company)
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeParticipant: db.Exec(): %v\n", err)
|
||||
}
|
||||
|
||||
p.ID, err = result.LastInsertId()
|
||||
if err != nil {
|
||||
return fmt.Errorf("*DB.writeParticipant: result.LastInsertId(): %v\n", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user