Merge pull request #15 from biigle/patch-1

Replace createFromDate() with create()
biigle · Aug 20, 2024 · 4fa7b8c · 4fa7b8c
2 parents 556e01b + 98c77d8
commit 4fa7b8c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/src/Requests.php b/src/Requests.php
@@ -18,15 +18,15 @@ public static function save($visits, $actions)
 
     public static function getActions($year, $month)
     {
-        $start = Carbon::createFromDate($year, $month)->startOfMonth();
+        $start = Carbon::create($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)->startOfMonth();
+        $start = Carbon::create($year, $month)->startOfMonth();
         $end = $start->copy()->addMonth();
         $res = DB::table('kpis_visits')->whereBetween('date', [$start, $end])->sum('value');
 

diff --git a/src/User.php b/src/User.php
@@ -9,8 +9,8 @@ class User
 {
     public static function getUser($year, $month)
     {
-        $first = Carbon::createFromDate($year, $month)->startOfMonth();
-        $last = $first->copy()->addMonth();
+        $first = Carbon::create($year, $month)->startOfMonth();
+        $last = $first->copy()->endOfMonth();
 
         return DB::table('kpis_users')
             ->whereBetween('date', [$first, $last])

diff --git a/tests/RequestsTest.php b/tests/RequestsTest.php
@@ -56,6 +56,12 @@ public function testGetActions()
         $this->assertEquals(10, $count);
     }
 
+    public function testGetActionsOverflow()
+    {
+        Carbon::setTestNow(Carbon::parse('2024-07-31T05:45:23Z'));
+        $this->testGetActions();
+    }
+
     public function testGetVisits()
     {
         $date = Carbon::now()
@@ -69,4 +75,10 @@ public function testGetVisits()
 
         $this->assertEquals(10, $count);
     }
+
+    public function testGetVisitsOverflow()
+    {
+        Carbon::setTestNow(Carbon::parse('2024-07-31T05:45:23Z'));
+        $this->testGetVisits();
+    }
 }
diff --git a/tests/UserTest.php b/tests/UserTest.php
@@ -27,6 +27,12 @@ public function testGetUser()
         $this->assertEquals(20, $count);
     }
 
+    public function testGetUserOverflow()
+    {
+        Carbon::setTestNow(Carbon::parse('2024-07-31T05:45:23Z'));
+        $this->testGetUser();
+    }
+
     public function testGetUniqueUser(){
         $date = Carbon::now()
             ->settings(['monthOverflow' => false])