Drop superfluous NotificationType mappings

Author: yhabteab

cmd/icingadb-migrate/convert.go

@@ -7,7 +7,6 @@ import (
 	"github.com/icinga/icinga-go-library/database"
 	"github.com/icinga/icinga-go-library/types"
 	"github.com/icinga/icinga-go-library/utils"
-	icingadbTypes "github.com/icinga/icingadb/pkg/icingadb/types"
 	v1 "github.com/icinga/icingadb/pkg/icingadb/v1"
 	"github.com/icinga/icingadb/pkg/icingadb/v1/history"
 	"github.com/jmoiron/sqlx"
@@ -620,17 +619,15 @@ func convertNotificationRows(
 		// migrated data itself via the history ID as object name, i.e. one "virtual object" per sent notification.
 		name := strconv.FormatUint(row.NotificationId, 10)
 
-		nt := convertNotificationType(row.NotificationReason, row.State)
-
-		ntEnum, err := nt.Value()
+		notificationType, err := convertNotificationType(row.NotificationReason, row.State)
 		if err != nil {
 			continue
 		}
 
 		ts := convertTime(row.EndTime.Int64, row.EndTimeUsec)
 		tsMilli := float64(ts.Time().UnixMilli())
-		notificationHistoryId := hashAny([]interface{}{env, name, ntEnum, tsMilli})
-		id := hashAny([]interface{}{env, "notification", name, ntEnum, tsMilli})
+		notificationHistoryId := hashAny([]interface{}{env, name, notificationType, tsMilli})
+		id := hashAny([]interface{}{env, "notification", name, notificationType, tsMilli})
 		typ := objectTypes[row.ObjecttypeId]
 		hostId := calcObjectId(env, row.Name1)
 		serviceId := calcServiceId(env, row.Name1, row.Name2)
@@ -653,7 +650,7 @@ func convertNotificationRows(
 				ServiceId:     serviceId,
 			},
 			NotificationId:    calcObjectId(env, name),
-			Type:              nt,
+			Type:              notificationType,
 			SendTime:          ts,
 			State:             row.State,
 			PreviousHardState: previousHardState,
@@ -702,30 +699,30 @@ func convertNotificationRows(
 //
 // [1]: https://github.com/Icinga/icinga2/blob/32c7f7730db154ba0dff5856a8985d125791c/lib/db_ido/dbevents.cpp#L1507-L1524
 // [2]: https://github.com/Icinga/icingadb/blob/8f31ac143875498797725adb9bfacf3d4/pkg/types/notification_type.go#L53-L61
-func convertNotificationType(notificationReason, state uint8) icingadbTypes.NotificationType {
+func convertNotificationType(notificationReason, state uint8) (string, error) {
 	switch notificationReason {
 	case 0: // state
 		if state == 0 {
-			return 64 // recovery
+			return "recovery", nil
 		} else {
-			return 32 // problem
+			return "problem", nil
 		}
-	case 1: // acknowledgement
-		return 16
-	case 2: // flapping start
-		return 128
-	case 3: // flapping end
-		return 256
-	case 5: // downtime start
-		return 1
-	case 6: // downtime end
-		return 2
-	case 7: // downtime removed
-		return 4
-	case 8: // custom
-		return 8
-	default: // bad notification type
-		return 0
+	case 1:
+		return "acknowledgement", nil
+	case 2:
+		return "flapping_start", nil
+	case 3:
+		return "flapping_end", nil
+	case 5:
+		return "downtime_start", nil
+	case 6:
+		return "downtime_end", nil
+	case 7:
+		return "downtime_removed", nil
+	case 8:
+		return "custom", nil
+	default:
+		return "", fmt.Errorf("bad notification type: %#v", notificationReason)
 	}
 }
 

pkg/icingadb/types/notification_type.go

@@ -3,21 +3,20 @@ package history
 import (
 	"github.com/icinga/icinga-go-library/database"
 	"github.com/icinga/icinga-go-library/types"
-	icingadbTypes "github.com/icinga/icingadb/pkg/icingadb/types"
 	v1 "github.com/icinga/icingadb/pkg/icingadb/v1"
 )
 
 type NotificationHistory struct {
 	HistoryTableEntity `json:",inline"`
 	HistoryTableMeta   `json:",inline"`
-	NotificationId     types.Binary                   `json:"notification_id"`
-	Type               icingadbTypes.NotificationType `json:"type"`
-	SendTime           types.UnixMilli                `json:"send_time"`
-	State              uint8                          `json:"state"`
-	PreviousHardState  uint8                          `json:"previous_hard_state"`
-	Author             string                         `json:"author"`
-	Text               types.String                   `json:"text"`
-	UsersNotified      uint16                         `json:"users_notified"`
+	NotificationId     types.Binary    `json:"notification_id"`
+	Type               string          `json:"type"`
+	SendTime           types.UnixMilli `json:"send_time"`
+	State              uint8           `json:"state"`
+	PreviousHardState  uint8           `json:"previous_hard_state"`
+	Author             string          `json:"author"`
+	Text               types.String    `json:"text"`
+	UsersNotified      uint16          `json:"users_notified"`
 }
 
 type UserNotificationHistory struct {