anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

removing some more EnsureSuccessStatusCode calls

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-11-12 10:10:23 +03:30
parent 63c91b024a
commit 817fbe2b5e
6 changed files with 102 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GanjooRazor/Areas/Admin/Pages/PageHistory.cshtml.cs
View File

@ -28,10 +28,9 @@ namespace GanjooRazor.Areas.Admin.Pages
if (!response.IsSuccessStatusCode)
{
LastMessage = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
response.EnsureSuccessStatusCode();
OlderVersions = JsonConvert.DeserializeObject<GanjoorPageSnapshotSummaryViewModel[]>(await response.Content.ReadAsStringAsync());
}

64
GanjooRazor/Areas/Admin/Pages/Poet.cshtml.cs
View File

@ -68,17 +68,19 @@ namespace GanjooRazor.Areas.Admin.Pages
public SQLiteCorrecionDbModel CorrecionDbModel { get; set; }
private async Task PreparePoet()
private async Task<bool> PreparePoet()
{
await ReadLocationsAsync();
var response = await _httpClient.GetAsync($"{APIRoot.Url}/api/ganjoor/poet/{Request.Query["id"]}");
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return false;
}
var poet = JsonConvert.DeserializeObject<GanjoorPoetCompleteViewModel>(await response.Content.ReadAsStringAsync());
Poet = poet.Poet;
return true;
}
public List<GanjoorGeoLocation> Locations { get; set; }
@ -97,8 +99,6 @@ namespace GanjooRazor.Areas.Admin.Pages
return;
}
response.EnsureSuccessStatusCode();
Locations = new List<GanjoorGeoLocation>();
Locations.Add
(
@ -156,7 +156,11 @@ namespace GanjooRazor.Areas.Admin.Pages
if (Request.Query["id"].ToString() == "0")
{
HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/poet", new StringContent(JsonConvert.SerializeObject(Poet), Encoding.UTF8, "application/json"));
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
var poet = JsonConvert.DeserializeObject<GanjoorPoetCompleteViewModel>(await response.Content.ReadAsStringAsync());
@ -172,7 +176,11 @@ namespace GanjooRazor.Areas.Admin.Pages
else
{
HttpResponseMessage response = await secureClient.PutAsync($"{APIRoot.Url}/api/ganjoor/poet/{Request.Query["id"]}", new StringContent(JsonConvert.SerializeObject(Poet), Encoding.UTF8, "application/json"));
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
var cacheKey1 = $"/api/ganjoor/poets";
if (_memoryCache.TryGetValue(cacheKey1, out List<GanjoorPoetViewModel> poets))
@ -199,7 +207,10 @@ namespace GanjooRazor.Areas.Admin.Pages
public async Task<IActionResult> OnPostUploadImageAsync(IFormFile Image)
{
LastResult = "";
await PreparePoet();
if(false == await PreparePoet())
{
return Page();
}
using (HttpClient secureClient = new HttpClient())
@ -215,7 +226,11 @@ namespace GanjooRazor.Areas.Admin.Pages
form.Add(new ByteArrayContent(fileContent, 0, fileContent.Length), Poet.Nickname, Image.FileName);
HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/poet/image/{Request.Query["id"]}", form);
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
LastResult = $"تصویر بارگذاری شد. <a role=\"button\" href=\"/Admin/Poet?id={Request.Query["id"]}\" class=\"actionlink\">برگشت به صفحهٔ ویرایش شاعر</a>";
@ -228,7 +243,10 @@ namespace GanjooRazor.Areas.Admin.Pages
public async Task<IActionResult> OnPostUploadDbAsync(IFormFile SQLiteDb)
{
LastResult = "";
await PreparePoet();
if(false == await PreparePoet())
{
return Page();
}
using (HttpClient secureClient = new HttpClient())
@ -244,7 +262,11 @@ namespace GanjooRazor.Areas.Admin.Pages
form.Add(new ByteArrayContent(fileContent, 0, fileContent.Length), Poet.Nickname, SQLiteDb.FileName);
HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/sqlite/import/{Request.Query["id"]}", form);
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
LastResult = $"پایگاه داده‌ها بارگذاری شد. <a role=\"button\" href=\"/Admin/Poet?id={Request.Query["id"]}\" class=\"actionlink\">برگشت به صفحهٔ ویرایش شاعر</a>";
@ -257,7 +279,10 @@ namespace GanjooRazor.Areas.Admin.Pages
public async Task<IActionResult> OnPostUploadCorrectionDbAsync(SQLiteCorrecionDbModel CorrecionDbModel)
{
LastResult = "";
await PreparePoet();
if(false == await PreparePoet())
{
return Page();
}
using (HttpClient secureClient = new HttpClient())
@ -273,7 +298,11 @@ namespace GanjooRazor.Areas.Admin.Pages
form.Add(new ByteArrayContent(fileContent, 0, fileContent.Length), Poet.Nickname, CorrecionDbModel.Db.FileName);
HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/ganjoor/sqlite/update/{Request.Query["id"]}?note={CorrecionDbModel.Note}", form);
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
LastResult = $"پایگاه داده‌های اصلاحی بارگذاری شد. <a role=\"button\" href=\"/Admin/Poet?id={Request.Query["id"]}\" class=\"actionlink\">برگشت به صفحهٔ ویرایش شاعر</a>";
@ -288,7 +317,10 @@ namespace GanjooRazor.Areas.Admin.Pages
using (HttpClient secureClient = new HttpClient())
{
LastResult = "";
await PreparePoet();
if(false == await PreparePoet())
{
return BadRequest(LastResult);
}
await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response);

15
GanjooRazor/Areas/Admin/Pages/PoetDel.cshtml.cs
View File

@ -42,16 +42,21 @@ namespace GanjooRazor.Areas.Admin.Pages
public GanjoorPoetViewModel Poet { get; set; }
private async Task PreparePoet()
private async Task<bool> PreparePoet()
{
var response = await _httpClient.GetAsync($"{APIRoot.Url}/api/ganjoor/poet/{Request.Query["id"]}");
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return false;
}
var poet = JsonConvert.DeserializeObject<GanjoorPoetCompleteViewModel>(await response.Content.ReadAsStringAsync());
Poet = poet.Poet;
return true;
}
public async Task<IActionResult> OnGetAsync()
@ -70,7 +75,11 @@ namespace GanjooRazor.Areas.Admin.Pages
await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response);
HttpResponseMessage response = await secureClient.DeleteAsync($"{APIRoot.Url}/api/ganjoor/poet/{Request.Query["id"]}");
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastResult = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
var cacheKey1 = $"/api/ganjoor/poets";
if (_memoryCache.TryGetValue(cacheKey1, out List<GanjoorPoetViewModel> poets))

8
GanjooRazor/Areas/Admin/Pages/Poets.cshtml.cs
View File

@ -41,8 +41,6 @@ namespace GanjooRazor.Areas.Admin.Pages
return;
}
response.EnsureSuccessStatusCode();
Locations = new List<GanjoorGeoLocation>();
Locations.Add
(
@ -75,7 +73,11 @@ namespace GanjooRazor.Areas.Admin.Pages
if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
{
var response = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/poets/secure");
response.EnsureSuccessStatusCode();
if (!response.IsSuccessStatusCode)
{
LastMessage = JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync());
return Page();
}
await ReadLocationsAsync();

26
GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
View File

@ -51,7 +51,11 @@ namespace GanjooRazor.Areas.Admin.Pages
if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
{
var nextResponse = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/poem/correction/next?skip={Skip}");
nextResponse.EnsureSuccessStatusCode();
if (!nextResponse.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await nextResponse.Content.ReadAsStringAsync());
return Page();
}
string paginnationMetadata = nextResponse.Headers.GetValues("paging-headers").FirstOrDefault();
if (!string.IsNullOrEmpty(paginnationMetadata))
@ -62,11 +66,19 @@ namespace GanjooRazor.Areas.Admin.Pages
if(Correction != null)
{
var pageUrlResponse = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/pageurl?id={Correction.PoemId}");
pageUrlResponse.EnsureSuccessStatusCode();
if (!pageUrlResponse.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await pageUrlResponse.Content.ReadAsStringAsync());
return Page();
}
var pageUrl = JsonConvert.DeserializeObject<string>(await pageUrlResponse.Content.ReadAsStringAsync());
var pageQuery = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/page?url={pageUrl}");
pageQuery.EnsureSuccessStatusCode();
if (!pageQuery.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await pageQuery.Content.ReadAsStringAsync());
return Page();
}
PageInformation = JObject.Parse(await pageQuery.Content.ReadAsStringAsync()).ToObject<GanjoorPageCompleteViewModel>();
if (Correction.Title != null)
@ -121,8 +133,12 @@ namespace GanjooRazor.Areas.Admin.Pages
if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
{
var correctionResponse = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/correction/{correctionId}");
correctionResponse.EnsureSuccessStatusCode();
if (!correctionResponse.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await correctionResponse.Content.ReadAsStringAsync());
return Page();
}
Correction = JsonConvert.DeserializeObject<GanjoorPoemCorrectionViewModel>(await correctionResponse.Content.ReadAsStringAsync());
if (Correction.Title != null)

18
GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
View File

@ -103,15 +103,27 @@ namespace GanjooRazor.Areas.User.Pages
var rhythmResponse = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/rhythms");
rhythmResponse.EnsureSuccessStatusCode();
if (!rhythmResponse.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await rhythmResponse.Content.ReadAsStringAsync());
return Page();
}
Rhythms = JsonConvert.DeserializeObject<GanjoorMetre[]>(await rhythmResponse.Content.ReadAsStringAsync());
var pageUrlResponse = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/pageurl?id={Request.Query["id"]}");
pageUrlResponse.EnsureSuccessStatusCode();
if (!pageUrlResponse.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await pageUrlResponse.Content.ReadAsStringAsync());
return Page();
}
var pageUrl = JsonConvert.DeserializeObject<string>(await pageUrlResponse.Content.ReadAsStringAsync());
var pageQuery = await secureClient.GetAsync($"{APIRoot.Url}/api/ganjoor/page?url={pageUrl}");
pageQuery.EnsureSuccessStatusCode();
if (!pageQuery.IsSuccessStatusCode)
{
FatalError = JsonConvert.DeserializeObject<string>(await pageQuery.Content.ReadAsStringAsync());
return Page();
}
PageInformation = JObject.Parse(await pageQuery.Content.ReadAsStringAsync()).ToObject<GanjoorPageCompleteViewModel>();
}
else