Remove references to summary pages/DB (#860)

Co-authored-by: Mark Williams <[email protected]>
DiamondLightSource · Jan 13, 2025 · 060440a · 060440a
1 parent 3684b32
commit 060440a
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 2,281 deletions.
diff --git a/api/config_sample.php b/api/config_sample.php
@@ -13,11 +13,6 @@
     $isb  = array('user' => 'user', 'pass' => 'pass', 'db' => 'localhost/ispyb');
     $dbtype = 'mysql';
 
-    # Summary Database credentials 
-    ######### DELETE if not using connection. 
-    $summarydbconfig = array('user' => 'user', 'pass' => 'pass', 'db' => 'localhost/ispyb');
-    $ifsummary = true;
-
     # Encoded JWT key, used to sign and check validaty of jwt tokens
     # - Create one of these using /api/authenticate/key
     #   This can be changed to invalidate all currently active tokens

diff --git a/api/index.php b/api/index.php
@@ -70,7 +70,7 @@ function setupApplication($mode): Slim
         global $motd, $authentication_type, $cas_url, $cas_sso, $sso_url, $package_description,
             $facility_courier_countries, $facility_courier_countries_nde, $facility_courier_countries_link,
             $dhl_enable, $scale_grid, $scale_grid_end_date, $preset_proposal, $timezone,
-            $valid_components, $enabled_container_types, $ifsummary, $synchweb_version, $redirects,
+            $valid_components, $enabled_container_types, $synchweb_version, $redirects,
             $shipping_service_app_url, $use_shipping_service_redirect, $use_shipping_service_redirect_incoming_shipments,
             $dials_rest_url_rings;
         $app->contentType('application/json');
@@ -92,7 +92,6 @@ function setupApplication($mode): Slim
             'timezone' => $timezone,
             'valid_components' => $valid_components,
             'enabled_container_types' => $enabled_container_types,
-            'ifsummary' => $ifsummary,
             'synchweb_version' => $synchweb_version,
             'shipping_service_app_url' => $use_shipping_service_redirect || $use_shipping_service_redirect_incoming_shipments ? $shipping_service_app_url : null,
             'shipping_service_app_url_incoming' => $use_shipping_service_redirect_incoming_shipments ? $shipping_service_app_url : null,
@@ -112,13 +111,6 @@ function setupDependencyInjectionContainer($app)
         return $db;
     });
 
-    $app->container->singleton('dbsummary', function () use ($app): DatabaseParent {
-        $dbFactory = new DatabaseFactory(new DatabaseConnectionFactory());
-        $db = $dbFactory->get("summary");
-        $db->set_app($app);
-        return $db;
-    });
-
     $app->container->singleton('authData', function () use ($app) {
         return new AuthenticationData($app->container['db']);
     });

diff --git a/api/src/Database/DatabaseConnectionFactory.php b/api/src/Database/DatabaseConnectionFactory.php
@@ -9,7 +9,6 @@ class DatabaseConnectionFactory
     public function get($databaseType)
     {
         global $isb;
-        global $summarydbconfig;
 
         if (!$databaseType) {
             error_log('Database type variable, dbtype, is not specified in config.php - defaulting to MySql.');
@@ -25,16 +24,6 @@ public function get($databaseType)
             $conn = new \mysqli($host, $isb['user'], $isb['pass'], $dbn, $port);
             $conn->set_charset("utf8mb4");
         }
-        elseif ($databaseType == 'PureMySQL') {
-            $port = array_key_exists('port', $summarydbconfig) ? $summarydbconfig['port'] : null;
-            if (!$port) {
-                $port = ini_get("mysqli.default_port");
-            }
-            list($host, $dbn) = explode('/', $summarydbconfig['db']);
-            $conn = new \mysqli($host, $summarydbconfig['user'], $summarydbconfig['pass'], $dbn, $port);
-            $conn->set_charset("utf8mb4");
-        }
-
 
         if ($conn == null) {
             Utils::returnError("Database Configuration Error", "Database connection for type '$databaseType' does not exist.");

diff --git a/api/src/Database/DatabaseFactory.php b/api/src/Database/DatabaseFactory.php
@@ -10,7 +10,6 @@ class DatabaseFactory
     // Key is lower case representation of class name.
     public $database_types = array(
         'mysql' => ["dbClassName" =>'MySQL', "dataConnectionName" => 'MySQL'],
-        'summary' => ["dbClassName" =>'PureMySQL', "dataConnectionName" => 'PureMySQL']
     );
 
     function __construct($databaseConnectionFactory)