Refactoring functions to save tickets, comments and votes through repositories instead of controllers / models

Author: vagrant

app/Entities/User.php

@@ -47,17 +47,4 @@ public function hasVoted(Ticket $ticket)
         return $this->voted()->where('ticket_id', $ticket->id)->count();
     }
 
-    public function vote(Ticket $ticket)
-    {
-        if ($this->hasVoted($ticket)) return false;
-
-        $this->voted()->attach($ticket);
-        return true;
-    }
-
-    public function unvote(Ticket $ticket)
-    {
-        $this->voted()->detach($ticket);
-    }
-
 }

app/Http/Controllers/CommentsController.php

@@ -6,21 +6,38 @@
 use Illuminate\Http\Request;
 use TeachMe\Entities\Ticket;
 use TeachMe\Entities\TicketComment;
+use TeachMe\Repositories\CommentRepository;
+use TeachMe\Repositories\TicketRepository;
 
 class CommentsController extends Controller {
 
+    protected $commentRepository;
+    protected $ticketRepository;
+
+    public function __construct(
+        TicketRepository $ticketRepository,
+        CommentRepository $commentRepository
+    )
+    {
+        $this->commentRepository = $commentRepository;
+        $this->ticketRepository = $ticketRepository;
+    }
+
     public function submit($id, Request $request, Guard $auth)
     {
         $this->validate($request, [
             'comment' => 'required|max:250',
             'link' => 'url'
         ]);
 
-        $comment = new TicketComment($request->only(['comment', 'link']));
-        $comment->user_id = $auth->id();
+        $ticket = $this->ticketRepository->findOrFail($id);
 
-        $ticket = Ticket::findOrFail($id);
-        $ticket->comments()->save($comment);
+        $this->commentRepository->create(
+            $ticket,
+            currentUser(),
+            $request->get('comment'),
+            $request->get('link')
+        );
 
         session()->flash('success', 'Tu comentario fue guardado exitosamente');
         return redirect()->back();

app/Http/Controllers/TicketsController.php

@@ -2,17 +2,12 @@
 
 use Illuminate\Auth\Guard;
 use Illuminate\Support\Facades\Redirect;
-use TeachMe\Entities\Ticket;
-use TeachMe\Http\Requests;
-
 use Illuminate\Http\Request;
+
 use TeachMe\Repositories\TicketRepository;
 
 class TicketsController extends Controller {
 
-    /**
-     * @var TicketRepository
-     */
     private $ticketRepository;
 
     public function __construct(TicketRepository $ticketRepository)
@@ -55,16 +50,16 @@ public function create()
         return view('tickets.create');
     }
 
-    public function store(Request $request, Guard $auth)
+    public function store(Request $request)
     {
         $this->validate($request, [
             'title' => 'required|max:120'
         ]);
 
-        $ticket = $auth->user()->tickets()->create([
-            'title'  => $request->get('title'),
-            'status' => 'open'
-        ]);
+        $ticket = $this->ticketRepository->openNew(
+            currentUser(),
+            $request->get('title')
+        );
 
         return Redirect::route('tickets.details', $ticket->id);
     }

app/Http/Controllers/VotesController.php

@@ -1,21 +1,35 @@
 <?php namespace TeachMe\Http\Controllers;
 
 use TeachMe\Entities\Ticket;
+use TeachMe\Repositories\TicketRepository;
+use TeachMe\Repositories\VoteRepository;
 
 class VotesController extends Controller {
 
+    private $ticketRepository;
+    private $voteRepository;
+
+    public function __construct(
+        TicketRepository $ticketRepository,
+        VoteRepository $voteRepository
+    )
+    {
+        $this->ticketRepository = $ticketRepository;
+        $this->voteRepository = $voteRepository;
+    }
+
     public function submit($id)
     {
-        $ticket = Ticket::findOrFail($id);
-        currentUser()->vote($ticket);
+        $ticket = $this->ticketRepository->findOrFail($id);
+        $this->voteRepository->vote(currentUser(), $ticket);
 
         return redirect()->back();
 	}
 
     public function destroy($id)
     {
-        $ticket = Ticket::findOrFail($id);
-        currentUser()->unvote($ticket);
+        $ticket = $this->ticketRepository->findOrFail($id);
+        $this->voteRepository->unvote(currentUser(), $ticket);
 
         return redirect()->back();
     }

app/Repositories/CommentRepository.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace TeachMe\Repositories;
+
+use TeachMe\Entities\Ticket;
+use TeachMe\Entities\TicketComment;
+use TeachMe\Entities\User;
+
+class CommentRepository extends BaseRepository {
+
+    public function getModel()
+    {
+        return new TicketComment();
+    }
+
+    public function create(Ticket $ticket, User $user, $comment, $link = '')
+    {
+        $comment = new TicketComment(compact('comment', 'link'));
+        $comment->user_id = $user->id;
+        $ticket->comments()->save($comment);
+    }
+
+}

app/Repositories/TicketRepository.php

@@ -43,4 +43,12 @@ public function paginateClosed()
             ->paginate(20);
     }
 
+    public function openNew($user, $title)
+    {
+        return $user->tickets()->create([
+            'title'  => $title,
+            'status' => 'open'
+        ]);
+    }
+
 }

app/Repositories/VoteRepository.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace TeachMe\Repositories;
+
+use TeachMe\Entities\Ticket;
+use TeachMe\Entities\User;
+
+class VoteRepository {
+
+    public function vote(User $user, Ticket $ticket)
+    {
+        if ($user->hasVoted($ticket)) return false;
+
+        $user->voted()->attach($ticket);
+        return true;
+    }
+
+    public function unvote(User $user, Ticket $ticket)
+    {
+        $user->voted()->detach($ticket);
+    }
+
+}