talksik/clean-architecture-go-v2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: improvements in structures

Browse Source
This commit is contained in:
Elton Minetto
2020-09-29 21:51:18 -03:00
parent 201f7607e1
commit 2c7f87e73a
41 changed files with 821 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
domain/entity/book/entity.go → domain/entity/book.go
+2 -4
View File
@@ -1,14 +1,12 @@
package book
package entity
import (
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//Book data
type Book struct {
ID entity.ID
ID ID
Title string
Author string
Pages int
domain/entity/book/interface.go
-28
View File
@@ -1,28 +0,0 @@
package book
import "github.com/eminetto/clean-architecture-go-v2/domain/entity"
//Reader interface
type Reader interface {
Get(id entity.ID) (*Book, error)
Search(query string) ([]*Book, error)
List() ([]*Book, error)
}
//Writer book writer
type Writer interface {
Create(e *Book) (entity.ID, error)
Update(e *Book) error
Delete(id entity.ID) error
}
//repository interface
type repository interface {
Reader
Writer
}
//Manager interface
type Manager interface {
repository
}
domain/entity/book/manager.go
-55
View File
@@ -1,55 +0,0 @@
package book
import (
"strings"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
type manager struct {
repo repository
}
//NewManager create new manager
func NewManager(r repository) *manager {
return &manager{
repo: r,
}
}
//Create a book
func (s *manager) Create(e *Book) (entity.ID, error) {
e.ID = entity.NewID()
e.CreatedAt = time.Now()
return s.repo.Create(e)
}
//Get a book
func (s *manager) Get(id entity.ID) (*Book, error) {
return s.repo.Get(id)
}
//Search books
func (s *manager) Search(query string) ([]*Book, error) {
return s.repo.Search(strings.ToLower(query))
}
//List books
func (s *manager) List() ([]*Book, error) {
return s.repo.List()
}
//Delete a book
func (s *manager) Delete(id entity.ID) error {
_, err := s.Get(id)
if err != nil {
return err
}
return s.repo.Delete(id)
}
//Update a book
func (s *manager) Update(e *Book) error {
return s.repo.Update(e)
}
domain/entity/book/manager_test.go
-82
View File
@@ -1,82 +0,0 @@
package book
import (
"testing"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/stretchr/testify/assert"
)
func Test_Create(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo)
u := NewFixtureBook()
id, err := m.Create(u)
assert.Nil(t, err)
assert.Equal(t, u.ID, id)
assert.False(t, u.CreatedAt.IsZero())
}
func Test_SearchAndFind(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo)
u1 := NewFixtureBook()
u2 := NewFixtureBook()
u2.Title = "Lemmy: Biography"
uID, _ := m.Create(u1)
_, _ = m.Create(u2)
t.Run("search", func(t *testing.T) {
c, err := m.Search("ozzy")
assert.Nil(t, err)
assert.Equal(t, 1, len(c))
assert.Equal(t, "I Am Ozzy", c[0].Title)
c, err = m.Search("dio")
assert.Equal(t, domain.ErrNotFound, err)
assert.Nil(t, c)
})
t.Run("list all", func(t *testing.T) {
all, err := m.List()
assert.Nil(t, err)
assert.Equal(t, 2, len(all))
})
t.Run("get", func(t *testing.T) {
saved, err := m.Get(uID)
assert.Nil(t, err)
assert.Equal(t, u1.Title, saved.Title)
})
}
func Test_Update(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo)
u := NewFixtureBook()
id, err := m.Create(u)
assert.Nil(t, err)
saved, _ := m.Get(id)
saved.Title = "Lemmy: Biography"
assert.Nil(t, m.Update(saved))
updated, err := m.Get(id)
assert.Nil(t, err)
assert.Equal(t, "Lemmy: Biography", updated.Title)
}
func TestDelete(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo)
u1 := NewFixtureBook()
u2 := NewFixtureBook()
u2ID, _ := m.Create(u2)
err := m.Delete(u1.ID)
assert.Equal(t, domain.ErrNotFound, err)
err = m.Delete(u2ID)
assert.Nil(t, err)
_, err = m.Get(u2ID)
assert.Equal(t, domain.ErrNotFound, err)
}
domain/entity/book/mock/book.go
-368
View File
@@ -1,368 +0,0 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: domain/entity/book/interface.go
// Package mock is a generated GoMock package.
package mock
import (
entity "github.com/eminetto/clean-architecture-go-v2/domain/entity"
book "github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)
// MockReader is a mock of Reader interface
type MockReader struct {
ctrl *gomock.Controller
recorder *MockReaderMockRecorder
}
// MockReaderMockRecorder is the mock recorder for MockReader
type MockReaderMockRecorder struct {
mock *MockReader
}
// NewMockReader creates a new mock instance
func NewMockReader(ctrl *gomock.Controller) *MockReader {
mock := &MockReader{ctrl: ctrl}
mock.recorder = &MockReaderMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockReader) EXPECT() *MockReaderMockRecorder {
return m.recorder
}
// Get mocks base method
func (m *MockReader) Get(id entity.ID) (*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", id)
ret0, _ := ret[0].(*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockReaderMockRecorder) Get(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockReader)(nil).Get), id)
}
// Search mocks base method
func (m *MockReader) Search(query string) ([]*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Search", query)
ret0, _ := ret[0].([]*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Search indicates an expected call of Search
func (mr *MockReaderMockRecorder) Search(query interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockReader)(nil).Search), query)
}
// List mocks base method
func (m *MockReader) List() ([]*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "List")
ret0, _ := ret[0].([]*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// List indicates an expected call of List
func (mr *MockReaderMockRecorder) List() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockReader)(nil).List))
}
// MockWriter is a mock of Writer interface
type MockWriter struct {
ctrl *gomock.Controller
recorder *MockWriterMockRecorder
}
// MockWriterMockRecorder is the mock recorder for MockWriter
type MockWriterMockRecorder struct {
mock *MockWriter
}
// NewMockWriter creates a new mock instance
func NewMockWriter(ctrl *gomock.Controller) *MockWriter {
mock := &MockWriter{ctrl: ctrl}
mock.recorder = &MockWriterMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockWriter) EXPECT() *MockWriterMockRecorder {
return m.recorder
}
// Create mocks base method
func (m *MockWriter) Create(e *book.Book) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", e)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Create indicates an expected call of Create
func (mr *MockWriterMockRecorder) Create(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockWriter)(nil).Create), e)
}
// Update mocks base method
func (m *MockWriter) Update(e *book.Book) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", e)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockWriterMockRecorder) Update(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockWriter)(nil).Update), e)
}
// Delete mocks base method
func (m *MockWriter) Delete(id entity.ID) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockWriterMockRecorder) Delete(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockWriter)(nil).Delete), id)
}
// MockRepository is a mock of Repository interface
type MockRepository struct {
ctrl *gomock.Controller
recorder *MockRepositoryMockRecorder
}
// MockRepositoryMockRecorder is the mock recorder for MockRepository
type MockRepositoryMockRecorder struct {
mock *MockRepository
}
// NewMockRepository creates a new mock instance
func NewMockRepository(ctrl *gomock.Controller) *MockRepository {
mock := &MockRepository{ctrl: ctrl}
mock.recorder = &MockRepositoryMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockRepository) EXPECT() *MockRepositoryMockRecorder {
return m.recorder
}
// Get mocks base method
func (m *MockRepository) Get(id entity.ID) (*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", id)
ret0, _ := ret[0].(*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockRepositoryMockRecorder) Get(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockRepository)(nil).Get), id)
}
// Search mocks base method
func (m *MockRepository) Search(query string) ([]*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Search", query)
ret0, _ := ret[0].([]*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Search indicates an expected call of Search
func (mr *MockRepositoryMockRecorder) Search(query interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockRepository)(nil).Search), query)
}
// List mocks base method
func (m *MockRepository) List() ([]*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "List")
ret0, _ := ret[0].([]*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// List indicates an expected call of List
func (mr *MockRepositoryMockRecorder) List() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockRepository)(nil).List))
}
// Create mocks base method
func (m *MockRepository) Create(e *book.Book) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", e)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Create indicates an expected call of Create
func (mr *MockRepositoryMockRecorder) Create(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockRepository)(nil).Create), e)
}
// Update mocks base method
func (m *MockRepository) Update(e *book.Book) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", e)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockRepositoryMockRecorder) Update(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockRepository)(nil).Update), e)
}
// Delete mocks base method
func (m *MockRepository) Delete(id entity.ID) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockRepositoryMockRecorder) Delete(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockRepository)(nil).Delete), id)
}
// MockManager is a mock of Manager interface
type MockManager struct {
ctrl *gomock.Controller
recorder *MockManagerMockRecorder
}
// MockManagerMockRecorder is the mock recorder for MockManager
type MockManagerMockRecorder struct {
mock *MockManager
}
// NewMockManager creates a new mock instance
func NewMockManager(ctrl *gomock.Controller) *MockManager {
mock := &MockManager{ctrl: ctrl}
mock.recorder = &MockManagerMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockManager) EXPECT() *MockManagerMockRecorder {
return m.recorder
}
// Get mocks base method
func (m *MockManager) Get(id entity.ID) (*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", id)
ret0, _ := ret[0].(*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockManagerMockRecorder) Get(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockManager)(nil).Get), id)
}
// Search mocks base method
func (m *MockManager) Search(query string) ([]*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Search", query)
ret0, _ := ret[0].([]*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Search indicates an expected call of Search
func (mr *MockManagerMockRecorder) Search(query interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockManager)(nil).Search), query)
}
// List mocks base method
func (m *MockManager) List() ([]*book.Book, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "List")
ret0, _ := ret[0].([]*book.Book)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// List indicates an expected call of List
func (mr *MockManagerMockRecorder) List() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockManager)(nil).List))
}
// Create mocks base method
func (m *MockManager) Create(e *book.Book) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", e)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Create indicates an expected call of Create
func (mr *MockManagerMockRecorder) Create(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockManager)(nil).Create), e)
}
// Update mocks base method
func (m *MockManager) Update(e *book.Book) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", e)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockManagerMockRecorder) Update(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockManager)(nil).Update), e)
}
// Delete mocks base method
func (m *MockManager) Delete(id entity.ID) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockManagerMockRecorder) Delete(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockManager)(nil).Delete), id)
}
domain/entity/book/repository_inmem.go
-78
View File
@@ -1,78 +0,0 @@
package book
import (
"strings"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//iRepo in memory repo
type iRepo struct {
m map[entity.ID]*Book
}
//NewInmemRepository create new repository
func NewInmemRepository() *iRepo {
var m = map[entity.ID]*Book{}
return &iRepo{
m: m,
}
}
//Create a book
func (r *iRepo) Create(e *Book) (entity.ID, error) {
r.m[e.ID] = e
return e.ID, nil
}
//Get a book
func (r *iRepo) Get(id entity.ID) (*Book, error) {
if r.m[id] == nil {
return nil, domain.ErrNotFound
}
return r.m[id], nil
}
//Update a book
func (r *iRepo) Update(e *Book) error {
_, err := r.Get(e.ID)
if err != nil {
return err
}
r.m[e.ID] = e
return nil
}
//Search books
func (r *iRepo) Search(query string) ([]*Book, error) {
var d []*Book
for _, j := range r.m {
if strings.Contains(strings.ToLower(j.Title), query) {
d = append(d, j)
}
}
if len(d) == 0 {
return nil, domain.ErrNotFound
}
return d, nil
}
//List books
func (r *iRepo) List() ([]*Book, error) {
var d []*Book
for _, j := range r.m {
d = append(d, j)
}
return d, nil
}
//Delete a book
func (r *iRepo) Delete(id entity.ID) error {
if r.m[id] == nil {
return domain.ErrNotFound
}
r.m[id] = nil
return nil
}
domain/entity/book/repository_mysql.go
-134
View File
@@ -1,134 +0,0 @@
package book
import (
"database/sql"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//mySQLRepo mysql repo
type mySQLRepo struct {
db *sql.DB
}
//NewMySQLRepository create new repository
func NewMySQLRepository(db *sql.DB) *mySQLRepo {
return &mySQLRepo{
db: db,
}
}
//Create a book
func (r *mySQLRepo) Create(e *Book) (entity.ID, error) {
stmt, err := r.db.Prepare(`
insert into book (id, title, author, pages, quantity, created_at)
values(?,?,?,?,?,?)`)
if err != nil {
return e.ID, err
}
_, err = stmt.Exec(
e.ID,
e.Title,
e.Author,
e.Pages,
e.Quantity,
time.Now().Format("2006-01-02"),
)
if err != nil {
return e.ID, err
}
err = stmt.Close()
if err != nil {
return e.ID, err
}
return e.ID, nil
}
//Get a book
func (r *mySQLRepo) Get(id entity.ID) (*Book, error) {
stmt, err := r.db.Prepare(`select id, title, author, pages, quantity, created_at from book where id = ?`)
if err != nil {
return nil, err
}
var b Book
rows, err := stmt.Query(id)
if err != nil {
return nil, err
}
for rows.Next() {
err = rows.Scan(&b.ID, &b.Title, &b.Author, &b.Pages, &b.Quantity, &b.CreatedAt)
}
return &b, nil
}
//Update a book
func (r *mySQLRepo) Update(e *Book) error {
e.UpdatedAt = time.Now()
_, err := r.db.Exec("update book set title = ?, author = ?, pages = ?, quantity = ?, updated_at = ? where id = ?", e.Title, e.Author, e.Pages, e.Quantity, e.UpdatedAt.Format("2006-01-02"), e.ID)
if err != nil {
return err
}
return nil
}
//Search books
func (r *mySQLRepo) Search(query string) ([]*Book, error) {
stmt, err := r.db.Prepare(`select id, title, author, pages, quantity, created_at from book where title like ?`)
if err != nil {
return nil, err
}
var books []*Book
rows, err := stmt.Query("%" + query + "%")
if err != nil {
return nil, err
}
for rows.Next() {
var b Book
err = rows.Scan(&b.ID, &b.Title, &b.Author, &b.Pages, &b.Quantity, &b.CreatedAt)
if err != nil {
return nil, err
}
books = append(books, &b)
}
if len(books) == 0 {
return nil, domain.ErrNotFound
}
return books, nil
}
//List books
func (r *mySQLRepo) List() ([]*Book, error) {
stmt, err := r.db.Prepare(`select id, title, author, pages, quantity, created_at from book`)
if err != nil {
return nil, err
}
var books []*Book
rows, err := stmt.Query()
if err != nil {
return nil, err
}
for rows.Next() {
var b Book
err = rows.Scan(&b.ID, &b.Title, &b.Author, &b.Pages, &b.Quantity, &b.CreatedAt)
if err != nil {
return nil, err
}
books = append(books, &b)
}
if len(books) == 0 {
return nil, domain.ErrNotFound
}
return books, nil
}
//Delete a book
func (r *mySQLRepo) Delete(id entity.ID) error {
_, err := r.db.Exec("delete from book where id = ?", id)
if err != nil {
return err
}
return nil
}
domain/entity/book/fixture.go → domain/entity/book_fixture.go
+2 -4
View File
@@ -1,14 +1,12 @@
package book
package entity
import (
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
func NewFixtureBook() *Book {
return &Book{
ID: entity.NewID(),
ID: NewID(),
Title: "I Am Ozzy",
Author: "Ozzy Osbourne",
Pages: 294,
domain/entity/entity.go
-2
View File
@@ -12,5 +12,3 @@ func StringToID(s string) (ID, error) {
id, err := uuid.Parse(s)
return ID(id), err
}
domain/entity/user/entity.go → domain/entity/user.go
+3 -5
View File
@@ -1,19 +1,17 @@
package user
package entity
import (
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//User data
type User struct {
ID entity.ID
ID ID
Email string
Password string
FirstName string
LastName string
CreatedAt time.Time
UpdatedAt time.Time
Books []entity.ID
Books []ID
}
domain/entity/user/interface.go
-28
View File
@@ -1,28 +0,0 @@
package user
import "github.com/eminetto/clean-architecture-go-v2/domain/entity"
//Reader interface
type Reader interface {
Get(id entity.ID) (*User, error)
Search(query string) ([]*User, error)
List() ([]*User, error)
}
//Writer user writer
type Writer interface {
Create(e *User) (entity.ID, error)
Update(e *User) error
Delete(id entity.ID) error
}
//repository interface
type repository interface {
Reader
Writer
}
//Manager interface
type Manager interface {
repository
}
domain/entity/user/manager.go
-71
View File
@@ -1,71 +0,0 @@
package user
import (
"strings"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/pkg/password"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//manager interface
type manager struct {
repo repository
pwd password.Service
}
//NewManager create new repository
func NewManager(r repository, pwd password.Service) *manager {
return &manager{
repo: r,
pwd: pwd,
}
}
//Create an user
func (s *manager) Create(e *User) (entity.ID, error) {
e.ID = entity.NewID()
e.CreatedAt = time.Now()
pwd, err := s.pwd.Generate(e.Password)
if err != nil {
return e.ID, err
}
e.Password = pwd
return s.repo.Create(e)
}
//Get an user
func (s *manager) Get(id entity.ID) (*User, error) {
return s.repo.Get(id)
}
//Search users
func (s *manager) Search(query string) ([]*User, error) {
return s.repo.Search(strings.ToLower(query))
}
//List users
func (s *manager) List() ([]*User, error) {
return s.repo.List()
}
//Delete an user
func (s *manager) Delete(id entity.ID) error {
u, err := s.Get(id)
if err != nil {
return err
}
if len(u.Books) > 0 {
return domain.ErrCannotBeDeleted
}
return s.repo.Delete(id)
}
//Update an user
func (s *manager) Update(e *User) error {
e.UpdatedAt = time.Now()
return s.repo.Update(e)
}
domain/entity/user/manager_test.go
-95
View File
@@ -1,95 +0,0 @@
package user
import (
"testing"
"github.com/eminetto/clean-architecture-go-v2/pkg/password"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/stretchr/testify/assert"
)
func Test_Create(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo, password.NewFakeService())
u := NewFixtureUser()
id, err := m.Create(u)
assert.Nil(t, err)
assert.Equal(t, u.ID, id)
assert.False(t, u.CreatedAt.IsZero())
assert.True(t, u.UpdatedAt.IsZero())
}
func Test_SearchAndFind(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo, password.NewFakeService())
u1 := NewFixtureUser()
u2 := NewFixtureUser()
u2.FirstName = "Lemmy"
uID, _ := m.Create(u1)
_, _ = m.Create(u2)
t.Run("search", func(t *testing.T) {
c, err := m.Search("ozzy")
assert.Nil(t, err)
assert.Equal(t, 1, len(c))
assert.Equal(t, "Osbourne", c[0].LastName)
c, err = m.Search("dio")
assert.Equal(t, domain.ErrNotFound, err)
assert.Nil(t, c)
})
t.Run("list all", func(t *testing.T) {
all, err := m.List()
assert.Nil(t, err)
assert.Equal(t, 2, len(all))
})
t.Run("get", func(t *testing.T) {
saved, err := m.Get(uID)
assert.Nil(t, err)
assert.Equal(t, u1.FirstName, saved.FirstName)
})
}
func Test_Update(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo, password.NewFakeService())
u := NewFixtureUser()
id, err := m.Create(u)
assert.Nil(t, err)
saved, _ := m.Get(id)
saved.FirstName = "Dio"
saved.Books = append(saved.Books, entity.NewID())
assert.Nil(t, m.Update(saved))
updated, err := m.Get(id)
assert.Nil(t, err)
assert.Equal(t, "Dio", updated.FirstName)
assert.False(t, u.UpdatedAt.IsZero())
assert.Equal(t, 1, len(updated.Books))
}
func TestDelete(t *testing.T) {
repo := NewInmemRepository()
m := NewManager(repo, password.NewFakeService())
u1 := NewFixtureUser()
u2 := NewFixtureUser()
u2ID, _ := m.Create(u2)
err := m.Delete(u1.ID)
assert.Equal(t, domain.ErrNotFound, err)
err = m.Delete(u2ID)
assert.Nil(t, err)
_, err = m.Get(u2ID)
assert.Equal(t, domain.ErrNotFound, err)
u3 := NewFixtureUser()
u3.Books = []entity.ID{entity.NewID()}
_, _ = m.Create(u3)
err = m.Delete(u3.ID)
assert.Equal(t, domain.ErrCannotBeDeleted, err)
}
domain/entity/user/mock/user.go
-368
View File
@@ -1,368 +0,0 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: domain/entity/user/interface.go
// Package mock is a generated GoMock package.
package mock
import (
entity "github.com/eminetto/clean-architecture-go-v2/domain/entity"
user "github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)
// MockReader is a mock of Reader interface
type MockReader struct {
ctrl *gomock.Controller
recorder *MockReaderMockRecorder
}
// MockReaderMockRecorder is the mock recorder for MockReader
type MockReaderMockRecorder struct {
mock *MockReader
}
// NewMockReader creates a new mock instance
func NewMockReader(ctrl *gomock.Controller) *MockReader {
mock := &MockReader{ctrl: ctrl}
mock.recorder = &MockReaderMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockReader) EXPECT() *MockReaderMockRecorder {
return m.recorder
}
// Get mocks base method
func (m *MockReader) Get(id entity.ID) (*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", id)
ret0, _ := ret[0].(*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockReaderMockRecorder) Get(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockReader)(nil).Get), id)
}
// Search mocks base method
func (m *MockReader) Search(query string) ([]*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Search", query)
ret0, _ := ret[0].([]*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Search indicates an expected call of Search
func (mr *MockReaderMockRecorder) Search(query interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockReader)(nil).Search), query)
}
// List mocks base method
func (m *MockReader) List() ([]*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "List")
ret0, _ := ret[0].([]*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// List indicates an expected call of List
func (mr *MockReaderMockRecorder) List() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockReader)(nil).List))
}
// MockWriter is a mock of Writer interface
type MockWriter struct {
ctrl *gomock.Controller
recorder *MockWriterMockRecorder
}
// MockWriterMockRecorder is the mock recorder for MockWriter
type MockWriterMockRecorder struct {
mock *MockWriter
}
// NewMockWriter creates a new mock instance
func NewMockWriter(ctrl *gomock.Controller) *MockWriter {
mock := &MockWriter{ctrl: ctrl}
mock.recorder = &MockWriterMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockWriter) EXPECT() *MockWriterMockRecorder {
return m.recorder
}
// Create mocks base method
func (m *MockWriter) Create(e *user.User) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", e)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Create indicates an expected call of Create
func (mr *MockWriterMockRecorder) Create(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockWriter)(nil).Create), e)
}
// Update mocks base method
func (m *MockWriter) Update(e *user.User) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", e)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockWriterMockRecorder) Update(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockWriter)(nil).Update), e)
}
// Delete mocks base method
func (m *MockWriter) Delete(id entity.ID) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockWriterMockRecorder) Delete(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockWriter)(nil).Delete), id)
}
// MockRepository is a mock of Repository interface
type MockRepository struct {
ctrl *gomock.Controller
recorder *MockRepositoryMockRecorder
}
// MockRepositoryMockRecorder is the mock recorder for MockRepository
type MockRepositoryMockRecorder struct {
mock *MockRepository
}
// NewMockRepository creates a new mock instance
func NewMockRepository(ctrl *gomock.Controller) *MockRepository {
mock := &MockRepository{ctrl: ctrl}
mock.recorder = &MockRepositoryMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockRepository) EXPECT() *MockRepositoryMockRecorder {
return m.recorder
}
// Get mocks base method
func (m *MockRepository) Get(id entity.ID) (*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", id)
ret0, _ := ret[0].(*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockRepositoryMockRecorder) Get(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockRepository)(nil).Get), id)
}
// Search mocks base method
func (m *MockRepository) Search(query string) ([]*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Search", query)
ret0, _ := ret[0].([]*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Search indicates an expected call of Search
func (mr *MockRepositoryMockRecorder) Search(query interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockRepository)(nil).Search), query)
}
// List mocks base method
func (m *MockRepository) List() ([]*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "List")
ret0, _ := ret[0].([]*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// List indicates an expected call of List
func (mr *MockRepositoryMockRecorder) List() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockRepository)(nil).List))
}
// Create mocks base method
func (m *MockRepository) Create(e *user.User) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", e)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Create indicates an expected call of Create
func (mr *MockRepositoryMockRecorder) Create(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockRepository)(nil).Create), e)
}
// Update mocks base method
func (m *MockRepository) Update(e *user.User) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", e)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockRepositoryMockRecorder) Update(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockRepository)(nil).Update), e)
}
// Delete mocks base method
func (m *MockRepository) Delete(id entity.ID) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockRepositoryMockRecorder) Delete(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockRepository)(nil).Delete), id)
}
// MockManager is a mock of Manager interface
type MockManager struct {
ctrl *gomock.Controller
recorder *MockManagerMockRecorder
}
// MockManagerMockRecorder is the mock recorder for MockManager
type MockManagerMockRecorder struct {
mock *MockManager
}
// NewMockManager creates a new mock instance
func NewMockManager(ctrl *gomock.Controller) *MockManager {
mock := &MockManager{ctrl: ctrl}
mock.recorder = &MockManagerMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
func (m *MockManager) EXPECT() *MockManagerMockRecorder {
return m.recorder
}
// Get mocks base method
func (m *MockManager) Get(id entity.ID) (*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", id)
ret0, _ := ret[0].(*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockManagerMockRecorder) Get(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockManager)(nil).Get), id)
}
// Search mocks base method
func (m *MockManager) Search(query string) ([]*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Search", query)
ret0, _ := ret[0].([]*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Search indicates an expected call of Search
func (mr *MockManagerMockRecorder) Search(query interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockManager)(nil).Search), query)
}
// List mocks base method
func (m *MockManager) List() ([]*user.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "List")
ret0, _ := ret[0].([]*user.User)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// List indicates an expected call of List
func (mr *MockManagerMockRecorder) List() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockManager)(nil).List))
}
// Create mocks base method
func (m *MockManager) Create(e *user.User) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", e)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Create indicates an expected call of Create
func (mr *MockManagerMockRecorder) Create(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockManager)(nil).Create), e)
}
// Update mocks base method
func (m *MockManager) Update(e *user.User) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", e)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockManagerMockRecorder) Update(e interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockManager)(nil).Update), e)
}
// Delete mocks base method
func (m *MockManager) Delete(id entity.ID) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockManagerMockRecorder) Delete(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockManager)(nil).Delete), id)
}
domain/entity/user/repository_inmem.go
-78
View File
@@ -1,78 +0,0 @@
package user
import (
"strings"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//IRepo in memory repo
type IRepo struct {
m map[entity.ID]*User
}
//NewInmemRepository create new repository
func NewInmemRepository() *IRepo {
var m = map[entity.ID]*User{}
return &IRepo{
m: m,
}
}
//Create an user
func (r *IRepo) Create(e *User) (entity.ID, error) {
r.m[e.ID] = e
return e.ID, nil
}
//Get an user
func (r *IRepo) Get(id entity.ID) (*User, error) {
if r.m[id] == nil {
return nil, domain.ErrNotFound
}
return r.m[id], nil
}
//Update an user
func (r *IRepo) Update(e *User) error {
_, err := r.Get(e.ID)
if err != nil {
return err
}
r.m[e.ID] = e
return nil
}
//Search users
func (r *IRepo) Search(query string) ([]*User, error) {
var d []*User
for _, j := range r.m {
if strings.Contains(strings.ToLower(j.FirstName), query) {
d = append(d, j)
}
}
if len(d) == 0 {
return nil, domain.ErrNotFound
}
return d, nil
}
//List users
func (r *IRepo) List() ([]*User, error) {
var d []*User
for _, j := range r.m {
d = append(d, j)
}
return d, nil
}
//Delete an user
func (r *IRepo) Delete(id entity.ID) error {
if r.m[id] == nil {
return domain.ErrNotFound
}
r.m[id] = nil
return nil
}
domain/entity/user/repository_mysql.go
-179
View File
@@ -1,179 +0,0 @@
package user
import (
"database/sql"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//MySQLRepo mysql repo
type MySQLRepo struct {
db *sql.DB
}
//NewMySQLRepoRepository create new repository
func NewMySQLRepoRepository(db *sql.DB) *MySQLRepo {
return &MySQLRepo{
db: db,
}
}
//Create an user
func (r *MySQLRepo) Create(e *User) (entity.ID, error) {
stmt, err := r.db.Prepare(`
insert into user (id, email, password, first_name, last_name, created_at)
values(?,?,?,?,?,?)`)
if err != nil {
return e.ID, err
}
_, err = stmt.Exec(
e.ID,
e.Email,
e.Password,
e.FirstName,
e.LastName,
time.Now().Format("2006-01-02"),
)
if err != nil {
return e.ID, err
}
err = stmt.Close()
if err != nil {
return e.ID, err
}
return e.ID, nil
}
//Get an user
func (r *MySQLRepo) Get(id entity.ID) (*User, error) {
return getUser(id, r.db)
}
func getUser(id entity.ID, db *sql.DB) (*User, error) {
stmt, err := db.Prepare(`select id, email, first_name, last_name, created_at from user where id = ?`)
if err != nil {
return nil, err
}
var u User
rows, err := stmt.Query(id)
if err != nil {
return nil, err
}
for rows.Next() {
err = rows.Scan(&u.ID, &u.Email, &u.FirstName, &u.LastName, &u.CreatedAt)
}
stmt, err = db.Prepare(`select book_id from book_user where user_id = ?`)
if err != nil {
return nil, err
}
rows, err = stmt.Query(id)
if err != nil {
return nil, err
}
for rows.Next() {
var i entity.ID
err = rows.Scan(&i)
u.Books = append(u.Books, i)
}
return &u, nil
}
//Update an user
func (r *MySQLRepo) Update(e *User) error {
e.UpdatedAt = time.Now()
_, err := r.db.Exec("update user set email = ?, password = ?, first_name = ?, last_name = ?, updated_at = ? where id = ?", e.Email, e.Password, e.FirstName, e.LastName, e.UpdatedAt.Format("2006-01-02"), e.ID)
if err != nil {
return err
}
_, err = r.db.Exec("delete from book_user where user_id = ?", e.ID)
if err != nil {
return err
}
for _, b := range e.Books {
_, err := r.db.Exec("insert into book_user values(?,?,?)", e.ID, b, time.Now().Format("2006-01-02"))
if err != nil {
return err
}
}
return nil
}
//Search users
func (r *MySQLRepo) Search(query string) ([]*User, error) {
stmt, err := r.db.Prepare(`select id from user where name like ?`)
if err != nil {
return nil, err
}
defer stmt.Close()
var ids []entity.ID
rows, err := stmt.Query()
if err != nil {
return nil, err
}
for rows.Next() {
var i entity.ID
err = rows.Scan(&i)
if err != nil {
return nil, err
}
ids = append(ids, i)
}
if len(ids) == 0 {
return nil, domain.ErrNotFound
}
var users []*User
for _, id := range ids {
u, err := getUser(id, r.db)
if err != nil {
return nil, err
}
users = append(users, u)
}
return users, nil
}
//List users
func (r *MySQLRepo) List() ([]*User, error) {
stmt, err := r.db.Prepare(`select id from user`)
if err != nil {
return nil, err
}
defer stmt.Close()
var ids []entity.ID
rows, err := stmt.Query()
if err != nil {
return nil, err
}
for rows.Next() {
var i entity.ID
err = rows.Scan(&i)
if err != nil {
return nil, err
}
ids = append(ids, i)
}
if len(ids) == 0 {
return nil, domain.ErrNotFound
}
var users []*User
for _, id := range ids {
u, err := getUser(id, r.db)
if err != nil {
return nil, err
}
users = append(users, u)
}
return users, nil
}
//Delete an user
func (r *MySQLRepo) Delete(id entity.ID) error {
_, err := r.db.Exec("delete from user where id = ?", id)
if err != nil {
return err
}
return nil
}
domain/entity/user/fixture.go → domain/entity/user_fixture.go
+2 -4
View File
@@ -1,14 +1,12 @@
package user
package entity
import (
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
func NewFixtureUser() *User {
return &User{
ID: entity.NewID(),
ID: NewID(),
Email: "[email protected]",
Password: "123456",
FirstName: "Ozzy",