Merge pull request #934 from gobitfly/BEDS-582/fix_null_error

fix(notifications): handle nil pointer exception
gobitfly · Oct 10, 2024 · 6cad522 · 6cad522
2 parents 5a0017f + 1554d5e
commit 6cad522
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/backend/pkg/api/data_access/notifications.go b/backend/pkg/api/data_access/notifications.go
@@ -16,6 +16,7 @@ import (
 	"github.com/gobitfly/beaconchain/pkg/api/enums"
 	t "github.com/gobitfly/beaconchain/pkg/api/types"
 	"github.com/gobitfly/beaconchain/pkg/commons/db"
+	"github.com/gobitfly/beaconchain/pkg/commons/log"
 	"github.com/gobitfly/beaconchain/pkg/commons/types"
 	"github.com/gobitfly/beaconchain/pkg/commons/utils"
 	"github.com/shopspring/decimal"
@@ -918,7 +919,11 @@ func (d *DataAccessService) GetNotificationSettings(ctx context.Context, userId
 				result.GeneralSettings.IsMachineMemoryUsageSubscribed = true
 				result.GeneralSettings.MachineMemoryUsageThreshold = event.Threshold
 			case types.EthClientUpdateEventName:
-				clientSettings[event.Filter].IsSubscribed = true
+				if clientSettings[event.Filter] != nil {
+					clientSettings[event.Filter].IsSubscribed = true
+				} else {
+					log.Warnf("client %s is not found in the client settings", event.Filter)
+				}
 			}
 		}
 	}