Revert "merge 1"

This reverts commit 0bc6c20a6d.

app/Http/Middleware/ApplicationEligibility.php

@@ -22,11 +22,8 @@
 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;
@@ -36,42 +33,34 @@ class ApplicationEligibility
     /**
      * Handle an incoming request.
      *
-     * @deprecated Deprecated in 0.9.0
-     * @see User::isEligible()
-     * @param Request $request
-     * @param Closure $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
      * @return mixed
-     * @throws Exception
+     * @throws \Exception
      */
     public function handle($request, Closure $next)
     {
-        $eligible = false;
-        $daysRemaining = __('N/A');
+        $curtime = new Carbon(now());
 
         if (Auth::check()) {
+            $applications = Application::where('applicantUserID', Auth::user()->id)->get();
+            $eligible = true;
 
-            $lastApplication = Application::where('applicantUserID', Auth::user()->id)->latest()->first();
+            $daysRemaining = 0;
 
-            if (is_null($lastApplication)) {
-                View::share('isEligibleForApplication', true);
-                View::share('eligibilityDaysRemaining', 0);
+            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;
+                    }
+                }
 
-                return $next($request);
+                $allowedTime = Carbon::parse($applications->last()->created_at)->addMonth();
+                $daysRemaining = $allowedTime->diffInDays(now());
             }
 
-            $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);
         }