check count of rented biked for qr system

cyklokoalicia · Jun 2, 2024 · c83a7a1 · c83a7a1
1 parent ac7d3fc
commit c83a7a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Rent/AbstractRentSystem.php b/src/Rent/AbstractRentSystem.php
@@ -14,7 +14,7 @@
  */
 abstract class AbstractRentSystem implements RentSystemInterface
 {
-    private const ERROR = 1;
+    protected const ERROR = 1;
     /**
      * @var DbInterface
      */

diff --git a/src/Rent/RentSystemQR.php b/src/Rent/RentSystemQR.php
@@ -18,23 +18,25 @@ public function returnBike($userId, $bikeId, $standName, $note = '', $force = fa
 
         if ($bikeId !== 0) {
             $this->logger->error("Bike number could not be provided via QR code", ["userId" => $userId]);
-            return $this->response(_('Invalid bike number'), ERROR);
+            return $this->response(_('Invalid bike number'), self::ERROR);
         }
 
         $result = $this->db->query("SELECT bikeNum FROM bikes WHERE currentUser=$userId ORDER BY bikeNum");
         $bikeNumber = $result->rowCount();
-        $bikeId = $result->fetchAssoc()['bikeNum'];
 
-        if ($bikeNumber > 1) {
+        if ($bikeNumber === 0) {
+            return $this->response(_('You currently have no rented bikes.'), self::ERROR);
+        } elseif ($bikeNumber > 1) {
             $message = _('You have') . ' ' . $bikeNumber . ' '
                 . _('rented bikes currently. QR code return can be used only when 1 bike is rented. Please, use web');
             if ($this->connectorsConfig["sms"]) {
                 $message .= _(' or SMS');
             }
             $message .= _(' to return the bikes.');
 
-            return $this->response($message, ERROR);
+            return $this->response($message, self::ERROR);
         }
+        $bikeId = $result->fetchAssoc()['bikeNum'];
 
         return parent::returnBike($userId, $bikeId, $standName, $note, $force);
     }