bring back refactor

therealpaulgg · Aug 15, 2024 · 12afa58 · 12afa58
1 parent a7685cd
commit 12afa58
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 56 deletions.
diff --git a/pkg/database/query/transaction.go b/pkg/database/query/transaction.go
@@ -73,7 +73,7 @@ func RollbackFunc(txQueryService TransactionService, tx pgx.Tx, w http.ResponseW
 			log.Err(err).Msg("error rolling back transaction")
 		}
 	}
-	if err != nil {
+	if *err != nil {
 		rb(tx)
 	} else {
 		internalErr := txQueryService.Commit(tx)

diff --git a/pkg/web/router/routes/data.go b/pkg/web/router/routes/data.go
@@ -116,24 +116,7 @@ func addData(i *do.Injector) http.HandlerFunc {
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-		defer func() {
-			rb := func(tx pgx.Tx) {
-				err := txQueryService.Rollback(tx)
-				if err != nil {
-					log.Err(err).Msg("error rolling back transaction")
-				}
-			}
-			if err != nil {
-				rb(tx)
-			} else {
-				internalErr := txQueryService.Commit(tx)
-				if internalErr != nil {
-					log.Err(internalErr).Msg("error committing transaction")
-					rb(tx)
-					w.WriteHeader(http.StatusInternalServerError)
-				}
-			}
-		}()
+		defer query.RollbackFunc(txQueryService, tx, w, &err)
 		if err = userRepo.AddAndUpdateConfigTx(user, tx); err != nil {
 			log.Err(err).Msg("could not add config")
 			w.WriteHeader(http.StatusInternalServerError)
@@ -198,24 +181,25 @@ func deleteData(i *do.Injector) http.HandlerFunc {
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-		defer func() {
-			rb := func(tx pgx.Tx) {
-				err := txQueryService.Rollback(tx)
-				if err != nil {
-					log.Err(err).Msg("error rolling back transaction")
-				}
-			}
-			if err != nil {
-				rb(tx)
-			} else {
-				internalErr := txQueryService.Commit(tx)
-				if internalErr != nil {
-					log.Err(internalErr).Msg("error committing transaction")
-					rb(tx)
-					w.WriteHeader(http.StatusInternalServerError)
-				}
-			}
-		}()
+		defer query.RollbackFunc(txQueryService, tx, w, &err)
+		// defer func() {
+		// 	rb := func(tx pgx.Tx) {
+		// 		err := txQueryService.Rollback(tx)
+		// 		if err != nil {
+		// 			log.Err(err).Msg("error rolling back transaction")
+		// 		}
+		// 	}
+		// 	if err != nil {
+		// 		rb(tx)
+		// 	} else {
+		// 		internalErr := txQueryService.Commit(tx)
+		// 		if internalErr != nil {
+		// 			log.Err(internalErr).Msg("error committing transaction")
+		// 			rb(tx)
+		// 			w.WriteHeader(http.StatusInternalServerError)
+		// 		}
+		// 	}
+		// }()
 		if err = userRepo.DeleteUserKeyTx(user, key.ID, tx); err != nil {
 			log.Err(err).Msg("could not delete key")
 			w.WriteHeader(http.StatusInternalServerError)

diff --git a/pkg/web/router/routes/data_test.go b/pkg/web/router/routes/data_test.go
@@ -340,5 +340,4 @@ func TestDeleteKeyError(t *testing.T) {
 		t.Errorf("deleteData returned wrong status code: got %v want %v",
 			status, http.StatusInternalServerError)
 	}
-
 }
diff --git a/pkg/web/router/routes/setup.go b/pkg/web/router/routes/setup.go
@@ -67,24 +67,7 @@ func initialSetup(i *do.Injector) http.HandlerFunc {
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-		defer func() {
-			rb := func(tx pgx.Tx) {
-				err := txQueryService.Rollback(tx)
-				if err != nil {
-					log.Err(err).Msg("error rolling back transaction")
-				}
-			}
-			if err != nil {
-				rb(tx)
-			} else {
-				internalErr := txQueryService.Commit(tx)
-				if internalErr != nil {
-					log.Err(internalErr).Msg("error committing transaction")
-					rb(tx)
-					w.WriteHeader(http.StatusInternalServerError)
-				}
-			}
-		}()
+		defer query.RollbackFunc(txQueryService, tx, w, &err)
 		userRepo := do.MustInvoke[repository.UserRepository](i)
 		user := &models.User{}
 		user.Username = userDto.Username
-Original file line number
+Diff line change
@@ Expand Up / @@ -340,5 +340,4 @@ func TestDeleteKeyError(t *testing.T) { @@
     		t.Errorf("deleteData returned wrong status code: got %v want %v",
     			status, http.StatusInternalServerError)
     	}
     }