Adding more tests for adding a poll if it doesn't exist on get, Adding code to update votes
This commit is contained in:
@@ -3,6 +3,7 @@ package services
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"go-sjles-pta-vote/server/db"
|
||||
"go-sjles-pta-vote/server/models"
|
||||
@@ -10,6 +11,7 @@ import (
|
||||
|
||||
var ErrQuestionAlreadyExists = errors.New("Question already exists")
|
||||
var ErrQuestionDoesntExist = errors.New("Question does not exist yet")
|
||||
var ErrVoterAlreadyVoted = errors.New("Voter already voted")
|
||||
|
||||
func CreatePoll(poll *models.Poll) (*models.Poll, error) {
|
||||
new_poll := models.Poll{}
|
||||
@@ -125,4 +127,110 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
|
||||
}
|
||||
|
||||
return &new_poll, nil
|
||||
}
|
||||
|
||||
func GetAndCreatePollByQuestion(question string) (*models.Poll, error) {
|
||||
new_poll, err := GetPollByQuestion(question)
|
||||
|
||||
if err == ErrQuestionDoesntExist {
|
||||
create_poll := &models.Poll{
|
||||
Question: question,
|
||||
ExpiresAt: time.Now().Add(time.Hour * 10).Format("2006-01-02 15:04:05"),
|
||||
}
|
||||
|
||||
if _, err = CreatePoll(create_poll); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return GetPollByQuestion(question)
|
||||
} else if err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return new_poll, err
|
||||
}
|
||||
}
|
||||
|
||||
func SetVote(poll_id int64, email string, vote bool) error {
|
||||
db_conn, err := db.Connect()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
set_voter_stmt, err := db_conn.Prepare(`
|
||||
INSERT IGNORE INTO voters
|
||||
(poll_id, voter_email)
|
||||
VALUES ($1, $2)
|
||||
`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer set_voter_stmt.Close()
|
||||
|
||||
res, err := set_voter_stmt.Exec(poll_id, email)
|
||||
if err != nil {
|
||||
return err
|
||||
} else {
|
||||
rows_changed, err := res.RowsAffected()
|
||||
if rows_changed != 1 {
|
||||
return ErrVoterAlreadyVoted
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
is_voter_member_stmt, err := db_conn.Prepare(`
|
||||
SELECT 1
|
||||
FROM members
|
||||
WHERE email == $1
|
||||
`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer is_voter_member_stmt.Close()
|
||||
|
||||
var member_check int64
|
||||
is_member := true
|
||||
err = is_voter_member_stmt.QueryRow(email).Scan(&member_check)
|
||||
if err == sql.ErrNoRows {
|
||||
is_member = false
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Member column name is not dependant on user input
|
||||
// So it's ok to put it directly in the query
|
||||
member_column_name := "member_"
|
||||
if !is_member {
|
||||
member_column_name = "non_" + member_column_name
|
||||
}
|
||||
|
||||
if vote {
|
||||
member_column_name += "yes_votes"
|
||||
} else {
|
||||
member_column_name += "no_votes"
|
||||
}
|
||||
|
||||
add_vote_stmt, err := db_conn.Prepare(`
|
||||
UPDATE polls
|
||||
SET ` + member_column_name + ` = ` + member_column_name + ` 1
|
||||
WHERE id == $1
|
||||
`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer add_vote_stmt.Close()
|
||||
|
||||
res, err = add_vote_stmt.Exec(poll_id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if num, err := res.RowsAffected(); num != 1 {
|
||||
return errors.New("Failed to update votes")
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -30,8 +30,10 @@ func TestCreatePoll(t *testing.T) {
|
||||
{RandString(10) + "2", 2},
|
||||
{RandString(10) + "3", 3},
|
||||
{"\"" + RandString(10) + "4", 4},
|
||||
{"'" + RandString(10) + "5", 5},
|
||||
{";" + RandString(10) + "6", 6},
|
||||
{"\\\"" + RandString(10) + "5", 5},
|
||||
{"'" + RandString(10) + "6", 6},
|
||||
{";" + RandString(10) + "7", 7},
|
||||
{"\\" + RandString(10) + "8", 8},
|
||||
}
|
||||
|
||||
tmp_db, err := os.CreateTemp("", "vote_test.*.db")
|
||||
@@ -117,7 +119,7 @@ func TestAlreadyExists(t *testing.T) {
|
||||
|
||||
func TestGetPollByQuestion(t *testing.T) {
|
||||
question := "TestQuestion"
|
||||
|
||||
|
||||
tmp_db, err := os.CreateTemp("", "vote_test.*.db")
|
||||
if err != nil {
|
||||
t.Errorf(`Failed to create temporary db file: %v`, err)
|
||||
@@ -160,3 +162,55 @@ func TestGetPollByQuestion(t *testing.T) {
|
||||
t.Fatalf(`Questions don't match: expected %s: recieved %s`, question, get_poll.Question)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetCreatePollByQuestion(t *testing.T) {
|
||||
parameters := []struct{
|
||||
question string
|
||||
table_index int64
|
||||
}{
|
||||
{RandString(10) + "1", 1},
|
||||
{RandString(10) + "2", 2},
|
||||
{RandString(10) + "3", 3},
|
||||
{"\"" + RandString(10) + "4", 4},
|
||||
{"'" + RandString(10) + "5", 5},
|
||||
{";" + RandString(10) + "6", 6},
|
||||
}
|
||||
|
||||
tmp_db, err := os.CreateTemp("", "vote_test.*.db")
|
||||
if err != nil {
|
||||
t.Errorf(`Failed to create temporary db file: %v`, err)
|
||||
}
|
||||
|
||||
init_conf := &config.Config{
|
||||
DBPath: string(tmp_db.Name()),
|
||||
}
|
||||
config.SetConfig(init_conf)
|
||||
|
||||
defer os.Remove(tmp_db.Name())
|
||||
tmp_db.Close()
|
||||
|
||||
if _, err := db.Connect(); err != nil {
|
||||
t.Errorf(`Failed to create the database: %v`, err)
|
||||
}
|
||||
|
||||
for i := range parameters {
|
||||
new_poll, err := GetAndCreatePollByQuestion(parameters[i].question)
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf(`Failed to create new poll %s: %v`, parameters[i].question, err)
|
||||
}
|
||||
|
||||
if new_poll == nil {
|
||||
t.Fatalf(`Failed to insert %s into table`, parameters[i].question)
|
||||
}
|
||||
|
||||
if new_poll.ID != parameters[i].table_index {
|
||||
t.Fatalf(`Incorrect increment in index for %s: expected %d != %d`, parameters[i].question, parameters[i].table_index, new_poll.ID)
|
||||
}
|
||||
|
||||
if new_poll.Question != parameters[i].question {
|
||||
t.Fatalf(`Incorrect question returned: Expected %s != %s`, parameters[i].question, new_poll.Question)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user