Renamed db packahe to pg (preparing to add mysql package)

cmd/api/env.sh

@@ -7,7 +7,7 @@ export GC_BUCKET=my-cool-bucket
 
 # Local postgres
 export PG_URL=postgres://postgres:postgres@localhost/test?sslmode=disable
-export PG_MIGRATIONS_PATH=file://../../db//migrations
+export PG_MIGRATIONS_PATH=file://../../pg/migrations
 
 # Logger settings
 export LOG_LEVEL=debug

cmd/api/main.go

@@ -12,11 +12,11 @@ import (
 
 	"github.com/evt/rest-api-example/config"
 	"github.com/evt/rest-api-example/controller"
-	"github.com/evt/rest-api-example/db"
 	libError "github.com/evt/rest-api-example/lib/error"
 	"github.com/evt/rest-api-example/lib/validator"
 	"github.com/evt/rest-api-example/logger"
-	"github.com/evt/rest-api-example/repository/pg"
+	"github.com/evt/rest-api-example/pg"
+	pgrepo "github.com/evt/rest-api-example/repository/pg"
 	"github.com/evt/rest-api-example/service/web"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
@@ -45,7 +45,7 @@ func run() error {
 	l := logger.Get()
 
 	// connect to Postgres
-	pgDB, err := db.Dial(cfg)
+	pgDB, err := pg.Dial(cfg)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -63,8 +63,8 @@ func run() error {
 	}
 
 	// Init repositories
-	userRepo := pg.NewUserRepo(pgDB)
-	fileRepo := pg.NewFileRepo(pgDB)
+	userRepo := pgrepo.NewUserRepo(pgDB)
+	fileRepo := pgrepo.NewFileRepo(pgDB)
 	fileContentRepo := gcloudRepo.NewFileRepo(cloudStorage, cfg.GCBucket)
 
 	// Init services

db/pg.go → pg/pg.go

@@ -1,4 +1,4 @@
-package db
+package pg
 
 import (
 	"time"

postman/Simple Web Server.postman_collection.json → postman/REST API Example.postman_collection.json

@@ -1,7 +1,7 @@
 {
 	"info": {
 		"_postman_id": "8e87341e-2892-494b-a0e9-8ff700847a2e",
-		"name": "Simple Web Server",
+		"name": "REST API Example",
 		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
 	},
 	"item": [

postman/REST API Server Local.postman_environment.json

@@ -0,0 +1,14 @@
+{
+	"id": "33494e3e-f94d-41f2-9035-566955b2ffd2",
+	"name": "REST API Server Local",
+	"values": [
+		{
+			"key": "rest_api_addr",
+			"value": "http://127.0.0.1:8080",
+			"enabled": true
+		}
+	],
+	"_postman_variable_scope": "environment",
+	"_postman_exported_at": "2020-10-07T17:49:31.940Z",
+	"_postman_exported_using": "Postman/7.33.1"
+}

repository/pg/file.go

@@ -5,18 +5,18 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/evt/rest-api-example/db"
 	"github.com/evt/rest-api-example/model"
-	"github.com/go-pg/pg/v10"
+	"github.com/evt/rest-api-example/pg"
+	gopg "github.com/go-pg/pg/v10"
 )
 
 // FilePgRepo ...
 type FilePgRepo struct {
-	db *db.PgDB
+	db *pg.PgDB
 }
 
 // NewFileRepo ...
-func NewFileRepo(db *db.PgDB) *FilePgRepo {
+func NewFileRepo(db *pg.PgDB) *FilePgRepo {
 	return &FilePgRepo{db: db}
 }
 
@@ -27,7 +27,7 @@ func (repo *FilePgRepo) Get(ctx context.Context, id uuid.UUID) (*model.DBFile, e
 		Where("id = ?", id).
 		Select()
 	if err != nil {
-		if err == pg.ErrNoRows { //not found
+		if err == gopg.ErrNoRows { //not found
 			return nil, nil
 		}
 		return nil, err
@@ -53,7 +53,7 @@ func (repo *FilePgRepo) Update(ctx context.Context, user *model.DBFile) (*model.
 		Returning("*").
 		Update()
 	if err != nil {
-		if err == pg.ErrNoRows { //not found
+		if err == gopg.ErrNoRows { //not found
 			return nil, nil
 		}
 		return nil, err
@@ -68,7 +68,7 @@ func (repo *FilePgRepo) Delete(ctx context.Context, id uuid.UUID) error {
 		Where("id = ?", id).
 		Delete()
 	if err != nil {
-		if err == pg.ErrNoRows {
+		if err == gopg.ErrNoRows {
 			return nil
 		}
 		return err

repository/pg/user.go

@@ -5,18 +5,18 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/evt/rest-api-example/db"
 	"github.com/evt/rest-api-example/model"
-	"github.com/go-pg/pg/v10"
+	"github.com/evt/rest-api-example/pg"
+	gopg "github.com/go-pg/pg/v10"
 )
 
 // UserPgRepo ...
 type UserPgRepo struct {
-	db *db.PgDB
+	db *pg.PgDB
 }
 
 // NewUserRepo ...
-func NewUserRepo(db *db.PgDB) *UserPgRepo {
+func NewUserRepo(db *pg.PgDB) *UserPgRepo {
 	return &UserPgRepo{db: db}
 }
 
@@ -27,7 +27,7 @@ func (repo *UserPgRepo) GetUser(ctx context.Context, id uuid.UUID) (*model.DBUse
 		Where("id = ?", id).
 		Select()
 	if err != nil {
-		if err == pg.ErrNoRows { //not found
+		if err == gopg.ErrNoRows { //not found
 			return nil, nil
 		}
 		return nil, err
@@ -53,7 +53,7 @@ func (repo *UserPgRepo) UpdateUser(ctx context.Context, user *model.DBUser) (*mo
 		Returning("*").
 		Update()
 	if err != nil {
-		if err == pg.ErrNoRows { //not found
+		if err == gopg.ErrNoRows { //not found
 			return nil, nil
 		}
 		return nil, err
@@ -68,7 +68,7 @@ func (repo *UserPgRepo) DeleteUser(ctx context.Context, id uuid.UUID) error {
 		Where("id = ?", id).
 		Delete()
 	if err != nil {
-		if err == pg.ErrNoRows {
+		if err == gopg.ErrNoRows {
 			return nil
 		}
 		return err