[settings] fix minor issues

Author: capcom6

internal/sms-gateway/handlers/settings/3rdparty.go

@@ -44,7 +44,7 @@ type ThirdPartyController struct {
 //
 // Get settings
 func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
-	settings, err := h.settingsSvc.GetSettings(user.ID)
+	settings, err := h.settingsSvc.GetSettings(user.ID, true)
 	if err != nil {
 		return fmt.Errorf("can't get settings: %w", err)
 	}

internal/sms-gateway/handlers/settings/mobile.go

@@ -41,7 +41,7 @@ type MobileController struct {
 //
 // Get settings
 func (h *MobileController) get(device models.Device, c *fiber.Ctx) error {
-	settings, err := h.settingsSvc.GetSettings(device.UserID)
+	settings, err := h.settingsSvc.GetSettings(device.UserID, false)
 	if err != nil {
 		return fmt.Errorf("can't get settings for device %s (user ID: %s): %w", device.ID, device.UserID, err)
 	}

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

@@ -9,6 +9,7 @@ type repository struct {
 	db *gorm.DB
 }
 
+// GetSettings retrieves the device settings for a user by their userID.
 func (r *repository) GetSettings(userID string) (*DeviceSettings, error) {
 	settings := &DeviceSettings{}
 	err := r.db.Where("user_id = ?", userID).Limit(1).Find(settings).Error
@@ -19,23 +20,39 @@ func (r *repository) GetSettings(userID string) (*DeviceSettings, error) {
 	return settings, nil
 }
 
-func (r *repository) UpdateSettings(settings *DeviceSettings) error {
-	return r.db.Transaction(func(tx *gorm.DB) error {
+// UpdateSettings updates the settings for a user.
+func (r *repository) UpdateSettings(settings *DeviceSettings) (*DeviceSettings, error) {
+	var updatedSettings *DeviceSettings
+	err := r.db.Transaction(func(tx *gorm.DB) error {
 		source := &DeviceSettings{UserID: settings.UserID}
-		if err := r.db.Clauses(clause.Locking{Strength: "UPDATE"}).Limit(1).Find(source).Error; err != nil {
+		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Limit(1).Find(source).Error; err != nil {
 			return err
 		}
 
 		if source.Settings == nil {
 			source.Settings = map[string]any{}
 		}
 
-		settings.Settings = appendMap(source.Settings, settings.Settings, rules)
+		var err error
+		settings.Settings, err = appendMap(source.Settings, settings.Settings, rules)
+		if err != nil {
+			return err
+		}
+
+		if err := tx.Clauses(clause.OnConflict{UpdateAll: true}).Create(settings).Error; err != nil {
+			return err
+		}
 
-		return r.db.Clauses(clause.OnConflict{UpdateAll: true}).Create(settings).Error
+		// Return the updated settings
+		updatedSettings = settings
+		return nil
 	})
+	return updatedSettings, err
 }
 
+// ReplaceSettings replaces the settings for a user.
+//
+// This function will overwrite all existing settings for the user.
 func (r *repository) ReplaceSettings(settings *DeviceSettings) (*DeviceSettings, error) {
 	err := r.db.Transaction(func(tx *gorm.DB) error {
 		return tx.Save(settings).Error

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

@@ -19,12 +19,16 @@ type Service struct {
 	logger *zap.Logger
 }
 
-func (s *Service) GetSettings(userID string) (map[string]any, error) {
+func (s *Service) GetSettings(userID string, public bool) (map[string]any, error) {
 	settings, err := s.settings.GetSettings(userID)
 	if err != nil {
 		return nil, err
 	}
 
+	if !public {
+		return settings.Settings, nil
+	}
+
 	return filterMap(settings.Settings, rulesPublic)
 }
 
@@ -34,15 +38,15 @@ func (s *Service) UpdateSettings(userID string, settings map[string]any) (map[st
 		return nil, err
 	}
 
-	err = s.settings.UpdateSettings(&DeviceSettings{
+	updatedSettings, err := s.settings.UpdateSettings(&DeviceSettings{
 		UserID:   userID,
 		Settings: filtered,
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	return s.GetSettings(userID)
+	return filterMap(updatedSettings.Settings, rulesPublic)
 }
 
 func (s *Service) ReplaceSettings(userID string, settings map[string]any) (map[string]any, error) {

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

@@ -76,20 +76,29 @@ func filterMap(m map[string]any, r map[string]any) (map[string]any, error) {
 	return result, nil
 }
 
-func appendMap(m1, m2 map[string]any, rules map[string]any) map[string]any {
+func appendMap(m1, m2 map[string]any, rules map[string]any) (map[string]any, error) {
+	var err error
 
 	for field, rule := range rules {
 		if ruleObj, ok := rule.(map[string]any); ok {
 			if dataObj, ok := m2[field].(map[string]any); ok {
 				if m1Field, ok := m1[field].(map[string]any); ok {
-					m1[field] = appendMap(m1Field, dataObj, ruleObj)
+					m1[field], err = appendMap(m1Field, dataObj, ruleObj)
+					if err != nil {
+						return nil, err
+					}
 				} else {
 					// Initialize if not present or not a map
 					newMap := make(map[string]any)
-					m1[field] = appendMap(newMap, dataObj, ruleObj)
+					m1[field], err = appendMap(newMap, dataObj, ruleObj)
+					if err != nil {
+						return nil, 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])
 			}
 		} else if _, ok := rule.(string); ok {
 			if _, ok := m2[field]; !ok {
@@ -99,5 +108,5 @@ func appendMap(m1, m2 map[string]any, rules map[string]any) map[string]any {
 		}
 	}
 
-	return m1
+	return m1, nil
 }