refs #34: transaction wrapperをリファクタリング

CityBear3 · Dec 8, 2023 · 304cf4d · 304cf4d
1 parent d1b4a2f
commit 304cf4d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/internal/adaptor/gateway/repository/mysql/archive.go b/internal/adaptor/gateway/repository/mysql/archive.go
@@ -31,7 +31,7 @@ func (i *ArchiveRepository) Save(
 	archive entity.Archive,
 ) error {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = i.db
 	}
@@ -59,7 +59,7 @@ func (i *ArchiveRepository) GetArchive(
 	archiveID primitive.ID,
 ) (entity.Archive, error) {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = i.db
 	}
@@ -105,7 +105,7 @@ func (i *ArchiveRepository) GetArchiveByArchiveEventID(
 	archiveEventID primitive.ID,
 ) (entity.Archive, error) {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = i.db
 	}

diff --git a/internal/adaptor/gateway/repository/mysql/client.go b/internal/adaptor/gateway/repository/mysql/client.go
@@ -29,7 +29,7 @@ func NewClientRepository(db boil.ContextExecutor) *ClientRepository {
 
 func (i *ClientRepository) GetClient(ctx context.Context, clientID primitive.ID) (entity.Client, error) {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = i.db
 	}

diff --git a/internal/adaptor/gateway/repository/mysql/device.go b/internal/adaptor/gateway/repository/mysql/device.go
@@ -26,7 +26,7 @@ func NewDeviceRepository(db boil.ContextExecutor) *DeviceRepository {
 
 func (d *DeviceRepository) GetDevice(ctx context.Context, deviceID primitive.ID) (entity.Device, error) {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = d.db
 	}

diff --git a/internal/adaptor/gateway/repository/mysql/event.go b/internal/adaptor/gateway/repository/mysql/event.go
@@ -24,7 +24,7 @@ func NewEventRepository(db boil.ContextExecutor) *EventRepository {
 
 func (r *EventRepository) SaveArchiveEvent(ctx context.Context, archiveEvent entity.ArchiveEvent) error {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = r.db
 	}
@@ -45,7 +45,7 @@ func (r *EventRepository) SaveArchiveEvent(ctx context.Context, archiveEvent ent
 
 func (r *EventRepository) GetArchiveEvent(ctx context.Context, archiveEventID primitive.ID) (entity.ArchiveEvent, error) {
 	var exec boil.ContextExecutor
-	exec, ok := ctx.Value("tx").(*sql.Tx)
+	exec, ok := getTxFromCtx(ctx)
 	if !ok {
 		exec = r.db
 	}

diff --git a/internal/adaptor/gateway/repository/mysql/transaction.go b/internal/adaptor/gateway/repository/mysql/transaction.go
@@ -17,23 +17,30 @@ func NewTxManger(db *sql.DB) *TxManager {
 	}
 }
 
-func (t *TxManager) DoInTx(ctx context.Context, operation usecase.Operation) error {
+func (t *TxManager) DoInTx(ctx context.Context, operation usecase.Operation) (context.Context, error) {
 	tx, err := t.db.BeginTx(ctx, nil)
 	if err != nil {
-		return err
+		return ctx, err
 	}
 
 	ctx = context.WithValue(ctx, "tx", tx)
 
 	if err := operation(ctx); err != nil {
 		if err := tx.Rollback(); err != nil {
-			return err
+			return ctx, err
 		}
-		return err
+		return ctx, err
 	}
 
 	if err = tx.Commit(); err != nil {
-		return err
+		return ctx, err
 	}
-	return nil
+
+	ctx = context.WithValue(ctx, "tx", nil)
+	return ctx, nil
+}
+
+func getTxFromCtx(ctx context.Context) (*sql.Tx, bool) {
+	tx, ok := ctx.Value("tx").(*sql.Tx)
+	return tx, ok
 }
diff --git a/internal/usecase/archive.go b/internal/usecase/archive.go
@@ -60,7 +60,7 @@ func (i *ArchiveInteractor) CreateArchive(
 	request CreateArchiveInput,
 	device entity.Device,
 ) error {
-	if err := i.txManager.DoInTx(ctx, func(ctx2 context.Context) error {
+	if _, err := i.txManager.DoInTx(ctx, func(ctx2 context.Context) error {
 		archiveID := primitive.NewID()
 
 		event, err := i.eventRepository.GetArchiveEvent(ctx2, request.ArchiveEventID)

diff --git a/internal/usecase/event.go b/internal/usecase/event.go
@@ -45,7 +45,7 @@ func NewEventInteractor(
 
 func (i EventInteractor) PublishArchiveEvent(ctx context.Context, client entity.Client) (primitive.ID, error) {
 	archiveEvent := entity.NewArchiveEvent(primitive.NewID(), client.Devices[0].ID, client.ID)
-	if err := i.txManager.DoInTx(ctx, func(ctx2 context.Context) error {
+	if _, err := i.txManager.DoInTx(ctx, func(ctx2 context.Context) error {
 		if err := i.eventRepository.SaveArchiveEvent(ctx2, archiveEvent); err != nil {
 			return err
 		}

diff --git a/internal/usecase/transaction.go b/internal/usecase/transaction.go
@@ -1,3 +1,4 @@
+//go:generate mockgen -source=$GOFILE -package=mock_usecase -destination=./mock/$GOFILE
 package usecase
 
 import (
@@ -7,5 +8,5 @@ import (
 type Operation func(ctx context.Context) error
 
 type ITxManager interface {
-	DoInTx(ctx context.Context, operation Operation) error
+	DoInTx(ctx context.Context, operation Operation) (context.Context, error)
 }