@@ -54,8 +47,7 @@
diff --git a/main.go b/main.go
index a3bbde0..19156d0 100644
--- a/main.go
+++ b/main.go
@@ -60,7 +60,6 @@ func main() {
var bind = flag.String("bind", ":8081", "Bind port/socket")
var dsn = flag.String("dsn", DSNGenerator(), "DSN to connect to the MySQL server")
flag.StringVar(&baseURL, "baseurl", baseURL, "URL prepended to each URL")
- flag.UintVar(¤tPromo, "current-promo", currentPromo, "Year of the current promotion")
flag.Parse()
// Sanitize options
diff --git a/surveys.go b/surveys.go
index 5556c3e..cd531d3 100644
--- a/surveys.go
+++ b/surveys.go
@@ -3,7 +3,6 @@ package main
import (
"encoding/json"
"errors"
- "fmt"
"net/http"
"strconv"
"time"
@@ -15,11 +14,11 @@ func init() {
router.GET("/api/surveys", apiAuthHandler(
func(u *User, _ httprouter.Params, _ []byte) HTTPResponse {
if u == nil {
- return formatApiResponse(getSurveys(fmt.Sprintf("WHERE shown = TRUE AND NOW() > start_availability AND promo = %d", currentPromo)))
+ return formatApiResponse(getSurveys("WHERE shown = TRUE AND NOW() > start_availability"))
} else if u.IsAdmin {
return formatApiResponse(getSurveys(""))
} else {
- return formatApiResponse(getSurveys(fmt.Sprintf("WHERE shown = TRUE AND promo = %d", u.Promo)))
+ return formatApiResponse(getSurveys("WHERE shown = TRUE"))
}
}))
router.POST("/api/surveys", apiHandler(func(_ httprouter.Params, body []byte) HTTPResponse {
@@ -28,15 +27,11 @@ func init() {
return APIErrorResponse{err: err}
}
- if new.Promo == 0 {
- new.Promo = currentPromo
- }
-
- return formatApiResponse(NewSurvey(new.Title, new.Promo, new.Shown, new.StartAvailability, new.EndAvailability))
+ return formatApiResponse(NewSurvey(new.Title, new.Shown, new.StartAvailability, new.EndAvailability))
}, adminRestricted))
router.GET("/api/surveys/:sid", apiAuthHandler(surveyAuthHandler(
func(s Survey, u *User, _ []byte) HTTPResponse {
- if (s.Promo == u.Promo && s.Shown) || (u != nil && u.IsAdmin) {
+ if s.Shown || (u != nil && u.IsAdmin) {
return APIResponse{s}
} else {
return APIErrorResponse{
@@ -60,7 +55,7 @@ func init() {
}), adminRestricted))
router.GET("/api/surveys/:sid/score", apiAuthHandler(surveyAuthHandler(
func(s Survey, u *User, _ []byte) HTTPResponse {
- if (s.Promo == u.Promo && s.Shown) || (u != nil && u.IsAdmin) {
+ if s.Shown || (u != nil && u.IsAdmin) {
if score, err := s.GetScore(u); err != nil {
return APIErrorResponse{err: err}
} else if score == nil {
@@ -78,7 +73,7 @@ func init() {
router.GET("/api/users/:uid/surveys/:sid/score", apiAuthHandler(func(uauth *User, ps httprouter.Params, body []byte) HTTPResponse {
return surveyAuthHandler(func(s Survey, uauth *User, _ []byte) HTTPResponse {
return userHandler(func(u User, _ []byte) HTTPResponse {
- if uauth != nil && ((s.Promo == u.Promo && s.Shown && u.Id == uauth.Id) || uauth.IsAdmin) {
+ if uauth != nil && ((s.Shown && u.Id == uauth.Id) || uauth.IsAdmin) {
if score, err := s.GetScore(&u); err != nil {
return APIErrorResponse{err: err}
} else if score == nil {
@@ -124,7 +119,6 @@ func surveyAuthHandler(f func(Survey, *User, []byte) HTTPResponse) func(*User, h
type Survey struct {
Id int64 `json:"id"`
Title string `json:"title"`
- Promo uint `json:"promo"`
Shown bool `json:"shown"`
Corrected bool `json:"corrected"`
StartAvailability time.Time `json:"start_availability"`
@@ -132,14 +126,14 @@ type Survey struct {
}
func getSurveys(cnd string, param ...interface{}) (surveys []Survey, err error) {
- if rows, errr := DBQuery("SELECT id_survey, title, promo, shown, corrected, start_availability, end_availability FROM surveys "+cnd, param...); errr != nil {
+ if rows, errr := DBQuery("SELECT id_survey, title, shown, corrected, start_availability, end_availability FROM surveys "+cnd, param...); errr != nil {
return nil, errr
} else {
defer rows.Close()
for rows.Next() {
var s Survey
- if err = rows.Scan(&s.Id, &s.Title, &s.Promo, &s.Shown, &s.Corrected, &s.StartAvailability, &s.EndAvailability); err != nil {
+ if err = rows.Scan(&s.Id, &s.Title, &s.Shown, &s.Corrected, &s.StartAvailability, &s.EndAvailability); err != nil {
return
}
surveys = append(surveys, s)
@@ -153,17 +147,17 @@ func getSurveys(cnd string, param ...interface{}) (surveys []Survey, err error)
}
func getSurvey(id int) (s Survey, err error) {
- err = DBQueryRow("SELECT id_survey, title, promo, shown, corrected, start_availability, end_availability FROM surveys WHERE id_survey=?", id).Scan(&s.Id, &s.Title, &s.Promo, &s.Shown, &s.Corrected, &s.StartAvailability, &s.EndAvailability)
+ err = DBQueryRow("SELECT id_survey, title, shown, corrected, start_availability, end_availability FROM surveys WHERE id_survey=?", id).Scan(&s.Id, &s.Title, &s.Shown, &s.Corrected, &s.StartAvailability, &s.EndAvailability)
return
}
-func NewSurvey(title string, promo uint, shown bool, startAvailability time.Time, endAvailability time.Time) (Survey, error) {
- if res, err := DBExec("INSERT INTO surveys (title, promo, shown, start_availability, end_availability) VALUES (?, ?, ?, ?, ?)", title, promo, shown, startAvailability, endAvailability); err != nil {
+func NewSurvey(title string, shown bool, startAvailability time.Time, endAvailability time.Time) (Survey, error) {
+ if res, err := DBExec("INSERT INTO surveys (title, shown, start_availability, end_availability) VALUES (?, ?, ?, ?)", title, shown, startAvailability, endAvailability); err != nil {
return Survey{}, err
} else if sid, err := res.LastInsertId(); err != nil {
return Survey{}, err
} else {
- return Survey{sid, title, promo, shown, false, startAvailability, endAvailability}, nil
+ return Survey{sid, title, shown, false, startAvailability, endAvailability}, nil
}
}
@@ -201,7 +195,7 @@ func (s Survey) GetScores() (scores map[int64]*float64, err error) {
}
func (s Survey) Update() (int64, error) {
- if res, err := DBExec("UPDATE surveys SET title = ?, promo = ?, shown = ?, corrected = ?, start_availability = ?, end_availability = ? WHERE id_survey = ?", s.Title, s.Promo, s.Shown, s.Corrected, s.StartAvailability, s.EndAvailability, s.Id); err != nil {
+ if res, err := DBExec("UPDATE surveys SET title = ?, shown = ?, corrected = ?, start_availability = ?, end_availability = ? WHERE id_survey = ?", s.Title, s.Shown, s.Corrected, s.StartAvailability, s.EndAvailability, s.Id); err != nil {
return 0, err
} else if nb, err := res.RowsAffected(); err != nil {
return 0, err
diff --git a/users.go b/users.go
index 1e5d8bc..d779ed7 100644
--- a/users.go
+++ b/users.go
@@ -8,8 +8,6 @@ import (
"github.com/julienschmidt/httprouter"
)
-var currentPromo uint = 0
-
func init() {
router.GET("/api/users", apiHandler(
func(httprouter.Params, []byte) HTTPResponse {
@@ -49,19 +47,18 @@ type User struct {
Firstname string `json:"firstname"`
Lastname string `json:"lastname"`
Time time.Time `json:"time"`
- Promo uint `json:"promo"`
IsAdmin bool `json:"is_admin"`
}
func getUsers() (users []User, err error) {
- if rows, errr := DBQuery("SELECT id_user, login, email, firstname, lastname, time, promo, is_admin FROM users"); errr != nil {
+ if rows, errr := DBQuery("SELECT id_user, login, email, firstname, lastname, time, is_admin FROM users"); errr != nil {
return nil, errr
} else {
defer rows.Close()
for rows.Next() {
var u User
- if err = rows.Scan(&u.Id, &u.Login, &u.Email, &u.Firstname, &u.Lastname, &u.Time, &u.Promo, &u.IsAdmin); err != nil {
+ if err = rows.Scan(&u.Id, &u.Login, &u.Email, &u.Firstname, &u.Lastname, &u.Time, &u.IsAdmin); err != nil {
return
}
users = append(users, u)
@@ -75,12 +72,12 @@ func getUsers() (users []User, err error) {
}
func getUser(id int) (u User, err error) {
- err = DBQueryRow("SELECT id_user, login, email, firstname, lastname, time, promo, is_admin FROM users WHERE id_user=?", id).Scan(&u.Id, &u.Login, &u.Email, &u.Firstname, &u.Lastname, &u.Time, &u.Promo, &u.IsAdmin)
+ err = DBQueryRow("SELECT id_user, login, email, firstname, lastname, time, is_admin FROM users WHERE id_user=?", id).Scan(&u.Id, &u.Login, &u.Email, &u.Firstname, &u.Lastname, &u.Time, &u.IsAdmin)
return
}
func getUserByLogin(login string) (u User, err error) {
- err = DBQueryRow("SELECT id_user, login, email, firstname, lastname, time, promo, is_admin FROM users WHERE login=?", login).Scan(&u.Id, &u.Login, &u.Email, &u.Firstname, &u.Lastname, &u.Time, &u.Promo, &u.IsAdmin)
+ err = DBQueryRow("SELECT id_user, login, email, firstname, lastname, time, is_admin FROM users WHERE login=?", login).Scan(&u.Id, &u.Login, &u.Email, &u.Firstname, &u.Lastname, &u.Time, &u.IsAdmin)
return
}
@@ -92,17 +89,17 @@ func userExists(login string) bool {
func NewUser(login string, email string, firstname string, lastname string) (User, error) {
t := time.Now()
- if res, err := DBExec("INSERT INTO users (login, email, firstname, lastname, time, promo) VALUES (?, ?, ?, ?, ?, ?)", login, email, firstname, lastname, t, currentPromo); err != nil {
+ if res, err := DBExec("INSERT INTO users (login, email, firstname, lastname, time) VALUES (?, ?, ?, ?, ?)", login, email, firstname, lastname, t); err != nil {
return User{}, err
} else if sid, err := res.LastInsertId(); err != nil {
return User{}, err
} else {
- return User{sid, login, email, firstname, lastname, t, currentPromo, false}, nil
+ return User{sid, login, email, firstname, lastname, t, false}, nil
}
}
func (u User) Update() (int64, error) {
- if res, err := DBExec("UPDATE users SET login = ?, email = ?, firstname = ?, lastname = ?, time = ?, promo = ? WHERE id_user = ?", u.Login, u.Email, u.Firstname, u.Lastname, u.Time, u.Promo, u.Id); err != nil {
+ if res, err := DBExec("UPDATE users SET login = ?, email = ?, firstname = ?, lastname = ?, time = ? WHERE id_user = ?", u.Login, u.Email, u.Firstname, u.Lastname, u.Time, u.Id); err != nil {
return 0, err
} else if nb, err := res.RowsAffected(); err != nil {
return 0, err
@@ -151,6 +148,5 @@ func updateUser(current User, body []byte) HTTPResponse {
current.Firstname = new.Firstname
current.Lastname = new.Lastname
current.Time = new.Time
- current.Promo = new.Promo
return formatApiResponse(current.Update())
}