chore: fix user setting key checks
This commit is contained in:
parent
d4157bcffa
commit
087f60ba7b
1 changed files with 7 additions and 1 deletions
|
|
@ -34,6 +34,9 @@ func (s *Store) UpsertUserSetting(ctx context.Context, upsert *storepb.UserSetti
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if userSetting == nil {
|
||||||
|
return nil, errors.New("unexpected nil user setting")
|
||||||
|
}
|
||||||
s.userSettingCache.Store(getUserSettingCacheKey(userSetting.UserId, userSetting.Key.String()), userSetting)
|
s.userSettingCache.Store(getUserSettingCacheKey(userSetting.UserId, userSetting.Key.String()), userSetting)
|
||||||
return userSetting, nil
|
return userSetting, nil
|
||||||
}
|
}
|
||||||
|
|
@ -50,6 +53,9 @@ func (s *Store) ListUserSettings(ctx context.Context, find *FindUserSetting) ([]
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if userSetting == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
s.userSettingCache.Store(getUserSettingCacheKey(userSetting.UserId, userSetting.Key.String()), userSetting)
|
s.userSettingCache.Store(getUserSettingCacheKey(userSetting.UserId, userSetting.Key.String()), userSetting)
|
||||||
userSettings = append(userSettings, userSetting)
|
userSettings = append(userSettings, userSetting)
|
||||||
}
|
}
|
||||||
|
|
@ -143,7 +149,7 @@ func convertUserSettingFromRaw(raw *UserSetting) (*storepb.UserSetting, error) {
|
||||||
case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY:
|
case storepb.UserSettingKey_USER_SETTING_MEMO_VISIBILITY:
|
||||||
userSetting.Value = &storepb.UserSetting_MemoVisibility{MemoVisibility: raw.Value}
|
userSetting.Value = &storepb.UserSetting_MemoVisibility{MemoVisibility: raw.Value}
|
||||||
default:
|
default:
|
||||||
return nil, errors.Errorf("unsupported user setting key: %v", raw.Key)
|
return nil, nil
|
||||||
}
|
}
|
||||||
return userSetting, nil
|
return userSetting, nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue