Minor changes in FacilitiesService

Author: amitdugar

app/classes/Services/FacilitiesService.php

@@ -186,57 +186,53 @@ public function getTestingLabFacilityMap($labId)
     // $onlyActive = true/false
     public function getHealthFacilities($testType = null, $byPassFacilityMap = false, $allColumns = false, $condition = [], $onlyActive = true, $userId = null)
     {
-
-        return MemoUtility::remember(function () use ($testType, $byPassFacilityMap, $allColumns, $condition, $onlyActive, $userId): string|array|null|int|float|false {
-            $userId ??= null;
-            if (isset($_SESSION['userId']) && $userId === null) {
-                $userId ??= $_SESSION['userId'];
-            }
-            if (!$byPassFacilityMap && !empty($userId)) {
-                $facilityMap = $this->getUserFacilityMap($userId);
-                if (!empty($facilityMap)) {
-                    $this->db->where("`facility_id` IN ($facilityMap)");
-                }
+        $userId ??= null;
+        if (isset($_SESSION['userId']) && $userId === null) {
+            $userId ??= $_SESSION['userId'];
+        }
+        if (!$byPassFacilityMap && !empty($userId)) {
+            $facilityMap = $this->getUserFacilityMap($userId);
+            if (!empty($facilityMap)) {
+                $this->db->where("`facility_id` IN ($facilityMap)");
             }
+        }
 
-            if (!empty($testType)) {
-                // subquery
-                $healthFacilities = $this->db->subQuery();
-                // we want to fetch facilities that have test type is not specified as well as this specific test type
-                $healthFacilities->where("test_type is null or test_type like '$testType'");
-                $healthFacilities->get("health_facilities", null, "facility_id");
+        if (!empty($testType)) {
+            // subquery
+            $healthFacilities = $this->db->subQuery();
+            // we want to fetch facilities that have test type is not specified as well as this specific test type
+            $healthFacilities->where("test_type is null or test_type like '$testType'");
+            $healthFacilities->get("health_facilities", null, "facility_id");
 
-                $this->db->where("facility_id", $healthFacilities, 'IN');
-            }
+            $this->db->where("facility_id", $healthFacilities, 'IN');
+        }
 
-            if ($onlyActive) {
-                $this->db->where('status', 'active');
-            }
+        if ($onlyActive) {
+            $this->db->where('status', 'active');
+        }
 
-            if (!empty($condition)) {
-                $condition = is_array($condition) ? $condition : [$condition];
-                foreach ($condition as $cond) {
-                    $this->db->where($cond);
-                }
+        if (!empty($condition)) {
+            $condition = is_array($condition) ? $condition : [$condition];
+            foreach ($condition as $cond) {
+                $this->db->where($cond);
             }
+        }
 
+        $this->db->orderBy("facility_name", "asc");
 
-            $this->db->orderBy("facility_name", "asc");
-
-            if ($allColumns) {
-                return $this->db->get("facility_details");
-            } else {
+        if ($allColumns) {
+            return $this->db->get("facility_details");
+        } else {
 
-                $response = [];
+            $response = [];
 
-                $results = $this->db->get("facility_details", null, "facility_id,facility_name");
+            $results = $this->db->get("facility_details", null, "facility_id,facility_name");
 
-                foreach ($results as $row) {
-                    $response[$row['facility_id']] = $row['facility_name'];
-                }
-                return $response;
+            foreach ($results as $row) {
+                $response[$row['facility_id']] = $row['facility_name'];
             }
-        }, 300);
+            return $response;
+        }
     }
 
 

bin/db-tools.php

@@ -34,7 +34,6 @@
 use App\Services\DatabaseService;
 use App\Exceptions\SystemException;
 use App\Services\SystemService;
-use Ifsnop\Mysqldump as IMysqldump;
 use App\Registries\ContainerRegistry;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Helper\ProgressBar;
@@ -50,7 +49,7 @@
 // Database dumps routinely exceed the default 25MB safety limit; lift it for this CLI.
 ArchiveUtility::setMaxFileSize(null);
 
-$backupFolder = APPLICATION_PATH . '/../backups/db';
+$backupFolder = BACKUP_PATH . DIRECTORY_SEPARATOR . 'db';
 if (!is_dir($backupFolder)) {
     MiscUtility::makeDirectory($backupFolder);
 }

composer.json

@@ -35,7 +35,6 @@
         "guzzlehttp/guzzle": "^7.10",
         "hackzilla/password-generator": "^1.7",
         "halaxa/json-machine": "^1.2",
-        "ifsnop/mysqldump-php": "^2.12",
         "league/csv": "^9.27",
         "maennchen/zipstream-php": "^3.1",
         "monolog/monolog": "^3.9",