Refactor SQL query formatting in various scripts

- Updated multiple scripts to improve SQL query formatting by ensuring consistent line breaks and indentation, enhancing readability.
- Adjusted queries in `alertManager.sh`, `generateMetrics.sh`, `updateDashboard.sh`, `metricsFunctions.sh`, `monitoringFunctions.sh`, and others to follow a uniform style.
- Improved overall code clarity and maintainability by applying consistent formatting practices across the codebase.

Author: angoca

bin/alerts/alertManager.sh

@@ -405,7 +405,7 @@ show_stats() {
  local dbport="${DBPORT:-5432}"
  local dbuser="${DBUSER:-postgres}"
 
- local query="SELECT 
+ local query="SELECT
                    component,
                    alert_level,
                    status,

bin/dashboard/generateMetrics.sh

@@ -103,7 +103,7 @@ generate_component_metrics() {
  local component_lower
  component_lower=$(echo "${component}" | tr '[:upper:]' '[:lower:]')
 
- local query="SELECT 
+ local query="SELECT
                    metric_name,
                    metric_value,
                    metadata,
@@ -215,7 +215,7 @@ generate_dashboard_metrics() {
  component_lower=$(echo "${component}" | tr '[:upper:]' '[:lower:]')
 
  # Aggregate metrics by name for dashboard
- local dashboard_query="SELECT 
+ local dashboard_query="SELECT
                             metric_name,
                             COUNT(*) as count,
                             AVG(metric_value::numeric) as avg_value,

bin/dashboard/updateDashboard.sh

@@ -308,7 +308,7 @@ update_component_health() {
             SELECT DISTINCT ON (component)
                 component,
                 MAX(timestamp) as latest_timestamp,
-                CASE 
+                CASE
                     WHEN COUNT(*) FILTER (WHERE (metric_name LIKE '%error%' OR metric_name LIKE '%failure%') AND metric_value::numeric > 0) > 0 THEN 'degraded'
                     WHEN COUNT(*) FILTER (WHERE metric_name LIKE '%availability%' AND metric_value::numeric < 1) > 0 THEN 'down'
                     WHEN MAX(timestamp) < CURRENT_TIMESTAMP - INTERVAL '1 hour' THEN 'unknown'
@@ -320,7 +320,7 @@ update_component_health() {
             ORDER BY component, MAX(timestamp) DESC
         )
         INSERT INTO component_health (component, status, last_check, last_success)
-        SELECT 
+        SELECT
             lm.component,
             lm.status,
             CURRENT_TIMESTAMP,
@@ -331,7 +331,7 @@ update_component_health() {
             status = EXCLUDED.status,
             last_check = EXCLUDED.last_check,
             last_success = CASE WHEN EXCLUDED.status = 'healthy' THEN EXCLUDED.last_success ELSE component_health.last_success END,
-            error_count = CASE 
+            error_count = CASE
                 WHEN EXCLUDED.status != 'healthy' THEN component_health.error_count + 1
                 ELSE 0
             END;
@@ -356,37 +356,37 @@ update_component_health() {
 
  # Update daemon health separately (daemon metrics are under 'ingestion' component)
  local daemon_query="
-        UPDATE component_health 
-        SET status = CASE 
+        UPDATE component_health
+        SET status = CASE
             WHEN EXISTS (
-                SELECT 1 FROM metrics 
-                WHERE component = 'ingestion' 
-                AND metric_name LIKE 'daemon%' 
+                SELECT 1 FROM metrics
+                WHERE component = 'ingestion'
+                AND metric_name LIKE 'daemon%'
                 AND timestamp > CURRENT_TIMESTAMP - INTERVAL '5 minutes'
             ) THEN 'healthy'
             WHEN EXISTS (
-                SELECT 1 FROM metrics 
-                WHERE component = 'ingestion' 
-                AND metric_name LIKE 'daemon%' 
+                SELECT 1 FROM metrics
+                WHERE component = 'ingestion'
+                AND metric_name LIKE 'daemon%'
                 AND timestamp > CURRENT_TIMESTAMP - INTERVAL '1 hour'
             ) THEN 'degraded'
             ELSE 'down'
         END,
         last_check = CURRENT_TIMESTAMP,
-        last_success = CASE 
+        last_success = CASE
             WHEN EXISTS (
-                SELECT 1 FROM metrics 
-                WHERE component = 'ingestion' 
-                AND metric_name LIKE 'daemon%' 
+                SELECT 1 FROM metrics
+                WHERE component = 'ingestion'
+                AND metric_name LIKE 'daemon%'
                 AND timestamp > CURRENT_TIMESTAMP - INTERVAL '5 minutes'
             ) THEN CURRENT_TIMESTAMP
             ELSE last_success
         END,
-        error_count = CASE 
+        error_count = CASE
             WHEN EXISTS (
-                SELECT 1 FROM metrics 
-                WHERE component = 'ingestion' 
-                AND metric_name LIKE 'daemon%' 
+                SELECT 1 FROM metrics
+                WHERE component = 'ingestion'
+                AND metric_name LIKE 'daemon%'
                 AND timestamp > CURRENT_TIMESTAMP - INTERVAL '5 minutes'
             ) THEN 0
             ELSE error_count + 1

bin/lib/metricsFunctions.sh

@@ -46,7 +46,7 @@ get_metrics_summary() {
  local dbuser="${DBUSER:-postgres}"
 
  local query
- query="SELECT 
+ query="SELECT
                metric_name,
                AVG(metric_value) as avg_value,
                MIN(metric_value) as min_value,
@@ -377,7 +377,7 @@ aggregate_metrics() {
   esac
 
   local query
-  query="SELECT 
+  query="SELECT
                    ${time_group} as period,
                    AVG(metric_value) as avg_value,
                    MIN(metric_value) as min_value,

bin/lib/monitoringFunctions.sh

@@ -362,15 +362,15 @@ update_component_health() {
 
  local query
  if [[ "${status}" == "healthy" ]]; then
-  query="UPDATE component_health 
-               SET status = '${status}', 
+  query="UPDATE component_health
+               SET status = '${status}',
                    last_check = CURRENT_TIMESTAMP,
                    last_success = CURRENT_TIMESTAMP,
                    error_count = ${error_count}
                WHERE component = '${component}';"
  else
-  query="UPDATE component_health 
-               SET status = '${status}', 
+  query="UPDATE component_health
+               SET status = '${status}',
                    last_check = CURRENT_TIMESTAMP,
                    error_count = ${error_count}
                WHERE component = '${component}';"

bin/monitor/collectBoundaryMetrics.sh

@@ -156,8 +156,8 @@ detect_notes_out_of_bounds() {
  log_info "${COMPONENT}: Detecting notes with coordinates out of bounds"
 
  # Check for notes with invalid coordinates (outside valid lat/lon ranges)
- local query="SELECT COUNT(*) FROM notes 
-                 WHERE latitude < -90 OR latitude > 90 
+ local query="SELECT COUNT(*) FROM notes
+                 WHERE latitude < -90 OR latitude > 90
                     OR longitude < -180 OR longitude > 180;"
  local result
  result=$(execute_sql_query "${query}" 2> /dev/null | tr -d '[:space:]' || echo "0")
@@ -181,8 +181,8 @@ detect_wrong_country_assignments() {
  log_info "${COMPONENT}: Detecting notes with potentially wrong country assignment"
 
  # Check 1: Notes with country_id that doesn't exist in countries table
- local query_invalid_ref="SELECT COUNT(*) FROM notes n 
-                             WHERE n.country_id IS NOT NULL 
+ local query_invalid_ref="SELECT COUNT(*) FROM notes n
+                             WHERE n.country_id IS NOT NULL
                                AND NOT EXISTS (
                                    SELECT 1 FROM countries c WHERE c.id = n.country_id
                                );"
@@ -201,7 +201,7 @@ detect_wrong_country_assignments() {
                      AND n.latitude IS NOT NULL
                      AND n.longitude IS NOT NULL
                      AND EXISTS (
-                         SELECT 1 FROM countries c 
+                         SELECT 1 FROM countries c
                          WHERE c.id = n.country_id
                            AND (
                                -- Check if note coordinates are outside country bounding box
@@ -225,7 +225,7 @@ detect_wrong_country_assignments() {
                          AND n.latitude IS NOT NULL
                          AND n.longitude IS NOT NULL
                          AND EXISTS (
-                             SELECT 1 FROM countries c 
+                             SELECT 1 FROM countries c
                              WHERE c.id = n.country_id
                                AND c.geometry IS NOT NULL
                                AND NOT ST_Contains(
@@ -297,7 +297,7 @@ detect_notes_affected_by_boundary_changes() {
                    AND n.longitude IS NOT NULL
                    AND n.updated_at < (SELECT MAX(updated_at) FROM countries WHERE updated_at IS NOT NULL)
                    AND EXISTS (
-                       SELECT 1 FROM countries c 
+                       SELECT 1 FROM countries c
                        WHERE c.id = n.country_id
                          AND c.updated_at > n.updated_at
                    );"

bin/monitor/collectDatabaseMetrics.sh

@@ -45,7 +45,7 @@ collect_table_sizes() {
  log_info "${COMPONENT}: Collecting table sizes"
 
  local query="
-        SELECT 
+        SELECT
             tablename,
             pg_total_relation_size('public.'||tablename) AS total_size_bytes,
             pg_relation_size('public.'||tablename) AS table_size_bytes,
@@ -91,7 +91,7 @@ collect_table_bloat() {
  log_info "${COMPONENT}: Collecting table bloat metrics"
 
  local query="
-        SELECT 
+        SELECT
             tablename,
             n_live_tup AS live_tuples,
             n_dead_tup AS dead_tuples,
@@ -148,12 +148,12 @@ collect_index_usage() {
  log_info "${COMPONENT}: Collecting index usage metrics"
 
  local query="
-        SELECT 
+        SELECT
             t.tablename,
             COALESCE(SUM(i.idx_scan), 0) AS total_index_scans,
             t.seq_scan AS sequential_scans,
-            CASE 
-                WHEN t.seq_scan + COALESCE(SUM(i.idx_scan), 0) > 0 
+            CASE
+                WHEN t.seq_scan + COALESCE(SUM(i.idx_scan), 0) > 0
                 THEN ROUND(COALESCE(SUM(i.idx_scan), 0) * 100.0 / (t.seq_scan + COALESCE(SUM(i.idx_scan), 0)), 2)
                 ELSE 0
             END AS index_scan_ratio_percent
@@ -211,7 +211,7 @@ collect_unused_indexes() {
  log_info "${COMPONENT}: Collecting unused indexes metrics"
 
  local query="
-        SELECT 
+        SELECT
             COUNT(*) AS unused_index_count,
             SUM(pg_relation_size(indexrelid)) AS unused_index_size_bytes
         FROM pg_stat_user_indexes
@@ -263,7 +263,7 @@ collect_slow_queries() {
  fi
 
  local query="
-        SELECT 
+        SELECT
             COUNT(*) AS slow_query_count
         FROM pg_stat_statements
         WHERE mean_exec_time > 1000
@@ -288,7 +288,7 @@ collect_cache_hit_ratio() {
  log_info "${COMPONENT}: Collecting cache hit ratio"
 
  local query="
-        SELECT 
+        SELECT
             ROUND(blks_hit * 100.0 / NULLIF(blks_hit + blks_read, 0), 2) AS cache_hit_ratio_percent
         FROM pg_stat_database
         WHERE datname = current_database();
@@ -313,7 +313,7 @@ collect_connection_stats() {
 
  # Active connections by application
  local app_query="
-        SELECT 
+        SELECT
             application_name,
             COUNT(*) AS connection_count
         FROM pg_stat_activity
@@ -339,7 +339,7 @@ collect_connection_stats() {
 
  # Overall connection statistics
  local conn_query="
-        SELECT 
+        SELECT
             COUNT(*) AS total_connections,
             COUNT(*) FILTER (WHERE state = 'active') AS active_connections,
             COUNT(*) FILTER (WHERE state = 'idle') AS idle_connections,
@@ -375,7 +375,7 @@ collect_connection_stats() {
 
  # Connection usage percentage
  local usage_query="
-        SELECT 
+        SELECT
             COUNT(*) AS current_connections,
             current_setting('max_connections')::integer AS max_connections,
             ROUND(COUNT(*) * 100.0 / current_setting('max_connections')::integer, 2) AS connection_usage_percent
@@ -413,7 +413,7 @@ collect_lock_stats() {
 
  # Active locks summary
  local lock_query="
-        SELECT 
+        SELECT
             COUNT(*) AS total_locks,
             COUNT(*) FILTER (WHERE granted = true) AS granted_locks,
             COUNT(*) FILTER (WHERE granted = false) AS waiting_locks
@@ -441,7 +441,7 @@ collect_lock_stats() {
 
  # Deadlocks count
  local deadlock_query="
-        SELECT 
+        SELECT
             deadlocks AS deadlocks_count
         FROM pg_stat_database
         WHERE datname = current_database();

bin/monitor/monitorAPI.sh

@@ -57,7 +57,7 @@ Options:
     -q, --quiet         Suppress non-error output
     -c, --config FILE   Use specific configuration file
     --check CHECK       Run specific check only
-                        Available checks: availability, rate_limiting, 
+                        Available checks: availability, rate_limiting,
                                         ddos_protection, abuse_detection
 
 Examples: