fix in DTO

Author: prkhrkat

client/events/EventClient.go

@@ -287,10 +287,34 @@ func (impl *EventRESTClientImpl) sendEvent(event Event) (bool, error) {
 			return false, err
 		}
 
+		// convert notificationSetting to notificationSettingbean
+		notificationSettingsBean := make([]*repository.NotificationSettingsBean, 0)
+		for _, item := range notificationSettings {
+			config := make([]repository.ConfigEntry, 0)
+			if item.Config != "" {
+				err := json.Unmarshal([]byte(item.Config), &config)
+				if err != nil {
+					impl.logger.Errorw("error while unmarshaling config", "err", err)
+					return false, err
+				}
+			}
+			notificationSettingsBean = append(notificationSettingsBean, &repository.NotificationSettingsBean{
+				Id:           item.Id,
+				TeamId:       item.TeamId,
+				AppId:        item.AppId,
+				EnvId:        item.EnvId,
+				PipelineId:   item.PipelineId,
+				PipelineType: item.PipelineType,
+				EventTypeId:  item.EventTypeId,
+				Config:       config,
+				ViewId:       item.ViewId,
+			})
+		}
+
 		// Create a combined payload with event and notification settings
 		combinedPayload := map[string]interface{}{
 			"event":                event,
-			"notificationSettings": notificationSettings,
+			"notificationSettings": notificationSettingsBean,
 		}
 
 		// Marshal the combined payload

internal/sql/repository/NotificationSettingsRepository.go

@@ -90,6 +90,25 @@ type NotificationSettings struct {
 	ClusterId            *int     `sql:"cluster_id"`
 }
 
+type NotificationSettingsBean struct {
+	Id           int           `json:"id"`
+	TeamId       *int          `json:"team_id"`
+	AppId        *int          `json:"app_id"`
+	EnvId        *int          `json:"env_id"`
+	PipelineId   *int          `json:"pipeline_id"`
+	PipelineType string        `json:"pipeline_type"`
+	EventTypeId  int           `json:"event_type_id"`
+	Config       []ConfigEntry `json:"config"`
+	ViewId       int           `json:"view_id"`
+}
+
+type ConfigEntry struct {
+	Dest      string `json:"dest"`
+	Rule      string `json:"rule"`
+	ConfigId  int    `json:"configId"`
+	Recipient string `json:"recipient"`
+}
+
 type SettingOptionDTO struct {
 	//TeamId       int    `json:"-"`
 	//AppId        int    `json:"-"`