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

Sessions vollständig implementiert

Browse Source
This commit is contained in:
Jason Streifling
2023-10-30 11:38:56 +01:00
parent 33cbf4b215
commit ba53bba0f6
13 changed files with 257 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/data/dataStructs.go
View File

@ -17,7 +17,6 @@ type Instructor Person
type Participant struct {
Person
Company string
Login string
}
type Briefing struct {

95
packages/data/dbFuncs.go
View File

@ -16,68 +16,74 @@ func OpenDB(dbName string) (*DB, error) {
cfg.DBName = dbName
cfg.User, cfg.Passwd, err = getCredentials()
if err != nil {
return nil, fmt.Errorf("Open: getCredentials(): %v\n", err)
return nil, fmt.Errorf("error: OpenDB: getCredentials(): %v", err)
}
db.DB, err = sql.Open("mysql", cfg.FormatDSN())
if err != nil {
return nil, fmt.Errorf("Open: sql.Open(\"mysql\", cfg.FormatDSN()): %v\n", err)
return nil, fmt.Errorf("error: OpenDB: sql.Open(\"mysql\", cfg.FormatDSN()): %v", err)
}
if err := db.Ping(); err != nil {
return nil, fmt.Errorf("Open: db.Ping(): %v\n", err)
return nil, fmt.Errorf("error: OpenDB: db.Ping(): %v", err)
}
return db, nil
}
func (db *DB) WriteBriefing(b *Briefing) error {
result, err := db.Exec(`
query := `
INSERT INTO briefings
(date, time, location, document_name, as_of, instructor_id)
VALUES
(?, ?, ?, ?, ?, ?)
`, b.Date, b.Time, b.Location, b.DocumentName, b.AsOf, b.InstructorID)
`
result, err := db.Exec(query, b.Date, b.Time, b.Location, b.DocumentName, b.AsOf, b.InstructorID)
if err != nil {
return fmt.Errorf("*DB.writeBriefing: db.Exec(): %v\n", err)
return fmt.Errorf("error: *DB.writeBriefing: db.Exec(): %v", err)
}
b.ID, err = result.LastInsertId()
if err != nil {
return fmt.Errorf("*DB.writeBriefing: result.LastInsertId(): %v\n", err)
return fmt.Errorf("error: *DB.writeBriefing: result.LastInsertId(): %v", err)
}
return nil
}
func (db *DB) WriteParticipant(p *Participant) error {
result, err := db.Exec(`
query := `
INSERT INTO participants
(first_name, last_name, company)
VALUES
(?, ?, ?)
`, p.FirstName, p.LastName, p.Company)
`
result, err := db.Exec(query, p.FirstName, p.LastName, p.Company)
if err != nil {
return fmt.Errorf("*DB.writeParticipants: db.Exec(): %v\n", err)
return fmt.Errorf("error: *DB.writeParticipants: db.Exec(): %v", err)
}
p.ID, err = result.LastInsertId()
if err != nil {
return fmt.Errorf("*DB.writeParticipants: result.LastInsertId(): %v\n", err)
return fmt.Errorf("error: *DB.writeParticipants: result.LastInsertId(): %v", err)
}
return nil
}
func (db *DB) WriteGivenAnswers(b Briefing, p Participant, sq []Question, givenAnswers []int) error {
for i, q := range sq {
_, err := db.Exec(`
query := `
INSERT INTO given_answers
(briefing_id, participant_id, question_id, given_answer)
VALUES
(?, ?, ?, ?)
`, b.ID, p.ID, q.ID, givenAnswers[i])
`
for i, q := range sq {
_, err := db.Exec(query, b.ID, p.ID, q.ID, givenAnswers[i])
if err != nil {
return fmt.Errorf("*DB.WriteGivenAnswers: db.Exec(): %v\n", err)
return fmt.Errorf("error: *DB.WriteGivenAnswers: db.Exec(): %v", err)
}
}
@ -85,7 +91,7 @@ func (db *DB) WriteGivenAnswers(b Briefing, p Participant, sq []Question, givenA
}
func (db *DB) GetAllOverviewTableData() ([]OverviewTableData, error) {
rows, err := db.Query(`
query := `
SELECT
i.first_name,
i.last_name,
@ -111,9 +117,11 @@ func (db *DB) GetAllOverviewTableData() ([]OverviewTableData, error) {
ORDER BY
b.id DESC,
p.id
`)
`
rows, err := db.Query(query)
if err != nil {
return nil, fmt.Errorf("*DB.ReadAllBriefings: db.Query(): %v\n", err)
return nil, fmt.Errorf("error: *DB.ReadAllBriefings: db.Query(): %v", err)
}
defer rows.Close()
@ -134,7 +142,7 @@ func (db *DB) GetAllOverviewTableData() ([]OverviewTableData, error) {
&otd.ParticipantCompany,
)
if err != nil {
return nil, fmt.Errorf("*DB.ReadAllBriefings: rows.Scan(): %v\n", err)
return nil, fmt.Errorf("error: *DB.ReadAllBriefings: rows.Scan(): %v", err)
}
data = append(data, *otd)
@ -143,8 +151,8 @@ func (db *DB) GetAllOverviewTableData() ([]OverviewTableData, error) {
return data, nil
}
func (db *DB) GetOverviewTableDataByName(n string) (*[]*OverviewTableData, error) {
rows, err := db.Query(`
func (db *DB) GetOverviewTableDataByName(n string) ([]OverviewTableData, error) {
query := `
SELECT
i.first_name,
i.last_name,
@ -172,13 +180,15 @@ func (db *DB) GetOverviewTableDataByName(n string) (*[]*OverviewTableData, error
ORDER BY
b.id DESC,
p.id
`, "%"+n+"%", "%"+n+"%", "%"+n+"%", "%"+n+"%")
`
rows, err := db.Query(query, "%"+n+"%", "%"+n+"%", "%"+n+"%", "%"+n+"%")
if err != nil {
return nil, fmt.Errorf("*DB.GetOverviewTableDataByName: db.Query(): %v\n", err)
return nil, fmt.Errorf("error: *DB.GetOverviewTableDataByName: db.Query(): %v", err)
}
defer rows.Close()
data := make([]*OverviewTableData, 0)
data := make([]OverviewTableData, 0)
for rows.Next() {
otd := new(OverviewTableData)
@ -195,42 +205,44 @@ func (db *DB) GetOverviewTableDataByName(n string) (*[]*OverviewTableData, error
&otd.ParticipantCompany,
)
if err != nil {
return nil, fmt.Errorf("*DB.ReadAllBriefings: rows.Scan(): %v\n", err)
return nil, fmt.Errorf("error: *DB.ReadAllBriefings: rows.Scan(): %v", err)
}
data = append(data, otd)
data = append(data, *otd)
}
return &data, nil
return data, nil
}
func (db *DB) GetLastID(table string) (int, error) {
var id int
row := db.QueryRow(`
query := `
SELECT id
FROM ?
ORDER BY id DESC
LIMIT 0, 1
`, table)
`
row := db.QueryRow(query, table)
if err := row.Scan(&id); err != nil {
return -1, fmt.Errorf("*DB.GetLastID: row.Scan(): %v\n", err)
return -1, fmt.Errorf("error: *DB.GetLastID: row.Scan(): %v", err)
}
return id, nil
}
func (db *DB) GetInstructors() ([]*Instructor, error) {
rows, err := db.Query(`
query := `
SELECT *
FROM instructors
ORDER BY
last_name,
first_name
`)
`
rows, err := db.Query(query)
if err != nil {
return nil, fmt.Errorf("*DB.GetInstructors: db.Query(): %v\n", err)
return nil, fmt.Errorf("error: *DB.GetInstructors: db.Query(): %v", err)
}
defer rows.Close()
@ -238,7 +250,7 @@ func (db *DB) GetInstructors() ([]*Instructor, error) {
for rows.Next() {
instructor := new(Instructor)
if err = rows.Scan(&instructor.ID, &instructor.FirstName, &instructor.LastName); err != nil {
return nil, fmt.Errorf("*DB.GetInstructors: rows.Scan(): %v\n", err)
return nil, fmt.Errorf("error: *DB.GetInstructors: rows.Scan(): %v", err)
}
instructors = append(instructors, instructor)
}
@ -247,16 +259,19 @@ func (db *DB) GetInstructors() ([]*Instructor, error) {
}
func (db *DB) GetQuestions(nums []string) ([]Question, error) {
rows, err := db.Query(`
query := `
SELECT *
FROM questions
WHERE id IN (` + strings.Join(nums, ", ") + `)
`)
`
rows, err := db.Query(query)
if err != nil {
return nil, fmt.Errorf("*DB.GetQuestions: db.Query(): %v\n", err)
return nil, fmt.Errorf("error: *DB.GetQuestions: db.Query(): %v", err)
}
defer rows.Close()
// TODO: not scalable
questions := make([]Question, 0)
for rows.Next() {
q := new(Question)
@ -271,7 +286,7 @@ func (db *DB) GetQuestions(nums []string) ([]Question, error) {
a4.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("*DB.GetQuestions: rows.Scan(): %v\n", err)
return nil, fmt.Errorf("error: *DB.GetQuestions: rows.Scan(): %v", err)
}
q.Answers = append(q.Answers, *a1)
@ -301,7 +316,7 @@ func (db *DB) GetGivenAnswers(bid, pid int64, sq []Question) ([]int, error) {
row := db.QueryRow(query, bid, pid, q.ID)
if err := row.Scan(&answer); err != nil {
return nil, fmt.Errorf("*DB.GetGivenAnswers: row.Scan(): %v\n", err)
return nil, fmt.Errorf("error: *DB.GetGivenAnswers: row.Scan(): %v", err)
}
answers = append(answers, answer)

8
packages/data/helperFuncs.go
View File

@ -17,7 +17,7 @@ func getUsername() (string, error) {
fmt.Printf("DB Benutzer: ")
user, err = bufio.NewReader(os.Stdin).ReadString('\n')
if err != nil {
return "", fmt.Errorf("getUsername: bufio.NewReader(os.Stdin).ReadString('\n'): %v", err)
return "", fmt.Errorf("error: getUsername: bufio.NewReader().ReadString(): %v", err)
}
}
return strings.TrimSpace(user), nil
@ -29,7 +29,7 @@ func getPassword() (string, error) {
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)
return "", fmt.Errorf("error: getPassword: term.ReadPassword(): %v", err)
}
fmt.Println()
pass = strings.TrimSpace(string(bytePass))
@ -40,12 +40,12 @@ func getPassword() (string, error) {
func getCredentials() (string, string, error) {
user, err := getUsername()
if err != nil {
return "", "", fmt.Errorf("getCredentials: getUsername(): %v", err)
return "", "", fmt.Errorf("error: getCredentials: getUsername(): %v", err)
}
pass, err := getPassword()
if err != nil {
return "", "", fmt.Errorf("getCredentials: getPassword(): %v", err)
return "", "", fmt.Errorf("error: getCredentials: getPassword(): %v", err)
}
return user, pass, nil