Added db configuration and db testing

Author: dannycrief

configs/apiserver.toml

@@ -1,2 +1,5 @@
 bind_addr = ":8080"
-log_level = "debug"
+log_level = "debug"
+
+[store]
+database_url = "postgres://postgres:211217ns@localhost/restapi_dev?sslmode=disable"

go.mod

@@ -4,7 +4,9 @@ go 1.15
 
 require (
 	github.com/BurntSushi/toml v0.3.1
+	github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
 	github.com/gorilla/mux v1.8.0
+	github.com/lib/pq v1.8.0
 	github.com/sirupsen/logrus v1.7.0
 	github.com/stretchr/testify v1.6.1
 )

go.sum

@@ -3,8 +3,13 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang-migrate/migrate v1.3.2 h1:QAlFV1QF9zdkzy/jujlBVkVu+L/+k18cg8tuY1/4JDY=
+github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA=
+github.com/golang-migrate/migrate v3.5.4+incompatible/go.mod h1:IsVUlFN5puWOmXrqjgGUfIRIbU7mr8oNBE2tyERd9Wk=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
+github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=

interanal/app/model/user.go

@@ -0,0 +1,9 @@
+package model
+
+//User ...
+type User struct {
+	ID                int
+	Email             string
+	EncryptedPassword string
+}
+

interanal/app/store/config.go

@@ -0,0 +1,11 @@
+package store
+
+//Config ...
+type Config struct {
+	DatabaseURL string `toml:"database_url"`
+}
+
+//NewConfig ...
+func NewConfig() *Config {
+	return &Config{}
+}

interanal/app/store/store.go

@@ -0,0 +1,55 @@
+package store
+
+import (
+	"database/sql"
+
+	_ "github.com/lib/pq" // ...
+)
+
+//Store ...
+type Store struct {
+	config         *Config
+	db             *sql.DB
+	userRepository *UserRepository
+}
+
+//New ...
+func New(config *Config) *Store {
+	return &Store{
+		config: config,
+	}
+}
+
+//Open ...
+func (s *Store) Open() error {
+	db, err := sql.Open("postgres", s.config.DatabaseURL)
+	if err != nil {
+		return err
+	}
+
+	if err := db.Ping(); err != nil {
+		return err
+	}
+
+	s.db = db
+
+	return nil
+}
+
+//Close ...
+func (s *Store) Close() {
+	s.db.Close()
+}
+
+//User ...
+func (s *Store) User() *UserRepository {
+	if s.userRepository != nil {
+		return s.userRepository
+	}
+
+	s.userRepository = &UserRepository{
+		store: s,
+	}
+
+	return s.userRepository
+}

interanal/app/store/store_test.go

@@ -0,0 +1,19 @@
+package store_test
+
+import (
+	"os"
+	"testing"
+)
+
+var (
+	databaseURL string
+)
+
+func TestMain(m *testing.M) {
+	databaseURL = os.Getenv("database_url")
+	if databaseURL == "" {
+		databaseURL = "postgres://postgres:211217ns@localhost/restapi_test?sslmode=disable"
+	}
+
+	os.Exit(m.Run())
+}

interanal/app/store/testing.go

@@ -0,0 +1,27 @@
+package store
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+)
+
+//TestStore ...
+func TestStore(t *testing.T, databaseURL string) (*Store, func(...string)) {
+	t.Helper()
+	config := NewConfig()
+	config.DatabaseURL = databaseURL
+	s := New(config)
+	if err := s.Open(); err != nil {
+		t.Fatal(err)
+	}
+
+	return s, func(tables ...string) {
+		if len(tables) > 0 {
+			if _, err := s.db.Exec(fmt.Sprintf("truncate %s cascade", strings.Join(tables, ", "))); err != nil {
+				t.Fatal(err)
+			}
+		}
+		s.Close()
+	}
+}

interanal/app/store/userrepository.go

@@ -0,0 +1,36 @@
+package store
+
+import "github.com/dannycrief/go-http-rest-api/interanal/app/model"
+
+//UserRepository ...
+type UserRepository struct {
+	store *Store
+}
+
+//Create ...
+func (r *UserRepository) Create(u *model.User) (*model.User, error) {
+	if err := r.store.db.QueryRow(
+		"insert into users (email, encrypted_password) values ($1, $2) returning id",
+		u.Email, u.EncryptedPassword,
+	).Scan(&u.ID); err != nil {
+		return nil, err
+	}
+
+	return u, nil
+}
+
+//FindByEmail ...
+func (r *UserRepository) FindByEmail(email string) (*model.User, error) {
+	u := &model.User{}
+	if err := r.store.db.QueryRow(
+		"select id, email, encrypted_password from users where email = $1",
+		email,
+	).Scan(
+		&u.ID,
+		&u.Email,
+		&u.EncryptedPassword,
+	); err != nil {
+		return nil, err
+	}
+	return u, nil
+}

interanal/app/store/userrepository_test.go

@@ -0,0 +1,36 @@
+package store_test
+
+import (
+	"github.com/dannycrief/go-http-rest-api/interanal/app/model"
+	"github.com/dannycrief/go-http-rest-api/interanal/app/store"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestUserRepository_Create(t *testing.T) {
+	s, teardown := store.TestStore(t, databaseURL)
+	defer teardown("users")
+
+	u, err := s.User().Create(&model.User{
+		Email: "user@example.org",
+	})
+	assert.NoError(t, err)
+	assert.NotNil(t, u)
+}
+
+func TestUserRepository_FindByEmail(t *testing.T) {
+	s, teardown := store.TestStore(t, databaseURL)
+	defer teardown("users")
+
+	email := "user@example.org"
+	_, err := s.User().FindByEmail(email)
+	assert.Error(t, err)
+
+	s.User().Create(&model.User{
+		Email: "user@example.org",
+	})
+	u, err := s.User().FindByEmail(email)
+	assert.NoError(t, err)
+	assert.NotNil(t, u)
+
+}

migrations/20201113224354_create_users.down.sql

@@ -0,0 +1 @@
+drop table users;

migrations/20201113224354_create_users.up.sql

@@ -0,0 +1,5 @@
+create table users (
+    id bigserial not null primary key,
+    email varchar not null unique,
+    encrypted_password varchar not null
+);