add Rainfalls Index page

This commit is contained in:
Romulus21
2023-09-14 23:20:29 +02:00
parent 42f03707d9
commit 4a733929ed
11 changed files with 177 additions and 26 deletions

View File

@@ -2,34 +2,36 @@
namespace App\Http\Controllers;
use App\Http\Requests\RainfallRequest;
use App\Http\Resources\RainfallCollection;
use App\Http\Resources\RainfallResource;
use App\Models\Rainfall;
use Carbon\Carbon;
use Carbon\CarbonPeriod;
use Illuminate\Http\Request;
use Ramsey\Collection\Collection;
use Illuminate\Support\Collection;
class RainfallController extends Controller
{
/**
* Display a listing of the resource.
* Display a listing of the rainfalls.
*/
public function index()
public function index(Request $request)
{
//
$rainfalls = $request->user()
->rainfalls()
->orderByDesc('date')
->paginate(15);
return new RainfallCollection($rainfalls);
}
/**
* Store a newly created resource in storage.
*/
public function store(Request $request)
public function store(RainfallRequest $request)
{
$data = $request->validate([
'date' => ['required', 'date'],
'value' => ['required', 'int', 'min:1', 'max:1000']
]);
$rainfall = $request->user()->rainfalls()->create($data);
$rainfall = $request->user()->rainfalls()->create($request->validated());
return response()->json(new RainfallResource($rainfall), 201);
}
@@ -37,25 +39,37 @@ class RainfallController extends Controller
/**
* Display the specified resource.
*/
public function show(Rainfall $rainfall)
public function show(Request $request, Rainfall $rainfall)
{
//
$rainfall = $request->user()->rainfalls()
->where('id', $rainfall->id)
->first();
return response()->json(new RainfallResource($rainfall));
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, Rainfall $rainfall)
public function update(RainfallRequest $request, Rainfall $rainfall)
{
//
$rainfall = $request->user()->rainfalls()
->where('id', $rainfall->id)
->first()?->update($request->validated());
return response()->json(new RainfallResource($rainfall));
}
/**
* Remove the specified resource from storage.
*/
public function destroy(Rainfall $rainfall)
public function destroy(Request $request, Rainfall $rainfall)
{
//
$request->user()->rainfalls()
->where('id', $rainfall->id)
->first()?->delete();
return response()->noContent();
}
public function lastRainfalls(Request $request)
@@ -100,13 +114,13 @@ class RainfallController extends Controller
}
if ($results->isNotEmpty() && $results->last()['date'] !== $data['end']) {
[$results, $index] = $this->addEmptyDays($results, $index, (new Carbon($results->last()['date']))->addDay(), $data['end']);
[$results] = $this->addEmptyDays($results, $index, (new Carbon($results->last()['date']))->addDay(), $data['end']);
}
return response()->json($results);
}
private function addEmptyDays(\Illuminate\Support\Collection $results, int $index, Carbon|string $start, Carbon|string $end)
private function addEmptyDays(Collection $results, int $index, Carbon|string $start, Carbon|string $end)
{
foreach (CarbonPeriod::create($start, $end) as $date) {
$results->push([

View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class RainfallRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array|string>
*/
public function rules(): array
{
return [
'date' => ['required', 'date'],
'value' => ['required', 'int', 'min:1', 'max:1000'],
];
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\ResourceCollection;
class RainfallCollection extends ResourceCollection
{
/**
* Transform the resource collection into an array.
*
* @return array<int|string, mixed>
*/
public function toArray(Request $request): array
{
return ['data' => $this->collection];
}
}

View File

@@ -3,7 +3,6 @@
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;

View File

@@ -12,6 +12,10 @@ class Rainfall extends Model
protected $guarded = [];
protected $casts = [
'date' => 'date',
];
public function user(): BelongsTo
{
return $this->belongsTo(User::class);