Skip to content

fix: app detail deployed by #6032

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 6 commits into from
Nov 4, 2024
Merged

fix: app detail deployed by #6032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d7b4b9
modified the deployed by value in appDetail Card
RajeevRanjan27 Oct 25, 2024
683baf9
also took account for the deleted user
RajeevRanjan27 Oct 25, 2024
0a8a2e2
added comment
RajeevRanjan27 Oct 25, 2024
022712d
added the new field in Deployment Container bean
RajeevRanjan27 Oct 28, 2024
7a11c77
resolved the comments
RajeevRanjan27 Oct 28, 2024
adc87fc
Merge branch 'develop' into fix-app-detail-deployed-by
RajeevRanjan27 Nov 4, 2024
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
1 change: 1 addition & 0 deletions api/bean/AppView.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ type DeploymentDetailContainer struct {
DeploymentConfig *bean.DeploymentConfig `json:"-"`
IsPipelineTriggered bool `json:"isPipelineTriggered"`
ReleaseMode string `json:"releaseMode"`
LastDeployedById int `json:"-" sql:"last_deployed_by_id"`
}

type AppDetailContainer struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/external-app/wire_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/sql/repository/AppListingRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ func (impl AppListingRepositoryImpl) FetchMinDetailOtherEnvironment(appId int) (
func (impl AppListingRepositoryImpl) DeploymentDetailByArtifactId(ciArtifactId int, envId int) (bean.DeploymentDetailContainer, error) {
impl.Logger.Debug("reached at AppListingRepository:")
var deploymentDetail bean.DeploymentDetailContainer
query := "SELECT env.id AS environment_id, env.environment_name, env.default, pco.created_on as last_deployed_time, a.app_name" +
query := "SELECT env.id AS environment_id, env.environment_name, env.default, pco.created_on as last_deployed_time, pco.updated_by as last_deployed_by_id, a.app_name" +
" FROM pipeline_config_override pco" +
" INNER JOIN pipeline p on p.id = pco.pipeline_id" +
" INNER JOIN environment env ON env.id=p.environment_id" +
Expand Down
4 changes: 3 additions & 1 deletion pkg/pipeline/CiHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,9 @@ func (impl *CiHandlerImpl) FetchMaterialInfoByArtifactId(ciArtifactId int, envId
}
}

triggeredByUserEmailId, err = impl.userService.GetActiveEmailById(workflow.TriggeredBy)
//getting the user including both active and inactive both
// as there arises case of having the deleted user had triggered the deployment
triggeredByUserEmailId, err = impl.userService.GetEmailById(int32(deployDetail.LastDeployedById))
if err != nil && !util.IsErrNoRows(err) {
impl.Logger.Errorw("err", "err", err)
return &types.GitTriggerInfoResponse{}, err
Expand Down