Skip to content

all logic for trip moved to trip repository #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashish64 merged 1 commit into from
Sep 28, 2025
Merged

all logic for trip moved to trip repository #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 32 additions & 38 deletions app/Http/Controllers/V1/TripController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,29 @@
use App\Http\Requests\TripRequest;
use App\Models\Trip;
use App\Models\User;
use Illuminate\Auth\Access\AuthorizationException;
use App\Repositories\Contracts\TripRepositoryContract;
use App\Repositories\TripRepository;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Gate;
use Illuminate\View\View;

class TripController extends Controller
{
/**
* @param TripRepository $trip
*/
public function __construct(
protected TripRepositoryContract $trip
) {}

/**
* Display a listing of the resource.
*/
public function index(): View
{

$user = auth()->user()->load(['owns', 'trips']);
$trips = [
'owns' => $user->owns,
'invited' => $user->trips,
];
$trips = $this->trip->findAll();

return view('trips.index', compact('trips'));

Expand All @@ -38,9 +42,7 @@ public function index(): View
public function create(): View
{
//
$users = Cache::remember('listableUsers', 3600, function () {
return User::get(['id', 'name']);
});
$users = $this->getUsers();

return view('trips.create', compact('users'));
}
Expand All @@ -50,67 +52,59 @@ public function create(): View
*/
public function store(TripRequest $tripRequest): RedirectResponse
{
$trip = auth()->user()->owns()->create($tripRequest->validated());
$trip->users()->attach($tripRequest->users);

$trip = $this->trip->create($tripRequest->all());

return redirect()->route('trips.show', ['trip' => $trip]);

}

/**
* Display the specified resource.
*
* @throws AuthorizationException
*/
public function show(Trip $trip): View
{
Gate::authorize('view', $trip);
$data = $trip->load([
'suggestions' => function ($query) {
$query->withCount([
'vote as up_votes_count' => function ($q) {
$q->where('type', 'up');
},
'vote as down_votes_count' => function ($q) {
$q->where('type', 'down');
},
]);
},
'users:name',
]);

$data = $this->trip->findWithSuggestions($trip);

return view('trips.show', compact('data'));
}

/**
* Show the form for editing the specified resource.
*
* @throws AuthorizationException
*/
public function edit(Trip $trip): View
{
//
Gate::authorize('update', $trip);
$trip = $trip->load('users:id,name');
$users = Cache::remember('listableUsers', 3600, function () {
return User::get(['id', 'name']);
});
$data = $this->trip->find($trip, 'users:id,name');
$users = $this->getUsers();

return view('trips.edit', compact('trip', 'users'));
return view('trips.edit', compact('data', 'users'));
}

/**
* Update the specified resource in storage.
*
* @throws AuthorizationException
*/
public function update(TripRequest $tripRequest, Trip $trip): RedirectResponse
{
//
Gate::authorize('update', $trip);
$trip->update($tripRequest->validated());
$trip->users()->attach($tripRequest->users);
$this->trip->updateTrip($trip, $tripRequest->all());

return redirect()->route('trips.show', ['trip' => $trip]);
}

/**
* Caches users and retrieves them.
*
* @return Collection<int, User>
*/
private function getUsers(): Collection
{
return Cache::remember('listableUsers', 3600, function () {
return User::get(['id', 'name']);
});
}
}
3 changes: 3 additions & 0 deletions app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace App\Providers;

use App\Repositories\Contracts\TripRepositoryContract;
use App\Repositories\TripRepository;
use Illuminate\Support\ServiceProvider;

class AppServiceProvider extends ServiceProvider
Expand All @@ -12,6 +14,7 @@ class AppServiceProvider extends ServiceProvider
public function register(): void
{
//
$this->app->bind(TripRepositoryContract::class, TripRepository::class);
}

/**
Expand Down
30 changes: 30 additions & 0 deletions app/Repositories/Contracts/TripRepositoryContract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

declare(strict_types=1);

namespace App\Repositories\Contracts;

use App\Models\Trip;
use Illuminate\Support\Collection;

interface TripRepositoryContract
{
/**
* @return array<string, Collection<int, Trip>>
*/
public function findAll(): array;

public function find(Trip $trip, string $relation = ''): Trip;

public function findWithSuggestions(Trip $trip): Trip;

/**
* @param array<string, mixed> $data
*/
public function create(array $data): Trip;

/**
* @param array<string, mixed> $data
*/
public function updateTrip(Trip $trip, array $data): Trip;
}
73 changes: 73 additions & 0 deletions app/Repositories/TripRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?php

declare(strict_types=1);

namespace App\Repositories;

use App\Models\Trip;
use App\Repositories\Contracts\TripRepositoryContract;
use Illuminate\Support\Collection;

class TripRepository implements TripRepositoryContract
{
/**
* @return array<string, Collection<int, Trip>>
*/
public function findAll(): array
{
$user = auth()->user()->load(['owns', 'trips']);

return [
'owns' => $user->owns,
'invited' => $user->trips,
];
}

public function findWithSuggestions(Trip $trip): Trip
{
return $trip->load([
'suggestions' => function ($query) {
$query->withCount([
'vote as up_votes_count' => function ($q) {
$q->where('type', 'up');
},
'vote as down_votes_count' => function ($q) {
$q->where('type', 'down');
},
]);
},
'users:name',
]);
}

public function find(Trip $trip, string $relation = ''): Trip
{
if ($relation != '') {
return $trip->load($relation);
}

return $trip;
}

/**
* @param array<string, mixed> $data
*/
public function create(array $data): Trip
{
$trip = auth()->user()->owns()->create($data);
$trip->users()->attach($data['users']);

return $trip;
}

/**
* @param array<string, mixed> $data
*/
public function updateTrip(Trip $trip, array $data): Trip
{
$trip->update($data);
$trip->users()->sync($data['users']);

return $trip;
}
}
10 changes: 5 additions & 5 deletions resources/views/trips/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8 my-4">
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
<form method="POST" action="{{ route('trips.update', $trip) }}">
<form method="POST" action="{{ route('trips.update', $data) }}">
@csrf
@method('PUT')
<div class="p-6 text-gray-900 flex flex-col">
Expand All @@ -17,7 +17,7 @@

<x-text-input id="title" class="block mt-1 w-full"
type="text"
value="{{ old('title', $trip->title) }}"
value="{{ old('title', $data->title) }}"
name="title"
/>

Expand All @@ -28,7 +28,7 @@

<x-textarea-input id="description" class="block mt-1 w-full p-1"
name="description">
{{ old('description', $trip->description) }}
{{ old('description', $data->description) }}
</x-textarea-input>

<x-input-error :messages="$errors->get('description')" class="mt-2" />
Expand All @@ -41,7 +41,7 @@
value="active"
type="radio"
name="status"
@checked(old('status', $trip->status))
@checked(old('status', $data->status))
>
<x-input-label for="description" value="Completed" />
<input id="completed" class="block mt-1"
Expand All @@ -60,7 +60,7 @@
name="users[]"
value="{{ $user->id }}"
@checked(
$trip->users->contains('id',$user->id)
$data->users->contains('id',$user->id)
|| (is_array(old('user')) && in_array($user->id, old('user')))
)
/>
Expand Down