error handling

Author: prkhrkat

client/telemetry/TelemetryEventClientExtended.go

@@ -407,7 +407,11 @@ func (impl *TelemetryEventClientImplExtended) getCiBuildTypeData() (int, int, in
 func (impl *TelemetryEventClientImplExtended) getCiBuildTypeVsStatusVsCount() (successCount map[bean.CiBuildType]int, failureCount map[bean.CiBuildType]int) {
 	successCount = make(map[bean.CiBuildType]int)
 	failureCount = make(map[bean.CiBuildType]int)
-	buildTypeAndStatusVsCount := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	buildTypeAndStatusVsCount, err := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	if err != nil {
+		impl.logger.Errorw("error getting build type vs status vs count data", "err", err)
+		return successCount, failureCount
+	}
 	for _, buildTypeCount := range buildTypeAndStatusVsCount {
 		if buildTypeCount == nil {
 			continue

client/telemetry/telemetryQueriesExtended.go

@@ -27,10 +27,10 @@ func (impl *TelemetryEventClientImplExtended) getJobCount() int {
 
 func (impl *TelemetryEventClientImplExtended) getJobPipelineTriggeredLast24h() int {
 	// Get build type and status data for the last 24 hours
-	buildTypeStatusData := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
-	if buildTypeStatusData == nil {
+	buildTypeStatusData, err := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	if err != nil {
 		impl.logger.Warnw("no build type status data available for last 24 hours")
-		return 0
+		return -1
 	}
 
 	// Count job pipeline triggers
@@ -47,10 +47,10 @@ func (impl *TelemetryEventClientImplExtended) getJobPipelineTriggeredLast24h() i
 
 func (impl *TelemetryEventClientImplExtended) getJobPipelineSucceededLast24h() int {
 	// Get build type and status data for the last 24 hours
-	buildTypeStatusData := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
-	if buildTypeStatusData == nil {
+	buildTypeStatusData, err := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	if err != nil {
 		impl.logger.Warnw("no build type status data available for last 24 hours")
-		return 0
+		return -1
 	}
 
 	// Count successful job pipeline runs
@@ -71,7 +71,7 @@ func (impl *TelemetryEventClientImplExtended) getUserCreatedPluginCount() int {
 	plugins, err := impl.pluginRepository.GetAllPluginMinDataByType(string(pluginRepository.PLUGIN_TYPE_SHARED))
 	if err != nil {
 		impl.logger.Errorw("error getting user created plugin count", "err", err)
-		return 0
+		return -1
 	}
 
 	return len(plugins)

internal/sql/repository/pipelineConfig/CiWorkflowRepository.go

@@ -45,7 +45,7 @@ type CiWorkflowRepository interface {
 	FindLastTriggeredWorkflowGitTriggersByArtifactId(ciArtifactId int) (ciWorkflow *CiWorkflow, err error)
 	FindLastTriggeredWorkflowGitTriggersByArtifactIds(ciArtifactIds []int) ([]*WorkflowWithArtifact, error)
 	ExistsByStatus(status string) (bool, error)
-	FindBuildTypeAndStatusDataOfLast1Day() []*BuildTypeCount
+	FindBuildTypeAndStatusDataOfLast1Day() ([]*BuildTypeCount, error)
 	FIndCiWorkflowStatusesByAppId(appId int) ([]*CiWorkflowStatus, error)
 
 	MigrateIsArtifactUploaded(wfId int, isArtifactUploaded bool)
@@ -347,14 +347,15 @@ func (impl *CiWorkflowRepositoryImpl) ExistsByStatus(status string) (bool, error
 	return exists, err
 }
 
-func (impl *CiWorkflowRepositoryImpl) FindBuildTypeAndStatusDataOfLast1Day() []*BuildTypeCount {
+func (impl *CiWorkflowRepositoryImpl) FindBuildTypeAndStatusDataOfLast1Day() ([]*BuildTypeCount, error) {
 	var buildTypeCounts []*BuildTypeCount
 	query := "select status,ci_build_type as type, count(*) from ci_workflow where status in ('Succeeded','Failed') and started_on > ? group by (ci_build_type, status)"
 	_, err := impl.dbConnection.Query(&buildTypeCounts, query, time.Now().AddDate(0, 0, -1))
 	if err != nil {
 		impl.logger.Errorw("error occurred while fetching build type vs status vs count data", "err", err)
+		return nil, err
 	}
-	return buildTypeCounts
+	return buildTypeCounts, nil
 }
 
 func (impl *CiWorkflowRepositoryImpl) FIndCiWorkflowStatusesByAppId(appId int) ([]*CiWorkflowStatus, error) {
@@ -372,6 +373,7 @@ func (impl *CiWorkflowRepositoryImpl) FIndCiWorkflowStatusesByAppId(appId int) (
 	_, err := impl.dbConnection.Query(&ciworkflowStatuses, query, appId) //, pg.In(ciPipelineIds))
 	if err != nil {
 		impl.logger.Errorw("error occurred while fetching build type vs status vs count data", "err", err)
+		return ciworkflowStatuses, err
 	}
 	return ciworkflowStatuses, err
 }

internal/sql/repository/pipelineConfig/CiWorkflowRepository_test.go

@@ -32,7 +32,7 @@ func TestCiWorkflowRepository(t *testing.T) {
 		con, _ := sql.NewDbConnection(cfg, logger)
 		assert.Nil(t, err)
 		workflowRepositoryImpl := NewCiWorkflowRepositoryImpl(con, logger)
-		statusData := workflowRepositoryImpl.FindBuildTypeAndStatusDataOfLast1Day()
+		statusData, _ := workflowRepositoryImpl.FindBuildTypeAndStatusDataOfLast1Day()
 		for _, statusDatum := range statusData {
 			fmt.Println(statusDatum.Count)
 		}