code improv

Author: ayu-devtron

api/GrpcHandler.go

@@ -562,24 +562,18 @@ func (impl *GrpcHandlerImpl) GetAllWebhookEventConfigForHost(ctx context.Context
 
 	var res []*git.WebhookEventConfig
 	var err error
-	if req.GitHostName != "" {
-		res, err = impl.repositoryManager.GetAllWebhookEventConfigForHostName(req.GetGitHostName())
-		if err != nil {
-			impl.logger.Errorw("error while fetching webhook event config",
-				"gitHostId", req.GitHostId,
-				"err", err)
-
-			return nil, err
-		}
-	} else {
-		res, err = impl.repositoryManager.GetAllWebhookEventConfigForHost(int(req.GitHostId))
-		if err != nil {
-			impl.logger.Errorw("error while fetching webhook event config",
-				"gitHostId", req.GitHostId,
-				"err", err)
+	reqModel := &git.WebhookEventConfigRequest{
+		GitHostId:   int(req.GitHostId),
+		GitHostName: req.GitHostName,
+		EventId:     int(req.EventId),
+	}
+	res, err = impl.repositoryManager.GetAllWebhookEventConfigForHost(reqModel)
+	if err != nil {
+		impl.logger.Errorw("error while fetching webhook event config",
+			"gitHostId", req.GitHostId,
+			"err", err)
 
-			return nil, err
-		}
+		return nil, err
 	}
 
 	webhookConfig := &pb.WebhookEventConfigResponse{}

api/RestHandler.go

@@ -430,15 +430,7 @@ func (handler RestHandlerImpl) GetAllWebhookEventConfigForHost(w http.ResponseWr
 	handler.logger.Infow("webhook event config request ", "req", request)
 
 	var webhookEventConfigArr []*git.WebhookEventConfig
-	if request.GitHostName != "" {
-		webhookEventConfigArr, err = handler.repositoryManager.GetAllWebhookEventConfigForHostName(request.GitHostName)
-		if webhookEventConfigArr == nil || len(webhookEventConfigArr) == 0 {
-			//fallback to try with gitHostId
-			webhookEventConfigArr, err = handler.repositoryManager.GetAllWebhookEventConfigForHost(request.GitHostId)
-		}
-	} else {
-		webhookEventConfigArr, err = handler.repositoryManager.GetAllWebhookEventConfigForHost(request.GitHostId)
-	}
+	webhookEventConfigArr, err = handler.repositoryManager.GetAllWebhookEventConfigForHost(request)
 
 	if err != nil {
 		handler.writeJsonResp(w, err, nil, http.StatusInternalServerError)

pkg/RepoManages.go

@@ -47,7 +47,7 @@ type RepoManager interface {
 	RefreshGitMaterial(req *git.RefreshGitMaterialRequest) (*git.RefreshGitMaterialResponse, error)
 
 	GetWebhookAndCiDataById(id int, ciPipelineMaterialId int) (*git.WebhookAndCiData, error)
-	GetAllWebhookEventConfigForHost(gitHostId int) ([]*git.WebhookEventConfig, error)
+	GetAllWebhookEventConfigForHost(req *git.WebhookEventConfigRequest) ([]*git.WebhookEventConfig, error)
 	GetAllWebhookEventConfigForHostName(gitHostName string) ([]*git.WebhookEventConfig, error)
 	GetWebhookEventConfig(eventId int) (*git.WebhookEventConfig, error)
 	GetWebhookPayloadDataForPipelineMaterialId(request *git.WebhookPayloadDataRequest) (*git.WebhookPayloadDataResponse, error)
@@ -871,15 +871,31 @@ func (impl RepoManagerImpl) GetAllWebhookEventConfigForHostName(gitHostName stri
 	return impl.convertSqlBeansToWebhookEventConfig(webhookEventsFromDb)
 }
 
-func (impl RepoManagerImpl) GetAllWebhookEventConfigForHost(gitHostId int) ([]*git.WebhookEventConfig, error) {
-
+func (impl RepoManagerImpl) GetAllWebhookEventConfigForHost(req *git.WebhookEventConfigRequest) ([]*git.WebhookEventConfig, error) {
+	gitHostId := req.GitHostId
+	gitHostName := req.GitHostName
+	var webhookEventsFromDb []*sql.GitHostWebhookEvent
+	var err error
 	impl.logger.Debugw("Getting All webhook event config ", "gitHostId", gitHostId)
-
-	webhookEventsFromDb, err := impl.webhookEventRepository.GetAllGitHostWebhookEventByGitHostId(gitHostId)
-
-	if err != nil {
-		impl.logger.Errorw("error in getting webhook events", "gitHostId", gitHostId, "err", err)
-		return nil, err
+	if gitHostName != "" {
+		webhookEventsFromDb, err = impl.webhookEventRepository.GetAllGitHostWebhookEventByGitHostName(gitHostName)
+		if err != nil {
+			impl.logger.Errorw("error in getting webhook events", "gitHostName", gitHostName, "err", err)
+			return nil, err
+		}
+		if webhookEventsFromDb == nil || len(webhookEventsFromDb) == 0 {
+			webhookEventsFromDb, err = impl.webhookEventRepository.GetAllGitHostWebhookEventByGitHostId(gitHostId)
+			if err != nil {
+				impl.logger.Errorw("error in getting webhook events", "gitHostId", gitHostId, "err", err)
+				return nil, err
+			}
+		}
+	} else {
+		webhookEventsFromDb, err = impl.webhookEventRepository.GetAllGitHostWebhookEventByGitHostId(gitHostId)
+		if err != nil {
+			impl.logger.Errorw("error in getting webhook events", "gitHostId", gitHostId, "err", err)
+			return nil, err
+		}
 	}
 
 	// build events