fix incr xp

app/Actions/Locations/UpdateLeaderboardsXpAction.php

@@ -28,9 +28,15 @@ public function run (
         $this->addXp("leaderboard:users:$year", $incrXp, $userId);
     }
 
-    protected function addXp ($key, $xp, $userId) {
-        $currentScore = Redis::zscore($key, $userId) ?? 0;
-        $newScore = max(0, $currentScore + $xp);
-        Redis::zadd($key, $newScore, $userId);
+    protected function addXp ($key, $xp, $userId): void {
+        if ($xp <= 0) {
+            $currentScore = Redis::zscore($key, $userId) ?? 0;
+            $newScore = max(0, $currentScore + $xp);
+
+            Redis::zincrby($key, $newScore, $userId);
+        } else {
+
+            Redis::zincrby($key, $xp, $userId);
+        }
     }
 }

app/Actions/Locations/UpdateTotalPhotosForLocationAction.php

@@ -16,8 +16,9 @@ class UpdateTotalPhotosForLocationAction
      * @param string $stateId State
      * @param string $cityId City
      * @param int $increaseBy can be negative, value will be subtracted, but not below 0
+     * @return void
      */
-    public function run(string $countryId, string $stateId, string $cityId, int $increaseBy = 1)
+    public function run (string $countryId, string $stateId, string $cityId, int $increaseBy = 1): void
     {
         $this->updateValue("country:$countryId", $increaseBy);
 
@@ -33,8 +34,9 @@ public function run(string $countryId, string $stateId, string $cityId, int $inc
      *
      * @param $hashName
      * @param $value
+     * @return void
      */
-    protected function updateValue($hashName, $value)
+    protected function updateValue ($hashName, $value): void
     {
         // Separate if conditions to skip redis check when $value is positive
         if ($value < 0) {

app/Http/Controllers/Uploads/UploadPhotoController.php

@@ -68,7 +68,9 @@ public function __invoke (UploadPhotoRequest $request): JsonResponse
             'user_id' => $user->id
         ]);
 
-        if (!$user->has_uploaded) $user->has_uploaded = 1;
+        if (!$user->has_uploaded) {
+            $user->has_uploaded = 1;
+        }
 
         $file = $request->file('file'); // /tmp/php7S8v..
 
@@ -94,8 +96,9 @@ public function __invoke (UploadPhotoRequest $request): JsonResponse
         if ($exif["GPSLatitude"][0] === "0/0" && $exif["GPSLongitude"][0] === "0/0")
         {
             abort(500,
-                "Sorry, Your Images have GeoTags, but they have values of Zero. 
-                You may have lost the geotags when transferring images across devices."
+                "Error: Your Images have GeoTags, but they have values of zero. 
+                You may have lost the geotags when transferring images across devices
+                or you might need to enable another setting to make them available."
             );
         }
 
@@ -169,7 +172,11 @@ public function __invoke (UploadPhotoRequest $request): JsonResponse
         if (($latitude === 0 && $longitude === 0) || ($latitude === '0' && $longitude === '0'))
         {
             \Log::info("invalid coordinates found for userId $user->id \n");
-            abort(500, "Invalid coordinates: lat=0, lon=0");
+            abort(500,
+                "Error: Your Images have GeoTags, but they have values of zero. 
+                You may have lost the geotags when transferring images across devices
+                or you might need to enable another setting to make them available."
+            );
         }
 
         // Use OpenStreetMap to Reverse Geocode the coordinates into an Address.
@@ -239,7 +246,7 @@ public function __invoke (UploadPhotoRequest $request): JsonResponse
 
         $user->refresh();
 
-        // Update the Leaderboards
+        // Update the Leaderboards and give xp.
         $this->updateLeaderboardsAction->run(
             $photo,
             $user->id,

app/Listeners/Teams/IncreaseTeamTotalPhotos.php

@@ -2,11 +2,11 @@
 
 namespace App\Listeners\Teams;
 
-use App\Events\ImageUploaded;
-use App\Models\Teams\Team;
 use App\Models\User\User;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Models\Teams\Team;
+use App\Events\ImageUploaded;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
 class IncreaseTeamTotalPhotos implements ShouldQueue
 {
@@ -21,7 +21,7 @@ class IncreaseTeamTotalPhotos implements ShouldQueue
      * @param ImageUploaded $event
      * @return void
      */
-    public function handle(ImageUploaded $event)
+    public function handle (ImageUploaded $event): void
     {
         if (!$event->teamId) {
             return;