Skip to content

Commit f1067ee

Browse files
committed
Merge branch 'feature/allow-single-sorting-in-query' of https://github.com/5am-code/laravel-notion-api into feature/allow-single-sorting-in-query
2 parents a03a01e + c561b8c commit f1067ee

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/Endpoints/Database.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,15 @@ public function filterBy(Collection $filter): Database
9797
}
9898

9999
/**
100-
* @param Collection|Sorting $sorts
100+
* @param Collection|Sorting $sorts
101101
* @return Database $this
102102
*
103103
* @throws HandlingException
104-
*
105104
*/
106105
public function sortBy(Sorting|Collection $sorts): Database
107106
{
108107
$sortInstance = get_class($sorts);
109-
switch($sortInstance) {
108+
switch ($sortInstance) {
110109
case Sorting::class:
111110
$this->sorts->push($sorts);
112111
break;

src/Query/Sorting.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static function sortQuery(Sorting|Collection $sortings): array
100100
{
101101
$querySortings = new Collection();
102102

103-
if($sortings instanceof Collection) {
103+
if ($sortings instanceof Collection) {
104104
$sortings->each(function (Sorting $sorting) use ($querySortings) {
105105
$querySortings->push($sorting->toArray());
106106
});

tests/NotionApiTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use FiveamCode\LaravelNotionApi\NotionFacade;
77
use Illuminate\Support\Collection;
88
use Orchestra\Testbench\TestCase as Orchestra;
9+
910
/**
1011
* Class EndpointPageTest.
1112
*

tests/Pest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
use FiveamCode\LaravelNotionApi\Tests\NotionApiTest;
44

5-
uses(NotionApiTest::class)->in(__DIR__);
5+
uses(NotionApiTest::class)->in(__DIR__);

tests/SortingTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?php
22

3-
use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
43
use FiveamCode\LaravelNotionApi\Query\Sorting;
54
use Illuminate\Support\Collection;
65

76
it('can sort by a single property', function () {
87
$expectedSortQuery = '[{"property":"Birth year","direction":"ascending"}]';
98

10-
$sortBy = Sorting::propertySort("Birth year", "ascending");
11-
$this->assertEquals($expectedSortQuery, json_encode(Sorting::sortQuery($sortBy)));});
9+
$sortBy = Sorting::propertySort('Birth year', 'ascending');
10+
$this->assertEquals($expectedSortQuery, json_encode(Sorting::sortQuery($sortBy)));
11+
});
1212

1313
it('can sort by multiple properties', function () {
1414
$expectedSortQuery = '[{"timestamp":"created_time","direction":"ascending"},{"property":"Birth year","direction":"ascending"}]';
1515

1616
$sortings = new Collection();
1717

18-
$sortings->add(Sorting::timestampSort("created_time", "ascending"));
19-
$sortings->add(Sorting::propertySort("Birth year", "ascending"));
18+
$sortings->add(Sorting::timestampSort('created_time', 'ascending'));
19+
$sortings->add(Sorting::propertySort('Birth year', 'ascending'));
2020

2121
$this->assertEquals($expectedSortQuery, json_encode(Sorting::sortQuery($sortings)));
2222
});
@@ -27,4 +27,4 @@
2727
Notion::database('8284f3ff77e24d4a939d19459e4d6bdc')
2828
->sortBy(new stdClass())
2929
->query();
30-
});
30+
});

0 commit comments

Comments
 (0)