rename @entity to @dbrepo + support bulk insert

typical-go · Apr 21, 2021 · 7e7da8c · 7e7da8c
1 parent d7f9172
commit 7e7da8c
Show file tree

Hide file tree

Showing 17 changed files with 128 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Pragmatic Golang RESTful Server Implementation. The project using [typical-go](h
 - Others
  - [x] Database migration and seed tool
  - [x] Generate code, `.env` file and `USAGE.md` according the configuration (using `@envconfig` annotation)
- - [x] Generate code for repository layer (using `@entity` annotation)
+ - [x] Generate code for repository layer (using `@dbrepo` annotation)
  - [x] Releaser
 
 

diff --git a/internal/app/entity/entity.go b/internal/app/entity/entity.go
@@ -4,7 +4,7 @@ import "time"
 
 type (
  // Song entity
- // @entity (table:"songs" dialect:"mysql" ctor_db:"mysql")
+ // @dbrepo (table:"songs" dialect:"mysql" ctor_db:"mysql")
  Song struct {
  ID int64 `column:"id" option:"pk" json:"id"`
  Title string `column:"title" json:"title" validate:"required"`
@@ -13,7 +13,7 @@ type (
  CreatedAt time.Time `column:"created_at" option:"now,no_update" json:"created_at"`
  }
  // Book represented book model
- // @entity (table:"books" dialect:"postgres" ctor_db:"pg")
+ // @dbrepo (table:"books" dialect:"postgres" ctor_db:"pg")
  Book struct {
  ID int64 `column:"id" option:"pk" json:"id"`
  Title string `column:"title" json:"title" validate:"required"`

diff --git a/internal/app/service/book_svc.go b/internal/app/service/book_svc.go
@@ -57,7 +57,7 @@ func (b *BookSvcImpl) Create(ctx context.Context, book *entity.Book) (*entity.Bo
  if err := validator.New().Struct(book); err != nil {
  return nil, echokit.NewValidErr(err.Error())
  }
- id, err := b.Repo.Create(ctx, book)
+ id, err := b.Repo.Insert(ctx, book)
  if err != nil {
  return nil, err
  }

diff --git a/internal/app/service/book_svc_test.go b/internal/app/service/book_svc_test.go
@@ -48,7 +48,7 @@ func TestBookSvc_Create(t *testing.T) {
  expectedErr: "create-error",
  bookSvcFn: func(mockRepo *repo_mock.MockBookRepo) {
  mockRepo.EXPECT().
- Create(gomock.Any(), &entity.Book{Author: "some-author", Title: "some-title"}).
+ Insert(gomock.Any(), &entity.Book{Author: "some-author", Title: "some-title"}).
  Return(int64(-1), errors.New("create-error"))
  },
  },
@@ -58,7 +58,7 @@ func TestBookSvc_Create(t *testing.T) {
  expectedErr: "find-error",
  bookSvcFn: func(mockRepo *repo_mock.MockBookRepo) {
  mockRepo.EXPECT().
- Create(gomock.Any(), &entity.Book{Author: "some-author", Title: "some-title"}).
+ Insert(gomock.Any(), &entity.Book{Author: "some-author", Title: "some-title"}).
  Return(int64(1), nil)
  mockRepo.EXPECT().
  Find(gomock.Any(), sqkit.Eq{"id": int64(1)}).
@@ -73,7 +73,7 @@ func TestBookSvc_Create(t *testing.T) {
  expected: &entity.Book{Author: "some-author", Title: "some-title"},
  bookSvcFn: func(mockRepo *repo_mock.MockBookRepo) {
  mockRepo.EXPECT().
- Create(gomock.Any(), &entity.Book{Author: "some-author", Title: "some-title"}).
+ Insert(gomock.Any(), &entity.Book{Author: "some-author", Title: "some-title"}).
  Return(int64(1), nil)
  mockRepo.EXPECT().
  Find(gomock.Any(), sqkit.Eq{"id": int64(1)}).

diff --git a/internal/app/service/song_svc.go b/internal/app/service/song_svc.go
@@ -57,7 +57,7 @@ func (b *SongSvcImpl) Create(ctx context.Context, book *entity.Song) (*entity.So
  if err := validator.New().Struct(book); err != nil {
  return nil, echokit.NewValidErr(err.Error())
  }
- id, err := b.Repo.Create(ctx, book)
+ id, err := b.Repo.Insert(ctx, book)
  if err != nil {
  return nil, err
  }

diff --git a/internal/app/service/song_svc_test.go b/internal/app/service/song_svc_test.go
@@ -7,8 +7,8 @@ import (
 
  "github.com/golang/mock/gomock"
  "github.com/stretchr/testify/require"
- "github.com/typical-go/typical-rest-server/internal/app/service"
  "github.com/typical-go/typical-rest-server/internal/app/entity"
+ "github.com/typical-go/typical-rest-server/internal/app/service"
  "github.com/typical-go/typical-rest-server/internal/generated/entity/app/repo_mock"
  "github.com/typical-go/typical-rest-server/pkg/sqkit"
 )
@@ -46,7 +46,7 @@ func TestSongSvc_Create(t *testing.T) {
  expectedErr: "create-error",
  songSvcFn: func(mockRepo *repo_mock.MockSongRepo) {
  mockRepo.EXPECT().
- Create(gomock.Any(), &entity.Song{Artist: "some-artist", Title: "some-title"}).
+ Insert(gomock.Any(), &entity.Song{Artist: "some-artist", Title: "some-title"}).
  Return(int64(-1), errors.New("create-error"))
  },
  },
@@ -56,7 +56,7 @@ func TestSongSvc_Create(t *testing.T) {
  expectedErr: "Find-error",
  songSvcFn: func(mockRepo *repo_mock.MockSongRepo) {
  mockRepo.EXPECT().
- Create(gomock.Any(), &entity.Song{Artist: "some-artist", Title: "some-title"}).
+ Insert(gomock.Any(), &entity.Song{Artist: "some-artist", Title: "some-title"}).
  Return(int64(1), nil)
  mockRepo.EXPECT().
  Find(gomock.Any(), sqkit.Eq{"id": int64(1)}).
@@ -71,7 +71,7 @@ func TestSongSvc_Create(t *testing.T) {
  expected: &entity.Song{Artist: "some-artist", Title: "some-title"},
  songSvcFn: func(mockRepo *repo_mock.MockSongRepo) {
  mockRepo.EXPECT().
- Create(gomock.Any(), &entity.Song{Artist: "some-artist", Title: "some-title"}).
+ Insert(gomock.Any(), &entity.Song{Artist: "some-artist", Title: "some-title"}).
  Return(int64(1), nil)
  mockRepo.EXPECT().
  Find(gomock.Any(), sqkit.Eq{"id": int64(1)}).

diff --git a/internal/app/service_mock/book_svc.go b/internal/app/service_mock/book_svc.go
diff --git a/internal/app/service_mock/song_svc.go b/internal/app/service_mock/song_svc.go
diff --git a/internal/generated/entity/app/repo/book_repo.go b/internal/generated/entity/app/repo/book_repo.go
@@ -1,6 +1,6 @@
 package repo
 
-/* DO NOT EDIT. This file generated due to '@entity' annotation */
+/* DO NOT EDIT. This file generated due to '@dbrepo' annotation */
 
 import (
  "context"
@@ -41,7 +41,7 @@ type (
  BookRepo interface {
  Count(context.Context, ...sqkit.SelectOption) (int64, error)
  Find(context.Context, ...sqkit.SelectOption) ([]*entity.Book, error)
- Create(context.Context, *entity.Book) (int64, error)
+ Insert(context.Context, ...*entity.Book) (int64, error)
  Delete(context.Context, sqkit.DeleteOption) (int64, error)
  Update(context.Context, *entity.Book, sqkit.UpdateOption) (int64, error)
  Patch(context.Context, *entity.Book, sqkit.UpdateOption) (int64, error)
@@ -130,33 +130,36 @@ func (r *BookRepoImpl) Find(ctx context.Context, opts ...sqkit.SelectOption) (li
  return
 }
 
-// Create books
-func (r *BookRepoImpl) Create(ctx context.Context, ent *entity.Book) (int64, error) {
+// Insert books
+func (r *BookRepoImpl) Insert(ctx context.Context, ents ...*entity.Book) (int64, error) {
  txn, err := dbtxn.Use(ctx, r.DB)
  if err != nil {
  return -1, err
  }
 
- scanner := sq.
+ builder := sq.
  Insert(BookTableName).
  Columns(
  BookTable.Title,
  BookTable.Author,
  BookTable.UpdatedAt,
  BookTable.CreatedAt,
  ).
- Values(
+ Suffix(
+ fmt.Sprintf("RETURNING \"%s\"", BookTable.ID),
+ ).
+ PlaceholderFormat(sq.Dollar)
+
+ for _, ent := range ents {
+ builder = builder.Values(
  ent.Title,
  ent.Author,
  time.Now(),
  time.Now(),
- ).
- Suffix(
- fmt.Sprintf("RETURNING \"%s\"", BookTable.ID),
- ).
- PlaceholderFormat(sq.Dollar).
- RunWith(txn).
- QueryRowContext(ctx)
+ )
+ }
+
+ scanner := builder.RunWith(txn).QueryRowContext(ctx)
 
  var id int64
  if err := scanner.Scan(&id); err != nil {

diff --git a/internal/generated/entity/app/repo/song_repo.go b/internal/generated/entity/app/repo/song_repo.go
@@ -1,6 +1,6 @@
 package repo
 
-/* DO NOT EDIT. This file generated due to '@entity' annotation */
+/* DO NOT EDIT. This file generated due to '@dbrepo' annotation */
 
 import (
  "context"
@@ -40,7 +40,7 @@ type (
  SongRepo interface {
  Count(context.Context, ...sqkit.SelectOption) (int64, error)
  Find(context.Context, ...sqkit.SelectOption) ([]*entity.Song, error)
- Create(context.Context, *entity.Song) (int64, error)
+ Insert(context.Context, ...*entity.Song) (int64, error)
  Delete(context.Context, sqkit.DeleteOption) (int64, error)
  Update(context.Context, *entity.Song, sqkit.UpdateOption) (int64, error)
  Patch(context.Context, *entity.Song, sqkit.UpdateOption) (int64, error)
@@ -128,30 +128,32 @@ func (r *SongRepoImpl) Find(ctx context.Context, opts ...sqkit.SelectOption) (li
  return
 }
 
-// Create songs
-func (r *SongRepoImpl) Create(ctx context.Context, ent *entity.Song) (int64, error) {
+// Insert songs
+func (r *SongRepoImpl) Insert(ctx context.Context, ents ...*entity.Song) (int64, error) {
  txn, err := dbtxn.Use(ctx, r.DB)
  if err != nil {
  return -1, err
  }
 
- res, err := sq.
+ builder := sq.
  Insert(SongTableName).
  Columns(
  SongTable.Title,
  SongTable.Artist,
  SongTable.UpdatedAt,
  SongTable.CreatedAt,
- ).
- Values(
+ )
+
+ for _, ent := range ents {
+ builder = builder.Values(
  ent.Title,
  ent.Artist,
  time.Now(),
  time.Now(),
- ).
- RunWith(txn).
- ExecContext(ctx)
+ )
+ }
 
+ res, err := builder.RunWith(txn).ExecContext(ctx)
  if err != nil {
  txn.SetError(err)
  return -1, err

diff --git a/internal/generated/entity/app/repo_mock/book_repo.go b/internal/generated/entity/app/repo_mock/book_repo.go
diff --git a/internal/generated/entity/app/repo_mock/song_repo.go b/internal/generated/entity/app/repo_mock/song_repo.go