Skip to content

fix: optimized fetch deployment status timeline api #3653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2023
Merged

fix: optimized fetch deployment status timeline api #3653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5881d6
adding query param for showTimelines
prakash100198 Jul 18, 2023
6543b0c
adding query param for showTimelines for devtron app details page
prakash100198 Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion api/appStore/AppStoreStatusTimelineRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ func (handler AppStoreStatusTimelineRestHandlerImpl) FetchTimelinesForAppStore(w
return
}
installedAppVersionHistoryId := 0
showTimeline := false
showTimelineParam := r.URL.Query().Get("showTimeline")
if len(showTimelineParam) > 0 {
showTimeline, err = strconv.ParseBool(showTimelineParam)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
}
installedAppVersionHistoryIdParam := r.URL.Query().Get("installedAppVersionHistoryId")
if len(installedAppVersionHistoryIdParam) != 0 {
installedAppVersionHistoryId, err = strconv.Atoi(installedAppVersionHistoryIdParam)
Expand All @@ -56,7 +65,7 @@ func (handler AppStoreStatusTimelineRestHandlerImpl) FetchTimelinesForAppStore(w
}
}
//rbac will already be handled at app level
timelines, err := handler.pipelineStatusTimelineService.FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId)
timelines, err := handler.pipelineStatusTimelineService.FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId, showTimeline)
if err != nil {
handler.logger.Errorw("error in getting pipeline status timelines by installedAppVersionHistoryId", "err", err, "installedAppVersionHistoryId", installedAppVersionHistoryId, "installedAppId", installedAppId, "envId", envId)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
12 changes: 11 additions & 1 deletion api/restHandler/PipelineStatusTimelineRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,24 @@ func (handler *PipelineStatusTimelineRestHandlerImpl) FetchTimelines(w http.Resp
return
}
}
showTimeline := false
showTimelineParam := r.URL.Query().Get("showTimeline")
if len(showTimelineParam) > 0 {
showTimeline, err = strconv.ParseBool(showTimelineParam)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
}

resourceName := handler.enforcerUtil.GetAppRBACNameByAppId(appId)
token := r.Header.Get("token")
if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, resourceName); !ok {
common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
return
}

timelines, err := handler.pipelineStatusTimelineService.FetchTimelines(appId, envId, wfrId)
timelines, err := handler.pipelineStatusTimelineService.FetchTimelines(appId, envId, wfrId, showTimeline)
if err != nil {
handler.logger.Errorw("error in getting cd pipeline status timelines by wfrId", "err", err, "wfrId", wfrId)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
12 changes: 6 additions & 6 deletions pkg/app/status/PipelineStatusTimelineService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

type PipelineStatusTimelineService interface {
SaveTimeline(timeline *pipelineConfig.PipelineStatusTimeline, tx *pg.Tx, isAppStore bool) error
FetchTimelines(appId, envId, wfrId int) (*PipelineTimelineDetailDto, error)
FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId int) (*PipelineTimelineDetailDto, error)
FetchTimelines(appId, envId, wfrId int, showTimeline bool) (*PipelineTimelineDetailDto, error)
FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId int, showTimeline bool) (*PipelineTimelineDetailDto, error)
GetTimelineDbObjectByTimelineStatusAndTimelineDescription(cdWorkflowRunnerId int, timelineStatus pipelineConfig.TimelineStatus, timelineDescription string, userId int32) *pipelineConfig.PipelineStatusTimeline
}

Expand Down Expand Up @@ -154,7 +154,7 @@ func (impl *PipelineStatusTimelineServiceImpl) saveOrUpdateTimeline(timeline *pi
return nil
}

func (impl *PipelineStatusTimelineServiceImpl) FetchTimelines(appId, envId, wfrId int) (*PipelineTimelineDetailDto, error) {
func (impl *PipelineStatusTimelineServiceImpl) FetchTimelines(appId, envId, wfrId int, showTimeline bool) (*PipelineTimelineDetailDto, error) {
var triggeredBy int32
var deploymentStartedOn time.Time
var deploymentFinishedOn time.Time
Expand Down Expand Up @@ -191,7 +191,7 @@ func (impl *PipelineStatusTimelineServiceImpl) FetchTimelines(appId, envId, wfrI
var timelineDtos []*PipelineStatusTimelineDto
var statusLastFetchedAt time.Time
var statusFetchCount int
if util.IsAcdApp(deploymentAppType) {
if util.IsAcdApp(deploymentAppType) && showTimeline {
timelines, err := impl.pipelineStatusTimelineRepository.FetchTimelinesByWfrId(wfrId)
if err != nil {
impl.logger.Errorw("error in getting timelines by wfrId", "err", err, "wfrId", wfrId)
Expand Down Expand Up @@ -242,7 +242,7 @@ func (impl *PipelineStatusTimelineServiceImpl) FetchTimelines(appId, envId, wfrI
return timelineDetail, nil
}

func (impl *PipelineStatusTimelineServiceImpl) FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId int) (*PipelineTimelineDetailDto, error) {
func (impl *PipelineStatusTimelineServiceImpl) FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId int, showTimeline bool) (*PipelineTimelineDetailDto, error) {
var deploymentStartedOn time.Time
var deploymentFinishedOn time.Time
var installedAppVersionHistoryStatus string
Expand Down Expand Up @@ -287,7 +287,7 @@ func (impl *PipelineStatusTimelineServiceImpl) FetchTimelinesForAppStore(install
var timelineDtos []*PipelineStatusTimelineDto
var statusLastFetchedAt time.Time
var statusFetchCount int
if util.IsAcdApp(deploymentAppType) {
if util.IsAcdApp(deploymentAppType) && showTimeline {
timelines, err := impl.pipelineStatusTimelineRepository.FetchTimelinesByInstalledAppVersionHistoryId(installedAppVersionHistoryId)
if err != nil {
impl.logger.Errorw("error in getting timelines by installedAppVersionHistoryId", "err", err, "wfrId", installedAppVersionHistoryId)
Expand Down