Fixing up the go code, adding initial work for the stats pages, adding a function to pre-populate the database with some example polls for testing. Will be removed later
This commit is contained in:
@@ -2,27 +2,28 @@ package services
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"time"
|
||||
"log"
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"errors"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"go-sjles-pta-vote/server/common"
|
||||
"go-sjles-pta-vote/server/db"
|
||||
"go-sjles-pta-vote/server/models"
|
||||
)
|
||||
|
||||
var ErrQuestionAlreadyExists = errors.New("Question already exists")
|
||||
var ErrQuestionDoesntExist = errors.New("Question does not exist yet")
|
||||
var ErrVoterAlreadyVoted = errors.New("Voter already voted")
|
||||
var ErrPollNotFound = errors.New("Poll not found")
|
||||
var ErrFailedToUpdateVote = errors.New("Failed to update vote")
|
||||
var ErrFailedToDeletePoll = errors.New("Failed to delete poll")
|
||||
var (
|
||||
ErrQuestionAlreadyExists = errors.New("Question already exists")
|
||||
ErrQuestionDoesntExist = errors.New("Question does not exist yet")
|
||||
ErrVoterAlreadyVoted = errors.New("Voter already voted")
|
||||
ErrPollNotFound = errors.New("Poll not found")
|
||||
ErrFailedToUpdateVote = errors.New("Failed to update vote")
|
||||
ErrFailedToDeletePoll = errors.New("Failed to delete poll")
|
||||
)
|
||||
|
||||
const (
|
||||
DATE_FORMAT = "2006-01-02 15:04:05"
|
||||
const (
|
||||
DEFAULT_POLL_DURATION_HOURS = 24
|
||||
)
|
||||
|
||||
@@ -49,8 +50,8 @@ func AdminNewVoteHandler(resWriter http.ResponseWriter, request *http.Request) {
|
||||
}
|
||||
|
||||
poll := models.Poll{
|
||||
Question: question,
|
||||
ExpiresAt: time.Now().Add(time.Duration(durationHours) * time.Hour).Format(DATE_FORMAT),
|
||||
Question: question,
|
||||
ExpiresAt: time.Now().Add(time.Duration(durationHours) * time.Hour).Format(common.DATE_FORMAT),
|
||||
}
|
||||
|
||||
_, err := CreatePoll(&poll)
|
||||
@@ -60,14 +61,14 @@ func AdminNewVoteHandler(resWriter http.ResponseWriter, request *http.Request) {
|
||||
}
|
||||
|
||||
resWriter.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(resWriter).Encode(map[string]bool{"success": true})
|
||||
json.NewEncoder(resWriter).Encode(map[string]bool{common.SUCCESS: true})
|
||||
}
|
||||
|
||||
func CreatePoll(poll *models.Poll) (*int64, error) {
|
||||
func CreatePoll(poll *models.Poll) (int64, error) {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
return nil, err
|
||||
log.Printf("Failed to connect to database: %s", err.Error())
|
||||
return -1, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
@@ -77,21 +78,21 @@ func CreatePoll(poll *models.Poll) (*int64, error) {
|
||||
WHERE question == $1
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
return nil, err
|
||||
log.Printf("%s", err.Error())
|
||||
return -1, err
|
||||
}
|
||||
defer get_stmt.Close()
|
||||
|
||||
var id int
|
||||
err = get_stmt.QueryRow(poll.Question).Scan(&id)
|
||||
if err != sql.ErrNoRows {
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
return nil, err
|
||||
if err != nil {
|
||||
if err != sql.ErrNoRows {
|
||||
log.Printf("%s", err.Error())
|
||||
return -1, err
|
||||
}
|
||||
return nil, ErrQuestionAlreadyExists
|
||||
return -1, ErrQuestionAlreadyExists
|
||||
}
|
||||
|
||||
|
||||
stmt, err := db_conn.Prepare(`
|
||||
INSERT INTO polls (
|
||||
question,
|
||||
@@ -103,20 +104,20 @@ func CreatePoll(poll *models.Poll) (*int64, error) {
|
||||
`)
|
||||
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
return nil, err
|
||||
log.Printf("%s", err.Error())
|
||||
return -1, err
|
||||
}
|
||||
|
||||
defer stmt.Close()
|
||||
|
||||
res, err := stmt.Exec(poll.Question, poll.ExpiresAt)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
return nil, err
|
||||
log.Printf("%s", err.Error())
|
||||
return -1, err
|
||||
}
|
||||
|
||||
new_poll_id, err := res.LastInsertId()
|
||||
return &new_poll_id, err
|
||||
new_poll_id, err := res.LastInsertId()
|
||||
return new_poll_id, err
|
||||
}
|
||||
|
||||
func AdminViewVoteHandler(resWriter http.ResponseWriter, request *http.Request) {
|
||||
@@ -125,19 +126,36 @@ func AdminViewVoteHandler(resWriter http.ResponseWriter, request *http.Request)
|
||||
return
|
||||
}
|
||||
|
||||
polls, err := GetAllPolls()
|
||||
if err != nil {
|
||||
common.SendError(resWriter, "Failed to get polls", http.StatusInternalServerError)
|
||||
return
|
||||
var polls []models.Poll
|
||||
var err error
|
||||
question := request.FormValue("question")
|
||||
if question == "" {
|
||||
polls, err = GetAllPolls()
|
||||
if err != nil {
|
||||
common.SendError(resWriter, "Failed to get polls", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
poll, err := GetPollByQuestion(question)
|
||||
if err != nil {
|
||||
common.SendError(resWriter, "Failed to get poll question "+question, http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
polls = append(polls, *poll)
|
||||
}
|
||||
|
||||
json.NewEncoder(resWriter).Encode(polls)
|
||||
err = json.NewEncoder(resWriter).Encode(polls)
|
||||
if err != nil {
|
||||
log.Printf("Error encoding response: %v", err)
|
||||
common.SendError(resWriter, "Failed to encode polls", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func GetAllPolls() ([]models.Poll, error) {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
@@ -152,14 +170,14 @@ func GetAllPolls() ([]models.Poll, error) {
|
||||
FROM polls
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer get_polls_stmt.Close()
|
||||
|
||||
rows, err := get_polls_stmt.Query()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
@@ -175,7 +193,7 @@ func GetAllPolls() ([]models.Poll, error) {
|
||||
&new_poll.ExpiresAt,
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -188,7 +206,7 @@ func GetAllPolls() ([]models.Poll, error) {
|
||||
func GetPollByQuestion(question string) (*models.Poll, error) {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
@@ -204,7 +222,7 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
|
||||
WHERE question == $1
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer get_poll_stmt.Close()
|
||||
@@ -221,11 +239,11 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, ErrPollNotFound
|
||||
} else if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
|
||||
get_voters_stmt, err := db_conn.Prepare (`
|
||||
get_voters_stmt, err := db_conn.Prepare(`
|
||||
SELECT voter_email
|
||||
FROM voters
|
||||
WHERE poll_id == $1
|
||||
@@ -240,7 +258,7 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
|
||||
var voter_email string
|
||||
err = rows.Scan(&voter_email)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
new_poll.WhoVoted = append(new_poll.WhoVoted, voter_email)
|
||||
@@ -249,13 +267,56 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
|
||||
return &new_poll, nil
|
||||
}
|
||||
|
||||
func GetPollById(id int64) (*models.Poll, error) {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
get_poll_stmt, err := db_conn.Prepare(`
|
||||
SELECT
|
||||
id, question,
|
||||
member_yes_votes, member_no_votes,
|
||||
non_member_yes_votes, non_member_no_votes,
|
||||
created_at, updated_at,
|
||||
expires_at
|
||||
FROM polls
|
||||
WHERE id == $1
|
||||
`)
|
||||
if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
defer get_poll_stmt.Close()
|
||||
|
||||
new_poll := models.Poll{}
|
||||
err = get_poll_stmt.QueryRow(id).Scan(
|
||||
&new_poll.ID, &new_poll.Question,
|
||||
&new_poll.MemberYes, &new_poll.MemberNo,
|
||||
&new_poll.NonMemberYes, &new_poll.NonMemberNo,
|
||||
&new_poll.CreatedAt, &new_poll.UpdatedAt,
|
||||
&new_poll.ExpiresAt,
|
||||
)
|
||||
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, ErrPollNotFound
|
||||
} else if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &new_poll, nil
|
||||
}
|
||||
|
||||
func GetAndCreatePollByQuestion(question string) (*models.Poll, error) {
|
||||
new_poll, err := GetPollByQuestion(question)
|
||||
|
||||
if err == ErrPollNotFound {
|
||||
create_poll := &models.Poll{
|
||||
Question: question,
|
||||
ExpiresAt: time.Now().Add(time.Hour * 10).Format(DATE_FORMAT),
|
||||
Question: question,
|
||||
ExpiresAt: time.Now().Add(time.Hour * 10).Format(common.DATE_FORMAT),
|
||||
}
|
||||
|
||||
if _, err = CreatePoll(create_poll); err != nil {
|
||||
@@ -264,7 +325,7 @@ func GetAndCreatePollByQuestion(question string) (*models.Poll, error) {
|
||||
|
||||
return GetPollByQuestion(question)
|
||||
} else if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return nil, err
|
||||
} else {
|
||||
return new_poll, err
|
||||
@@ -274,7 +335,7 @@ func GetAndCreatePollByQuestion(question string) (*models.Poll, error) {
|
||||
func SetVote(vote *models.Vote) error {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
@@ -285,21 +346,21 @@ func SetVote(vote *models.Vote) error {
|
||||
VALUES ($1, $2)
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer set_voter_stmt.Close()
|
||||
|
||||
res, err := set_voter_stmt.Exec(vote.PollId, vote.Email)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
} else {
|
||||
rows_changed, err := res.RowsAffected()
|
||||
if rows_changed != 1 {
|
||||
return ErrVoterAlreadyVoted
|
||||
} else if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -310,7 +371,7 @@ func SetVote(vote *models.Vote) error {
|
||||
WHERE email == $1
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer is_voter_member_stmt.Close()
|
||||
@@ -321,7 +382,7 @@ func SetVote(vote *models.Vote) error {
|
||||
if err == sql.ErrNoRows {
|
||||
is_member = false
|
||||
} else if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -344,21 +405,21 @@ func SetVote(vote *models.Vote) error {
|
||||
WHERE id == $1
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer add_vote_stmt.Close()
|
||||
|
||||
res, err = add_vote_stmt.Exec(vote.PollId)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
if num, err := res.RowsAffected(); num != 1 {
|
||||
return ErrFailedToUpdateVote
|
||||
} else if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -369,8 +430,8 @@ func SetVote(vote *models.Vote) error {
|
||||
func DeletePollByQuestion(question string) error {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
@@ -383,14 +444,14 @@ func DeletePollByQuestion(question string) error {
|
||||
)
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer delete_votes_stmt.Close()
|
||||
|
||||
_, err = delete_votes_stmt.Exec(question)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -399,23 +460,79 @@ func DeletePollByQuestion(question string) error {
|
||||
WHERE question == $1
|
||||
`)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer delete_poll_stmt.Close()
|
||||
|
||||
res, err := delete_poll_stmt.Exec(question)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
if num, err := res.RowsAffected(); num != 1 {
|
||||
return ErrFailedToDeletePoll
|
||||
} else if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func CreatePollIgnore(poll *models.Poll) error {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
stmt, err := db_conn.Prepare(`
|
||||
INSERT OR IGNORE INTO polls (
|
||||
question,
|
||||
expires_at,
|
||||
member_yes_votes,
|
||||
member_no_votes,
|
||||
non_member_yes_votes,
|
||||
non_member_no_votes,
|
||||
created_at,
|
||||
updated_at
|
||||
) VALUES (
|
||||
$1,
|
||||
$2,
|
||||
$3,
|
||||
$4,
|
||||
$5,
|
||||
$6,
|
||||
$7,
|
||||
$8
|
||||
)
|
||||
`)
|
||||
|
||||
if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
defer stmt.Close()
|
||||
|
||||
_, err = stmt.Exec(
|
||||
poll.Question,
|
||||
poll.ExpiresAt,
|
||||
poll.MemberYes,
|
||||
poll.MemberNo,
|
||||
poll.NonMemberYes,
|
||||
poll.NonMemberNo,
|
||||
poll.CreatedAt,
|
||||
poll.UpdatedAt,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
log.Printf("%s", err.Error())
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user