FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure all dates are in UTC (#1139)

Browse Source
This commit is contained in:
Nabeel S
2021-04-13 09:25:38 -04:00
committed by GitHub
parent 7e9eb08135
commit bfddb2c84d
9 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Cron/Hourly/DeletePireps.php
View File

@@ -37,7 +37,7 @@ class DeletePireps extends Listener
*/
protected function deletePireps(int $expire_time_hours, int $state)
{
$dt = Carbon::now()->subHours($expire_time_hours);
$dt = Carbon::now('UTC')->subHours($expire_time_hours);
$pireps = Pirep::where('created_at', '<', $dt)->where(['state' => $state])->get();
/** @var PirepService $pirepSvc */

2
app/Cron/Hourly/RemoveExpiredBids.php
View File

@@ -25,7 +25,7 @@ class RemoveExpiredBids extends Listener
return;
}
$date = Carbon::now()->subHours(setting('bids.expire_time'));
$date = Carbon::now('UTC')->subHours(setting('bids.expire_time'));
Bid::where('created_at', '<', $date)->delete();
}
}

2
app/Cron/Hourly/RemoveExpiredLiveFlights.php
View File

@@ -26,7 +26,7 @@ class RemoveExpiredLiveFlights extends Listener
return;
}
$date = Carbon::now()->subHours(setting('acars.live_time'));
$date = Carbon::now('UTC')->subHours(setting('acars.live_time'));
Pirep::where('updated_at', '<', $date)
->where('state', PirepState::IN_PROGRESS)
->delete();

11
app/Database/factories/JournalTransactionsFactory.php
View File

@@ -1,17 +1,20 @@
<?php
use App\Models\Journal;
use Carbon\Carbon;
use Faker\Generator as Faker;
use Ramsey\Uuid\Uuid;
$factory->define(App\Models\JournalTransactions::class, function (Faker $faker) {
$factory->define(App\Models\JournalTransaction::class, function (Faker $faker) {
return [
'transaction_group' => \Ramsey\Uuid\Uuid::uuid4()->toString(),
'transaction_group' => Uuid::uuid4()->toString(),
'journal_id' => function () {
return factory(\App\Models\Journal::class)->create()->id;
return factory(Journal::class)->create()->id;
},
'credit' => $faker->numberBetween(100, 10000),
'debit' => $faker->numberBetween(100, 10000),
'currency' => 'USD',
'memo' => $faker->sentence(6),
'post_date' => \Carbon\Carbon::now(),
'post_date' => Carbon::now('UTC'),
];
});

2
app/Models/Journal.php
View File

@@ -186,7 +186,7 @@ class Journal extends Model
*/
public function getCurrentBalance()
{
return $this->getBalanceOn(Carbon::now());
return $this->getBalanceOn(Carbon::now('UTC'));
}
/**

2
app/Repositories/JournalRepository.php
View File

@@ -147,7 +147,7 @@ class JournalRepository extends Repository implements CacheableInterface
$journal->refresh();
if (!$date) {
$date = Carbon::now();
$date = Carbon::now('UTC');
}
$credit = $this->getCreditBalanceBetween($date, $journal);

4
app/Services/Installer/SeederService.php
View File

@@ -90,10 +90,10 @@ class SeederService extends Service
$data = file_get_contents(database_path('/seeds/modules.yml'));
$yml = Yaml::parse($data);
foreach ($yml as $module) {
$module['updated_at'] = Carbon::now();
$module['updated_at'] = Carbon::now('UTC');
$count = DB::table('modules')->where('name', $module['name'])->count('name');
if ($count === 0) {
$module['created_at'] = Carbon::now();
$module['created_at'] = Carbon::now('UTC');
DB::table('modules')->insert($module);
} else {
DB::table('modules')

2
app/Services/PirepService.php
View File

@@ -290,7 +290,7 @@ class PirepService extends Service
public function findDuplicate(Pirep $pirep)
{
$minutes = setting('pireps.duplicate_check_time', 10);
$time_limit = Carbon::now()->subMinutes($minutes)->toDateTimeString();
$time_limit = Carbon::now('UTC')->subMinutes($minutes)->toDateTimeString();
$where = [
'user_id' => $pirep->user_id,

2
tests/PIREPTest.php
View File

@@ -484,7 +484,7 @@ class PIREPTest extends TestCase
*/
$minutes = setting('pireps.duplicate_check_time') + 1;
$pirep = factory(Pirep::class)->create([
'created_at' => Carbon::now()->subMinutes($minutes)->toDateTimeString(),
'created_at' => Carbon::now('UTC')->subMinutes($minutes)->toDateTimeString(),
]);
// This should find itself...