Merge pull request #906 from gobitfly/staging

merge staging->main

Author: guybrush

backend/pkg/api/data_access/dummy.go

@@ -396,7 +396,20 @@ func (d *DummyService) GetValidatorDashboardRocketPoolMinipools(ctx context.Cont
 }
 
 func (d *DummyService) GetAllNetworks() ([]t.NetworkInfo, error) {
-	return getDummyData[[]t.NetworkInfo]()
+	return []types.NetworkInfo{
+		{
+			ChainId: 1,
+			Name:    "ethereum",
+		},
+		{
+			ChainId: 100,
+			Name:    "gnosis",
+		},
+		{
+			ChainId: 17000,
+			Name:    "holesky",
+		},
+	}, nil
 }
 
 func (d *DummyService) GetSearchValidatorByIndex(ctx context.Context, chainId, index uint64) (*t.SearchValidator, error) {
@@ -467,7 +480,7 @@ func (d *DummyService) GetClientNotifications(ctx context.Context, userId uint64
 func (d *DummyService) GetRocketPoolNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationRocketPoolColumn], search string, limit uint64) ([]t.NotificationRocketPoolTableRow, *t.Paging, error) {
 	return getDummyWithPaging[t.NotificationRocketPoolTableRow]()
 }
-func (d *DummyService) GetNetworkNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationNetworksColumn], search string, limit uint64) ([]t.NotificationNetworksTableRow, *t.Paging, error) {
+func (d *DummyService) GetNetworkNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationNetworksColumn], limit uint64) ([]t.NotificationNetworksTableRow, *t.Paging, error) {
 	return getDummyWithPaging[t.NotificationNetworksTableRow]()
 }
 

backend/pkg/api/data_access/notifications.go

@@ -18,7 +18,7 @@ type NotificationsRepository interface {
 	GetMachineNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationMachinesColumn], search string, limit uint64) ([]t.NotificationMachinesTableRow, *t.Paging, error)
 	GetClientNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationClientsColumn], search string, limit uint64) ([]t.NotificationClientsTableRow, *t.Paging, error)
 	GetRocketPoolNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationRocketPoolColumn], search string, limit uint64) ([]t.NotificationRocketPoolTableRow, *t.Paging, error)
-	GetNetworkNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationNetworksColumn], search string, limit uint64) ([]t.NotificationNetworksTableRow, *t.Paging, error)
+	GetNetworkNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationNetworksColumn], limit uint64) ([]t.NotificationNetworksTableRow, *t.Paging, error)
 
 	GetNotificationSettings(ctx context.Context, userId uint64) (*t.NotificationSettings, error)
 	UpdateNotificationSettingsGeneral(ctx context.Context, userId uint64, settings t.NotificationSettingsGeneral) error
@@ -55,8 +55,8 @@ func (d *DataAccessService) GetClientNotifications(ctx context.Context, userId u
 func (d *DataAccessService) GetRocketPoolNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationRocketPoolColumn], search string, limit uint64) ([]t.NotificationRocketPoolTableRow, *t.Paging, error) {
 	return d.dummy.GetRocketPoolNotifications(ctx, userId, cursor, colSort, search, limit)
 }
-func (d *DataAccessService) GetNetworkNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationNetworksColumn], search string, limit uint64) ([]t.NotificationNetworksTableRow, *t.Paging, error) {
-	return d.dummy.GetNetworkNotifications(ctx, userId, cursor, colSort, search, limit)
+func (d *DataAccessService) GetNetworkNotifications(ctx context.Context, userId uint64, cursor string, colSort t.Sort[enums.NotificationNetworksColumn], limit uint64) ([]t.NotificationNetworksTableRow, *t.Paging, error) {
+	return d.dummy.GetNetworkNotifications(ctx, userId, cursor, colSort, limit)
 }
 func (d *DataAccessService) GetNotificationSettings(ctx context.Context, userId uint64) (*t.NotificationSettings, error) {
 	return d.dummy.GetNotificationSettings(ctx, userId)

backend/pkg/api/handlers/common.go

@@ -19,6 +19,7 @@ import (
 	"github.com/gobitfly/beaconchain/pkg/commons/log"
 	"github.com/gorilla/mux"
 	"github.com/invopop/jsonschema"
+	"github.com/shopspring/decimal"
 	"github.com/xeipuuv/gojsonschema"
 
 	"github.com/alexedwards/scs/v2"
@@ -252,6 +253,35 @@ func (v *validationError) checkUint(param, paramName string) uint64 {
 	return num
 }
 
+func (v *validationError) checkWeiDecimal(param, paramName string) decimal.Decimal {
+	dec := decimal.Zero
+	// check if only numbers are contained in the string with regex
+	if !reInteger.MatchString(param) {
+		v.add(paramName, fmt.Sprintf("given value '%s' is not a wei string (must be positive integer)", param))
+		return dec
+	}
+	dec, err := decimal.NewFromString(param)
+	if err != nil {
+		v.add(paramName, fmt.Sprintf("given value '%s' is not a wei string (must be positive integer)", param))
+		return dec
+	}
+	return dec
+}
+
+func (v *validationError) checkWeiMinMax(param, paramName string, min, max decimal.Decimal) decimal.Decimal {
+	dec := v.checkWeiDecimal(param, paramName)
+	if v.hasErrors() {
+		return dec
+	}
+	if dec.LessThan(min) {
+		v.add(paramName, fmt.Sprintf("given value '%s' is too small, minimum value is %s", dec, min))
+	}
+	if dec.GreaterThan(max) {
+		v.add(paramName, fmt.Sprintf("given value '%s' is too large, maximum value is %s", dec, max))
+	}
+	return dec
+}
+
 func (v *validationError) checkBool(param, paramName string) bool {
 	if param == "" {
 		return false

backend/pkg/api/handlers/public.go

@@ -11,6 +11,7 @@ import (
 	"github.com/gobitfly/beaconchain/pkg/api/enums"
 	"github.com/gobitfly/beaconchain/pkg/api/types"
 	"github.com/gorilla/mux"
+	"github.com/shopspring/decimal"
 )
 
 // All handler function names must include the HTTP method and the path they handle
@@ -2098,7 +2099,7 @@ func (h *HandlerService) PublicGetUserNotificationClients(w http.ResponseWriter,
 //	@Param			cursor	query		string	false	"Return data for the given cursor value. Pass the `paging.next_cursor`` value of the previous response to navigate to forward, or pass the `paging.prev_cursor`` value of the previous response to navigate to backward."
 //	@Param			limit	query		integer	false	"The maximum number of results that may be returned."
 //	@Param			sort	query		string	false	"The field you want to sort by. Append with `:desc` for descending order."	Enums(timestamp, event_type, node_address)
-//	@Param			search	query		string	false	"Search for TODO"
+//	@Param			search	query		string	false	"Search for Node Address"
 //	@Success		200		{object}	types.InternalGetUserNotificationRocketPoolResponse
 //	@Failure		400		{object}	types.ApiErrorResponse
 //	@Router			/users/me/notifications/rocket-pool [get]
@@ -2137,7 +2138,6 @@ func (h *HandlerService) PublicGetUserNotificationRocketPool(w http.ResponseWrit
 //	@Param			cursor	query		string	false	"Return data for the given cursor value. Pass the `paging.next_cursor`` value of the previous response to navigate to forward, or pass the `paging.prev_cursor`` value of the previous response to navigate to backward."
 //	@Param			limit	query		integer	false	"The maximum number of results that may be returned."
 //	@Param			sort	query		string	false	"The field you want to sort by. Append with `:desc` for descending order."	Enums(timestamp, event_type)
-//	@Param			search	query		string	false	"Search for TODO"
 //	@Success		200		{object}	types.InternalGetUserNotificationNetworksResponse
 //	@Failure		400		{object}	types.ApiErrorResponse
 //	@Router			/users/me/notifications/networks [get]
@@ -2155,7 +2155,7 @@ func (h *HandlerService) PublicGetUserNotificationNetworks(w http.ResponseWriter
 		handleErr(w, r, v)
 		return
 	}
-	data, paging, err := h.dai.GetNetworkNotifications(r.Context(), userId, pagingParams.cursor, *sort, pagingParams.search, pagingParams.limit)
+	data, paging, err := h.dai.GetNetworkNotifications(r.Context(), userId, pagingParams.cursor, *sort, pagingParams.limit)
 	if err != nil {
 		handleErr(w, r, err)
 		return
@@ -2218,8 +2218,6 @@ func (h *HandlerService) PublicPutUserNotificationSettingsGeneral(w http.Respons
 	checkMinMax(&v, req.MachineStorageUsageThreshold, 0, 1, "machine_storage_usage_threshold")
 	checkMinMax(&v, req.MachineCpuUsageThreshold, 0, 1, "machine_cpu_usage_threshold")
 	checkMinMax(&v, req.MachineMemoryUsageThreshold, 0, 1, "machine_memory_usage_threshold")
-	checkMinMax(&v, req.RocketPoolMaxCollateralThreshold, 0, 1, "rocket_pool_max_collateral_threshold")
-	checkMinMax(&v, req.RocketPoolMinCollateralThreshold, 0, 1, "rocket_pool_min_collateral_threshold")
 	if v.hasErrors() {
 		handleErr(w, r, v)
 		return
@@ -2243,7 +2241,7 @@ func (h *HandlerService) PublicPutUserNotificationSettingsGeneral(w http.Respons
 //	@Accept			json
 //	@Produce		json
 //	@Param			network	path		string								true	"The networks name or chain ID."
-//	@Param			request	body		types.NotificationSettingsNetwork	true	"Description Todo"
+//	@Param			request	body		handlers.PublicPutUserNotificationSettingsNetworks.request	true	"Description Todo"
 //	@Success		200		{object}	types.InternalPutUserNotificationSettingsNetworksResponse
 //	@Failure		400		{object}	types.ApiErrorResponse
 //	@Router			/users/me/notifications/settings/networks/{network} [put]
@@ -2254,27 +2252,50 @@ func (h *HandlerService) PublicPutUserNotificationSettingsNetworks(w http.Respon
 		handleErr(w, r, err)
 		return
 	}
-	var req types.NotificationSettingsNetwork
+	type request struct {
+		IsGasAboveSubscribed          bool    `json:"is_gas_above_subscribed"`
+		GasAboveThreshold             string  `json:"gas_above_threshold"`
+		IsGasBelowSubscribed          bool    `json:"is_gas_below_subscribed"`
+		GasBelowThreshold             string  `json:"gas_below_threshold" `
+		IsParticipationRateSubscribed bool    `json:"is_participation_rate_subscribed"`
+		ParticipationRateThreshold    float64 `json:"participation_rate_threshold"`
+		IsNewRewardRoundSubscribed    bool    `json:"is_new_reward_round_subscribed"`
+	}
+	var req request
 	if err := v.checkBody(&req, r); err != nil {
 		handleErr(w, r, err)
 		return
 	}
 	checkMinMax(&v, req.ParticipationRateThreshold, 0, 1, "participation_rate_threshold")
-
 	chainId := v.checkNetworkParameter(mux.Vars(r)["network"])
+
+	minWei := decimal.New(1000000, 1)       // 0.001 Gwei
+	maxWei := decimal.New(1000000000000, 1) // 1000 Gwei
+	gasAboveThreshold := v.checkWeiMinMax(req.GasAboveThreshold, "gas_above_threshold", minWei, maxWei)
+	gasBelowThreshold := v.checkWeiMinMax(req.GasBelowThreshold, "gas_below_threshold", minWei, maxWei)
 	if v.hasErrors() {
 		handleErr(w, r, v)
 		return
 	}
-	err = h.dai.UpdateNotificationSettingsNetworks(r.Context(), userId, chainId, req)
+	settings := types.NotificationSettingsNetwork{
+		IsGasAboveSubscribed:          req.IsGasAboveSubscribed,
+		GasAboveThreshold:             gasAboveThreshold,
+		IsGasBelowSubscribed:          req.IsGasBelowSubscribed,
+		GasBelowThreshold:             gasBelowThreshold,
+		IsParticipationRateSubscribed: req.IsParticipationRateSubscribed,
+		ParticipationRateThreshold:    req.ParticipationRateThreshold,
+		IsNewRewardRoundSubscribed:    req.IsNewRewardRoundSubscribed,
+	}
+
+	err = h.dai.UpdateNotificationSettingsNetworks(r.Context(), userId, chainId, settings)
 	if err != nil {
 		handleErr(w, r, err)
 		return
 	}
 	response := types.InternalPutUserNotificationSettingsNetworksResponse{
 		Data: types.NotificationNetwork{
 			ChainId:  chainId,
-			Settings: req,
+			Settings: settings,
 		},
 	}
 	returnOk(w, r, response)
@@ -2469,6 +2490,9 @@ func (h *HandlerService) PublicPutUserNotificationSettingsValidatorDashboard(w h
 	vars := mux.Vars(r)
 	dashboardId := v.checkPrimaryDashboardId(vars["dashboard_id"])
 	groupId := v.checkExistingGroupId(vars["group_id"])
+
+	checkMinMax(&v, req.MaxCollateralThreshold, 0, 1, "max_collateral_threshold")
+	checkMinMax(&v, req.MinCollateralThreshold, 0, 1, "min_collateral_threshold")
 	if v.hasErrors() {
 		handleErr(w, r, v)
 		return