wip

Author: jbrooksuk

composer.json

@@ -34,7 +34,7 @@
         "laravel/sanctum": "^4.0",
         "nesbot/carbon": "^2.70|^3.0",
         "spatie/laravel-data": "^4.11",
-        "spatie/laravel-query-builder": "^6.3.1",
+        "spatie/laravel-query-builder": "^6.3",
         "spatie/laravel-settings": "^3.2",
         "spatie/laravel-webhook-server": "^3.8",
         "timacdonald/json-api": "^1.0.0-beta.4",
@@ -46,10 +46,10 @@
         "laravel/pail": "^1.1",
         "laravel/pint": "^1.21",
         "orchestra/testbench": "^9.5.1|^10.0",
-        "pestphp/pest": "^3.2",
-        "pestphp/pest-plugin-laravel": "^3.0",
-        "pestphp/pest-plugin-livewire": "*",
-        "pestphp/pest-plugin-type-coverage": "^3.3"
+        "pestphp/pest": "^3.8",
+        "pestphp/pest-plugin-laravel": "^3.7",
+        "pestphp/pest-plugin-livewire": "^v3.0",
+        "pestphp/pest-plugin-type-coverage": "^3.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

src/Http/Controllers/Api/IncidentController.php

@@ -13,6 +13,7 @@
 use Dedoc\Scramble\Attributes\Group;
 use Dedoc\Scramble\Attributes\QueryParameter;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Http\Response;
 use Illuminate\Pagination\Paginator;
@@ -41,22 +42,24 @@ class IncidentController extends Controller
      */
     #[QueryParameter('per_page', 'How many items to show per page.', type: 'int', default: 15, example: 20)]
     #[QueryParameter('page', 'Which page to show.', type: 'int', example: 2)]
-    public function index()
+    public function index(Request $request)
     {
-        $query = Incident::query()
-            ->when(! request('sort'), function (Builder $builder) {
-                $builder->orderByDesc('created_at');
-            });
+//        $query = Incident::query()
+//            ->when(!$request->has('sort'), function (Builder $builder) {
+//                $builder->orderByDesc('created_at');
+//            });
 
-        $incidents = QueryBuilder::for($query)
+        $incidents = QueryBuilder::for(Incident::query())
             ->allowedIncludes(self::ALLOWED_INCLUDES)
             ->allowedFilters([
                 'name',
                 AllowedFilter::exact('status'),
-                'occurred_at',
+                AllowedFilter::scope('occurs_after'),
+                AllowedFilter::scope('occurs_before'),
+                AllowedFilter::scope('occurs_on'),
             ])
             ->allowedSorts(['name', 'status', 'id'])
-            ->simplePaginate(request('per_page', 15));
+            ->simplePaginate($request->input('per_page', 15));
 
         return IncidentResource::collection($incidents);
     }

src/Models/Incident.php

@@ -171,6 +171,21 @@ public function scopeStickied(Builder $query): void
         $query->where('stickied', true);
     }
 
+    public function scopeOccursAfter(Builder $query, $date): void
+    {
+        $query->where('occurred_at', '>=', $date);
+    }
+
+    public function scopeOccursBefore(Builder $query, $date): void
+    {
+        $query->where('occurred_at', '<=', $date);
+    }
+
+    public function scopeOccursOn(Builder $query, $date): void
+    {
+        $query->whereDate('occurred_at', $date);
+    }
+
     /**
      * @return Attribute<Carbon, never>
      */

tests/Feature/Api/IncidentTest.php

@@ -10,6 +10,7 @@
 use function Pest\Laravel\getJson;
 use function Pest\Laravel\postJson;
 use function Pest\Laravel\putJson;
+use function Pest\Laravel\withoutExceptionHandling;
 
 it('can list incidents', function () {
     Incident::factory(2)->create();
@@ -144,19 +145,26 @@
 
 it('can filter incidents by occurred at date', function () {
     Incident::factory(20)->create([
-        'occurred_at' => '2019-01-01',
+        'occurred_at' => '2019-01-01 00:00:00',
     ]);
     $incident = Incident::factory()->create([
-        'occurred_at' => '2023-01-01',
+        'occurred_at' => '2025-01-01 00:00:00',
     ]);
 
-    $query = http_build_query([
+    withoutExceptionHandling();
+
+    dd(route('cachet.api.incidents.index', [
         'filter' => [
-            'occurred_at' => '2023-01-01',
+            'occurs_after' => '2024-12-31',
         ],
-    ]);
+    ]));
 
-    $response = getJson('/status/api/incidents?'.$query);
+    $response = getJson(route('cachet.api.incidents.index', [
+        'filter' => [
+            'occurs_after' => '2024-12-31',
+        ],
+    ]))
+        ->assertOk();
 
     $response->assertJsonCount(1, 'data');
     $response->assertJsonPath('data.0.attributes.id', $incident->id);