fix: empty webhook payload fix for PR based CI pipeline (#5879)

* use parsedDataId instead of payload_data_id

* fix: send webhook data to git-sensor in nats event

* fix: send webhook data to git-sensor in nats event

Author: gireesh-naidu

api/restHandler/WebhookEventHandler.go

@@ -18,6 +18,7 @@ package restHandler
 
 import (
 	"github.com/devtron-labs/devtron/pkg/eventProcessor/out"
+	"github.com/devtron-labs/devtron/pkg/eventProcessor/out/bean"
 	"github.com/devtron-labs/devtron/pkg/pipeline/types"
 	"io/ioutil"
 	"net/http"
@@ -119,7 +120,7 @@ func (impl WebhookEventHandlerImpl) OnWebhookEvent(w http.ResponseWriter, r *htt
 	}
 
 	// make request to handle this webhook
-	webhookEvent := &pipeline.WebhookEventDataRequest{
+	webhookEvent := &bean.CIPipelineGitWebhookEvent{
 		GitHostId:          gitHostId,
 		GitHostName:        gitHostName,
 		EventType:          eventType,
@@ -135,7 +136,7 @@ func (impl WebhookEventHandlerImpl) OnWebhookEvent(w http.ResponseWriter, r *htt
 	}
 
 	// write event
-	err = impl.ciPipelineEventPublishService.PublishGitWebhookEvent(gitHostId, gitHostName, eventType, string(requestBodyBytes))
+	err = impl.ciPipelineEventPublishService.PublishGitWebhookEvent(webhookEvent)
 	if err != nil {
 		impl.logger.Errorw("Error while handling webhook in git-sensor", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/restHandler/app/pipeline/webhook/WebhookDataRestHandler.go

@@ -185,7 +185,7 @@ func (impl WebhookDataRestHandlerImpl) GetWebhookPayloadFilterDataForPipelineMat
 
 	// set payload json
 	if response != nil && response.PayloadId != 0 {
-		webhookEventData, err := impl.webhookEventDataConfig.GetById(int(response.PayloadId))
+		webhookEventData, err := impl.webhookEventDataConfig.GetById(response.PayloadId)
 		if err != nil {
 			impl.logger.Errorw("error in getting webhook payload data", "err", err)
 			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

pkg/eventProcessor/out/CIPipelineEventPublishService.go

@@ -24,7 +24,7 @@ import (
 )
 
 type CIPipelineEventPublishService interface {
-	PublishGitWebhookEvent(gitHostId int, gitHostName string, eventType, requestJSON string) error
+	PublishGitWebhookEvent(event *bean.CIPipelineGitWebhookEvent) error
 }
 
 type CIPipelineEventPublishServiceImpl struct {
@@ -40,13 +40,7 @@ func NewCIPipelineEventPublishServiceImpl(logger *zap.SugaredLogger,
 	}
 }
 
-func (impl *CIPipelineEventPublishServiceImpl) PublishGitWebhookEvent(gitHostId int, gitHostName string, eventType, requestJSON string) error {
-	event := &bean.CIPipelineGitWebhookEvent{
-		GitHostId:          gitHostId,
-		GitHostName:        gitHostName,
-		EventType:          eventType,
-		RequestPayloadJson: requestJSON,
-	}
+func (impl *CIPipelineEventPublishServiceImpl) PublishGitWebhookEvent(event *bean.CIPipelineGitWebhookEvent) error {
 	body, err := json.Marshal(event)
 	if err != nil {
 		impl.logger.Errorw("error in marshaling git webhook event", "err", err, "event", event)

pkg/eventProcessor/out/bean/bean.go

@@ -18,6 +18,7 @@ package bean
 
 import (
 	bean4 "github.com/devtron-labs/devtron/pkg/deployment/deployedApp/bean"
+	"time"
 )
 
 type BulkTriggerRequest struct {
@@ -46,8 +47,10 @@ type CdPipelineDeleteEvent struct {
 }
 
 type CIPipelineGitWebhookEvent struct {
-	GitHostId          int    `json:"gitHostId"`
-	GitHostName        string `json:"gitHostName"`
-	EventType          string `json:"eventType"`
-	RequestPayloadJson string `json:"requestPayloadJson"`
+	PayloadId          int       `json:"payloadId"`
+	GitHostId          int       `json:"gitHostId"`
+	GitHostName        string    `json:"gitHostName"`
+	EventType          string    `json:"eventType"`
+	RequestPayloadJson string    `json:"requestPayloadJson"`
+	CreatedOn          time.Time `json:"createdOn"`
 }

pkg/pipeline/WebhookEventDataConfig.go

@@ -18,13 +18,14 @@ package pipeline
 
 import (
 	"github.com/devtron-labs/devtron/internal/sql/repository"
+	"github.com/devtron-labs/devtron/pkg/eventProcessor/out/bean"
 	"go.uber.org/zap"
 	"time"
 )
 
 type WebhookEventDataConfig interface {
-	Save(webhookEventDataRequest *WebhookEventDataRequest) error
-	GetById(payloadId int) (*WebhookEventDataRequest, error)
+	Save(webhookEventDataRequest *bean.CIPipelineGitWebhookEvent) error
+	GetById(payloadId int) (*bean.CIPipelineGitWebhookEvent, error)
 }
 
 type WebhookEventDataConfigImpl struct {
@@ -39,16 +40,7 @@ func NewWebhookEventDataConfigImpl(logger *zap.SugaredLogger, webhookEventDataRe
 	}
 }
 
-type WebhookEventDataRequest struct {
-	PayloadId          int       `json:"payloadId"`
-	GitHostId          int       `json:"gitHostId"`
-	GitHostName        string    `json:"gitHostName"`
-	EventType          string    `json:"eventType"`
-	RequestPayloadJson string    `json:"requestPayloadJson"`
-	CreatedOn          time.Time `json:"createdOn"`
-}
-
-func (impl WebhookEventDataConfigImpl) Save(webhookEventDataRequest *WebhookEventDataRequest) error {
+func (impl WebhookEventDataConfigImpl) Save(webhookEventDataRequest *bean.CIPipelineGitWebhookEvent) error {
 	impl.logger.Debug("save event data request")
 
 	webhookEventDataRequestSql := &repository.WebhookEventData{
@@ -70,7 +62,7 @@ func (impl WebhookEventDataConfigImpl) Save(webhookEventDataRequest *WebhookEven
 	return nil
 }
 
-func (impl WebhookEventDataConfigImpl) GetById(payloadId int) (*WebhookEventDataRequest, error) {
+func (impl WebhookEventDataConfigImpl) GetById(payloadId int) (*bean.CIPipelineGitWebhookEvent, error) {
 	impl.logger.Debug("get webhook payload request")
 
 	webhookEventData, err := impl.webhookEventDataRepository.GetById(payloadId)
@@ -79,7 +71,7 @@ func (impl WebhookEventDataConfigImpl) GetById(payloadId int) (*WebhookEventData
 		return nil, err
 	}
 
-	webhookEventDataRequest := &WebhookEventDataRequest{
+	webhookEventDataRequest := &bean.CIPipelineGitWebhookEvent{
 		RequestPayloadJson: webhookEventData.PayloadJson,
 	}