[lint] fix more issues

Author: capcom6

internal/sms-gateway/modules/settings/models.go

@@ -16,6 +16,14 @@ type DeviceSettings struct {
 	User models.User `gorm:"foreignKey:UserID;constraint:OnDelete:CASCADE"`
 }
 
+func NewDeviceSettings(userID string, settings map[string]any) *DeviceSettings {
+	//nolint:exhaustruct // partial constructor
+	return &DeviceSettings{
+		UserID:   userID,
+		Settings: settings,
+	}
+}
+
 func Migrate(db *gorm.DB) error {
 	if err := db.AutoMigrate(new(DeviceSettings)); err != nil {
 		return fmt.Errorf("device_settings migration failed: %w", err)

internal/sms-gateway/modules/settings/repository.go

@@ -44,7 +44,8 @@ func (r *repository) UpdateSettings(settings *DeviceSettings) (*DeviceSettings,
 			return err
 		}
 
-		if err := tx.Clauses(clause.OnConflict{UpdateAll: true}).Create(settings).Error; err != nil {
+		err = tx.Clauses(clause.OnConflict{UpdateAll: true}).Create(settings).Error
+		if err != nil {
 			return err
 		}
 

internal/sms-gateway/modules/settings/service.go

@@ -53,10 +53,7 @@ func (s *Service) UpdateSettings(userID string, settings map[string]any) (map[st
 		return nil, err
 	}
 
-	updatedSettings, err := s.settings.UpdateSettings(&DeviceSettings{
-		UserID:   userID,
-		Settings: filtered,
-	})
+	updatedSettings, err := s.settings.UpdateSettings(NewDeviceSettings(userID, filtered))
 	if err != nil {
 		return nil, err
 	}
@@ -72,10 +69,7 @@ func (s *Service) ReplaceSettings(userID string, settings map[string]any) (map[s
 		return nil, err
 	}
 
-	updated, err := s.settings.ReplaceSettings(&DeviceSettings{
-		UserID:   userID,
-		Settings: filtered,
-	})
+	updated, err := s.settings.ReplaceSettings(NewDeviceSettings(userID, filtered))
 	if err != nil {
 		return nil, err
 	}

internal/sms-gateway/modules/settings/utils.go

@@ -1,54 +1,65 @@
 package settings
 
-import "fmt"
+import (
+	"errors"
+	"fmt"
+)
 
-var rules = map[string]any{
-	"encryption": map[string]any{
-		"passphrase": "",
-	},
-	"messages": map[string]any{
-		"send_interval_min":  "",
-		"send_interval_max":  "",
-		"limit_period":       "",
-		"limit_value":        "",
-		"sim_selection_mode": "",
-		"log_lifetime_days":  "",
-	},
-	"ping": map[string]any{
-		"interval_seconds": "",
-	},
-	"logs": map[string]any{
-		"lifetime_days": "",
-	},
-	"webhooks": map[string]any{
-		"internet_required": "",
-		"retry_count":       "",
-		"signing_key":       "",
-	},
-}
+var (
+	ErrInvalidField = errors.New("invalid field")
+)
 
-var rulesPublic = map[string]any{
-	"encryption": map[string]any{},
-	"messages": map[string]any{
-		"send_interval_min":  "",
-		"send_interval_max":  "",
-		"limit_period":       "",
-		"limit_value":        "",
-		"sim_selection_mode": "",
-		"log_lifetime_days":  "",
-	},
-	"ping": map[string]any{
-		"interval_seconds": "",
-	},
-	"logs": map[string]any{
-		"lifetime_days": "",
-	},
-	"webhooks": map[string]any{
-		"internet_required": "",
-		"retry_count":       "",
-	},
-}
+//nolint:gochecknoglobals // private constants
+var (
+	rules = map[string]any{
+		"encryption": map[string]any{
+			"passphrase": "",
+		},
+		"messages": map[string]any{
+			"send_interval_min":  "",
+			"send_interval_max":  "",
+			"limit_period":       "",
+			"limit_value":        "",
+			"sim_selection_mode": "",
+			"log_lifetime_days":  "",
+		},
+		"ping": map[string]any{
+			"interval_seconds": "",
+		},
+		"logs": map[string]any{
+			"lifetime_days": "",
+		},
+		"webhooks": map[string]any{
+			"internet_required": "",
+			"retry_count":       "",
+			"signing_key":       "",
+		},
+	}
+
+	rulesPublic = map[string]any{
+		"encryption": map[string]any{},
+		"messages": map[string]any{
+			"send_interval_min":  "",
+			"send_interval_max":  "",
+			"limit_period":       "",
+			"limit_value":        "",
+			"sim_selection_mode": "",
+			"log_lifetime_days":  "",
+		},
+		"ping": map[string]any{
+			"interval_seconds": "",
+		},
+		"logs": map[string]any{
+			"lifetime_days": "",
+		},
+		"webhooks": map[string]any{
+			"internet_required": "",
+			"retry_count":       "",
+		},
+	}
+)
 
+//nolint:nestif,govet // keep as is
 func filterMap(m map[string]any, r map[string]any) (map[string]any, error) {
 	var err error
 
@@ -63,7 +74,7 @@ func filterMap(m map[string]any, r map[string]any) (map[string]any, error) {
 			} else if m[field] == nil {
 				continue
 			} else {
-				return nil, fmt.Errorf("the field: '%s' is not a map to dive", field)
+				return nil, fmt.Errorf("%w: '%s' is not a map to dive", ErrInvalidField, field)
 			}
 		} else if _, ok := rule.(string); ok {
 			if _, ok := m[field]; !ok {
@@ -76,6 +87,7 @@ func filterMap(m map[string]any, r map[string]any) (map[string]any, error) {
 	return result, nil
 }
 
+//nolint:nestif,gocognit,govet // keep as is
 func appendMap(m1, m2 map[string]any, rules map[string]any) (map[string]any, error) {
 	var err error
 
@@ -98,7 +110,7 @@ func appendMap(m1, m2 map[string]any, rules map[string]any) (map[string]any, err
 			} else if m2[field] == nil {
 				continue
 			} else {
-				return nil, fmt.Errorf("expected field '%s' to be a map, but got %T", field, m2[field])
+				return nil, fmt.Errorf("%w: expected field '%s' to be a map, but got %T", ErrInvalidField, field, m2[field])
 			}
 		} else if _, ok := rule.(string); ok {
 			if _, ok := m2[field]; !ok {