jason/sicherheitsunterweisung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instanziierung von structs an passenden Stellen auf struct{}-Schreibweise umgestellt

Browse Source
This commit is contained in:
Jason Streifling
2023-11-01 09:18:48 +01:00
parent 6404792946
commit 3b641a90a9
5 changed files with 95 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/data/dbFuncs.go
View File

@ -127,7 +127,7 @@ func (db *DB) GetAllOverviewTableData() ([]OverviewTableData, error) {
data := make([]OverviewTableData, 0)
for rows.Next() {
otd := new(OverviewTableData)
otd := OverviewTableData{}
err := rows.Scan(
&otd.InstructorFirstName,
@ -145,7 +145,7 @@ func (db *DB) GetAllOverviewTableData() ([]OverviewTableData, error) {
return nil, fmt.Errorf("error: *DB.ReadAllBriefings: rows.Scan(): %v", err)
}
data = append(data, *otd)
data = append(data, otd)
}
return data, nil
@ -194,7 +194,7 @@ func (db *DB) GetOverviewTableDataByName(n string) ([]OverviewTableData, error)
data := make([]OverviewTableData, 0)
for rows.Next() {
otd := new(OverviewTableData)
otd := OverviewTableData{}
err := rows.Scan(
&otd.InstructorFirstName,
@ -212,7 +212,7 @@ func (db *DB) GetOverviewTableDataByName(n string) ([]OverviewTableData, error)
return nil, fmt.Errorf("error: *DB.ReadAllBriefings: rows.Scan(): %v", err)
}
data = append(data, *otd)
data = append(data, otd)
}
return data, nil
@ -253,9 +253,11 @@ func (db *DB) GetInstructors() ([]*Instructor, error) {
instructors := make([]*Instructor, 0)
for rows.Next() {
instructor := new(Instructor)
if err = rows.Scan(&instructor.ID, &instructor.FirstName, &instructor.LastName); err != nil {
return nil, fmt.Errorf("error: *DB.GetInstructors: rows.Scan(): %v", err)
}
instructors = append(instructors, instructor)
}
@ -278,27 +280,21 @@ func (db *DB) GetQuestions(nums []string) ([]Question, error) {
// TODO: not scalable
questions := make([]Question, 0)
for rows.Next() {
q := new(Question)
a1 := new(Answer)
a2 := new(Answer)
a3 := new(Answer)
a4 := new(Answer)
a1.ID = 1
a2.ID = 2
a3.ID = 3
a4.ID = 4
q := Question{}
a1 := Answer{ID: 1}
a2 := Answer{ID: 2}
a3 := Answer{ID: 3}
a4 := Answer{ID: 4}
if err := rows.Scan(&q.ID, &q.Text, &a1.Text, &a2.Text, &a3.Text, &a4.Text, &q.Correct); err != nil {
return nil, fmt.Errorf("error: *DB.GetQuestions: rows.Scan(): %v", err)
}
q.Answers = append(q.Answers, *a1)
q.Answers = append(q.Answers, *a2)
q.Answers = append(q.Answers, *a3)
q.Answers = append(q.Answers, *a4)
questions = append(questions, *q)
q.Answers = append(q.Answers, a1)
q.Answers = append(q.Answers, a2)
q.Answers = append(q.Answers, a3)
q.Answers = append(q.Answers, a4)
questions = append(questions, q)
}
return questions, nil