Too much things

This commit is contained in:
nemunaire 2016-01-25 03:09:22 +01:00
commit f3a15b00e9
15 changed files with 640 additions and 17 deletions

View file

@ -17,6 +17,16 @@ func DBInit(dsn string) error {
func DBCreate() error {
if _, err := db.Exec(`
CREATE TABLE IF NOT EXISTS events(
id_event INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
txt VARCHAR(255) NOT NULL UNIQUE,
kind ENUM('alert-default', 'alert-primary', 'alert-info', 'alert-warning', 'alert-danger', 'alert-success') NOT NULL,
time TIMESTAMP NOT NULL
);
`); err != nil {
return err
}
if _, err := db.Exec(`
CREATE TABLE IF NOT EXISTS themes(
id_theme INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
name VARCHAR(255) NOT NULL UNIQUE,

64
libfic/event.go Normal file
View file

@ -0,0 +1,64 @@
package fic
import (
"time"
)
type Event struct {
Id int64 `json:"id"`
Kind string `json:"kind"`
Text string `json:"txt"`
Time time.Time `json:"time"`
}
func GetEvents() ([]Event, error) {
if rows, err := DBQuery("SELECT id_event, txt, kind, time FROM events ORDER BY time DESC LIMIT 6"); err != nil {
return nil, err
} else {
defer rows.Close()
var events = make([]Event, 0)
for rows.Next() {
var e Event
if err := rows.Scan(&e.Id, &e.Text, &e.Kind, &e.Time); err != nil {
return nil, err
}
events = append(events, e)
}
if err := rows.Err(); err != nil {
return nil, err
}
return events, nil
}
}
func NewEvent(txt string, kind string) (Event, error) {
if res, err := DBExec("INSERT INTO events (txt, kind, time) VALUES (?, ?, ?)", txt, kind, time.Now()); err != nil {
return Event{}, err
} else if eid, err := res.LastInsertId(); err != nil {
return Event{}, err
} else {
return Event{eid, txt, kind, time.Now()}, nil
}
}
func (e Event) Update() (int64, error) {
if res, err := DBExec("UPDATE events SET txt = ?, kind = ?, time = ? WHERE id_event = ?", e.Text, e.Kind, e.Time, e.Id); err != nil {
return 0, err
} else if nb, err := res.RowsAffected(); err != nil {
return 0, err
} else {
return nb, err
}
}
func (e Event) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM events WHERE id_event = ?", e.Id); err != nil {
return 0, err
} else if nb, err := res.RowsAffected(); err != nil {
return 0, err
} else {
return nb, err
}
}

View file

@ -133,6 +133,20 @@ func (e Exercice) Delete() (int64, error) {
}
}
func (e Exercice) GetLevel() (int, error) {
dep := e.Depend
nb := 1
for dep != nil {
nb += 1
if edep, err := GetExercice(*dep); err != nil {
return nb, err
} else {
dep = edep.Depend
}
}
return nb, nil
}
func (e Exercice) NewTry(t Team) error {
if _, err := DBExec("INSERT INTO exercice_tries (id_exercice, id_team, time) VALUES (?, ?, ?)", e.Id, t.Id, time.Now()); err != nil {
return err
@ -176,19 +190,19 @@ func (e Exercice) TriedCount() int64 {
}
}
func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, error) {
s, _, _ := t.HasSolved(e)
func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, bool, error) {
s, tm, _ := t.HasSolved(e)
if s {
return true, nil
return true, false, nil
}
if err := e.NewTry(t); err != nil {
return false, err
return false, false, err
} else if keys, err := e.GetKeys(); err != nil {
return false, err
return false, false, err
} else {
if len(keys) < 1 {
return true, errors.New("Exercice with no key registered")
return true, false, errors.New("Exercice with no key registered")
}
valid := true
@ -203,6 +217,6 @@ func (e Exercice) CheckResponse(resps map[string]string, t Team) (bool, error) {
}
}
return valid, nil
return valid, tm.Unix() == 0, nil
}
}