From 5b10dca868cf2216301f3cd727315d5bbb56d289 Mon Sep 17 00:00:00 2001 From: "B.Fatih KOZ" Date: Thu, 27 May 2021 16:27:38 +0300 Subject: [PATCH] Fix SimBriefService (#1209) * Fix removeExpiredEntires() * Fix SimBriefTest No need to add `'pirep_id' => ''` , just let it be `null` (like the core code does) and no need to convert Carbon to DateTimeString. --- app/Services/SimBriefService.php | 6 +++--- tests/SimBriefTest.php | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/Services/SimBriefService.php b/app/Services/SimBriefService.php index 1d090533..f09880c5 100644 --- a/app/Services/SimBriefService.php +++ b/app/Services/SimBriefService.php @@ -192,11 +192,11 @@ class SimBriefService extends Service public function removeExpiredEntries(): void { $expire_days = setting('simbrief.expire_days', 5); - $expire_time = Carbon::now('UTC')->subDays($expire_days)->toDateTimeString(); + $expire_time = Carbon::now('UTC')->subDays($expire_days); $briefs = SimBrief::where([ - ['pirep_id', '=', ''], - ['created_at', '<', $expire_time], + ['pirep_id', null], + ['created_at', '<=', $expire_time], ])->get(); foreach ($briefs as $brief) { diff --git a/tests/SimBriefTest.php b/tests/SimBriefTest.php index 0d00529f..a380396e 100644 --- a/tests/SimBriefTest.php +++ b/tests/SimBriefTest.php @@ -336,14 +336,13 @@ class SimBriefTest extends TestCase 'user_id' => $user->id, 'flight_id' => 'a_flight_id', 'pirep_id' => 'a_pirep_id', - 'created_at' => Carbon::now('UTC')->subDays(6)->toDateTimeString(), + 'created_at' => Carbon::now('UTC')->subDays(6), ]); factory(SimBrief::class)->create([ 'user_id' => $user->id, 'flight_id' => 'a_flight_Id', - 'pirep_id' => '', - 'created_at' => Carbon::now('UTC')->subDays(6)->toDateTimeString(), + 'created_at' => Carbon::now('UTC')->subDays(6), ]); /** @var SimBriefService $sb */