Merge branch 'deploy' of github.com:go-park-mail-ru/2023_2_Hamster in…

…to deploy
go-park-mail-ru · Nov 13, 2023 · 50d3b91 · 50d3b91
2 parents a23e637 + 8b0ba7c
commit 50d3b91
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/internal/microservices/category/repository/postgres/postgres.go b/internal/microservices/category/repository/postgres/postgres.go
@@ -6,11 +6,12 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/jackc/pgx/v4"
+
 	"github.com/go-park-mail-ru/2023_2_Hamster/cmd/api/init/db/postgresql"
 	"github.com/go-park-mail-ru/2023_2_Hamster/internal/common/logger"
 	"github.com/go-park-mail-ru/2023_2_Hamster/internal/models"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v4"
 )
 
 const (
@@ -89,6 +90,7 @@ func (r *Repository) UpdateTag(ctx context.Context, tag *models.Category) error
 	} else if err != nil {
 		return fmt.Errorf("[repo] failed request db %s, %w", CategoryGet, err)
 	} */
+
 	var err error
 	if tag.ParentID == uuid.Nil {
 		_, err = r.db.Exec(ctx, CategoryUpdate,

diff --git a/internal/microservices/transaction/repository/postgresql/postgres.go b/internal/microservices/transaction/repository/postgresql/postgres.go
@@ -120,8 +120,11 @@ func (r *transactionRep) CreateTransaction(ctx context.Context, transaction *mod
 		return uuid.Nil, fmt.Errorf("failed to start transaction: %w", err)
 	}
 	defer func() {
-		if err := tx.Rollback(ctx); err != nil {
-			r.logger.Fatal("Rollback transaction Error: %w", err)
+		if err != nil {
+			if err = tx.Rollback(ctx); err != nil {
+				r.logger.Fatal("Rollback transaction Error: %w", err)
+			}
+
 		}
 	}()
 
@@ -201,9 +204,13 @@ func (r *transactionRep) UpdateTransaction(ctx context.Context, transaction *mod
 	if err != nil {
 		return fmt.Errorf("[repo] failed to start transaction: %w", err)
 	}
+
 	defer func() {
-		if err := tx.Rollback(ctx); err != nil {
-			r.logger.Fatal("Rollback transaction Error: %w", err)
+		if err != nil {
+			if err = tx.Rollback(ctx); err != nil {
+				r.logger.Fatal("Rollback transaction Error: %w", err)
+			}
+
 		}
 	}()
 
@@ -295,9 +302,13 @@ func (r *transactionRep) DeleteTransaction(ctx context.Context, transactionID uu
 	if err != nil {
 		return fmt.Errorf("[repo] failed to start transaction: %w", err)
 	}
+
 	defer func() {
-		if err := tx.Rollback(ctx); err != nil {
-			r.logger.Fatal("Rollback transaction Error: %w", err)
+		if err != nil {
+			if err = tx.Rollback(ctx); err != nil {
+				r.logger.Fatal("Rollback transaction Error: %w", err)
+			}
+
 		}
 	}()