Merge pull request #18 from Kejax/main

Changed how the history works

.github/workflows/deploy.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - production
-  pull_request:
-    branches:
-      production
 
 jobs:
   deploy:

app/Console/Kernel.php

@@ -37,7 +37,14 @@ protected function schedule(Schedule $schedule): void
                     $planetModel->fill($planet);
                     $planetModel->save();
 
-                    PlanetHistory::create($planet);
+                    $history = PlanetHistory::orderBy('updated_at', 'DESC')->where('index', $planet['index'])->first();
+
+                    if ($history && $history->toArray() == $planet) {
+                        $history->touch();
+                    } else {
+                        PlanetHistory::create($planet);
+                    }
+
                 }
 
             }

app/Http/Controllers/Api/PlanetStatusController.php

@@ -40,7 +40,7 @@ public function planetsAtTime(Request $request) {
         $time = Carbon::parse($request->input('time'));
 
         $planets = Planet::with(['history' => function (Builder $q) use ($time) {
-            $q->latest()->where('created_at', '<', $time)->limit(1);
+            $q->latest()->where('updated_at', '<', $time)->limit(1);
         }])->get();
 
         return response()->json($planets->pluck('history')->OneEntryArrayList(), 200);

app/Models/Planet.php

@@ -24,6 +24,11 @@ class Planet extends Model
         'created_at'
     ];
 
+    protected $hidden = [
+        'created_at',
+        'index'
+    ];
+
     public function history() {
         return $this->hasMany(PlanetHistory::class, 'index', 'index');
     }

app/Models/PlanetHistory.php

@@ -9,8 +9,6 @@ class PlanetHistory extends Model
 {
     use HasFactory;
 
-    public $timestamps = false;
-
     protected $table = 'planet_histories';
 
     protected $fillable = [
@@ -20,10 +18,7 @@ class PlanetHistory extends Model
         'health',
         'regenPerSecond',
         'players',
-        'created_at'
+        'created_at',
+        'updated_at'
     ];
-
-    // protected $hidden = [
-    //     'id'
-    // ];
 }

database/migrations/2024_03_27_104500_add_updated_at_to_planet_histories.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('planet_histories', function (Blueprint $table) {
+            $table->timestamp('updated_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('planet_histories', function (Blueprint $table) {
+            $table->removeColumn('updated_at');
+        });
+    }
+};

database/migrations/2024_03_27_123937_fix_regen_columns.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('planet_histories', function (Blueprint $table) {
+            $table->decimal('regenPerSecond', 8, 4)->change();
+        });
+
+        Schema::table('planets', function (Blueprint $table) {
+            $table->decimal('regenPerSecond', 8, 4)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('planet_histories', function (Blueprint $table) {
+            $table->float('regenPerSecond', 8, 4)->change();
+        });
+
+        Schema::table('planets', function (Blueprint $table) {
+            $table->float('regenPerSecond', 8, 4)->change();
+        });
+    }
+};

routes/console.php

@@ -35,12 +35,19 @@
         foreach ($data['planetStatus'] as $planet) {
 
             $planet['warId'] = $currentWarId;
+            $planet['regenPerSecond'] = round($planet['regenPerSecond'], 4);
 
             $planetModel = Planet::firstOrNew(['index' => $planet['index']]);
             $planetModel->fill($planet);
             $planetModel->save();
 
-            PlanetHistory::create($planet);
+            $history = PlanetHistory::orderBy('updated_at', 'DESC')->where('index', $planet['index'])->first();
+
+            if ($history && $history->makeHidden(['created_at', 'updated_at', 'id'])->toArray() == $planet) {
+                $history->touch();
+            } else {
+                PlanetHistory::create($planet);
+            }
         }
 
     }