Create func GetByEmail

internal/storage/postgress/mock.go → internal/storage/postgres/mock.go

@@ -1,4 +1,4 @@
-package postgress
+package postgres
 
 import (
 	"database/sql"

internal/storage/postgress/postgres.go → internal/storage/postgres/postgres.go

@@ -1,4 +1,4 @@
-package postgress
+package postgres
 
 import (
 	"database/sql"

internal/storage/postgress/postgres_test.go → internal/storage/postgres/postgres_test.go

@@ -1,37 +1,37 @@
-package postgress_test
+package postgres_test
 
 import (
 	"testing"
 	"zerg-team-student-information-service/internal/storage"
-	"zerg-team-student-information-service/internal/storage/postgress"
+	"zerg-team-student-information-service/internal/storage/postgres"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestCreateConnectString(t *testing.T) {
-	cfg := postgress.PGConfig{
+	cfg := postgres.PGConfig{
 		Host:     "localhost",
 		Port:     5432,
 		Username: "postgres",
-		DBName:   "postgress",
+		DBName:   "postgres",
 		Password: "password",
 		SSLMode:  "require",
 	}
 	res := cfg.CreateConnectString()
-	exp := "host=localhost port=5432 user=postgres dbname=postgress password=password sslmode=require"
+	exp := "host=localhost port=5432 user=postgres dbname=postgres password=password sslmode=require"
 
 	assert.Equal(t, exp, res, "invalid connection string")
 }
 
 func TestPGConfigImplementsDBConfig(t *testing.T) {
-	cfg := &postgress.PGConfig{}
+	cfg := &postgres.PGConfig{}
 	assert.Implements(t, (*storage.DBConfig)(nil), cfg, "PGConfig not implementing DbConfig interface")
 }
 
 func TestNewPostgresConnect(t *testing.T) {
-	cfg := &postgress.PGConfig{}
+	cfg := &postgres.PGConfig{}
 
-	conn, err := postgress.NewPostgresConnect(cfg)
+	conn, err := postgres.NewPostgresConnect(cfg)
 	if err != nil {
 		t.Error(err)
 	}

internal/storage/postgress/user.go → internal/storage/postgres/user.go

@@ -1,4 +1,4 @@
-package postgress
+package postgres
 
 import (
 	"zerg-team-student-information-service/internal/models"
@@ -27,6 +27,20 @@ func (u *UserDB) GetByID(id int) (models.User, error) {
 	return userModel, err
 }
 
+func (u *UserDB) GetByEmail(email string) (models.User, error) {
+	var userModel models.User
+	row := u.dbConn.GetConn().QueryRow("SELECT * FROM users WHERE email=$1", email)
+	err := row.Scan(
+		&userModel.ID,
+		&userModel.FirstName,
+		&userModel.LastName,
+		&userModel.Birthday,
+		&userModel.Email,
+		&userModel.PasswordHash,
+	)
+	return userModel, err
+}
+
 func (u *UserDB) Create(user models.User) (int64, error) {
 	sqlStatement := "INSERT INTO users (first_name, last_name, birthday, email, password_hash) "
 	sqlStatement += "VALUES ($1, $2, $3, $4, $5) RETURNING id"

internal/storage/postgres/user_test.go

@@ -0,0 +1,63 @@
+package postgres_test
+
+import (
+	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"zerg-team-student-information-service/internal/models"
+	"zerg-team-student-information-service/internal/storage/postgres"
+)
+
+var userModel = models.User{ID: 7, FirstName: "Ivan", LastName: "Sidorov", Birthday: "30.01.1985",
+	Email: "[email protected]", PasswordHash: "sst67a8dfge638"}
+
+var columns = []string{"id", "first_name", "last_name", "birthday", "email", "password_hash"}
+
+func TestCreateUser(t *testing.T) {
+	dbConnect, _ := postgres.NewMockConnect()
+	defer dbConnect.Close()
+
+	userId := int64(5)
+	dbConnect.Mock.ExpectExec("INSERT INTO users").
+		WithArgs(userModel.FirstName, userModel.LastName,
+			userModel.Birthday, userModel.Email, userModel.PasswordHash).
+		WillReturnResult(sqlmock.NewResult(userId, 1))
+
+	db := postgres.NewUserDB(dbConnect)
+	id, err := db.Create(userModel)
+
+	assert.Equal(t, nil, err)
+	assert.Equal(t, userId, id)
+}
+
+func TestGetByEmail(t *testing.T) {
+	dbConnect, _ := postgres.NewMockConnect()
+	defer dbConnect.Close()
+
+	dbConnect.Mock.ExpectQuery(`SELECT \* FROM users WHERE email=(.+)`).
+		WithArgs(userModel.Email).
+		WillReturnRows(sqlmock.NewRows(columns).AddRow(userModel.ID, userModel.FirstName, userModel.LastName,
+			userModel.Birthday, userModel.Email, userModel.PasswordHash))
+
+	db := postgres.NewUserDB(dbConnect)
+	user, err := db.GetByEmail(userModel.Email)
+
+	assert.Equal(t, nil, err)
+	assert.EqualValues(t, userModel, user)
+}
+
+func TestGetByID(t *testing.T) {
+	dbConnect, _ := postgres.NewMockConnect()
+	defer dbConnect.Close()
+
+	dbConnect.Mock.ExpectQuery(`SELECT \* FROM users WHERE id=(.+)`).
+		WithArgs(userModel.ID).
+		WillReturnRows(sqlmock.NewRows(columns).AddRow(userModel.ID, userModel.FirstName, userModel.LastName,
+			userModel.Birthday, userModel.Email, userModel.PasswordHash))
+
+	db := postgres.NewUserDB(dbConnect)
+	user, err := db.GetByID(userModel.ID)
+
+	assert.Equal(t, nil, err)
+	assert.EqualValues(t, userModel, user)
+}

internal/storage/repository/repository.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"zerg-team-student-information-service/internal/logger"
 	"zerg-team-student-information-service/internal/storage"
-	"zerg-team-student-information-service/internal/storage/postgress"
+	"zerg-team-student-information-service/internal/storage/postgres"
 )
 
 type Repository struct {
@@ -16,16 +16,16 @@ type Repository struct {
 func New(dbms string, logger logger.Logger) (*Repository, error) {
 	switch dbms {
 	case "postgres":
-		cfg := postgress.PGConfig{}
-		dbConnect, err := postgress.NewPostgresConnect(&cfg)
+		cfg := postgres.PGConfig{}
+		dbConnect, err := postgres.NewPostgresConnect(&cfg)
 		if err != nil {
 			return nil, err
 		}
 		if err = dbConnect.CheckConn(); err != nil {
 			return nil, err
 		}
 
-		return &Repository{dbConnect, logger, postgress.NewUserDB(dbConnect)}, nil
+		return &Repository{dbConnect, logger, postgres.NewUserDB(dbConnect)}, nil
 	default:
 		return nil, errors.New("DBMS not supported")
 	}

internal/storage/repository/user.go

@@ -5,4 +5,5 @@ import "zerg-team-student-information-service/internal/models"
 type UserRepository interface {
 	GetByID(id int) (models.User, error)
 	Create(user models.User) (int64, error)
+	GetByEmail(email string) (models.User, error)
 }