From 726af0e0da794e24866e33ff98abd59256ac612c Mon Sep 17 00:00:00 2001
From: "taekyu.kang" <ktkfree@naver.com>
Date: Thu, 29 Feb 2024 11:14:44 +0900
Subject: [PATCH] bugfix. fix middleware;

---
 internal/middleware/audit/audit.go | 6 ++----
 internal/route/route.go            | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/internal/middleware/audit/audit.go b/internal/middleware/audit/audit.go
index 55d61511..bd0d2c25 100644
--- a/internal/middleware/audit/audit.go
+++ b/internal/middleware/audit/audit.go
@@ -38,9 +38,6 @@ func (a *defaultAudit) WithAudit(endpoint internalApi.Endpoint, handler http.Han
 		}
 		userId := user.GetUserId()
 
-		requestBody := &bytes.Buffer{}
-		_, _ = io.Copy(requestBody, r.Body)
-
 		lrw := logging.NewLoggingResponseWriter(w)
 		handler.ServeHTTP(lrw, r)
 		statusCode := lrw.GetStatusCode()
@@ -53,11 +50,12 @@ func (a *defaultAudit) WithAudit(endpoint internalApi.Endpoint, handler http.Han
 
 		message, description := "", ""
 		if fn, ok := auditMap[endpoint]; ok {
-			body, err := io.ReadAll(requestBody)
+			body, err := io.ReadAll(r.Body)
 			if err != nil {
 				log.Error(err)
 			}
 			message, description = fn(lrw.GetBody(), body, statusCode)
+			r.Body = io.NopCloser(bytes.NewBuffer(body))
 
 			dto := domain.Audit{
 				OrganizationId: organizationId,
diff --git a/internal/route/route.go b/internal/route/route.go
index 02e7b2fe..4382baa1 100644
--- a/internal/route/route.go
+++ b/internal/route/route.go
@@ -7,6 +7,7 @@ import (
 	internalApi "github.com/openinfradev/tks-api/internal/delivery/api"
 	"github.com/openinfradev/tks-api/internal/middleware/audit"
 	"github.com/openinfradev/tks-api/internal/middleware/auth/requestRecoder"
+	"github.com/openinfradev/tks-api/internal/middleware/logging"
 
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
@@ -17,12 +18,11 @@ import (
 	"github.com/openinfradev/tks-api/internal/middleware/auth/authenticator"
 	authKeycloak "github.com/openinfradev/tks-api/internal/middleware/auth/authenticator/keycloak"
 	"github.com/openinfradev/tks-api/internal/middleware/auth/authorizer"
-	"github.com/openinfradev/tks-api/internal/middleware/logging"
 	"github.com/openinfradev/tks-api/internal/repository"
 	"github.com/openinfradev/tks-api/internal/usecase"
 	argowf "github.com/openinfradev/tks-api/pkg/argo-client"
 	gcache "github.com/patrickmn/go-cache"
-	"github.com/swaggo/http-swagger"
+	httpSwagger "github.com/swaggo/http-swagger"
 	"gorm.io/gorm"
 )