From 6c9378935886452105b61d728a87fb5508955bf8 Mon Sep 17 00:00:00 2001
From: miguel456 <me@nogueira.codes>
Date: Thu, 7 Apr 2022 23:55:43 +0100
Subject: [PATCH] fix: corrected issue with bad date checking for app
 eligibility

---
 .../Middleware/ApplicationEligibility.php     | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/Http/Middleware/ApplicationEligibility.php b/app/Http/Middleware/ApplicationEligibility.php
index 13cb1da..be9a021 100755
--- a/app/Http/Middleware/ApplicationEligibility.php
+++ b/app/Http/Middleware/ApplicationEligibility.php
@@ -24,6 +24,8 @@ namespace App\Http\Middleware;
 use App\Application;
 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 +35,40 @@ class ApplicationEligibility
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @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);
         }