Merge pull request #223 from Traewelling/dev-ks-221

🚑 Fixed points calculation
Traewelling · Feb 20, 2021 · 21dd3e5 · 21dd3e5
2 parents b2e78d3 + dea7313
commit 21dd3e5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
@@ -164,10 +164,6 @@ public static function DeleteStatus($user, $statusId): ?bool {
         $user->train_distance -= $trainCheckin->distance;
         $user->train_duration -= $trainCheckin->duration;
 
-        //Don't subtract points, if status outside of current point calculation
-        if ($trainCheckin->departure->isAfter(Carbon::parse('last thursday 3:14am'))) {
-            $user->points -= $trainCheckin->points;
-        }
         $user->update();
         $status->delete();
         return true;

diff --git a/app/Http/Controllers/TransportController.php b/app/Http/Controllers/TransportController.php
@@ -380,7 +380,6 @@ public static function TrainCheckin($tripId,
 
         $user->train_distance += $trainCheckin->distance;
         $user->train_duration += $trainCheckin->duration;
-        $user->points         += $trainCheckin->points;
 
         $user->update();
 

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -25,10 +26,10 @@ class User extends Authenticatable implements MustVerifyEmail
     ];
     protected $casts    = [
         'email_verified_at' => 'datetime',
-        'private_profile' => 'boolean'
+        'private_profile'   => 'boolean'
     ];
     protected $appends  = [
-        'averageSpeed'
+        'averageSpeed', 'points'
     ];
 
     public function getAverageSpeedAttribute(): float {
@@ -67,4 +68,11 @@ public function icsTokens(): HasMany {
         return $this->hasMany(IcsToken::class, 'user_id', 'id');
     }
 
+    public function getPointsAttribute(): int {
+        return TrainCheckin::whereIn('status_id', $this->statuses()->select('id'))
+                           ->where('departure', '>=', Carbon::now()->subDays(7)->toIso8601String())
+                           ->select('points')
+                           ->sum('points');
+    }
+
 }
diff --git a/database/migrations/2021_02_20_155443_remove_static_points_from_users.php b/database/migrations/2021_02_20_155443_remove_static_points_from_users.php
@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RemoveStaticPointsFromUsers extends Migration
+{
+
+    public function up(): void {
+        Schema::table('users', function(Blueprint $table) {
+            $table->dropColumn('points');
+        });
+    }
+
+    public function down(): void {
+        Schema::table('users', function(Blueprint $table) {
+            $table->integer('points')
+                  ->unsigned()
+                  ->default(0)
+                  ->after('train_duration');
+        });
+    }
+}