Added services

This commit moves most controller logic onto Services. Services are part of the Service-Repository pattern. The models act as repositories.

Services are easily testable and are needed for the upcoming API, in order to avoid duplicated code and to maintain a single source of "truth".

 The User, Vacancy and Vote controllers still need their logic moved onto services.

app/Http/Controllers/ContactController.php

@@ -21,7 +21,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Exceptions\FailedCaptchaException;
 use App\Notifications\NewContact;
+use App\Services\ContactService;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
@@ -30,47 +32,32 @@ class ContactController extends Controller
 {
     protected $users;
 
-    public function __construct(User $users)
+    private $contactService;
+
+    public function __construct(User $users, ContactService $contactService)
     {
+        $this->contactService = $contactService;
         $this->users = $users;
     }
 
     public function create(Request $request)
     {
-        $name = $request->name;
-        $email = $request->email;
-        $subject = $request->subject;
-        $msg = $request->msg;
+        try {
 
-        $challenge = $request->input('captcha');
+            $email = $request->email;
+            $msg = $request->msg;
+            $challenge = $request->input('captcha');
 
-        // TODO: now: add middleware for this verification, move to invisible captcha
-        $verifyrequest = Http::asForm()->post(config('recaptcha.verify.apiurl'), [
-            'secret' => config('recaptcha.keys.secret'),
-            'response' => $challenge,
-            'remoteip' => $request->ip(),
-        ]);
+            $this->contactService->sendMessage($request->ip(), $msg, $email, $challenge);
 
-        $response = json_decode($verifyrequest->getBody(), true);
+            return redirect()
+                ->back()
+                ->with('success',__('Message sent successfully! We usually respond within 48 hours.'));
 
-        if (! $response['success']) {
-            $request->session()->flash('error', __('Beep beep boop... Robot? Submission failed.'));
-
-            return redirect()->back();
+        } catch (FailedCaptchaException $ex) {
+            return redirect()
+                ->back()
+                ->with('error', $ex->getMessage());
         }
-
-        foreach (User::all() as $user) {
-            if ($user->hasRole('admin')) {
-                $user->notify(new NewContact(collect([
-                    'message' => $msg,
-                    'ip' => $request->ip(),
-                    'email' => $email,
-                ])));
-            }
-        }
-
-        $request->session()->flash('success', __('Message sent successfully! We usually respond within 48 hours.'));
-
-        return redirect()->back();
     }
 }