Add db to workflow #6

Lukasss93 · Dec 10, 2023 · 86d507f · 86d507f
1 parent 62c8bac
commit 86d507f
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 25 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -56,6 +56,7 @@ jobs:
       - name: Deploy to production server
         uses: appleboy/ssh-action@master
         with:
+          command_timeout: 60m
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USER }}
           password: ${{ secrets.SSH_PASS }}

diff --git a/app/Models/Statistic.php b/app/Models/Statistic.php
@@ -48,33 +48,27 @@ public static function getStatsForBot(): array
 
         // stickers optimized
         $stickersOptimizedYesterday = self::query()
-            ->where('action', 'sticker')
-            ->where('category', 'optimized')
+            ->where('action', 'sticker.optimized')
             ->whereBetween('collected_at', [$date->subDay()->startOfDay(), $date->subDay()->endOfDay()])
             ->count();
         $stickersOptimizedToday = self::query()
-            ->where('action', 'sticker')
-            ->where('category', 'optimized')
+            ->where('action', 'sticker.optimized')
             ->whereBetween('collected_at', [$date->startOfDay(), $date->endOfDay()])
             ->count();
         $stickersOptimizedWeek = self::query()
-            ->where('action', 'sticker')
-            ->where('category', 'optimized')
+            ->where('action', 'sticker.optimized')
             ->whereBetween('collected_at', [$date->startOfWeek(), $date->endOfWeek()])
             ->count();
         $stickersOptimizedMonth = self::query()
-            ->where('action', 'sticker')
-            ->where('category', 'optimized')
+            ->where('action', 'sticker.optimized')
             ->whereBetween('collected_at', [$date->startOfMonth(), $date->endOfMonth()])
             ->count();
         $stickersOptimizedYear = self::query()
-            ->where('action', 'sticker')
-            ->where('category', 'optimized')
+            ->where('action', 'sticker.optimized')
             ->whereBetween('collected_at', [$date->startOfYear(), $date->endOfYear()])
             ->count();
         $stickersOptimizedTotal = self::query()
-            ->where('action', 'sticker')
-            ->where('category', 'optimized')
+            ->where('action', 'sticker.optimized')
             ->count();
 
         //active users

diff --git a/database/migrations/2023_12_09_124814_change_statistics_table_better_data_handling.php b/database/migrations/2023_12_09_124814_change_statistics_table_better_data_handling.php
@@ -7,25 +7,71 @@
 return new class extends Migration {
     public function up(): void
     {
+        Schema::table('statistics', function (Blueprint $table) {
+            $table->index('category');
+        });
+
+        echo "\n\nAdded index to category\n";
+
+        DB::table('statistics')
+            ->where('category', 'command')
+            ->update(['action' => DB::raw("concat('command.', action)")]);
+
+        echo "Updated where category is command set action to command.action\n";
+
+        DB::table('statistics')
+            ->where('category', 'handler')
+            ->update(['action' => DB::raw("concat('handler.', action)")]);
+
+        echo "Updated where category is handler set action to handler.action\n";
+
         DB::table('statistics')
-            ->update([
-                'action' => DB::raw("case
-                    when category='command' then concat('command.', action)
-                    when category='handler' then concat('handler.', action)
-                    when action='chat.blocked' then 'user.status.blocked'
-                    when action='chat.unblocked' then 'user.status.unblocked'
-                    when action='sticker' then 'sticker.optimized'
-                    when category='settings' then 'settings.news'
-                    when action='donation' then 'donate.success'
-                    when action='precheckout' then 'donate.precheckout'
-                    else action
-                end"),
-            ]);
+            ->where('category', 'donation')
+            ->update(['action' => 'settings.news']);
+
+        echo "Updated where category is donation set action to settings.news\n";
 
         Schema::table('statistics', function (Blueprint $table) {
             $table->string('action')->index()->change();
+        });
+
+        echo "Changed action column to index\n";
+
+        DB::table('statistics')
+            ->where('action', 'chat.blocked')
+            ->update(['action' => 'user.status.blocked']);
+
+        echo "Updated where action is chat.blocked set action to user.status.blocked\n";
+
+        DB::table('statistics')
+            ->where('action', 'chat.unblocked')
+            ->update(['action' => 'user.status.unblocked']);
+
+        echo "Updated where action is chat.unblocked set action to user.status.unblocked\n";
+
+        DB::table('statistics')
+            ->where('action', 'sticker')
+            ->update(['action' => 'sticker.optimized']);
+
+        echo "Updated where action is sticker set action to sticker.optimized\n";
+
+        DB::table('statistics')
+            ->where('action', 'donation')
+            ->update(['action' => 'donate.success']);
+
+        echo "Updated where action is donation set action to donate.success\n";
+
+        DB::table('statistics')
+            ->where('action', 'precheckout')
+            ->update(['action' => 'donate.precheckout']);
+
+        echo "Updated where action is precheckout set action to donate.precheckout\n";
+
+        Schema::table('statistics', function (Blueprint $table) {
             $table->dropColumn('category');
         });
+
+        echo "Dropped category column\n";
     }
 
     public function down(): void