miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: corrected issue with bad date checking for app eligibility

Browse Source
This commit is contained in:
Miguel Nogueira 2022-04-07 23:55:43 +01:00
parent dd74d85434
commit 6c93789358
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Http/Middleware/ApplicationEligibility.php
View File

@ -24,6 +24,8 @@ namespace App\Http\Middleware;
use App\Application; use App\Application;
use Carbon\Carbon; use Carbon\Carbon;
use Closure; use Closure;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
@ -33,34 +35,40 @@ class ApplicationEligibility
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
* @param \Illuminate\Http\Request $request * @param Request $request
* @param \Closure $next * @param Closure $next
* @return mixed * @return mixed
* @throws \Exception * @throws Exception
*/ */
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
$curtime = new Carbon(now()); $eligible = false;
$daysRemaining = __('N/A');
if (Auth::check()) { 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()) { if (is_null($lastApplication)) {
foreach ($applications as $application) { View::share('isEligibleForApplication', true);
$appTime = Carbon::parse($application->created_at); View::share('eligibilityDaysRemaining', 0);
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;
}
}
$allowedTime = Carbon::parse($applications->last()->created_at)->addMonth(); return $next($request);
$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('isEligibleForApplication', $eligible);
View::share('eligibilityDaysRemaining', $daysRemaining); View::share('eligibilityDaysRemaining', $daysRemaining);
} }