Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with date handling #10

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Fix issues with date handling #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/Console/Commands/CountUniqueUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,14 @@ class CountUniqueUser extends Command
*/
public function handle()
{
$fromDate = Carbon::now()->subMonth()->startOfMonth()->toDateString();
$tillDate = Carbon::now()->subMonth()->endOfMonth()->toDateString();

$nbrUser = User::whereBetween('login_at', [$fromDate, $tillDate])->count();

DB::table('kpis_unique_users')->insert(['date' => $tillDate, 'value' => $nbrUser]);
}

private function countUniqueUser()
{
$nbrUser = User::whereBetween('login_at', [
Carbon::now()->subMonth()->startOfMonth(),
Carbon::now()->startOfMonth(),
])->count();

DB::table('kpis_unique_users')->insert([
'date' => Carbon::now()->subMonth()->endOfMonth(),
'value' => $nbrUser,
]);
}
}
5 changes: 3 additions & 2 deletions src/Console/Commands/CountUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ class CountUser extends Command
*/
public function handle()
{
$yesterday = Carbon::yesterday()->toDateString();
$nbrUser = User::where('login_at', '=', $yesterday)->count();
$yesterday = Carbon::yesterday();
$today = Carbon::today();
$nbrUser = User::whereBetween('login_at', [$yesterday, $today])->count();

DB::table('kpis_users')->insert(['date' => $yesterday, 'value' => $nbrUser]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/DetermineStorageUsage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function handle()
{
$size = $this->getSizeInGB();

$date = Carbon::now()->subMonth()->endOfMonth()->toDateString();
$date = Carbon::now()->subMonth()->endOfMonth();

DB::table('kpis_storage_usage')->insert(['date' => $date, 'value' => $size]);
}
Expand Down
12 changes: 7 additions & 5 deletions src/Requests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,26 @@ class Requests
public static function save($visits, $actions)
{
DB::transaction(function () use ($visits, $actions) {
$yesterday = Carbon::yesterday()->toDateString();
$yesterday = Carbon::yesterday();
DB::table('kpis_actions')->insert(['date' => $yesterday, 'value' => $actions]);
DB::table('kpis_visits')->insert(['date' => $yesterday, 'value' => $visits]);
});
}

public static function getActions($year, $month)
{
$start = Carbon::createFromDate($year, $month, 1)->toDateString();
$end = Carbon::createFromDate($year, $month, 1)->endOfMonth()->toDateString();
$start = Carbon::createFromDate($year, $month)->startOfMonth();
$end = $start->copy()->addMonth();
$res = DB::table('kpis_actions')->whereBetween('date', [$start, $end])->sum('value');

return $res;
}
public static function getVisits($year, $month)
{
$start = Carbon::createFromDate($year, $month, 1)->toDateString();
$end = Carbon::createFromDate($year, $month, 1)->endOfMonth()->toDateString();
$start = Carbon::createFromDate($year, $month)->startOfMonth();
$end = $start->copy()->addMonth();
$res = DB::table('kpis_visits')->whereBetween('date', [$start, $end])->sum('value');

return $res;
}
}
3 changes: 2 additions & 1 deletion src/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ class Storage
{
public static function getStorageUsage($year, $month)
{
$date = Carbon::createFromDate($year, $month, 1)->endOfMonth()->toDateString();
$date = Carbon::createFromDate($year, $month, 1)->endOfMonth();
$res = DB::table('kpis_storage_usage')->where('date', '=', $date)->sum('value');

return $res;
}
}
13 changes: 9 additions & 4 deletions src/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@ class User
{
public static function getUser($year, $month)
{
$first = Carbon::createFromDate($year, $month, 1);
$last = $first->copy()->endOfMonth();
return DB::table('kpis_users')->whereBetween('date', [$first->toDateString(), $last->toDateString()])->sum('value');
$first = Carbon::createFromDate($year, $month)->startOfMonth();
$last = $first->copy()->addMonth();

return DB::table('kpis_users')
->whereBetween('date', [$first, $last])
->sum('value');
}

public static function getUniqueUser($year, $month)
{
$date = Carbon::createFromDate($year, $month, 1)->endOfMonth()->toDateString();
$date = Carbon::createFromDate($year, $month, 1)->endOfMonth();
$res = DB::table('kpis_unique_users')->where('date', '=', $date)->sum('value');

return $res;
}
}
10 changes: 5 additions & 5 deletions tests/Console/Commands/CountUniqueUserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class CountUniqueUserTest extends TestCase
{
public function testHandle()
{
UserTest::create(['login_at' => Carbon::now()->subMonth()->firstOfMonth()->toDateString()]);
UserTest::create(['login_at' => Carbon::now()->subMonth()->toDateString()]);
UserTest::create(['login_at' => Carbon::now()->subMonth()->endOfMonth()->toDateString()]);
UserTest::create(['login_at' => Carbon::now()->subMonth()->firstOfMonth()]);
UserTest::create(['login_at' => Carbon::now()->subMonth()]);
UserTest::create(['login_at' => Carbon::now()->subMonth()->endOfMonth()]);

$this->artisan('kpis:count-unique-user')->assertExitCode(0);

Expand All @@ -28,8 +28,8 @@ public function testHandle()

public function testLoginWasNotLastMonth()
{
UserTest::create(['login_at' => Carbon::now()->subMonth()->firstOfMonth()->toDateString()]);
UserTest::create(['login_at' => Carbon::now()->subMonths(2)->endOfMonth()->toDateString()]);
UserTest::create(['login_at' => Carbon::now()->subMonth()->firstOfMonth()]);
UserTest::create(['login_at' => Carbon::now()->subMonths(2)->endOfMonth()]);

$this->artisan('kpis:count-unique-user')->assertExitCode(0);

Expand Down
10 changes: 5 additions & 5 deletions tests/Console/Commands/CountUserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ class CountUserTest extends TestCase
{
public function testHandle()
{
$yesterday = Carbon::yesterday()->toDateString();
$yesterday = Carbon::now()->subDay();

UserTest::create(['login_at' => $yesterday]);
UserTest::create(['login_at' => $yesterday]);

$this->artisan('kpis:count-user')->assertExitCode(0);

$users = DB::table('kpis_users')->where('date', '=', $yesterday)->pluck('value');
$users = DB::table('kpis_users')->where('date', '=', $yesterday->toDateString())->pluck('value');

$this->assertCount(1, $users);
$this->assertEquals(2, $users[0]);
Expand All @@ -28,14 +28,14 @@ public function testHandle()
public function testDifferentLogInDates()
{

$yesterday = Carbon::yesterday()->toDateString();
$yesterday = Carbon::now()->subDay();

UserTest::create(['login_at' => $yesterday]);
UserTest::create(['login_at' => Carbon::now()->subDays(2)->toDateString()]);
UserTest::create(['login_at' => Carbon::now()->subDays(2)]);

$this->artisan('kpis:count-user')->assertExitCode(0);

$users = DB::table('kpis_users')->where('date', '=', $yesterday)->pluck('value');
$users = DB::table('kpis_users')->where('date', '=', $yesterday->toDateString())->pluck('value');

$this->assertCount(1, $users);
$this->assertEquals(1, $users[0]);
Expand Down
5 changes: 3 additions & 2 deletions tests/RequestsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,18 @@ public function testGetActions()
{
$date = Carbon::now()->subMonth()->lastOfMonth();

DB::table('kpis_actions')->insert(['date' => $date->toDateString(), 'value' => 10]);
DB::table('kpis_actions')->insert(['date' => $date, 'value' => 10]);

$count = Requests::getActions($date->year, $date->month);

$this->assertEquals(10, $count);
}

public function testGetVisits()
{
$date = Carbon::now()->subMonth()->lastOfMonth();

DB::table('kpis_visits')->insert(['date' => $date->toDateString(), 'value' => 10]);
DB::table('kpis_visits')->insert(['date' => $date, 'value' => 10]);

$count = Requests::getVisits($date->year, $date->month);

Expand Down
2 changes: 1 addition & 1 deletion tests/StorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function testGetStorage()

$noFiles = Storage::getStorageUsage($date->year, $date->month);

DB::table('kpis_storage_usage')->insert(['date' => $date->toDateString(), 'value' => 100]);
DB::table('kpis_storage_usage')->insert(['date' => $date, 'value' => 100]);

$size = Storage::getStorageUsage($date->year, $date->month);

Expand Down
6 changes: 3 additions & 3 deletions tests/UserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public function testGetUser(){

$noUserCounted = User::getUser($first->year, $first->month);

DB::table('kpis_users')->insert(['date' => $first->toDateString(), 'value' => 10]);
DB::table('kpis_users')->insert(['date' => $last->toDateString(), 'value' => 10]);
DB::table('kpis_users')->insert(['date' => $first, 'value' => 10]);
DB::table('kpis_users')->insert(['date' => $last, 'value' => 10]);

$count = User::getUser($first->year, $first->month);

Expand All @@ -31,7 +31,7 @@ public function testGetUniqueUser(){

$noUserCounted = User::getUniqueUser($date->year, $date->month);

DB::table('kpis_unique_users')->insert(['date' => $date->toDateString(), 'value' => 10]);
DB::table('kpis_unique_users')->insert(['date' => $date, 'value' => 10]);

$count = User::getUniqueUser($date->year, $date->month);

Expand Down