devtron-labs
diff --git a/‎Wire.go‎
Lines changed: 3 additions & 0 deletions b/‎Wire.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎api/bean/AppView.go‎
Lines changed: 36 additions & 0 deletions b/‎api/bean/AppView.go‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎api/restHandler/AppListingRestHandler.go‎
Lines changed: 89 additions & 1 deletion b/‎api/restHandler/AppListingRestHandler.go‎
Lines changed: 89 additions & 1 deletion
diff --git a/‎api/restHandler/app/AutoCompleteRestHandler.go‎
Lines changed: 12 additions & 1 deletion b/‎api/restHandler/app/AutoCompleteRestHandler.go‎
Lines changed: 12 additions & 1 deletion
@@ -248,6 +248,9 @@ func InitializeApp() (*App, error) {
 		repository.NewAppListingRepositoryImpl,
 		wire.Bind(new(repository.AppListingRepository), new(*repository.AppListingRepositoryImpl)),
 
+		router.NewJobRouterImpl,
+		wire.Bind(new(router.JobRouter), new(*router.JobRouterImpl)),
+
 		pipelineConfig.NewPipelineRepositoryImpl,
 		wire.Bind(new(pipelineConfig.PipelineRepository), new(*pipelineConfig.PipelineRepositoryImpl)),
 		pipeline.NewPropertiesConfigServiceImpl,
 
@@ -20,6 +20,7 @@ package bean
 import (
 	"encoding/json"
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"time"
 )
 
 type AppContainer struct {
@@ -36,6 +37,11 @@ type AppContainerResponse struct {
 	DeploymentGroupDTO DeploymentGroupDTO `json:"deploymentGroup,omitempty"`
 }
 
+type JobContainerResponse struct {
+	JobContainers []*JobContainer `json:"jobContainers"`
+	JobCount      int             `json:"jobCount"`
+}
+
 type DeploymentGroupDTO struct {
 	Id             int             `json:"id"`
 	Name           string          `json:"name"`
@@ -52,6 +58,36 @@ type CiMaterialDTO struct {
 	SourceValue string `json:"value"`
 }
 
+type JobContainer struct {
+	JobId          int             `json:"jobId"`
+	JobName        string          `json:"jobName""`
+	Description    string          `json:"description"`
+	JobCiPipelines []JobCIPipeline `json:"ciPipelines"'`
+}
+
+type JobCIPipeline struct {
+	CiPipelineId   int       `json:"ciPipelineId"`
+	CiPipelineName string    `json:"ciPipelineName"`
+	Status         string    `json:"status"`
+	LastRunAt      time.Time `json:"lastRunAt"`
+	LastSuccessAt  time.Time `json:"lastSuccessAt"`
+}
+
+type JobListingContainer struct {
+	JobId          int       `json:"job_id"`
+	JobName        string    `json:"job_name"`
+	Description    string    `json:"description"`
+	CiPipelineID   int       `json:"ci_pipeline_id"`
+	CiPipelineName string    `json:"ci_pipeline_name"`
+	Status         string    `json:"status"`
+	StartedOn      time.Time `json:"started_on"`
+}
+
+type CiPipelineLastSucceededTime struct {
+	CiPipelineID    int       `json:"ci_pipeline_id"`
+	LastSucceededOn time.Time `json:"last_succeeded_on"`
+}
+
 type AppEnvironmentContainer struct {
 	AppId                       int                       `json:"appId"`
 	AppName                     string                    `json:"appName"`
 
@@ -30,6 +30,7 @@ import (
 	"github.com/devtron-labs/devtron/client/argocdServer/application"
 	"github.com/devtron-labs/devtron/client/cron"
 	"github.com/devtron-labs/devtron/internal/constants"
+	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
@@ -57,6 +58,8 @@ import (
 
 type AppListingRestHandler interface {
 	FetchAppsByEnvironment(w http.ResponseWriter, r *http.Request)
+	FetchJobs(w http.ResponseWriter, r *http.Request)
+	FetchJobOverviewCiPipelines(w http.ResponseWriter, r *http.Request)
 	FetchAppDetails(w http.ResponseWriter, r *http.Request)
 	FetchAllDevtronManagedApps(w http.ResponseWriter, r *http.Request)
 	FetchAppTriggerView(w http.ResponseWriter, r *http.Request)
@@ -157,6 +160,91 @@ func (handler AppListingRestHandlerImpl) FetchAllDevtronManagedApps(w http.Respo
 	res, err := handler.appListingService.FetchAllDevtronManagedApps()
 	common.WriteJsonResp(w, err, res, http.StatusOK)
 }
+func (handler AppListingRestHandlerImpl) FetchJobs(w http.ResponseWriter, r *http.Request) {
+	userId, err := handler.userService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		handler.logger.Errorw("request err, userId", "err", err, "payload", userId)
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+		return
+	}
+	isSuperAdmin, err := handler.userService.IsSuperAdmin(int(userId))
+	if !isSuperAdmin || err != nil {
+		if err != nil {
+			handler.logger.Errorw("request err, CheckSuperAdmin", "err", isSuperAdmin, "isSuperAdmin", isSuperAdmin)
+		}
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+		return
+	}
+	var fetchJobListingRequest app.FetchAppListingRequest
+	decoder := json.NewDecoder(r.Body)
+	err = decoder.Decode(&fetchJobListingRequest)
+	if err != nil {
+		handler.logger.Errorw("request err, FetchAppsByEnvironment", "err", err, "payload", fetchJobListingRequest)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	jobs, err := handler.appListingService.FetchJobs(fetchJobListingRequest)
+	if err != nil {
+		handler.logger.Errorw("service err, FetchJobs", "err", err, "payload", fetchJobListingRequest)
+		common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
+		return
+	}
+	jobsCount := len(jobs)
+	offset := fetchJobListingRequest.Offset
+	limit := fetchJobListingRequest.Size
+
+	if limit > 0 {
+		if offset+limit <= len(jobs) {
+			jobs = jobs[offset : offset+limit]
+		} else {
+			jobs = jobs[offset:]
+		}
+	}
+	jobContainerResponse := bean.JobContainerResponse{
+		JobContainers: jobs,
+		JobCount:      jobsCount,
+	}
+
+	common.WriteJsonResp(w, err, jobContainerResponse, http.StatusOK)
+}
+func (handler AppListingRestHandlerImpl) FetchJobOverviewCiPipelines(w http.ResponseWriter, r *http.Request) {
+	userId, err := handler.userService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		handler.logger.Errorw("request err, userId", "err", err, "payload", userId)
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+		return
+	}
+	isSuperAdmin, err := handler.userService.IsSuperAdmin(int(userId))
+	if !isSuperAdmin || err != nil {
+		if err != nil {
+			handler.logger.Errorw("request err, CheckSuperAdmin", "err", isSuperAdmin, "isSuperAdmin", isSuperAdmin)
+		}
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+		return
+	}
+	vars := mux.Vars(r)
+	jobId, err := strconv.Atoi(vars["jobId"])
+	if err != nil {
+		handler.logger.Errorw("request err, GetAppMetaInfo", "err", err, "jobId", jobId)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	job, err := handler.pipeline.GetApp(jobId)
+	if err != nil || job == nil || job.AppType != helper.Job {
+		handler.logger.Errorw("Job with the given Id does not exist", "err", err, "jobId", jobId)
+		common.WriteJsonResp(w, err, "Job with the given Id does not exist", http.StatusBadRequest)
+		return
+	}
+
+	jobCi, err := handler.appListingService.FetchOverviewCiPipelines(jobId)
+	if err != nil {
+		handler.logger.Errorw("request err, GetJobCi", "err", jobCi, "jobCi", jobCi)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+
+	common.WriteJsonResp(w, err, jobCi, http.StatusOK)
+}
 func (handler AppListingRestHandlerImpl) FetchAppsByEnvironment(w http.ResponseWriter, r *http.Request) {
 	//Allow CORS here By * or specific origin
 	setupResponse(&w, r)
@@ -571,7 +659,7 @@ func (handler AppListingRestHandlerImpl) FetchAppStageStatus(w http.ResponseWrit
 	}
 	//RBAC enforcer Ends
 
-	triggerView, err := handler.appListingService.FetchAppStageStatus(appId)
+	triggerView, err := handler.appListingService.FetchAppStageStatus(appId, int(app.AppType))
 	if err != nil {
 		handler.logger.Errorw("service err, FetchAppStageStatus", "err", err, "appId", appId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 
@@ -2,6 +2,7 @@ package app
 
 import (
 	"github.com/devtron-labs/devtron/api/restHandler/common"
+	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
 	"github.com/devtron-labs/devtron/pkg/user/casbin"
 	"github.com/gorilla/mux"
@@ -32,10 +33,20 @@ func (handler PipelineConfigRestHandlerImpl) GetAppListForAutocomplete(w http.Re
 	v := r.URL.Query()
 	teamId := v.Get("teamId")
 	appName := v.Get("appName")
+	appTypeParam := v.Get("appType")
+	var appType int
+	if appTypeParam != "" {
+		appType, err = strconv.Atoi(appTypeParam)
+		if err != nil {
+			handler.Logger.Errorw("service err, GetAppListForAutocomplete", "err", err, "teamId", teamId, "appTypeParam", appTypeParam)
+			common.WriteJsonResp(w, err, "Failed to parse appType param", http.StatusInternalServerError)
+			return
+		}
+	}
 	handler.Logger.Infow("request payload, GetAppListForAutocomplete", "teamId", teamId)
 	var apps []*pipeline.AppBean
 	if len(teamId) == 0 {
-		apps, err = handler.pipelineBuilder.FindAllMatchesByAppName(appName)
+		apps, err = handler.pipelineBuilder.FindAllMatchesByAppName(appName, helper.AppType(appType))
 		if err != nil {
 			handler.Logger.Errorw("service err, GetAppListForAutocomplete", "err", err, "teamId", teamId)
 			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)