Fix a bug where the API returns the wrong resource (#239)

Author: jbrooksuk

src/Http/Controllers/Api/ComponentController.php

@@ -11,6 +11,7 @@
 use Cachet\Enums\ComponentStatusEnum;
 use Cachet\Http\Resources\Component as ComponentResource;
 use Cachet\Models\Component;
+use Cachet\Models\Incident;
 use Dedoc\Scramble\Attributes\Group;
 use Dedoc\Scramble\Attributes\QueryParameter;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -77,9 +78,9 @@ public function store(CreateComponentRequestData $data, CreateComponent $createC
      */
     public function show(Component $component)
     {
-        $componentQuery = QueryBuilder::for($component)
+        $componentQuery = QueryBuilder::for(Component::class)
             ->allowedIncludes(self::ALLOWED_INCLUDES)
-            ->first();
+            ->find($component->id);
 
         return ComponentResource::make($componentQuery)
             ->response()

src/Http/Controllers/Api/ComponentGroupController.php

@@ -8,6 +8,7 @@
 use Cachet\Concerns\GuardsApiAbilities;
 use Cachet\Data\Requests\ComponentGroup\CreateComponentGroupRequestData;
 use Cachet\Data\Requests\ComponentGroup\UpdateComponentGroupRequestData;
+use Cachet\Http\Resources\Component;
 use Cachet\Http\Resources\ComponentGroup as ComponentGroupResource;
 use Cachet\Models\ComponentGroup;
 use Dedoc\Scramble\Attributes\Group;
@@ -57,9 +58,9 @@ public function store(CreateComponentGroupRequestData $data, CreateComponentGrou
      */
     public function show(ComponentGroup $componentGroup)
     {
-        $componentQuery = QueryBuilder::for($componentGroup)
+        $componentQuery = QueryBuilder::for(ComponentGroup::class)
             ->allowedIncludes(['components'])
-            ->first();
+            ->find($componentGroup->id);
 
         return ComponentGroupResource::make($componentQuery)
             ->response()

src/Http/Controllers/Api/IncidentController.php

@@ -78,9 +78,9 @@ public function store(CreateIncidentRequestData $data, CreateIncident $createInc
      */
     public function show(Incident $incident)
     {
-        $incidentQuery = QueryBuilder::for($incident)
+        $incidentQuery = QueryBuilder::for(Incident::class)
             ->allowedIncludes(self::ALLOWED_INCLUDES)
-            ->first();
+            ->find($incident->id);
 
         return IncidentResource::make($incidentQuery)
             ->response()

src/Http/Controllers/Api/IncidentUpdateController.php

@@ -65,11 +65,11 @@ public function store(CreateIncidentUpdateRequestData $data, Incident $incident,
      */
     public function show(Incident $incident, Update $update)
     {
-        $updateQuery = QueryBuilder::for($update)
+        $updateQuery = QueryBuilder::for(Update::class)
             ->allowedIncludes([
                 AllowedInclude::relationship('incident', 'updateable'),
             ])
-            ->first();
+            ->find($update->id);
 
         return UpdateResource::make($updateQuery)
             ->response()

src/Http/Controllers/Api/MetricController.php

@@ -67,9 +67,9 @@ public function store(CreateMetricRequestData $data, CreateMetric $createMetricA
      */
     public function show(Metric $metric)
     {
-        $metricQuery = QueryBuilder::for($metric)
+        $metricQuery = QueryBuilder::for(Metric::class)
             ->allowedIncludes(['points'])
-            ->first();
+            ->find($metric->id);
 
         return MetricResource::make($metricQuery)
             ->response()

src/Http/Controllers/Api/MetricPointController.php

@@ -61,9 +61,9 @@ public function store(CreateMetricPointRequestData $data, Metric $metric, Create
      */
     public function show(Metric $metric, MetricPoint $metricPoint)
     {
-        $metricPointQuery = QueryBuilder::for($metricPoint)
+        $metricPointQuery = QueryBuilder::for(MetricPoint::class)
             ->allowedIncludes(['metric'])
-            ->first();
+            ->find($metricPoint->id);
 
         return MetricPointResource::make($metricPointQuery)
             ->response()

src/Http/Controllers/Api/ScheduleController.php

@@ -61,9 +61,9 @@ public function store(CreateScheduleRequestData $data, CreateSchedule $createSch
      */
     public function show(Schedule $schedule)
     {
-        $scheduleQuery = QueryBuilder::for($schedule)
+        $scheduleQuery = QueryBuilder::for(Schedule::class)
             ->allowedIncludes(['components', 'updates', 'user'])
-            ->first();
+            ->find($schedule->id);
 
         return ScheduleResource::make($scheduleQuery)
             ->response()

src/Http/Controllers/Api/ScheduleUpdateController.php

@@ -64,11 +64,11 @@ public function store(CreateScheduleUpdateRequestData $data, Schedule $schedule,
      */
     public function show(Schedule $schedule, Update $update)
     {
-        $updateQuery = QueryBuilder::for($update)
+        $updateQuery = QueryBuilder::for(Update::class)
             ->allowedIncludes([
                 AllowedInclude::relationship('schedule', 'updateable'),
             ])
-            ->first();
+            ->find($update->id);
 
         return UpdateResource::make($updateQuery)
             ->response()