Revert "Revert "merge 1""

This reverts commit 0c463d1f10.

app/Http/Middleware/ApplicationEligibility.php

@@ -22,8 +22,11 @@
 namespace App\Http\Middleware;
 
 use App\Application;
+use App\User;
 use Carbon\Carbon;
 use Closure;
+use Exception;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\View;
@@ -33,34 +36,42 @@ class ApplicationEligibility
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @deprecated Deprecated in 0.9.0
+     * @see User::isEligible()
+     * @param Request $request
+     * @param Closure $next
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function handle($request, Closure $next)
     {
-        $curtime = new Carbon(now());
+        $eligible = false;
+        $daysRemaining = __('N/A');
 
         if (Auth::check()) {
-            $applications = Application::where('applicantUserID', Auth::user()->id)->get();
-            $eligible = true;
 
-            $daysRemaining = 0;
+            $lastApplication = Application::where('applicantUserID', Auth::user()->id)->latest()->first();
 
-            if (! $applications->isEmpty()) {
-                foreach ($applications as $application) {
-                    $appTime = Carbon::parse($application->created_at);
-                    if ($appTime->isSameMonth($curtime)) {
-                        Log::warning('Notice: Application ID '.$application->id.' was found to be in the same month as today\'s time, making the user '.Auth::user()->name.' ineligible for application');
-                        $eligible = false;
-                    }
-                }
+            if (is_null($lastApplication)) {
+                View::share('isEligibleForApplication', true);
+                View::share('eligibilityDaysRemaining', 0);
 
-                $allowedTime = Carbon::parse($applications->last()->created_at)->addMonth();
-                $daysRemaining = $allowedTime->diffInDays(now());
+                return $next($request);
             }
 
+            $daysRemaining = $lastApplication->created_at->addMonth()->diffInDays(now());
+            if ($lastApplication->created_at->diffInMonths(now()) > 1 && in_array($lastApplication->applicationStatus, ['DENIED', 'APPROVED'])) {
+
+                $eligible = true;
+            }
+
+            Log::debug('Perfomed application eligibility check', [
+                'eligible' => $eligible,
+                'daysRemaining' => $daysRemaining,
+                'ipAddress' => Auth::user()->originalIP,
+                'checkUserID' => Auth::user()->id
+            ]);
+
             View::share('isEligibleForApplication', $eligible);
             View::share('eligibilityDaysRemaining', $daysRemaining);
         }

app/Http/Middleware/Bancheck.php

@@ -21,12 +21,21 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\AccountSuspensionService;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
 
 class Bancheck
 {
+    private $suspensionService;
+
+
+    public function __construct(AccountSuspensionService $suspensionService) {
+        $this->suspensionService = $suspensionService;
+    }
+
+
     /**
      * Handle an incoming request.
      *
@@ -37,11 +46,11 @@ class Bancheck
     public function handle($request, Closure $next)
     {
         $userIP = $request->ip();
-        $anonymousUser = User::where('ipAddress', $userIP)->get();
+        $anonymousUser = User::where('currentIp', $userIP)->get();
 
-        if (Auth::check() && Auth::user()->isBanned()) {
+        if (Auth::check() && $this->suspensionService->isSuspended($anonymousUser)) {
             View::share('isBanned', true);
-        } elseif (! $anonymousUser->isEmpty() && User::find($anonymousUser->id)->isBanned()) {
+        } elseif (! $anonymousUser->isEmpty() && $this->suspensionService->isSuspended(User::find($anonymousUser->id))) {
             View::share('isBanned', true);
         } else {
             View::share('isBanned', false);

app/Http/Middleware/ForceLogoutMiddleware.php

@@ -21,6 +21,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\AccountSuspensionService;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -35,10 +36,10 @@ class ForceLogoutMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (Auth::user()->isBanned()) {
-            Auth::logout();
 
-            $request->session()->flash('error', __('Your account is suspended. You will not be able to login or register until the suspension is lifted.'));
+        if ((new AccountSuspensionService())->isSuspended(Auth::user())) {
+            Auth::logout();
+            $request->session()->flash('error', __('Your account is suspended. If you think this was a mistake, please contact an admin.'));
 
             return redirect('/');
         }