From f180ef13f044c1ffe2864761f3c3edf7ee22cfed Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 8 Nov 2018 19:43:45 +0100 Subject: [PATCH] Refactoring, App.Id => AppId --- src/Squidex/Areas/Api/Controllers/ApiController.cs | 5 ----- .../Areas/Api/Controllers/Assets/AssetsController.cs | 4 ++-- .../Areas/Api/Controllers/Backups/BackupsController.cs | 6 +++--- .../Areas/Api/Controllers/History/HistoryController.cs | 2 +- .../Areas/Api/Controllers/Rules/RulesController.cs | 4 ++-- .../Areas/Api/Controllers/Statistics/UsagesController.cs | 8 ++++---- src/Squidex/Areas/Api/Controllers/UI/UIController.cs | 6 +++--- 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/Squidex/Areas/Api/Controllers/ApiController.cs b/src/Squidex/Areas/Api/Controllers/ApiController.cs index 98615eb9f..df10e3af3 100644 --- a/src/Squidex/Areas/Api/Controllers/ApiController.cs +++ b/src/Squidex/Areas/Api/Controllers/ApiController.cs @@ -37,11 +37,6 @@ namespace Squidex.Areas.Api.Controllers } } - protected string AppName - { - get { return App.Name; } - } - protected Guid AppId { get { return App.Id; } diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index 666cdcce7..d7fd5df35 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -77,7 +77,7 @@ namespace Squidex.Areas.Api.Controllers.Assets [ApiCosts(1)] public async Task GetTags(string app) { - var response = await tagService.GetTagsAsync(App.Id, TagGroups.Assets); + var response = await tagService.GetTagsAsync(AppId, TagGroups.Assets); return Ok(response); } @@ -282,7 +282,7 @@ namespace Squidex.Areas.Api.Controllers.Assets var plan = appPlanProvider.GetPlanForApp(App); - var currentSize = await assetStatsRepository.GetTotalSizeAsync(App.Id); + var currentSize = await assetStatsRepository.GetTotalSizeAsync(AppId); if (plan.MaxAssetSize > 0 && plan.MaxAssetSize < currentSize + formFile.Length) { diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs index 89e9c52c3..2f88f75f3 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs @@ -49,7 +49,7 @@ namespace Squidex.Areas.Api.Controllers.Backups [ApiCosts(0)] public async Task GetJobs(string app) { - var backupGrain = grainFactory.GetGrain(App.Id); + var backupGrain = grainFactory.GetGrain(AppId); var jobs = await backupGrain.GetStateAsync(); @@ -73,7 +73,7 @@ namespace Squidex.Areas.Api.Controllers.Backups [ApiCosts(0)] public IActionResult PostBackup(string app) { - var backupGrain = grainFactory.GetGrain(App.Id); + var backupGrain = grainFactory.GetGrain(AppId); backupGrain.RunAsync().Forget(); @@ -96,7 +96,7 @@ namespace Squidex.Areas.Api.Controllers.Backups [ApiCosts(0)] public async Task DeleteBackup(string app, Guid id) { - var backupGrain = grainFactory.GetGrain(App.Id); + var backupGrain = grainFactory.GetGrain(AppId); await backupGrain.DeleteAsync(id); diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs index 9b99e9a67..106a27ac4 100644 --- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs +++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs @@ -46,7 +46,7 @@ namespace Squidex.Areas.Api.Controllers.History [ApiCosts(0.1)] public async Task GetHistory(string app, string channel) { - var entities = await historyEventRepository.QueryByChannelAsync(App.Id, channel, 100); + var entities = await historyEventRepository.QueryByChannelAsync(AppId, channel, 100); var response = entities.Select(HistoryEventDto.FromHistoryEvent).ToList(); diff --git a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index a567605c0..b9ff86b73 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -238,8 +238,8 @@ namespace Squidex.Areas.Api.Controllers.Rules [ApiCosts(0)] public async Task GetEvents(string app, [FromQuery] int skip = 0, [FromQuery] int take = 20) { - var taskForItems = ruleEventsRepository.QueryByAppAsync(App.Id, skip, take); - var taskForCount = ruleEventsRepository.CountByAppAsync(App.Id); + var taskForItems = ruleEventsRepository.QueryByAppAsync(AppId, skip, take); + var taskForCount = ruleEventsRepository.CountByAppAsync(AppId); await Task.WhenAll(taskForItems, taskForCount); diff --git a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs index 0e62bbdb1..cfb8d6bf9 100644 --- a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs @@ -58,7 +58,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics [ApiCosts(0)] public async Task GetMonthlyCalls(string app) { - var count = await usageTracker.GetMonthlyCallsAsync(App.Id.ToString(), DateTime.Today); + var count = await usageTracker.GetMonthlyCallsAsync(AppId.ToString(), DateTime.Today); var plan = appPlanProvider.GetPlanForApp(App); @@ -90,7 +90,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics return BadRequest(); } - var entities = await usageTracker.QueryAsync(App.Id.ToString(), fromDate.Date, toDate.Date); + var entities = await usageTracker.QueryAsync(AppId.ToString(), fromDate.Date, toDate.Date); var response = entities.ToDictionary(x => x.Key, x => x.Value.Select(CallsUsageDto.FromUsage).ToList()); @@ -112,7 +112,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics [ApiCosts(0)] public async Task GetCurrentStorageSize(string app) { - var size = await assetStatsRepository.GetTotalSizeAsync(App.Id); + var size = await assetStatsRepository.GetTotalSizeAsync(AppId); var plan = appPlanProvider.GetPlanForApp(App); @@ -144,7 +144,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics return BadRequest(); } - var entities = await assetStatsRepository.QueryAsync(App.Id, fromDate.Date, toDate.Date); + var entities = await assetStatsRepository.QueryAsync(AppId, fromDate.Date, toDate.Date); var models = entities.Select(StorageUsageDto.FromStats).ToList(); diff --git a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs index 1f12ce772..385c6e20e 100644 --- a/src/Squidex/Areas/Api/Controllers/UI/UIController.cs +++ b/src/Squidex/Areas/Api/Controllers/UI/UIController.cs @@ -53,7 +53,7 @@ namespace Squidex.Areas.Api.Controllers.UI [ApiPermission] public async Task GetSettings(string app) { - var result = await grainFactory.GetGrain(App.Id).GetAsync(); + var result = await grainFactory.GetGrain(AppId).GetAsync(); result.Value["mapType"] = uiOptions.Map?.Type ?? "OSM"; result.Value["mapKey"] = uiOptions.Map?.GoogleMaps?.Key; @@ -77,7 +77,7 @@ namespace Squidex.Areas.Api.Controllers.UI [ApiPermission] public async Task PutSetting(string app, string key, [FromBody] UpdateSettingDto request) { - await grainFactory.GetGrain(App.Id).SetAsync(key, request.Value); + await grainFactory.GetGrain(AppId).SetAsync(key, request.Value); return NoContent(); } @@ -96,7 +96,7 @@ namespace Squidex.Areas.Api.Controllers.UI [ApiPermission] public async Task DeleteSetting(string app, string key) { - await grainFactory.GetGrain(App.Id).RemoveAsync(key); + await grainFactory.GetGrain(AppId).RemoveAsync(key); return NoContent(); }