Merge remote-tracking branch 'origin/master' into akun

@@ -9,6 +9,7 @@
 
 namespace App\Console\Commands\ProjectWeeklyReport;
 
+use App\Models\Blog\Blog;
 use App\Models\Com\Notify;
 use App\Models\Com\V6WeeklyReport;
 use App\Models\HomeCount\Count;
@@ -85,7 +86,7 @@ class WeekProject extends Command
         $data['inquiry_country'] = $startOfLastWeekFormattedInfo['country'] ?? json_encode([]);
         $data['week_inquiry_total'] = ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0);
         $rankDataModel = new RankData();
-        $rankInfo = $rankDataModel->read(['project_id'=>$value['id']],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
+        $rankInfo = $rankDataModel->read(['project_id'=>$value['id'],'lang'=>''],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
         $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0;
         $externalLinksModel = new ExternalLinks();
         $linkInfo = $externalLinksModel->read(['project_id'=>$value['id']],['total']);
@@ -98,6 +99,8 @@ class WeekProject extends Command
         $data['product_num'] = $productModel->counts(['status'=>1]) ?? 0;
         $newsModel = new News();
         $data['news_num'] = $newsModel->counts(['status'=>1]) ?? 0;
+        $blogModel = new Blog();
+        $data['blog_num'] = $blogModel->counts(['status'=>1]) ?? 0;
         $notifyModel = new Notify();
         $data['main_update_num'] = $notifyModel->counts(['type'=>1,'route'=>1,'project_id'=>$value['id']]) ?? 0;
         $data['aggregation_update_num'] = $notifyModel->counts(['type'=>1,'route'=>4,'project_id'=>$value['id']]) ?? 0;