fic
/
server
2
0
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

HasSolved now returns a tuple (bool, Time, int)

This commit is contained in:
nemunaire 2016-01-18 19:40:11 +01:00
parent c33c2b8e8a
commit 381aefa597
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libfic/exercice.go
View File

@ -134,7 +134,8 @@ func (e Exercice) Solved(t Team) error {
}
func (e Exercice) CheckResponse(response string, t Team) (bool, error) {
if t.HasSolved(e) {
s, _, _ := t.HasSolved(e)
if s {
return true, nil
}

8
libfic/key.go
View File

@ -5,10 +5,10 @@ import (
)
type Key struct {
Id int64 `json:"id"`
IdExercice int64 `json:"idExercice"`
Type string `json:"type"`
Value []byte `json:"value"`
Id int64 `json:"id"`
IdExercice int64 `json:"idExercice"`
Type string `json:"type"`
Value []byte `json:"value"`
}
func (e Exercice) GetKeys() ([]Key, error) {

20
libfic/team.go
View File

@ -1,6 +1,8 @@
package fic
import ()
import (
"time"
)
type Team struct {
Id int64 `json:"id"`
@ -74,15 +76,19 @@ func (t Team) HasAccess(e Exercice) bool {
} else {
ed := Exercice{}
ed.Id = *e.Depend
return t.HasSolved(ed)
s, _, _ := t.HasSolved(ed)
return s
}
}
func (t Team) HasSolved(e Exercice) bool {
var nb int
if err := DBQueryRow("SELECT COUNT(id_exercice) FROM exercice_solved WHERE id_team = ? AND id_exercice = ?", t.Id, e.Id).Scan(&nb); err != nil {
return false
func (t Team) HasSolved(e Exercice) (bool, time.Time, int64) {
var nb int64
var tm time.Time
if err := DBQueryRow("SELECT time FROM exercice_solved WHERE id_team = ? AND id_exercice = ?", t.Id, e.Id).Scan(&tm); err != nil {
return false, time.Now(), 0
} else if err := DBQueryRow("SELECT COUNT(id_exercice) FROM exercice_solved WHERE id_exercice = ? AND time < ?", e.Id, tm).Scan(&nb); err != nil {
return true, tm, 0
} else {
return nb > 0
return true, tm, nb
}
}