fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Change internal variable representation vs JSON one

Browse source
This commit is contained in:
nemunaire 2016-01-13 01:20:21 +01:00
parent 8cf2a36fe1
commit e89af34c5c
6 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

30
admin/exercice.go
View file

@ -5,17 +5,17 @@ import (
) )
type Exercice struct { type Exercice struct {
id int64 Id int64 `json:"id"`
Title string Title string `json:"title"`
Statement string Statement string `json:"statement"`
Hint string Hint string `json:"hint"`
depend int64 Depend int64 `json:"depend"`
Gain int64 Gain int64 `json:"gain"`
VideoURI string VideoURI string `json:"videoURI"`
} }
func (t Theme) GetExercices() ([]Exercice, error) { func (t Theme) GetExercices() ([]Exercice, error) {
if rows, err := DBQuery("SELECT id_exercice, title, statement, hint, depend, gain, video_uri FROM teams WHERE id_theme = ?", t.id); err != nil { if rows, err := DBQuery("SELECT id_exercice, title, statement, hint, depend, gain, video_uri FROM teams WHERE id_theme = ?", t.Id); err != nil {
return nil, err return nil, err
} else { } else {
defer rows.Close() defer rows.Close()
@ -23,7 +23,7 @@ func (t Theme) GetExercices() ([]Exercice, error) {
var exos = make([]Exercice, 0) var exos = make([]Exercice, 0)
for rows.Next() { for rows.Next() {
var e Exercice var e Exercice
if err := rows.Scan(&e.id, &e.Title, &e.Statement, &e.Hint, &e.depend, &e.Gain, &e.VideoURI); err != nil { if err := rows.Scan(&e.Id, &e.Title, &e.Statement, &e.Hint, &e.Depend, &e.Gain, &e.VideoURI); err != nil {
return nil, err return nil, err
} }
exos = append(exos, e) exos = append(exos, e)
@ -37,17 +37,17 @@ func (t Theme) GetExercices() ([]Exercice, error) {
} }
func (t Theme) AddExercice(title string, statement string, hint string, depend *Exercice, gain int, videoURI string) (Exercice, error) { func (t Theme) AddExercice(title string, statement string, hint string, depend *Exercice, gain int, videoURI string) (Exercice, error) {
if res, err := DBExec("INSERT INTO exercices (id_theme, title, statement, hint, depend, gain, video_uri) VALUES (?, ?, ?, ?, ?, ?, ?)", t.id, title, statement, hint, depend.id, gain, videoURI); err != nil { if res, err := DBExec("INSERT INTO exercices (id_theme, title, statement, hint, depend, gain, video_uri) VALUES (?, ?, ?, ?, ?, ?, ?)", t.Id, title, statement, hint, depend.Id, gain, videoURI); err != nil {
return Exercice{}, err return Exercice{}, err
} else if eid, err := res.LastInsertId(); err != nil { } else if eid, err := res.LastInsertId(); err != nil {
return Exercice{}, err return Exercice{}, err
} else { } else {
return Exercice{eid, title, statement, hint, depend.id, int64(gain), videoURI}, nil return Exercice{eid, title, statement, hint, depend.Id, int64(gain), videoURI}, nil
} }
} }
func (e Exercice) Update() (int64, error) { func (e Exercice) Update() (int64, error) {
if res, err := DBExec("UPDATE exercices SET title = ?, statement = ?, hint = ?, depend = ?, gain = ?, video_uri = ? WHERE id_exercice = ?", e.Title, e.Statement, e.Hint, e.depend, e.Gain, e.VideoURI, e.id); err != nil { if res, err := DBExec("UPDATE exercices SET title = ?, statement = ?, hint = ?, depend = ?, gain = ?, video_uri = ? WHERE id_exercice = ?", e.Title, e.Statement, e.Hint, e.Depend, e.Gain, e.VideoURI, e.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -57,7 +57,7 @@ func (e Exercice) Update() (int64, error) {
} }
func (e Exercice) Delete() (int64, error) { func (e Exercice) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM exercices WHERE id_exercice = ?", e.id); err != nil { if res, err := DBExec("DELETE FROM exercices WHERE id_exercice = ?", e.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -67,7 +67,7 @@ func (e Exercice) Delete() (int64, error) {
} }
func (e Exercice) NewTry(t Team) error { 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 { if _, err := DBExec("INSERT INTO exercice_tries (id_exercice, id_team, time) VALUES (?, ?, ?)", e.Id, t.Id, time.Now()); err != nil {
return err return err
} else { } else {
return nil return nil
@ -75,7 +75,7 @@ func (e Exercice) NewTry(t Team) error {
} }
func (e Exercice) Solved(t Team) error { func (e Exercice) Solved(t Team) error {
if _, err := DBExec("INSERT INTO exercice_solved (id_exercice, id_team, time) VALUES (?, ?, ?)", e.id, t.id, time.Now()); err != nil { if _, err := DBExec("INSERT INTO exercice_solved (id_exercice, id_team, time) VALUES (?, ?, ?)", e.Id, t.Id, time.Now()); err != nil {
return err return err
} else { } else {
return nil return nil

24
admin/file.go
View file

@ -8,15 +8,15 @@ import (
) )
type EFile struct { type EFile struct {
id int64 Id int64 `json:"id"`
Path string Path string `json:"path"`
id_exercice int64 IdExercice int64 `json:"idExercice"`
Name string Name string `json:"name"`
Checksum []byte Checksum []byte `json:"checksum"`
} }
func (e Exercice) GetFiles() ([]EFile, error) { func (e Exercice) GetFiles() ([]EFile, error) {
if rows, err := DBQuery("SELECT id_file, path, name, sha1 FROM exercice_files WHERE id_exercice = ?", e.id); err != nil { if rows, err := DBQuery("SELECT id_file, path, name, sha1 FROM exercice_files WHERE id_exercice = ?", e.Id); err != nil {
return nil, err return nil, err
} else { } else {
defer rows.Close() defer rows.Close()
@ -24,8 +24,8 @@ func (e Exercice) GetFiles() ([]EFile, error) {
var files = make([]EFile, 0) var files = make([]EFile, 0)
for rows.Next() { for rows.Next() {
var f EFile var f EFile
f.id_exercice = e.id f.IdExercice = e.Id
if err := rows.Scan(&f.id, &f.Path, &f.Name, &f.Checksum); err != nil { if err := rows.Scan(&f.Id, &f.Path, &f.Name, &f.Checksum); err != nil {
return nil, err return nil, err
} }
files = append(files, f) files = append(files, f)
@ -55,17 +55,17 @@ func (e Exercice) ImportFile(filePath string) (EFile, error) {
} }
func (e Exercice) AddFile(path string, name string, checksum []byte) (EFile, error) { func (e Exercice) AddFile(path string, name string, checksum []byte) (EFile, error) {
if res, err := DBExec("INSERT INTO exercice_files (id_exercice, path, name, sha1) VALUES (?, ?, ?, ?)", e.id, path, name, checksum); err != nil { if res, err := DBExec("INSERT INTO exercice_files (id_exercice, path, name, sha1) VALUES (?, ?, ?, ?)", e.Id, path, name, checksum); err != nil {
return EFile{}, err return EFile{}, err
} else if fid, err := res.LastInsertId(); err != nil { } else if fid, err := res.LastInsertId(); err != nil {
return EFile{}, err return EFile{}, err
} else { } else {
return EFile{fid, path, e.id, name, checksum}, nil return EFile{fid, path, e.Id, name, checksum}, nil
} }
} }
func (f EFile) Update() (int64, error) { func (f EFile) Update() (int64, error) {
if res, err := DBExec("UPDATE exercice_files SET id_exercice = ?, path = ?, name = ?, sha1 = ? WHERE id_file = ?", f.id_exercice, f.Path, f.Name, f.Checksum, f.id); err != nil { if res, err := DBExec("UPDATE exercice_files SET id_exercice = ?, path = ?, name = ?, sha1 = ? WHERE id_file = ?", f.IdExercice, f.Path, f.Name, f.Checksum, f.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -75,7 +75,7 @@ func (f EFile) Update() (int64, error) {
} }
func (f EFile) Delete() (int64, error) { func (f EFile) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM exercice_files WHERE id_file = ?", f.id); err != nil { if res, err := DBExec("DELETE FROM exercice_files WHERE id_file = ?", f.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err

22
admin/key.go
View file

@ -5,14 +5,14 @@ import (
) )
type Key struct { type Key struct {
id int64 Id int64 `json:"id"`
id_exercice int64 IdExercice int64 `json:"idExercice"`
Type string Type string `json:"type"`
Value [64]byte Value [64]byte `json:"value"`
} }
func (e Exercice) GetKeys() ([]Key, error) { func (e Exercice) GetKeys() ([]Key, error) {
if rows, err := DBQuery("SELECT id_key, type, value FROM exercice_keys WHERE id_exercice = ?", e.id); err != nil { if rows, err := DBQuery("SELECT id_key, type, value FROM exercice_keys WHERE id_exercice = ?", e.Id); err != nil {
return nil, err return nil, err
} else { } else {
defer rows.Close() defer rows.Close()
@ -20,8 +20,8 @@ func (e Exercice) GetKeys() ([]Key, error) {
var keys = make([]Key, 0) var keys = make([]Key, 0)
for rows.Next() { for rows.Next() {
var k Key var k Key
k.id_exercice = e.id k.IdExercice = e.Id
if err := rows.Scan(&k.id, &k.id_exercice, &k.Type, &k.Value); err != nil { if err := rows.Scan(&k.Id, &k.IdExercice, &k.Type, &k.Value); err != nil {
return nil, err return nil, err
} }
keys = append(keys, k) keys = append(keys, k)
@ -39,17 +39,17 @@ func (e Exercice) AddRawKey(name string, raw_value string) (Key, error) {
} }
func (e Exercice) AddKey(name string, value [64]byte) (Key, error) { func (e Exercice) AddKey(name string, value [64]byte) (Key, error) {
if res, err := DBExec("INSERT INTO exercice_keys (id_exercice, type, value) VALUES (?, ?, ?)", e.id, name, value); err != nil { if res, err := DBExec("INSERT INTO exercice_keys (id_exercice, type, value) VALUES (?, ?, ?)", e.Id, name, value); err != nil {
return Key{}, err return Key{}, err
} else if kid, err := res.LastInsertId(); err != nil { } else if kid, err := res.LastInsertId(); err != nil {
return Key{}, err return Key{}, err
} else { } else {
return Key{kid, e.id, name, value}, nil return Key{kid, e.Id, name, value}, nil
} }
} }
func (k Key) Update() (int64, error) { func (k Key) Update() (int64, error) {
if res, err := DBExec("UPDATE exercice_keys SET id_exercice = ?, type = ?, value = ? WHERE id_key = ?", k.id_exercice, k.Type, k.Value, k.id); err != nil { if res, err := DBExec("UPDATE exercice_keys SET id_exercice = ?, type = ?, value = ? WHERE id_key = ?", k.IdExercice, k.Type, k.Value, k.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -59,7 +59,7 @@ func (k Key) Update() (int64, error) {
} }
func (k Key) Delete() (int64, error) { func (k Key) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM exercice_keys WHERE id_key = ?", k.id); err != nil { if res, err := DBExec("DELETE FROM exercice_keys WHERE id_key = ?", k.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err

22
admin/member.go
View file

@ -3,15 +3,15 @@ package main
import () import ()
type Member struct { type Member struct {
id int64 Id int64 `json:"id"`
Firstname string Firstname string `json:"firstname"`
Lastname string Lastname string `json:"lastname"`
Nickname string Nickname string `json:"nickname"`
Company string Company string `json:"company"`
} }
func (t Team) GetMembers() ([]Member, error) { func (t Team) GetMembers() ([]Member, error) {
if rows, err := DBQuery("SELECT id_member, firstname, lastname, nickname, company FROM team_members WHERE id_team = ?", t.id); err != nil { if rows, err := DBQuery("SELECT id_member, firstname, lastname, nickname, company FROM team_members WHERE id_team = ?", t.Id); err != nil {
return nil, err return nil, err
} else { } else {
defer rows.Close() defer rows.Close()
@ -19,7 +19,7 @@ func (t Team) GetMembers() ([]Member, error) {
var members = make([]Member, 0) var members = make([]Member, 0)
for rows.Next() { for rows.Next() {
var m Member var m Member
if err := rows.Scan(&m.id, &m.Firstname, &m.Lastname, &m.Nickname, &m.Company); err != nil { if err := rows.Scan(&m.Id, &m.Firstname, &m.Lastname, &m.Nickname, &m.Company); err != nil {
return nil, err return nil, err
} }
members = append(members, m) members = append(members, m)
@ -33,7 +33,7 @@ func (t Team) GetMembers() ([]Member, error) {
} }
func (t Team) AddMember(firstname string, lastname string, nickname string, company string) (Member, error) { func (t Team) AddMember(firstname string, lastname string, nickname string, company string) (Member, error) {
if res, err := DBExec("INSERT INTO team_members (id_team, firstname, lastname, nickname, company) VALUES (?, ?, ?, ?, ?)", t.id, firstname, lastname, nickname, company); err != nil { if res, err := DBExec("INSERT INTO team_members (id_team, firstname, lastname, nickname, company) VALUES (?, ?, ?, ?, ?)", t.Id, firstname, lastname, nickname, company); err != nil {
return Member{}, err return Member{}, err
} else if mid, err := res.LastInsertId(); err != nil { } else if mid, err := res.LastInsertId(); err != nil {
return Member{}, err return Member{}, err
@ -43,7 +43,7 @@ func (t Team) AddMember(firstname string, lastname string, nickname string, comp
} }
func (t Team) GainMember(m Member) error { func (t Team) GainMember(m Member) error {
if res, err := DBExec("UPDATE team_members SET id_team = ? WHERE id_member = ?", t.id, m.id); err != nil { if res, err := DBExec("UPDATE team_members SET id_team = ? WHERE id_member = ?", t.Id, m.Id); err != nil {
return err return err
} else if _, err := res.RowsAffected(); err != nil { } else if _, err := res.RowsAffected(); err != nil {
return err return err
@ -53,7 +53,7 @@ func (t Team) GainMember(m Member) error {
} }
func (m Member) Update() (int64, error) { func (m Member) Update() (int64, error) {
if res, err := DBExec("UPDATE team_members SET firstname = ?, lastname = ?, nickname = ?, company = ? WHERE id_member = ?", m.Firstname, m.Lastname, m.Nickname, m.Company, m.id); err != nil { if res, err := DBExec("UPDATE team_members SET firstname = ?, lastname = ?, nickname = ?, company = ? WHERE id_member = ?", m.Firstname, m.Lastname, m.Nickname, m.Company, m.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -63,7 +63,7 @@ func (m Member) Update() (int64, error) {
} }
func (m Member) Delete() (int64, error) { func (m Member) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM team_members WHERE id_member = ?", m.id); err != nil { if res, err := DBExec("DELETE FROM team_members WHERE id_member = ?", m.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err

12
admin/team.go
View file

@ -3,8 +3,8 @@ package main
import () import ()
type Team struct { type Team struct {
id int64 Id int64 `json:"id"`
Name string Name string `json:"name"`
} }
func GetTeams() ([]Team, error) { func GetTeams() ([]Team, error) {
@ -16,7 +16,7 @@ func GetTeams() ([]Team, error) {
var teams = make([]Team, 0) var teams = make([]Team, 0)
for rows.Next() { for rows.Next() {
var t Team var t Team
if err := rows.Scan(&t.id, &t.Name); err != nil { if err := rows.Scan(&t.Id, &t.Name); err != nil {
return nil, err return nil, err
} }
teams = append(teams, t) teams = append(teams, t)
@ -31,7 +31,7 @@ func GetTeams() ([]Team, error) {
func GetTeam(id int) (Team, error) { func GetTeam(id int) (Team, error) {
var t Team var t Team
if err := DBQueryRow("SELECT id_team, name FROM teams WHERE id_team = ?", id).Scan(&t.id, &t.Name); err != nil { if err := DBQueryRow("SELECT id_team, name FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.Name); err != nil {
return t, err return t, err
} }
@ -49,7 +49,7 @@ func CreateTeam(name string) (Team, error) {
} }
func (t Team) Update() (int64, error) { func (t Team) Update() (int64, error) {
if res, err := DBExec("UPDATE teams SET name = ? WHERE id_team = ?", t.Name, t.id); err != nil { if res, err := DBExec("UPDATE teams SET name = ? WHERE id_team = ?", t.Name, t.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -59,7 +59,7 @@ func (t Team) Update() (int64, error) {
} }
func (t Team) Delete() (int64, error) { func (t Team) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM teams WHERE id_teams = ?", t.id); err != nil { if res, err := DBExec("DELETE FROM team_members WHERE id_team = ?; DELETE FROM teams WHERE id_team = ?", t.Id, t.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err

12
admin/theme.go
View file

@ -3,8 +3,8 @@ package main
import () import ()
type Theme struct { type Theme struct {
id int64 Id int64 `json:"id"`
Name string Name string `json:"name"`
} }
func GetThemes() ([]Theme, error) { func GetThemes() ([]Theme, error) {
@ -16,7 +16,7 @@ func GetThemes() ([]Theme, error) {
var themes = make([]Theme, 0) var themes = make([]Theme, 0)
for rows.Next() { for rows.Next() {
var t Theme var t Theme
if err := rows.Scan(&t.id, &t.Name); err != nil { if err := rows.Scan(&t.Id, &t.Name); err != nil {
return nil, err return nil, err
} }
themes = append(themes, t) themes = append(themes, t)
@ -31,7 +31,7 @@ func GetThemes() ([]Theme, error) {
func GetTheme(id int) (Theme, error) { func GetTheme(id int) (Theme, error) {
var t Theme var t Theme
if err := DBQueryRow("SELECT id_theme, name FROM themes WHERE id_theme=?", id).Scan(&t.id, &t.Name); err != nil { if err := DBQueryRow("SELECT id_theme, name FROM themes WHERE id_theme=?", id).Scan(&t.Id, &t.Name); err != nil {
return t, err return t, err
} }
@ -49,7 +49,7 @@ func CreateTheme(name string) (Theme, error) {
} }
func (t Theme) Update() (int64, error) { func (t Theme) Update() (int64, error) {
if res, err := DBExec("UPDATE themes SET name = ? WHERE id_team = ?", t.Name, t.id); err != nil { if res, err := DBExec("UPDATE themes SET name = ? WHERE id_team = ?", t.Name, t.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err
@ -59,7 +59,7 @@ func (t Theme) Update() (int64, error) {
} }
func (t Theme) Delete() (int64, error) { func (t Theme) Delete() (int64, error) {
if res, err := DBExec("DELETE FROM themes WHERE id_theme = ?", t.id); err != nil { if res, err := DBExec("DELETE FROM themes WHERE id_theme = ?", t.Id); err != nil {
return 0, err return 0, err
} else if nb, err := res.RowsAffected(); err != nil { } else if nb, err := res.RowsAffected(); err != nil {
return 0, err return 0, err