fix: ロールバックの修正

su-its · Apr 3, 2024 · b942040 · b942040
1 parent 2a052b1
commit b942040
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/typing-server/api/repository/score.go b/typing-server/api/repository/score.go
@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 
 	"github.com/google/uuid"
@@ -97,8 +98,15 @@ func CreateScore(ctx context.Context, client *ent.Client, userID uuid.UUID, keys
 		return err
 	}
 	defer func() {
-		if r := recover(); r != nil {
-			tx.Rollback()
+		// txがコミット済みの場合はロールバックしない
+		if tx == nil {
+			return
+		}
+		if err := tx.Rollback(); err != nil {
+			if err != sql.ErrTxDone {
+				return
+			}
+			return
 		}
 	}()