Merge pull request #1043 from gobitfly/BEDS-890/handle-group-efficien…

…cy-event (BEDS-8909) DA: dashboard notifications handle group efficiency
gobitfly · Oct 29, 2024 · 9f5176f · 9f5176f
2 parents d4b309c + d078cab
commit 9f5176f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/backend/pkg/api/data_access/notifications.go b/backend/pkg/api/data_access/notifications.go
@@ -503,6 +503,12 @@ func (d *DataAccessService) GetValidatorDashboardNotificationDetails(ctx context
 
 		for _, notification := range notifications {
 			switch notification.GetEventName() {
+			case types.ValidatorGroupEfficiencyEventName:
+				curNotification, ok := notification.(*n.ValidatorGroupEfficiencyNotification)
+				if !ok {
+					return nil, fmt.Errorf("failed to cast notification to ValidatorGroupEfficiencyNotification")
+				}
+				notificationDetails.GroupEfficiencyBelow = curNotification.Threshold
 			case types.ValidatorMissedProposalEventName, types.ValidatorExecutedProposalEventName /*, types.ValidatorScheduledProposalEventName*/ :
 				// aggregate proposals
 				curNotification, ok := notification.(*n.ValidatorProposalNotification)
@@ -613,8 +619,12 @@ func (d *DataAccessService) GetValidatorDashboardNotificationDetails(ctx context
 				if !ok {
 					return nil, fmt.Errorf("failed to cast notification to RocketpoolNotification")
 				}
-				addr := t.Address{Hash: t.Hash(notification.GetEventFilter()), IsContract: true}
-				addressMapping[notification.GetEventFilter()] = &addr
+				nodeAddress := notification.GetEventFilter()
+				if nodeAddress == "" {
+					return nil, fmt.Errorf("empty node address in Rocket Pool collateral notification: dashboardId '%d', epoch '%d'", dashboardId, epoch)
+				}
+				addr := t.Address{Hash: t.Hash(nodeAddress), IsContract: true}
+				addressMapping[nodeAddress] = &addr
 				if notification.GetEventName() == types.RocketpoolCollateralMinReachedEventName {
 					notificationDetails.MinimumCollateralReached = append(notificationDetails.MinimumCollateralReached, addr)
 				} else {

diff --git a/backend/pkg/notification/collection.go b/backend/pkg/notification/collection.go
@@ -713,7 +713,7 @@ func collectGroupEfficiencyNotifications(notificationsByUserID types.Notificatio
 							DashboardGroupId:   groupDetails.Subscription.DashboardGroupId,
 							DashboardGroupName: groupDetails.Subscription.DashboardGroupName,
 						},
-						Threshold:  groupDetails.Subscription.EventThreshold * 100,
+						Threshold:  groupDetails.Subscription.EventThreshold,
 						Efficiency: efficiency,
 					}
 					notificationsByUserID.AddNotification(n)

diff --git a/backend/pkg/notification/types.go b/backend/pkg/notification/types.go
@@ -260,7 +260,7 @@ func (n *ValidatorGroupEfficiencyNotification) GetEntitiyId() string {
 func (n *ValidatorGroupEfficiencyNotification) GetInfo(format types.NotificationFormat) string {
 	dashboardAndGroupInfo := formatPureDashboardAndGroupLink(format, n)
 	epoch := formatEpochLink(format, n.Epoch)
-	return fmt.Sprintf(`%s efficiency of %.2f%% was below the threhold of %.2f%% in epoch %s.`, dashboardAndGroupInfo, n.Efficiency, n.Threshold, epoch)
+	return fmt.Sprintf(`%s efficiency of %.2f%% was below the threshold of %.2f%% in epoch %s.`, dashboardAndGroupInfo, n.Efficiency, n.Threshold, epoch)
 }
 
 func (n *ValidatorGroupEfficiencyNotification) GetTitle() string {