Renamed skip to offset

solidtime-io · Oct 1, 2024 · 22c1d44 · 22c1d44
1 parent 46ba4ac
commit 22c1d44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/Http/Controllers/Api/V1/TimeEntryController.php b/app/Http/Controllers/Api/V1/TimeEntryController.php
@@ -85,7 +85,7 @@ public function index(Organization $organization, TimeEntryIndexRequest $request
             $limit = 1000;
         }
         $timeEntriesQuery->limit($limit);
-        $timeEntriesQuery->skip($request->getSkip());
+        $timeEntriesQuery->skip($request->getOffset());
 
         $timeEntries = $timeEntriesQuery->get();
 

diff --git a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
@@ -132,7 +132,7 @@ public function rules(): array
                 'max:500',
             ],
             // Skip the first n time entries (default: 0)
-            'skip' => [
+            'offset' => [
                 'integer',
                 'min:0',
             ],
@@ -154,8 +154,8 @@ public function getLimit(): int
         return $this->has('limit') ? (int) $this->validated('limit', 100) : 100;
     }
 
-    public function getSkip(): int
+    public function getOffset(): int
     {
-        return $this->has('skip') ? (int) $this->validated('skip', 0) : 0;
+        return $this->has('offset') ? (int) $this->validated('offset', 0) : 0;
     }
 }
diff --git a/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php b/tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php
@@ -468,7 +468,7 @@ public function test_index_endpoint_with_all_available_filters(): void
         );
     }
 
-    public function test_index_endpoint_with_limit_skip_and_only_full_dates_deactivated(): void
+    public function test_index_endpoint_with_limit_offset_and_only_full_dates_deactivated(): void
     {
         // Arrange
         $data = $this->createUserWithPermission([
@@ -494,7 +494,7 @@ public function test_index_endpoint_with_limit_skip_and_only_full_dates_deactiva
             'member_id' => $data->member->getKey(),
             'project_ids' => [$project1->getKey()],
             'limit' => 1,
-            'skip' => 1,
+            'offset' => 1,
             'only_full_dates' => 'false',
         ]));