Open platform to collect and prioritize feedback
more tests
goenning588b74189bfe
diff --git a/service/errors.go b/service/consts.gosimilarity index 100%rename from service/errors.gorename to service/consts.godiff --git a/service/user.go b/service/user.goindex 18f3247ca..d745fe380 100644--- a/service/user.go+++ b/service/user.go@@ -28,8 +28,8 @@ type PostgresUserService struct {func (svc PostgresUserService) GetByEmail(email string) (*model.User, error) {user := &model.User{}row := svc.DB.QueryRow("SELECT id, name, email FROM users WHERE email = $1", email)- err := row.Scan(&user.ID, &user.Name, &user.Email)- if err != nil {++ if err := row.Scan(&user.ID, &user.Name, &user.Email); err != nil {return nil, ErrNotFound}@@ -43,14 +43,16 @@ func (svc PostgresUserService) Register(user *model.User) error {return err}- err = tx.QueryRow("INSERT INTO users (name, email) VALUES($1, $2) returning id;", user.Name, user.Email).Scan(&user.ID)- if err != nil {+ if err = tx.QueryRow("INSERT INTO users (name, email) VALUES ($1, $2) RETURNING id", user.Name, user.Email).Scan(&user.ID); err != nil {+ tx.Rollback()return err}- _, err = tx.Exec("INSERT INTO user_providers (user_id, provider, provider_uid) VALUES($1, $2, $3);", user.ID, user.Providers[0].Name, user.Providers[0].UID)- if err != nil {- return err+ for _, provider := range user.Providers {+ if _, err = tx.Exec("INSERT INTO user_providers (user_id, provider, provider_uid) VALUES ($1, $2, $3)", user.ID, provider.Name, provider.UID); err != nil {+ tx.Rollback()+ return err+ }}return tx.Commit()diff --git a/service/user_test.go b/service/user_test.gonew file mode 100644index 000000000..16a64caf2--- /dev/null+++ b/service/user_test.go@@ -0,0 +1,128 @@+package service_test++import (+ "database/sql"+ "database/sql/driver"+ "testing"++ sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"++ "github.com/WeCanHearYou/wchy/model"+ "github.com/WeCanHearYou/wchy/service"+ . "github.com/onsi/gomega"+)++func TestUserService_GetByEmail_Error(t *testing.T) {+ RegisterTestingT(t)++ db, mock, _ := sqlmock.New()+ defer db.Close()++ query := mock.ExpectQuery("SELECT id, name, email FROM users WHERE email = \\$1")+ query.WithArgs("[email protected]")+ query.WillReturnError(sql.ErrNoRows)++ svc := &service.PostgresUserService{DB: db}+ user, err := svc.GetByEmail("[email protected]")++ Expect(user).To(BeNil())+ Expect(err).NotTo(BeNil())+}++func TestUserService_GetByEmail(t *testing.T) {+ RegisterTestingT(t)++ db, mock, _ := sqlmock.New()+ defer db.Close()++ rows := sqlmock.NewRows([]string{"id", "name", "email"}).AddRow(int64(234), "Jon Snow", "[email protected]")+ query := mock.ExpectQuery("SELECT id, name, email FROM users WHERE email = \\$1")+ query.WithArgs("[email protected]")+ query.WillReturnRows(rows)++ svc := &service.PostgresUserService{DB: db}+ user, err := svc.GetByEmail("[email protected]")++ Expect(err).To(BeNil())+ Expect(user.ID).To(Equal(int64(234)))+ Expect(user.Name).To(Equal("Jon Snow"))+ Expect(user.Email).To(Equal("[email protected]"))+}++func TestUserService_Register(t *testing.T) {+ RegisterTestingT(t)++ db, mock, _ := sqlmock.New()+ defer db.Close()++ mock.ExpectBegin()++ query := mock.ExpectQuery("INSERT INTO users \\(name, email\\) VALUES \\(\\$1, \\$2\\) RETURNING id")+ query.WithArgs("Jon Snow", "[email protected]")+ query.WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(int64(300)))++ exec := mock.ExpectExec("INSERT INTO user_providers \\(user_id, provider, provider_uid\\) VALUES \\(\\$1, \\$2, \\$3\\)")+ exec.WithArgs(int64(300), service.OAuthFacebookProvider, "123123123")+ exec.WillReturnResult(driver.ResultNoRows)++ mock.ExpectCommit()++ svc := &service.PostgresUserService{DB: db}+ user := &model.User{+ Name: "Jon Snow",+ Email: "[email protected]",+ Providers: []*model.UserProvider{+ {+ UID: "123123123",+ Name: service.OAuthFacebookProvider,+ },+ },+ }+ err := svc.Register(user)++ Expect(err).To(BeNil())+ Expect(user.ID).To(Equal(int64(300)))+}++func TestUserService_Register_MultipleProviders(t *testing.T) {+ RegisterTestingT(t)++ db, mock, _ := sqlmock.New()+ defer db.Close()++ mock.ExpectBegin()++ query := mock.ExpectQuery("INSERT INTO users \\(name, email\\) VALUES \\(\\$1, \\$2\\) RETURNING id")+ query.WithArgs("Jon Snow", "[email protected]")+ query.WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(int64(300)))++ exec := mock.ExpectExec("INSERT INTO user_providers \\(user_id, provider, provider_uid\\) VALUES \\(\\$1, \\$2, \\$3\\)")+ exec.WithArgs(int64(300), service.OAuthFacebookProvider, "123123123")+ exec.WillReturnResult(driver.ResultNoRows)++ exec = mock.ExpectExec("INSERT INTO user_providers \\(user_id, provider, provider_uid\\) VALUES \\(\\$1, \\$2, \\$3\\)")+ exec.WithArgs(int64(300), service.OAuthGoogleProvider, "456456456")+ exec.WillReturnResult(driver.ResultNoRows)++ mock.ExpectCommit()++ svc := &service.PostgresUserService{DB: db}+ user := &model.User{+ Name: "Jon Snow",+ Email: "[email protected]",+ Providers: []*model.UserProvider{+ {+ UID: "123123123",+ Name: service.OAuthFacebookProvider,+ },+ {+ UID: "456456456",+ Name: service.OAuthGoogleProvider,+ },+ },+ }+ err := svc.Register(user)++ Expect(err).To(BeNil())+ Expect(user.ID).To(Equal(int64(300)))+}