Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactored Settings to use Dictionary

Browse Source
This commit is contained in:
Shaun Walker
2019-09-04 12:42:22 -04:00
parent e1cc1ce973
commit 65cb295e05
3 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
Oqtane.Client/Services/SettingService.cs
View File

@ -26,72 +26,101 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, urihelper.GetAbsoluteUri(), "Setting"); }
}
public async Task<List<Setting>> GetHostSettingsAsync()
public async Task<Dictionary<string, string>> GetHostSettingsAsync()
{
return await GetSettingsAsync("Host", -1);
}
public async Task<Setting> UpdateHostSettingsAsync(List<Setting> HostSettings, string SettingName, string SettingValue)
public async Task UpdateHostSettingsAsync(Dictionary<string, string> HostSettings)
{
return await UpdateSettingsAsync(HostSettings, "Host", -1, SettingName, SettingValue);
await UpdateSettingsAsync(HostSettings, "Host", -1);
}
public async Task<List<Setting>> GetSiteSettingsAsync(int SiteId)
public async Task<Dictionary<string, string>> GetSiteSettingsAsync(int SiteId)
{
return await GetSettingsAsync("Site", SiteId);
}
public async Task<Setting> UpdateSiteSettingsAsync(List<Setting> SiteSettings, int SiteId, string SettingName, string SettingValue)
public async Task UpdateSiteSettingsAsync(Dictionary<string, string> SiteSettings, int SiteId)
{
return await UpdateSettingsAsync(SiteSettings, "Site", SiteId, SettingName, SettingValue);
await UpdateSettingsAsync(SiteSettings, "Site", SiteId);
}
public async Task<List<Setting>> GetPageSettingsAsync(int PageId)
public async Task<Dictionary<string, string>> GetPageSettingsAsync(int PageId)
{
return await GetSettingsAsync("Page", PageId);
}
public async Task<Setting> UpdatePageSettingsAsync(List<Setting> PageSettings, int PageId, string SettingName, string SettingValue)
public async Task UpdatePageSettingsAsync(Dictionary<string, string> PageSettings, int PageId)
{
return await UpdateSettingsAsync(PageSettings, "Page", PageId, SettingName, SettingValue);
await UpdateSettingsAsync(PageSettings, "Page", PageId);
}
public async Task<List<Setting>> GetPageModuleSettingsAsync(int PageModuleId)
public async Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int PageModuleId)
{
return await GetSettingsAsync("PageModule", PageModuleId);
}
public async Task<Setting> UpdatePageModuleSettingsAsync(List<Setting> PageModuleSettings, int PageModuleId, string SettingName, string SettingValue)
public async Task UpdatePageModuleSettingsAsync(Dictionary<string, string> PageModuleSettings, int PageModuleId)
{
return await UpdateSettingsAsync(PageModuleSettings, "PageModule", PageModuleId, SettingName, SettingValue);
await UpdateSettingsAsync(PageModuleSettings, "PageModule", PageModuleId);
}
public async Task<List<Setting>> GetModuleSettingsAsync(int ModuleId)
public async Task<Dictionary<string, string>> GetModuleSettingsAsync(int ModuleId)
{
return await GetSettingsAsync("Module", ModuleId);
}
public async Task<Setting> UpdateModuleSettingsAsync(List<Setting> ModuleSettings, int ModuleId, string SettingName, string SettingValue)
public async Task UpdateModuleSettingsAsync(Dictionary<string, string> ModuleSettings, int ModuleId)
{
return await UpdateSettingsAsync(ModuleSettings, "Module", ModuleId, SettingName, SettingValue);
await UpdateSettingsAsync(ModuleSettings, "Module", ModuleId);
}
public async Task<List<Setting>> GetUserSettingsAsync(int UserId)
public async Task<Dictionary<string, string>> GetUserSettingsAsync(int UserId)
{
return await GetSettingsAsync("User", UserId);
}
public async Task<Setting> UpdateUserSettingsAsync(List<Setting> UserSettings, int UserId, string SettingName, string SettingValue)
public async Task UpdateUserSettingsAsync(Dictionary<string, string> UserSettings, int UserId)
{
return await UpdateSettingsAsync(UserSettings, "User", UserId, SettingName, SettingValue);
await UpdateSettingsAsync(UserSettings, "User", UserId);
}
public async Task<List<Setting>> GetSettingsAsync(string EntityName, int EntityId)
public async Task<Dictionary<string, string>> GetSettingsAsync(string EntityName, int EntityId)
{
Dictionary<string, string> dictionary = new Dictionary<string, string>();
List<Setting> Settings = await http.GetJsonAsync<List<Setting>>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
return Settings.OrderBy(item => item.SettingName).ToList();
foreach(Setting setting in Settings.OrderBy(item => item.SettingName).ToList())
{
dictionary.Add(setting.SettingName, setting.SettingValue);
}
return dictionary;
}
public async Task UpdateSettingsAsync(Dictionary<string, string> Settings, string EntityName, int EntityId)
{
List<Setting> settings = await http.GetJsonAsync<List<Setting>>(apiurl + "?entityname=" + EntityName + "&entityid=" + EntityId.ToString());
foreach (KeyValuePair<string, string> kvp in Settings)
{
Setting setting = settings.Where(item => item.SettingName == kvp.Key).FirstOrDefault();
if (setting == null)
{
setting = new Setting();
setting.EntityName = EntityName;
setting.EntityId = EntityId;
setting.SettingName = kvp.Key;
setting.SettingValue = kvp.Value;
setting = await AddSettingAsync(setting);
}
else
{
setting.SettingValue = kvp.Value;
setting = await UpdateSettingAsync(setting);
}
}
}
public async Task<Setting> GetSettingAsync(int SettingId)
{
return await http.GetJsonAsync<Setting>(apiurl + "/" + SettingId.ToString());
@ -107,53 +136,31 @@ namespace Oqtane.Services
return await http.PutJsonAsync<Setting>(apiurl + "/" + Setting.SettingId.ToString(), Setting);
}
public async Task<Setting> UpdateSettingsAsync(List<Setting> Settings, string EntityName, int EntityId, string SettingName, string SettingValue)
{
Setting setting = Settings.Where(item => item.SettingName == SettingName).FirstOrDefault();
if (setting == null || setting.SettingId == -1)
{
setting = new Setting();
setting.EntityName = EntityName;
setting.EntityId = EntityId;
setting.SettingName = SettingName;
setting.SettingValue = SettingValue;
setting = await AddSettingAsync(setting);
}
else
{
setting.SettingValue = SettingValue;
setting = await UpdateSettingAsync(setting);
}
return setting;
}
public async Task DeleteSettingAsync(int SettingId)
{
await http.DeleteAsync(apiurl + "/" + SettingId.ToString());
}
public string GetSetting(List<Setting> Settings, string SettingName, string DefaultValue)
public string GetSetting(Dictionary<string, string> Settings, string SettingName, string DefaultValue)
{
string value = DefaultValue;
Setting setting = Settings.Where(item => item.SettingName == SettingName).FirstOrDefault();
if (setting != null)
if (Settings.ContainsKey(SettingName))
{
value = setting.SettingValue;
value = Settings[SettingName];
}
return value;
}
public List<Setting> SetSetting(List<Setting> Settings, string EntityName, int EntityId, string SettingName, string SettingValue)
public Dictionary<string, string> SetSetting(Dictionary<string, string> Settings, string SettingName, string SettingValue)
{
int index = Settings.FindIndex(item => item.EntityName == EntityName && item.EntityId == EntityId && item.SettingName == SettingName);
if (index != -1)
{
Settings[index].SettingValue = SettingValue;
if (Settings.ContainsKey(SettingName))
{
Settings[SettingName] = SettingValue;
}
else
{
Settings.Add(new Setting { SettingId = -1, EntityName = EntityName, EntityId = EntityId, SettingName = SettingName, SettingValue = SettingValue });
Settings.Add(SettingName, SettingValue);
}
return Settings;
}