fix: remove goroutine in transaction

Author: steamedEggMaster

internal/api/router.go

@@ -17,7 +17,6 @@ limitations under the License.
 package api
 
 import (
-	"net/http"
 	v1 "teleport-plugin-slack-access-request/internal/api/v1"
 	"teleport-plugin-slack-access-request/internal/metric"
 
@@ -34,12 +33,11 @@ func NewRouter(v1 *v1.Router) *Router {
 	}
 }
 
-func (r *Router) Setup(router *chi.Mux) http.Handler {
+func (r *Router) Setup(router *chi.Mux) {
 	router.
 		With(metric.InstrumentHTTP).
 		With(VerifySlackRequest()).
 		Route("/api", func(router chi.Router) {
 			r.v1.Route(router)
 		})
-	return router
 }

internal/api/v1/accessreview/submit_modal_handler.go

@@ -32,8 +32,6 @@ import (
 	"teleport-plugin-slack-access-request/internal/util"
 	"teleport-plugin-slack-access-request/internal/util/container"
 	"teleport-plugin-slack-access-request/internal/util/verifier"
-
-	"golang.org/x/sync/errgroup"
 )
 
 func (h *Handler) HandleModalSubmission(payloadStr string, w http.ResponseWriter, r *http.Request) {
@@ -150,55 +148,47 @@ func (h *Handler) performTransaction(ctx context.Context, payload *viewsubmissio
 		return fmt.Errorf("failed to create access review: %w", err)
 	}
 
-	g, gCtx := errgroup.WithContext(ctx)
 	// 7. outbox 저장하기
-	g.Go(func() error {
-		// 1. Reviewer Channel 용 이벤트 객체 만들기
-		ob, err := model.NewOutboxWithAccessReviewReviewer(updatedAR, createdAccessReview, requesterSlackUser, reviewerSlackUser, payload.MessageTs)
-		if err != nil {
-			return fmt.Errorf("failed to create outbox with access review in reviewer channel : %w", err)
-		}
+	// Reviewer Channel 용 이벤트 객체 만들기
+	reviewOB, err := model.NewOutboxWithAccessReviewReviewer(updatedAR, createdAccessReview, requesterSlackUser, reviewerSlackUser, payload.MessageTs)
+	if err != nil {
+		return fmt.Errorf("failed to create outbox with access review in reviewer channel : %w", err)
+	}
 
-		createdOB, err := txServices.Outbox.CreateOutbox(gCtx, ob)
-		if err != nil {
-			return fmt.Errorf("failed to create reviewer outbox: %w", err)
-		}
+	createdReviewOB, err := txServices.Outbox.CreateOutbox(ctx, reviewOB)
+	if err != nil {
+		return fmt.Errorf("failed to create reviewer outbox: %w", err)
+	}
 
-		// Outbox Notification 설정
-		obn, err := model.NewOutboxNotification(createdOB)
-		if err != nil {
-			return fmt.Errorf("failed to create outbox notification: %w", err)
-		}
-		if err := txServices.Outbox.Notify(ctx, obn); err != nil {
-			return fmt.Errorf("failed to notify outbox: %w", err)
-		}
-		return nil
-	})
-
-	g.Go(func() error {
-		// 2. Requester Channel 용 이벤트 객체 만들기
-		ob, err := model.NewOutboxWithAccessReviewRequester(updatedAR, createdAccessReview, requesterSlackUser, reviewerSlackUser)
-		if err != nil {
-			return fmt.Errorf("failed to create outbox with access review in requester channel : %w", err)
-		}
+	// Outbox Notification 설정
+	reviewerOBN, err := model.NewOutboxNotification(createdReviewOB)
+	if err != nil {
+		return fmt.Errorf("failed to create outbox notification: %w", err)
+	}
 
-		createdOB, err := txServices.Outbox.CreateOutbox(gCtx, ob)
-		if err != nil {
-			return fmt.Errorf("failed to create requester outbox: %w", err)
-		}
+	if err := txServices.Outbox.Notify(ctx, reviewerOBN); err != nil {
+		return fmt.Errorf("failed to notify outbox: %w", err)
+	}
 
-		// Outbox Notification 설정
-		obn, err := model.NewOutboxNotification(createdOB)
-		if err != nil {
-			return fmt.Errorf("failed to create outbox notification: %w", err)
-		}
-		if err := txServices.Outbox.Notify(ctx, obn); err != nil {
-			return fmt.Errorf("failed to notify outbox: %w", err)
-		}
-		return nil
-	})
-	if err := g.Wait(); err != nil {
-		return fmt.Errorf("failed to wait goroutines : %w", err)
+	// Requester Channel 용 이벤트 객체 만들기
+	requesterOB, err := model.NewOutboxWithAccessReviewRequester(updatedAR, createdAccessReview, requesterSlackUser, reviewerSlackUser)
+	if err != nil {
+		return fmt.Errorf("failed to create outbox with access review in requester channel : %w", err)
+	}
+
+	createdRequesterOB, err := txServices.Outbox.CreateOutbox(ctx, requesterOB)
+	if err != nil {
+		return fmt.Errorf("failed to create requester outbox: %w", err)
+	}
+
+	// Outbox Notification 설정
+	requesterOBN, err := model.NewOutboxNotification(createdRequesterOB)
+	if err != nil {
+		return fmt.Errorf("failed to create outbox notification: %w", err)
+	}
+
+	if err := txServices.Outbox.Notify(ctx, requesterOBN); err != nil {
+		return fmt.Errorf("failed to notify outbox: %w", err)
 	}
 
 	// 8. 트랜잭션 종료하기

internal/app/run.go

@@ -45,13 +45,13 @@ func Run() {
 	isReady.Store(false)
 
 	app := NewContext()
-	SetupCloseHandler(cancel, func() {
+	setupCloseHandler(cancel, func() {
 		app.Cleanup(ctx)
 	})
 
 	errCh := make(chan error, 1)
 	go func() {
-		if err := StartCheckServer(router, isReady, app); err != nil {
+		if err := startCheckServer(router, isReady, app); err != nil {
 			errCh <- err
 		}
 	}()
@@ -70,7 +70,7 @@ func Run() {
 	}
 }
 
-func SetupCloseHandler(cancel context.CancelFunc, cleanup func()) {
+func setupCloseHandler(cancel context.CancelFunc, cleanup func()) {
 	c := make(chan os.Signal, 2)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 	go func() {
@@ -81,7 +81,7 @@ func SetupCloseHandler(cancel context.CancelFunc, cleanup func()) {
 	}()
 }
 
-func StartCheckServer(router *chi.Mux, isReady *atomic.Value, app *Context) error {
+func startCheckServer(router *chi.Mux, isReady *atomic.Value, app *Context) error {
 	router.Use(middleware.Recoverer)
 
 	router.Get("/healthz", check.Healthz)
@@ -144,7 +144,7 @@ func startAPIServer(ctx context.Context, router *chi.Mux, isReady *atomic.Value,
 	slog.Info("starting outbox worker")
 
 	routers := NewRouter(db, clients, repos, services)
-	_ = routers.Setup(router)
+	routers.Setup(router)
 	router.Handle("/metrics", promhttp.HandlerFor(metric.Registry, promhttp.HandlerOpts{}))
 	isReady.Store(true)
 	return nil