fixbug tổng hợp BXH tuần

app/Console/Kernel.php

@@ -84,12 +84,12 @@ class Kernel extends ConsoleKernel
         $schedule->command('crawler:get-listen zing')->dailyAt('22:45');
         $schedule->command('crawler:get-listen zing --limit=-1')->dailyAt('22:50');
 
-        $schedule->command('calculate:daily-listen')->dailyAt('5:00');
-        $schedule->command('calculate:daily-listen')->dailyAt('5:10');
+        $schedule->command('calculate:daily-listen')->dailyAt('2:00');
+        $schedule->command('calculate:daily-listen')->dailyAt('2:10');
 
-        $schedule->command('calculate:report daily')->dailyAt('5:30');
-        $schedule->command('calculate:report weekly')->sundays();
-        $schedule->command('calculate:report monthly')->monthlyOn(21, '6:10');
+        $schedule->command('calculate:report daily')->dailyAt('3:05');
+        $schedule->command('calculate:report weekly')->dailyAt('4:05');
+        $schedule->command('calculate:report monthly')->monthlyOn(21, '5:05');
 
         $schedule->command('queue:work --once --timeout=120')->everyMinute()->withoutOverlapping();
     }

app/Helpers/Constants.php

@@ -24,7 +24,9 @@ class Constants
     const TABLE_PERMISSIONS = 'permissions';
 
     const TABLE_REPORT_VIEWS_DAILY = 'report_views_daily';
+    const TABLE_REPORT_VIEWS_MONTHLY_NEW = 'report_views_monthly_new';
     const TABLE_REPORT_VIEWS_WEEKLY = 'report_views_weekly';
+    const TABLE_REPORT_VIEWS_WEEKLY_NEW = 'report_views_weekly_new';
     const TABLE_REPORTS_VIEWS_MONTHLY = 'reports_views_monthly';
 
     const TABLE_ROLE_USER = 'role_user';

app/Models/Report/MonthlyReport.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class MonthlyReport extends Model
 {
-    protected $table = Constants::TABLE_REPORTS_VIEWS_MONTHLY;
+    protected $table = Constants::TABLE_REPORT_VIEWS_MONTHLY_NEW;
 
     public $timestamps = true;
 

app/Models/Report/WeeklyReport.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class WeeklyReport extends Model
 {
-    protected $table = Constants::TABLE_REPORT_VIEWS_WEEKLY;
+    protected $table = Constants::TABLE_REPORT_VIEWS_WEEKLY_NEW;
 
     public $timestamps = true;