avoid unknown actions

This commit is contained in:
Alireza Ahmadi
2025-01-05 21:52:50 +01:00
parent d86adedd8b
commit 5dd0baad34
4 changed files with 18 additions and 6 deletions
+3
View File
@@ -6,6 +6,7 @@ import (
"s-ui/database/model" "s-ui/database/model"
"s-ui/logger" "s-ui/logger"
"s-ui/util" "s-ui/util"
"s-ui/util/common"
"time" "time"
"gorm.io/gorm" "gorm.io/gorm"
@@ -85,6 +86,8 @@ func (s *ClientService) Save(tx *gorm.DB, act string, data json.RawMessage, host
if err != nil { if err != nil {
return nil, err return nil, err
} }
default:
return nil, common.NewErrorf("unknown action: %s", act)
} }
return inboundIds, nil return inboundIds, nil
+6 -3
View File
@@ -5,6 +5,7 @@ import (
"os" "os"
"s-ui/database" "s-ui/database"
"s-ui/database/model" "s-ui/database/model"
"s-ui/util/common"
"gorm.io/gorm" "gorm.io/gorm"
) )
@@ -56,10 +57,10 @@ func (o *EndpointService) GetAllConfig(db *gorm.DB) ([]json.RawMessage, error) {
return endpointsJson, nil return endpointsJson, nil
} }
func (s *EndpointService) Save(tx *gorm.DB, action string, data json.RawMessage) error { func (s *EndpointService) Save(tx *gorm.DB, act string, data json.RawMessage) error {
var err error var err error
switch action { switch act {
case "new", "edit": case "new", "edit":
var endpoint model.Endpoint var endpoint model.Endpoint
err = endpoint.UnmarshalJSON(data) err = endpoint.UnmarshalJSON(data)
@@ -72,7 +73,7 @@ func (s *EndpointService) Save(tx *gorm.DB, action string, data json.RawMessage)
if err != nil { if err != nil {
return err return err
} }
if action == "edit" { if act == "edit" {
var oldTag string var oldTag string
err = tx.Model(model.Endpoint{}).Select("tag").Where("id = ?", endpoint.Id).Find(&oldTag).Error err = tx.Model(model.Endpoint{}).Select("tag").Where("id = ?", endpoint.Id).Find(&oldTag).Error
if err != nil { if err != nil {
@@ -109,6 +110,8 @@ func (s *EndpointService) Save(tx *gorm.DB, action string, data json.RawMessage)
if err != nil { if err != nil {
return err return err
} }
default:
return common.NewErrorf("unknown action: %s", act)
} }
return nil return nil
} }
+3
View File
@@ -6,6 +6,7 @@ import (
"s-ui/database" "s-ui/database"
"s-ui/database/model" "s-ui/database/model"
"s-ui/util" "s-ui/util"
"s-ui/util/common"
"strings" "strings"
"gorm.io/gorm" "gorm.io/gorm"
@@ -153,6 +154,8 @@ func (s *InboundService) Save(tx *gorm.DB, act string, data json.RawMessage, hos
if err != nil { if err != nil {
return 0, err return 0, err
} }
default:
return 0, common.NewErrorf("unknown action: %s", act)
} }
return id, nil return id, nil
} }
+6 -3
View File
@@ -5,6 +5,7 @@ import (
"os" "os"
"s-ui/database" "s-ui/database"
"s-ui/database/model" "s-ui/database/model"
"s-ui/util/common"
"gorm.io/gorm" "gorm.io/gorm"
) )
@@ -56,10 +57,10 @@ func (o *OutboundService) GetAllConfig(db *gorm.DB) ([]json.RawMessage, error) {
return outboundsJson, nil return outboundsJson, nil
} }
func (s *OutboundService) Save(tx *gorm.DB, action string, data json.RawMessage) error { func (s *OutboundService) Save(tx *gorm.DB, act string, data json.RawMessage) error {
var err error var err error
switch action { switch act {
case "new", "edit": case "new", "edit":
var outbound model.Outbound var outbound model.Outbound
err = outbound.UnmarshalJSON(data) err = outbound.UnmarshalJSON(data)
@@ -72,7 +73,7 @@ func (s *OutboundService) Save(tx *gorm.DB, action string, data json.RawMessage)
if err != nil { if err != nil {
return err return err
} }
if action == "edit" { if act == "edit" {
var oldTag string var oldTag string
err = tx.Model(model.Outbound{}).Select("tag").Where("id = ?", outbound.Id).Find(&oldTag).Error err = tx.Model(model.Outbound{}).Select("tag").Where("id = ?", outbound.Id).Find(&oldTag).Error
if err != nil { if err != nil {
@@ -109,6 +110,8 @@ func (s *OutboundService) Save(tx *gorm.DB, action string, data json.RawMessage)
if err != nil { if err != nil {
return err return err
} }
default:
return common.NewErrorf("unknown action: %s", act)
} }
return nil return nil
} }