Skip to content

fix: clusterId check for modifying triggers for cluster level notific… #6932

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
SATYAsasini merged 1 commit into from
Mar 11, 2026
+3 −2
Merged

fix: clusterId check for modifying triggers for cluster level notific… #6932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions internal/sql/repository/NotificationSettingsRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ type SearchRequest struct {

func (impl *NotificationSettingsRepositoryImpl) FetchNotificationSettingGroupBy(viewId int) ([]NotificationSettings, error) {
var ns []NotificationSettings
queryTemp := "select ns.team_id,ns.env_id,ns.app_id,ns.pipeline_id,ns.pipeline_type from notification_settings ns" +
" where ns.view_id=? group by 1,2,3,4,5;"
queryTemp := "select ns.team_id,ns.env_id,ns.app_id,ns.pipeline_id,ns.pipeline_type,ns.cluster_id from notification_settings ns" +
" where ns.view_id=? group by 1,2,3,4,5,6;"
_, err := impl.dbConnection.Query(&ns, queryTemp, viewId)
if err != nil {
return nil, err
Expand Down
1 change: 1 addition & 0 deletions pkg/notifier/NotificationConfigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ func (impl *NotificationConfigServiceImpl) updateNotificationSetting(notificatio
notificationSettingsRequest.PipelineId = nsConfig.PipelineId
notificationSettingsRequest.PipelineType = nsConfig.PipelineType
notificationSettingsRequest.Providers = nsConfig.Providers
notificationSettingsRequest.ClusterId = nsConfig.ClusterId
var notificationSettings []repository.NotificationSettings
nsOptions, err := impl.notificationSettingsRepository.FetchNotificationSettingGroupBy(notificationSettingsRequest.Id)
if err != nil {
Expand Down
Loading