GH-224 Move moving fleets counter fetcher to an util

mdziekon · Jun 13, 2022 · 1cf6817 · 1cf6817
1 parent 539f51b
commit 1cf6817
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/modules/settings/_includes.php b/modules/settings/_includes.php
@@ -12,6 +12,7 @@
     include($includePath . './utils/errorMappers/validateEmailChange.errorMapper.php');
 
     include($includePath . './utils/queries/createEmailChangeProcessEntry.query.php');
+    include($includePath . './utils/queries/getMovingFleetsCount.query.php');
     include($includePath . './utils/queries/getUserWithEmailAddress.query.php');
 
     include($includePath . './utils/validators/validatePasswordChange.validator.php');

diff --git a/modules/settings/utils/queries/getMovingFleetsCount.query.php b/modules/settings/utils/queries/getMovingFleetsCount.query.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Settings\Utils\Queries;
+
+/**
+ * @param array $params
+ * @param string $params['userId']
+ */
+function getMovingFleetsCount($params) {
+    $userId = $params['userId'];
+
+    $query = (
+        "SELECT " .
+        "COUNT(*) AS `fleetsCount` " .
+        "FROM {{table}} " .
+        "WHERE " .
+        "`fleet_owner` = {$userId} OR " .
+        "`fleet_target_owner` = {$userId} " .
+        ";"
+    );
+
+    $result = doquery($query, 'fleets', true);
+
+    return $result['fleetsCount'];
+}
+
+?>
diff --git a/settings.php b/settings.php
@@ -681,9 +681,9 @@
                             $WarningMsgs[] = $_Lang['Vacation_24hNotPassed'];
                         }
 
-                        $checkFleets = doquery("SELECT COUNT(*) AS `Count` FROM {{table}} WHERE `fleet_owner` = {$_User['id']} OR `fleet_target_owner` = {$_User['id']};", 'fleets', true);
-                        if($checkFleets['Count'] > 0)
-                        {
+                        $movingFleetsCount = Settings\Utils\Queries\getMovingFleetsCount([ 'userId' => $_User['id'] ]);
+
+                        if ($movingFleetsCount > 0) {
                             $allowVacation = false;
                             $WarningMsgs[] = $_Lang['Vacation_FlyingFleets'];
                         }