Fixed the bugs for setting up the server

DefinetlyNotAI · DefinetlyNotAI · commit 1f88bf06e5af · 2025-05-16T23:59:52.000+04:00
diff --git a/.gitignore b/.gitignore
@@ -78,4 +78,5 @@ dmypy.json
 cython_debug/
 instance/*
 !instance/.gitignore
-secret
+secret
+/extras/password
diff --git a/.idea/Banking.iml b/.idea/Banking.iml
diff --git a/api/__init__.py b/api/__init__.py
diff --git a/api/admin.py b/api/admin.py
@@ -6,7 +6,7 @@
 
 from banking.database import execute_query, execute_query_dict
 from banking.decorator import api_access_control, admin_required
-from banking.form_validate import SqlQueryForm, AdminActionForm, CurrencyForm
+from banking.form_types import SqlQueryForm, AdminActionForm, CurrencyForm
 from banking.get_data import get_settings, get_total_currency, get_user_by_wallet_name, \
     update_admin_balance
 from banking.log_module import create_log
diff --git a/api/get.py b/api/get.py
diff --git a/api/requests.py b/api/requests.py
@@ -5,7 +5,7 @@
 
 from banking.database import execute_query, execute_query_dict
 from banking.decorator import api_access_control, login_required
-from banking.form_validate import ResetPasswordForm
+from banking.form_types import ResetPasswordForm
 from banking.get_data import get_settings, get_client_ip, get_user_by_wallet_name
 from banking.log_module import create_log
 from banking.validate import validate_wallet_name
diff --git a/api/setup.py b/api/setup.py
@@ -1,9 +1,11 @@
+import os
+
 from flask import jsonify, request
 from werkzeug.security import generate_password_hash
 
 from banking.database import is_db_initialized, execute_query
 from banking.decorator import api_access_control, admin_required
-from banking.form_validate import SetupForm, WalletForm
+from banking.form_types import SetupForm, WalletForm
 from banking.get_data import get_settings, get_total_currency, get_user_by_wallet_name, \
     update_admin_balance
 from banking.log_module import create_log
@@ -29,6 +31,20 @@ def api_setup():
         admin_password = data.get('admin_password')
 
         try:
+            # Run DDL statements from schema.sql
+            schema_path = os.path.join(os.path.dirname(__file__), '../extras/schema.sql')
+            with open(schema_path, 'r') as f:
+                ddl_script = f.read()
+
+            # Assuming execute_query can run multiple statements if passed raw SQL
+            for statement in ddl_script.split(';'):
+                stmt = statement.strip()
+                if stmt:
+                    try:
+                        execute_query(stmt + ';', commit=True)
+                    except Exception as e:
+                        return jsonify({"error": "Failed to submit query to construct database", "details": f"{stmt} --> {e}"})
+
             # Insert settings
             execute_query(
                 "INSERT INTO settings (bank_name, currency_name, admin_password) VALUES (%s, %s, %s)",
diff --git a/api/transfer.py b/api/transfer.py
@@ -4,7 +4,7 @@
 
 from banking.database import execute_query
 from banking.decorator import api_access_control, admin_required, login_required
-from banking.form_validate import TransferForm, BankTransferForm
+from banking.form_types import TransferForm, BankTransferForm
 from banking.get_data import get_settings, get_client_ip, get_total_currency, get_user_by_wallet_name, \
     update_admin_balance
 from banking.log_module import create_log
diff --git a/api/unused.py b/api/unused.py
@@ -22,7 +22,7 @@ def api_check_database():
     def api_init_database():
         """API endpoint to initialize database tables"""
         if init_db():
-            return jsonify({"status": "success", "message": "Database tables created successfully"})
+            return jsonify({"status": "success", "message": "Database tables created successfully"}), 200
         else:
             return jsonify({"status": "error",
                             "message": "Failed to create database tables. Please check your database configuration."}), 500
diff --git a/app.py b/app.py
@@ -11,7 +11,7 @@
 from banking.global_vars import DB_POOL, ALLOW_PUBLIC_API_ACCESS
 from banking.log_module import create_log, rotate_logs
 from banking.validate import validate_wallet_name
-from routes import register_unused_api_routes, register_request_api_routes, register_get_api_routes, \
+from api import register_unused_api_routes, register_request_api_routes, register_get_api_routes, \
     register_setup_api_routes, register_transfer_api_routes, register_admin_api_routes
 
 # Configuration
@@ -47,6 +47,10 @@ def home():
 
 @app.route('/setup', methods=['GET', 'POST'])
 def setup_page():
+    if DB_POOL is None:
+        return render_template('error.html',
+                               message="Please setup the required ENV variables for DB URL")
+
     if is_db_initialized():
         return redirect(url_for('home'))
 
@@ -76,6 +80,9 @@ def setup_page():
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
+    if not is_db_initialized():
+        return redirect(url_for('setup_page'))
+
     if request.method == 'POST':
         wallet_name = request.form.get('wallet_name')
         password = request.form.get('password')
@@ -293,6 +300,10 @@ def admin_sql_page():
 @app.route('/server-health')
 def server_health_page():
     """Public page showing server health metrics"""
+    if not is_db_initialized():
+        return render_template('error.html',
+                               message="The DB is not initialised so the server health page is locked from rendering")
+
     settings = get_settings()
 
     return render_template('server_health.html', settings=settings,
@@ -352,7 +363,8 @@ def serve_static(filename):
     try:
         print("Database pool is initialized, starting the server...")
         print("Checking database initialization...")
-        init_db()
+        if not init_db():
+            exit("Oops! The DB init failed!! This means you have a issue with the database connection!")
         print("Rotating logs older than 30 days...")
         rotate_logs()  # Perform log rotation during startup
     except Exception as error:
diff --git a/banking/__init__.py b/banking/__init__.py
@@ -1,6 +1,6 @@
 from .database import check_db_connection, init_db, is_db_initialized, execute_query, execute_query_dict
 from .decorator import api_access_control, admin_required, login_required
-from .form_validate import SetupForm, WalletForm, TransferForm, BankTransferForm, SqlQueryForm, ResetPasswordForm, \
+from .form_types import SetupForm, WalletForm, TransferForm, BankTransferForm, SqlQueryForm, ResetPasswordForm, \
     AdminActionForm, CurrencyForm
 from .get_data import get_settings, get_client_ip, get_total_currency, get_server_health, get_user_by_wallet_name, \
     update_admin_balance
diff --git a/banking/database.py b/banking/database.py
@@ -259,8 +259,17 @@ def is_db_initialized():
         return False
 
     try:
+        # Check if settings table exists (Postgres example)
+        result = execute_query(
+            "SELECT to_regclass('public.settings')"
+        )
+        if not result or not result[0][0]:
+            return False
+
+        # Table exists, now check for rows
         result = execute_query("SELECT COUNT(*) FROM settings")
         return result and result[0][0] > 0
+
     except Exception as e:
         print(f"Error checking if DB is initialized: {e}")
         return False
diff --git a/banking/form_types.py b/banking/form_types.py
@@ -33,7 +33,7 @@ class WalletForm(Form):
     ])
 
     def process(self, formdata=None, obj=None, data=None, **kwargs):
-        if data and 'initial_currency' in data:
+        if isinstance(data, dict) and 'initial_currency' in data:
             try:
                 data['initial_currency'] = float(data['initial_currency'])
             except ValueError:
@@ -103,7 +103,7 @@ class CurrencyForm(Form):
     ])
 
     def process(self, formdata=None, obj=None, data=None, **kwargs):
-        if data and 'amount' in data:
+        if isinstance(data, dict) and 'amount' in data:
             try:
                 data['amount'] = float(data['amount'])
             except ValueError:
diff --git a/banking/global_vars.py b/banking/global_vars.py
@@ -3,6 +3,8 @@
 from psycopg2.pool import ThreadedConnectionPool
 
 DATABASE_URL = os.environ.get("DATABASE_URL", "EMPTY")
+if DATABASE_URL == "EMPTY":
+    print("The Database URL env variable is missing, THIS IS A MAJOR ISSUE!!")
 MAX_CONNECTION_POOL = 20  # Set the maximum number of connections in the pool for PostgreSQL
 
 """
@@ -26,3 +28,5 @@
     except Exception as err:
         print("\033[91mError initializing database connection pool:\033[0m", err)
         DB_POOL = None
+else:
+    print("Database connection pool skipped successfully, the default pages will show ONLY")
diff --git a/extras/getdbDDL.py b/extras/getdbDDL.py
@@ -0,0 +1,51 @@
+import os
+
+import psycopg2
+
+if __name__ == '__main__':
+    # Replace with your actual DATABASE_URL or use an environment variable
+    try:
+        DATABASE_URL = os.getenv("DATABASE_URL")
+
+        conn = psycopg2.connect(DATABASE_URL)
+        cur = conn.cursor()
+
+        # Get all user-defined tables
+        cur.execute("""
+                    SELECT table_name
+                    FROM information_schema.tables
+                    WHERE table_schema = 'public' AND table_type = 'BASE TABLE';
+                    """)
+
+        tables = cur.fetchall()
+
+        for table in tables:
+            table_name = table[0]
+            print(f"\n-- DDL for table: {table_name}")
+
+            # Get column info
+            cur.execute("""
+                        SELECT column_name, data_type, is_nullable, column_default
+                        FROM information_schema.columns
+                        WHERE table_name = %s;
+                        """, (table_name,))
+
+            columns = cur.fetchall()
+
+            ddl = f"CREATE TABLE {table_name} (\n"
+            col_lines = []
+            for col in columns:
+                line = f"  {col[0]} {col[1]}"
+                if col[3]:
+                    line += f" DEFAULT {col[3]}"
+                if col[2] == "NO":
+                    line += " NOT NULL"
+                col_lines.append(line)
+            ddl += ",\n".join(col_lines) + "\n);"
+            print(ddl)
+
+        cur.close()
+        conn.close()
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        exit(1)
diff --git a/extras/schema.sql b/extras/schema.sql
@@ -0,0 +1,56 @@
+-- DDL for table: logs
+CREATE TABLE logs (
+     id SERIAL PRIMARY KEY NOT NULL,
+     timestamp timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
+     action character varying NOT NULL,
+     details character varying NOT NULL,
+     private_level character varying NOT NULL,
+     ip_address character varying
+);
+
+-- DDL for table: logs_archive
+CREATE TABLE logs_archive (
+     id SERIAL PRIMARY KEY NOT NULL,
+     timestamp timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
+     action character varying NOT NULL,
+     details character varying NOT NULL,
+     private_level character varying NOT NULL,
+     ip_address character varying
+);
+
+-- DDL for table: requests
+CREATE TABLE requests (
+     id SERIAL PRIMARY KEY NOT NULL ,
+     timestamp timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
+     ticket_uuid character varying NOT NULL,
+     wallet_name character varying NOT NULL,
+     ip_address character varying,
+     category character varying,
+     status character varying DEFAULT 'Pending'::character varying,
+     reason character varying,
+     request_type character varying NOT NULL
+);
+
+-- DDL for table: settings
+CREATE TABLE settings (
+     maximum_currency double precision DEFAULT 1000000.0,
+     allow_debts boolean DEFAULT false,
+     allow_self_review boolean DEFAULT false,
+     id SERIAL PRIMARY KEY NOT NULL ,
+     allow_leaderboard boolean DEFAULT true,
+     allow_public_logs boolean DEFAULT true,
+     bank_name character varying NOT NULL,
+     currency_name character varying NOT NULL,
+     admin_password character varying NOT NULL
+);
+
+-- DDL for table: users
+CREATE TABLE users (
+     id SERIAL PRIMARY KEY NOT NULL ,
+     current_currency double precision DEFAULT 0.0,
+     created_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
+     last_login timestamp with time zone,
+     is_frozen boolean DEFAULT false,
+     wallet_name character varying NOT NULL,
+     password character varying NOT NULL
+);
diff --git a/static/js/setup.js b/static/js/setup.js
@@ -23,7 +23,7 @@ document.addEventListener('DOMContentLoaded', function () {
         // Show loading state
         Swal.fire({
             title: 'Initializing...',
-            text: 'Setting up your bank system',
+            text: 'Setting up your bank system, This may take some time!',
             allowOutsideClick: false,
             didOpen: () => {
                 Swal.showLoading();
