Fachschaft/sprechstunden-go
7
1
Fork 0
Code Issues 8 Pull requests Releases Activity

Verbessere Fehlerbehandlung bei Tutoren und Sprechstunden

Browse source
This commit is contained in:
Gonne 2022-09-28 12:00:45 +02:00
parent 58eb848f20
commit c8f85e40c4
2 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
repositories/request.go
View file

@ -37,7 +37,7 @@ func (r *RequestRepo) FindBySecret(secret string) (models.Request, error) {
var officeHourId int var officeHourId int
err := row.Scan(&request.Id, &officeHourId, &request.Action, &request.Secret) err := row.Scan(&request.Id, &officeHourId, &request.Action, &request.Secret)
if err != nil { if err != nil {
return models.Request{}, err return models.Request{}, fmt.Errorf("SQL-error scanning request row: %w", err)
} }
request.OfficeHour, err = r.officeHourRepo.FindById(officeHourId) request.OfficeHour, err = r.officeHourRepo.FindById(officeHourId)
return request, err return request, err
@ -46,7 +46,7 @@ func (r *RequestRepo) FindBySecret(secret string) (models.Request, error) {
func (r *RequestRepo) FindByOfficeHour(officeHour models.OfficeHour) ([]models.Request, error) { func (r *RequestRepo) FindByOfficeHour(officeHour models.OfficeHour) ([]models.Request, error) {
rows, err := r.db.Query("SELECT * FROM request WHERE officeHour=?", officeHour.Id) rows, err := r.db.Query("SELECT * FROM request WHERE officeHour=?", officeHour.Id)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("SQL-error selecting requests by office hour: %w", err)
} }
defer rows.Close() defer rows.Close()
@ -88,7 +88,7 @@ func (r *RequestRepo) Add(officeHour models.OfficeHour, action int) (int, error)
request := models.Request{Id: 0, OfficeHour: officeHour, Action: action, Secret: secret} request := models.Request{Id: 0, OfficeHour: officeHour, Action: action, Secret: secret}
_, err = r.db.Exec("INSERT INTO `request` (officeHour, action, secret) VALUES (?,?,?)", officeHour.Id, action, secret) _, err = r.db.Exec("INSERT INTO `request` (officeHour, action, secret) VALUES (?,?,?)", officeHour.Id, action, secret)
if err != nil { if err != nil {
return 0, err return 0, fmt.Errorf("SQL-error inserting new request: %w", err)
} }
request, err = r.FindBySecret(secret) request, err = r.FindBySecret(secret)
if err != nil { if err != nil {

71
repositories/tutor.go
View file

@ -26,35 +26,15 @@ func (r *TutorRepo) FindByEmail(email string) ([]models.Tutor, error) {
} }
defer rows.Close() defer rows.Close()
var tutors []models.Tutor return r.getFromRows(rows)
for rows.Next() {
var tutor models.Tutor
if err := rows.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
err = fmt.Errorf("Error scanning tutor row: %w", err)
log.Println(err.Error())
return tutors, err
}
tutors = append(tutors, tutor)
}
return tutors, nil
} }
func (r *TutorRepo) FindById(id int) (models.Tutor, error) { func (r *TutorRepo) FindById(id int) (models.Tutor, error) {
row := r.db.QueryRow("SELECT * FROM tutor WHERE id=?", id) return r.getFromRow(r.db.QueryRow("SELECT * FROM tutor WHERE id=?", id))
var tutor models.Tutor
if err := row.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
return models.Tutor{}, err
}
return tutor, nil
} }
func (r *TutorRepo) FindByNameAndEmail(name string, email string) (models.Tutor, error) { func (r *TutorRepo) FindByNameAndEmail(name string, email string) (models.Tutor, error) {
row := r.db.QueryRow("SELECT * FROM tutor WHERE email=? AND name=?", email, name) return r.getFromRow(r.db.QueryRow("SELECT * FROM tutor WHERE email=? AND name=?", email, name))
var tutor models.Tutor
if err := row.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
return models.Tutor{}, err
}
return tutor, nil
} }
func (r *TutorRepo) GetAll() ([]models.Tutor, error) { func (r *TutorRepo) GetAll() ([]models.Tutor, error) {
@ -64,6 +44,38 @@ func (r *TutorRepo) GetAll() ([]models.Tutor, error) {
} }
defer rows.Close() defer rows.Close()
return r.getFromRows(rows)
}
func (r *TutorRepo) Add(tutor models.Tutor) (int, error) {
//Don't add identical tutors
existentTutor, err := r.FindByNameAndEmail(tutor.Name, tutor.Email)
if errors.Is(err, sql.ErrNoRows) {
sqlResult, err := r.db.Exec("INSERT INTO `tutor` (name, email) VALUES (?,?)", tutor.Name, tutor.Email)
if err != nil {
err = fmt.Errorf("SQL-error inserting new tutor: %w", err)
log.Println(err.Error())
return 0, err
}
id, lastInsertIdErr := sqlResult.LastInsertId()
if lastInsertIdErr != nil {
log.Printf("Error getting Id for new tutor: %s", lastInsertIdErr.Error())
}
return int(id), err
}
return existentTutor.Id, err
}
func (r *TutorRepo) getFromRow(row *sql.Row) (models.Tutor, error) {
var tutor models.Tutor
if err := row.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
err = fmt.Errorf("SQL-error scanning tutor row: %w", err)
log.Println(err.Error())
return models.Tutor{}, err
}
return tutor, nil
}
func (r *TutorRepo) getFromRows(rows *sql.Rows) ([]models.Tutor, error) {
var tutors []models.Tutor var tutors []models.Tutor
for rows.Next() { for rows.Next() {
var tutor models.Tutor var tutor models.Tutor
@ -76,16 +88,3 @@ func (r *TutorRepo) GetAll() ([]models.Tutor, error) {
} }
return tutors, nil return tutors, nil
} }
func (r *TutorRepo) Add(tutor models.Tutor) (int, error) {
//Don't add identical tutors
existentTutor, err := r.FindByNameAndEmail(tutor.Name, tutor.Email)
if errors.Is(err, sql.ErrNoRows) {
sqlResult, err := r.db.Exec("INSERT INTO `tutor` (name, email) VALUES (?,?)", tutor.Name, tutor.Email)
id, lastInsertIdErr := sqlResult.LastInsertId()
if lastInsertIdErr != nil {
log.Printf("Error getting Id for new tutor: %s", lastInsertIdErr.Error())
}
return int(id), err
}
return existentTutor.Id, err
}