Refactoring, App.Id => AppId

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; }

src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs

@@ -77,7 +77,7 @@ namespace Squidex.Areas.Api.Controllers.Assets
         [ApiCosts(1)]
         public async Task<IActionResult> 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)
             {

src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs

@@ -49,7 +49,7 @@ namespace Squidex.Areas.Api.Controllers.Backups
         [ApiCosts(0)]
         public async Task<IActionResult> GetJobs(string app)
         {
-            var backupGrain = grainFactory.GetGrain<IBackupGrain>(App.Id);
+            var backupGrain = grainFactory.GetGrain<IBackupGrain>(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<IBackupGrain>(App.Id);
+            var backupGrain = grainFactory.GetGrain<IBackupGrain>(AppId);
 
             backupGrain.RunAsync().Forget();
 
@@ -96,7 +96,7 @@ namespace Squidex.Areas.Api.Controllers.Backups
         [ApiCosts(0)]
         public async Task<IActionResult> DeleteBackup(string app, Guid id)
         {
-            var backupGrain = grainFactory.GetGrain<IBackupGrain>(App.Id);
+            var backupGrain = grainFactory.GetGrain<IBackupGrain>(AppId);
 
             await backupGrain.DeleteAsync(id);
 

src/Squidex/Areas/Api/Controllers/History/HistoryController.cs

@@ -46,7 +46,7 @@ namespace Squidex.Areas.Api.Controllers.History
         [ApiCosts(0.1)]
         public async Task<IActionResult> 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();
 

src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs

@@ -238,8 +238,8 @@ namespace Squidex.Areas.Api.Controllers.Rules
         [ApiCosts(0)]
         public async Task<IActionResult> GetEvents(string app, [FromQuery] int skip = 0, [FromQuery] int take = 20)
         {
-            var taskForItems = ruleEventsRepository.QueryByAppAsync(App.Id, skip, take);
+            var taskForItems = ruleEventsRepository.QueryByAppAsync(AppId, skip, take);
-            var taskForCount = ruleEventsRepository.CountByAppAsync(App.Id);
+            var taskForCount = ruleEventsRepository.CountByAppAsync(AppId);
 
             await Task.WhenAll(taskForItems, taskForCount);
 

src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs

@@ -58,7 +58,7 @@ namespace Squidex.Areas.Api.Controllers.Statistics
         [ApiCosts(0)]
         public async Task<IActionResult> 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<IActionResult> 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();
 

src/Squidex/Areas/Api/Controllers/UI/UIController.cs

@@ -53,7 +53,7 @@ namespace Squidex.Areas.Api.Controllers.UI
         [ApiPermission]
         public async Task<IActionResult> GetSettings(string app)
         {
-            var result = await grainFactory.GetGrain<IAppUISettingsGrain>(App.Id).GetAsync();
+            var result = await grainFactory.GetGrain<IAppUISettingsGrain>(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<IActionResult> PutSetting(string app, string key, [FromBody] UpdateSettingDto request)
         {
-            await grainFactory.GetGrain<IAppUISettingsGrain>(App.Id).SetAsync(key, request.Value);
+            await grainFactory.GetGrain<IAppUISettingsGrain>(AppId).SetAsync(key, request.Value);
 
             return NoContent();
         }
@@ -96,7 +96,7 @@ namespace Squidex.Areas.Api.Controllers.UI
         [ApiPermission]
         public async Task<IActionResult> DeleteSetting(string app, string key)
         {
-            await grainFactory.GetGrain<IAppUISettingsGrain>(App.Id).RemoveAsync(key);
+            await grainFactory.GetGrain<IAppUISettingsGrain>(AppId).RemoveAsync(key);
 
             return NoContent();
         }