From a2d121f2eeb33f96331a88a71acd8c709a3e5c7c Mon Sep 17 00:00:00 2001 From: Vedant Koditkar Date: Sat, 8 Oct 2022 20:02:39 +0530 Subject: [PATCH] Add Async to follow same conventions --- .../Api/Comments/Create/CommentsClient.cs | 2 +- .../Api/Comments/ICommentsClient.cs | 4 +++- .../Api/Comments/Retrieve/CommentsClient.cs | 2 +- Src/Notion.Client/Api/Pages/IPagesClient.cs | 2 +- Src/Notion.Client/Api/Pages/PagesClient.cs | 2 +- .../CommentsClientTests.cs | 6 ++--- .../IPageClientTests.cs | 24 ++++++++++--------- Test/Notion.UnitTests/DatabasesClientTests.cs | 2 +- Test/Notion.UnitTests/PagesClientTests.cs | 6 ++--- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Src/Notion.Client/Api/Comments/Create/CommentsClient.cs b/Src/Notion.Client/Api/Comments/Create/CommentsClient.cs index 12f1207b..cb3b9bd1 100644 --- a/Src/Notion.Client/Api/Comments/Create/CommentsClient.cs +++ b/Src/Notion.Client/Api/Comments/Create/CommentsClient.cs @@ -4,7 +4,7 @@ namespace Notion.Client { public partial class CommentsClient { - public async Task Create(CreateCommentParameters parameters) + public async Task CreateAsync(CreateCommentParameters parameters) { var body = (ICreateCommentsBodyParameters)parameters; diff --git a/Src/Notion.Client/Api/Comments/ICommentsClient.cs b/Src/Notion.Client/Api/Comments/ICommentsClient.cs index 8ec81348..1b89dcd7 100644 --- a/Src/Notion.Client/Api/Comments/ICommentsClient.cs +++ b/Src/Notion.Client/Api/Comments/ICommentsClient.cs @@ -4,6 +4,8 @@ namespace Notion.Client { public interface ICommentsClient { - Task Create(CreateCommentParameters createCommentParameters); + Task CreateAsync(CreateCommentParameters createCommentParameters); + + Task RetrieveAsync(RetrieveCommentsParameters parameters); } } diff --git a/Src/Notion.Client/Api/Comments/Retrieve/CommentsClient.cs b/Src/Notion.Client/Api/Comments/Retrieve/CommentsClient.cs index eb1546ab..22964c5f 100644 --- a/Src/Notion.Client/Api/Comments/Retrieve/CommentsClient.cs +++ b/Src/Notion.Client/Api/Comments/Retrieve/CommentsClient.cs @@ -7,7 +7,7 @@ namespace Notion.Client public partial class CommentsClient { [SuppressMessage("ReSharper", "UnusedMember.Global")] - public async Task Retrieve(RetrieveCommentsParameters parameters) + public async Task RetrieveAsync(RetrieveCommentsParameters parameters) { var qp = (IRetrieveCommentsQueryParameters)parameters; diff --git a/Src/Notion.Client/Api/Pages/IPagesClient.cs b/Src/Notion.Client/Api/Pages/IPagesClient.cs index f6b8f94f..755b385f 100644 --- a/Src/Notion.Client/Api/Pages/IPagesClient.cs +++ b/Src/Notion.Client/Api/Pages/IPagesClient.cs @@ -57,7 +57,7 @@ Task UpdatePropertiesAsync( /// /// /// - Task RetrievePagePropertyItem( + Task RetrievePagePropertyItemAsync( RetrievePropertyItemParameters retrievePropertyItemParameters); } } diff --git a/Src/Notion.Client/Api/Pages/PagesClient.cs b/Src/Notion.Client/Api/Pages/PagesClient.cs index 91c59a64..43fe143e 100644 --- a/Src/Notion.Client/Api/Pages/PagesClient.cs +++ b/Src/Notion.Client/Api/Pages/PagesClient.cs @@ -54,7 +54,7 @@ public async Task RetrieveAsync(string pageId) return await _client.GetAsync(url); } - public async Task RetrievePagePropertyItem( + public async Task RetrievePagePropertyItemAsync( RetrievePropertyItemParameters retrievePropertyItemParameters) { var pathParameters = (IRetrievePropertyItemPathParameters)retrievePropertyItemParameters; diff --git a/Test/Notion.IntegrationTests/CommentsClientTests.cs b/Test/Notion.IntegrationTests/CommentsClientTests.cs index efc91a44..35a8b87d 100644 --- a/Test/Notion.IntegrationTests/CommentsClientTests.cs +++ b/Test/Notion.IntegrationTests/CommentsClientTests.cs @@ -43,7 +43,7 @@ public async Task ShouldCreatePageComment() ); // Act - var response = await _client.Comments.Create(parameters); + var response = await _client.Comments.CreateAsync(parameters); // Arrange @@ -64,7 +64,7 @@ public async Task ShouldCreatePageComment() public async Task ShouldCreateADiscussionComment() { // Arrange - var comment = await _client.Comments.Create( + var comment = await _client.Comments.CreateAsync( CreateCommentParameters.CreatePageComment( new ParentPageInput { PageId = _page.Id }, new List @@ -75,7 +75,7 @@ public async Task ShouldCreateADiscussionComment() ); // Act - var response = await _client.Comments.Create( + var response = await _client.Comments.CreateAsync( CreateCommentParameters.CreateDiscussionComment( comment.DiscussionId, new List diff --git a/Test/Notion.IntegrationTests/IPageClientTests.cs b/Test/Notion.IntegrationTests/IPageClientTests.cs index fb3dafaa..16051f42 100644 --- a/Test/Notion.IntegrationTests/IPageClientTests.cs +++ b/Test/Notion.IntegrationTests/IPageClientTests.cs @@ -47,7 +47,7 @@ public async Task CreateAsync_CreatesANewPage() var pageProperty = page.Properties["Name"].Should().BeOfType().Subject; var titleProperty - = (ListPropertyItem)await _client.Pages.RetrievePagePropertyItem( + = (ListPropertyItem)await _client.Pages.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, @@ -87,7 +87,7 @@ public async Task Bug_unable_to_create_page_with_select_property() var pageProperty = page.Properties["Name"].Should().BeOfType().Subject; var titleProperty - = (ListPropertyItem)await _client.Pages.RetrievePagePropertyItem( + = (ListPropertyItem)await _client.Pages.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, @@ -116,7 +116,7 @@ public async Task Test_RetrievePagePropertyItemAsync() var page = await _client.Pages.CreateAsync(pagesCreateParameters); - var property = await _client.Pages.RetrievePagePropertyItem(new RetrievePropertyItemParameters + var property = await _client.Pages.RetrievePagePropertyItemAsync(new RetrievePropertyItemParameters { PageId = page.Id, PropertyId = "title" @@ -185,11 +185,13 @@ public async Task Test_UpdatePageProperty_with_date_as_null() var page = await _client.Pages.CreateAsync(pagesCreateParameters); - var setDate = (DatePropertyItem)await _client.Pages.RetrievePagePropertyItem(new RetrievePropertyItemParameters - { - PageId = page.Id, - PropertyId = page.Properties[DatePropertyName].Id - }); + var setDate = (DatePropertyItem)await _client.Pages.RetrievePagePropertyItemAsync( + new RetrievePropertyItemParameters + { + PageId = page.Id, + PropertyId = page.Properties[DatePropertyName].Id + } + ); setDate?.Date?.Start.Should().Be(Convert.ToDateTime("2020-12-08T12:00:00Z")); @@ -201,7 +203,7 @@ public async Task Test_UpdatePageProperty_with_date_as_null() var updatedPage = await _client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Properties = testProps }); - var verifyDate = (DatePropertyItem)await _client.Pages.RetrievePagePropertyItem( + var verifyDate = (DatePropertyItem)await _client.Pages.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, @@ -236,7 +238,7 @@ public async Task Bug_Unable_To_Parse_NumberPropertyItem() var pageParent = Assert.IsType(page.Parent); Assert.Equal(_databaseId, pageParent.DatabaseId); - var titleProperty = (ListPropertyItem)await _client.Pages.RetrievePagePropertyItem( + var titleProperty = (ListPropertyItem)await _client.Pages.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, @@ -245,7 +247,7 @@ public async Task Bug_Unable_To_Parse_NumberPropertyItem() Assert.Equal("Test Page Title", titleProperty.Results.First().As().Title.PlainText); - var numberProperty = (NumberPropertyItem)await _client.Pages.RetrievePagePropertyItem( + var numberProperty = (NumberPropertyItem)await _client.Pages.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, diff --git a/Test/Notion.UnitTests/DatabasesClientTests.cs b/Test/Notion.UnitTests/DatabasesClientTests.cs index 326bd55a..fc06ebc7 100644 --- a/Test/Notion.UnitTests/DatabasesClientTests.cs +++ b/Test/Notion.UnitTests/DatabasesClientTests.cs @@ -490,7 +490,7 @@ var jsonData "{\"object\":\"property_item\",\"id\":\"JwY^\",\"type\":\"formula\",\"formula\":{\"type\":\"date\",\"date\":{\"start\":\"2021-06-28\",\"end\":null}}}") ); - var formulaPropertyValue = (FormulaPropertyItem)await _pagesClient.RetrievePagePropertyItem( + var formulaPropertyValue = (FormulaPropertyItem)await _pagesClient.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, diff --git a/Test/Notion.UnitTests/PagesClientTests.cs b/Test/Notion.UnitTests/PagesClientTests.cs index 87c32dae..adbb9443 100644 --- a/Test/Notion.UnitTests/PagesClientTests.cs +++ b/Test/Notion.UnitTests/PagesClientTests.cs @@ -110,7 +110,7 @@ public async Task UpdatePropertiesAsync() page.Properties.Should().HaveCount(2); var updatedProperty = page.Properties.First(x => x.Key == "In stock"); - var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItem( + var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, @@ -176,7 +176,7 @@ public async Task UpdatePageAsync() page.Properties.Should().HaveCount(2); var updatedProperty = page.Properties.First(x => x.Key == "In stock"); - var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItem( + var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id, @@ -225,7 +225,7 @@ public async Task ArchivePageAsync() page.Properties.Should().HaveCount(2); var updatedProperty = page.Properties.First(x => x.Key == "In stock"); - var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItem( + var checkboxPropertyValue = (CheckboxPropertyItem)await _client.RetrievePagePropertyItemAsync( new RetrievePropertyItemParameters { PageId = page.Id,