Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/Enums/SuggestionStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App\Enums;

enum SuggestionStatus: string
{
//
case APPROVED = 'approved';
case REJECTED = 'rejected';
}
10 changes: 10 additions & 0 deletions app/Enums/TripStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App\Enums;

enum TripStatus: string
{
//
case ACTIVE = 'active';
case COMPLETED = 'completed';
}
10 changes: 10 additions & 0 deletions app/Enums/VoteType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App\Enums;

enum VoteType: string
{
//
case UP = 'up';
case DOWN = 'down';
}
7 changes: 5 additions & 2 deletions app/Http/Controllers/V1/SuggestionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@

namespace App\Http\Controllers\V1;

use App\Enums\SuggestionStatus;
use App\Enums\VoteType;
use App\Http\Controllers\Controller;
use App\Http\Requests\SuggestionRequest;
use App\Models\Suggestion;
use App\Models\Trip;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Validation\Rules\Enum;

class SuggestionController extends Controller
{
Expand All @@ -36,7 +39,7 @@ public function store(Trip $trip, SuggestionRequest $suggestionRequest): Redirec
public function vote(Suggestion $suggestion, Request $request): RedirectResponse
{
$validated = $request->validate([
'type' => 'required|in:up,down',
'type' => ['required', new Enum(VoteType::class)],
]);

$suggestion->vote()->updateOrCreate([
Expand All @@ -56,7 +59,7 @@ public function status(Suggestion $suggestion, Request $request): RedirectRespon
{

$validated = $request->validate([
'type' => 'required|in:approved,rejected',
'type' => ['required', new Enum(SuggestionStatus::class)],
]);

$suggestion->update(['status' => $validated['type']]);
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Requests/TripRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace App\Http\Requests;

use App\Enums\TripStatus;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Enum;

class TripRequest extends FormRequest
{
Expand All @@ -24,7 +26,7 @@ public function rules(): array
return [
'title' => 'required',
'description' => 'required',
'status' => 'required',
'status' => ['required', new Enum(TripStatus::class)],
];
}
}
5 changes: 3 additions & 2 deletions app/Repositories/TripRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace App\Repositories;

use App\Enums\VoteType;
use App\Models\Trip;
use App\Repositories\Contracts\TripRepositoryContract;
use Illuminate\Support\Collection;
Expand All @@ -29,10 +30,10 @@ public function findWithSuggestions(Trip $trip): Trip
'suggestions' => function ($query) {
$query->withCount([
'vote as up_votes_count' => function ($q) {
$q->where('type', 'up');
$q->where('type', VoteType::UP);
},
'vote as down_votes_count' => function ($q) {
$q->where('type', 'down');
$q->where('type', VoteType::DOWN);
},
]);
},
Expand Down