updated tests

Author: bstaijen

profile-service/app/http/controllers/controllers_test.go

@@ -70,7 +70,7 @@ func TestCreateUser(t *testing.T) {
 
 	// Expectation: get user by id
 	timeNow := time.Now().UTC()
-	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "password", "email"}).AddRow(user.ID, user.Username, timeNow, "PasswordHashPlaceHolder", user.Email)
+	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "email"}).AddRow(user.ID, user.Username, timeNow, user.Email)
 	mock.ExpectQuery("SELECT (.+) FROM users WHERE").WithArgs(user.ID).WillReturnRows(selectByIDRows)
 
 	handler := CreateUserHandler(db, cnf)
@@ -368,7 +368,7 @@ func TestGetUserByIndex(t *testing.T) {
 
 	// Database expectations
 	timeNow := time.Now().UTC()
-	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "password", "email"}).AddRow(user.ID, user.Username, timeNow, "PasswordHashPlaceHolder", user.Email)
+	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "email"}).AddRow(user.ID, user.Username, timeNow, user.Email)
 	mock.ExpectQuery("SELECT (.+) FROM users WHERE").WithArgs(user.ID).WillReturnRows(selectByIDRows)
 
 	// Router

profile-service/app/http/routes/routes_test.go

@@ -128,7 +128,7 @@ func TestPOSTUsers(t *testing.T) {
 	defer db.Close()
 
 	// Expected rows
-	rows := sqlmock.NewRows([]string{"count(*)"})
+	rows := sqlmock.NewRows([]string{"count (*)"})
 
 	// Expectation: check for unique username
 	mock.ExpectQuery("SELECT (.+) FROM users WHERE").WithArgs(user.Username).WillReturnRows(rows)
@@ -139,6 +139,10 @@ func TestPOSTUsers(t *testing.T) {
 	// Expectation: insert into database
 	mock.ExpectExec("INSERT INTO users").WithArgs(user.Username, user.Email, TestHash{}).WillReturnResult(sqlmock.NewResult(1, 1))
 
+	timeNow := time.Now().UTC()
+	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "email"}).AddRow(user.ID, user.Username, timeNow, user.Email)
+	mock.ExpectQuery("SELECT (.+) FROM users WHERE").WithArgs(user.ID).WillReturnRows(selectByIDRows)
+
 	// Mock config
 	cnf := config.Config{}
 	cnf.SecretKey = "ABC"
@@ -156,6 +160,7 @@ func TestPOSTUsers(t *testing.T) {
 
 	// Make sure response statuscode expectation is met
 	if res.Result().StatusCode != 200 {
+		t.Logf(string(res.Body.Bytes()))
 		t.Errorf("Expected statuscode to be 200 but got %v", res.Result().StatusCode)
 	} else {
 		t.Logf("Result statuscode %v. (As expected)", res.Result().StatusCode)
@@ -174,7 +179,7 @@ func TestGETUserByID(t *testing.T) {
 
 	// Database expectations
 	timeNow := time.Now().UTC()
-	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "password", "email"}).AddRow(user.ID, user.Username, timeNow, "PasswordHashPlaceHolder", user.Email)
+	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "email"}).AddRow(user.ID, user.Username, timeNow, user.Email)
 	mock.ExpectQuery("SELECT (.+) FROM users WHERE").WithArgs(user.ID).WillReturnRows(selectByIDRows)
 
 	// Mock config

profile-service/database/db_test.go

@@ -22,7 +22,7 @@ func TestGetUserByID(t *testing.T) {
 
 	// Expectation: select user where id == user.ID
 	timeNow := time.Now().UTC()
-	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "password", "email"}).AddRow(user.ID, user.Username, timeNow, user.Hash, user.Email)
+	selectByIDRows := sqlmock.NewRows([]string{"id", "username", "createdAt", "email"}).AddRow(user.ID, user.Username, timeNow, user.Email)
 	mock.ExpectQuery("SELECT (.+) FROM users WHERE").WithArgs(user.ID).WillReturnRows(selectByIDRows)
 
 	// Execute the method

vote-service/database/db.go

@@ -42,11 +42,13 @@ func CloseConnection(db *sql.DB) {
 
 // Create a vote in the database
 func Create(db *sql.DB, vote *sharedModels.VoteCreateRequest) error {
+	// Delete previous vote (if any).
 	_, err := db.Exec("DELETE FROM votes WHERE user_id=? AND photo_id=?", vote.UserID, vote.PhotoID)
 	if err != nil {
 		return err
 	}
 
+	// Insert new vote
 	_, err = db.Exec("INSERT INTO votes(user_id, photo_id, upvote, downvote) VALUES(?,?,?,?)", vote.UserID, vote.PhotoID, vote.Upvote, vote.Downvote)
 	if err != nil {
 		return err