add: args in main and secret-webconfig file

server/app/__init__.py

+import json
+
 from flask import Flask, redirect, request
 from flask_uploads import configure_uploads
 from flask_uploads.extensions import IMAGES
@@ -8,15 +10,49 @@ from app.apis import init_api
 from app.core import bcrypt, db, jwt, ma
 
 
-def create_app(config_name="configmodule.DevelopmentConfig"):
+def load_secret_config(mode, database):
+    with open("./secret-webconfig.json") as f:
+        config = json.load(f)
+
+    mode_config = config[mode]
+    result = {"JWT_SECRET_KEY": mode_config["JWT_SECRET_KEY"]}
+
+    if database == "postgre":
+        pg = mode_config["postgre"]
+        uri = f"postgresql://{pg['USER']}:{pg['PASSWORD']}@{pg['HOST']}:{str(pg['PORT'])}/{pg['DATABASE']}"
+        result["SQLALCHEMY_DATABASE_URI"] = uri
+    elif database == "lite":
+        lite = mode_config["lite"]
+        result["SQLALCHEMY_DATABASE_URI"] = lite["SQLALCHEMY_DATABASE_URI"]
+
+    return result
+
+
+def create_app(mode, database):
     """
     Creates Flask app, returns it and a SocketIO instance. Call run on the
     SocketIO instance and pass in the Flask app to start the server.
     """
+    if mode == "dev":
+        config_name = "configmodule.DevelopmentConfig"
+    elif mode == "prod":
+        config_name = "configmodule.ProductionConfig"
+    elif mode == "test":
+        config_name = "configmodule.TestingConfig"
+    else:
+        raise Exception("Invalid mode\nValid modes are: dev, prod and test")
 
     # Init flask
     app = Flask(__name__, static_url_path="/static", static_folder="static")
+
+    # Init config
     app.config.from_object(config_name)
+
+    # Init secret config
+    secret_config = load_secret_config(mode, database)
+    app.config.update(secret_config)
+
+    print(app.config.get("SERVER_NAME"))
     app.url_map.strict_slashes = False
 
     with app.app_context():

server/configmodule.py

@@ -2,32 +2,6 @@ import os
 from datetime import timedelta
 
 
-class DevDbConfig:
-    HOST = "localhost"
-    PORT = 5432
-    USER = "postgres"
-    PASSWORD = "password"
-    DATABASE = "teknik8"
-    SQLALCHEMY_DATABASE_URI = "postgresql://" + USER + ":" + PASSWORD + "@" + HOST + ":" + str(PORT) + "/" + DATABASE
-
-
-class TestDbConfig:
-    HOST = "localhost"
-    PORT = 5432
-    USER = "postgres"
-    PASSWORD = "password"
-    DATABASE = "teknik8-test"
-    SQLALCHEMY_DATABASE_URI = "postgresql://" + USER + ":" + PASSWORD + "@" + HOST + ":" + str(PORT) + "/" + DATABASE
-
-
-class LiteDevDbConfig:
-    SQLALCHEMY_DATABASE_URI = "sqlite:///database.db"
-
-
-class LiteTestDbConfig:
-    SQLALCHEMY_DATABASE_URI = "sqlite:///test.db"
-
-
 class Config:
     DEBUG = False
     TESTING = False
@@ -55,16 +29,19 @@ class Config:
     OPENAPI_SWAGGER_UI_URL = "https://cdn.jsdelivr.net/npm/swagger-ui-dist/"
 
 
-class DevelopmentConfig(Config, LiteDevDbConfig):
+class DevelopmentConfig(Config):
     DEBUG = True
+    SERVER_NAME = "localhost:5000"
 
 
-class TestingConfig(Config, LiteTestDbConfig):
+class TestingConfig(Config):
     TESTING = True
+    SERVER_NAME = "localhost:5000"
     USER_LOGIN_LOCKED_ATTEMPTS = 4
     USER_LOGIN_LOCKED_EXPIRES = timedelta(seconds=4)
 
 
-class ProductionConfig(Config, LiteDevDbConfig):
+class ProductionConfig(Config):
     DEBUG = False
     TESTING = False
+    SERVER_NAME = "130.237.227.40:5000"  # teknikattan.sys.kth.se

server/main.py

+import sys
+
 from app import create_app
 
+"""
+Action-arg1:    server(default), populate
+Mode-arg2:      dev(default), prod, test
+Database-arg3:  lite(default), postgre
+"""
+
 if __name__ == "__main__":
-    app, sio = create_app("configmodule.DevelopmentConfig")
-    sio.run(app, port=5000)
+    argv = sys.argv
+
+    # action = argv[1] if len(argv) > 1 else "server"
+    mode = argv[1] if len(argv) > 1 else "dev"
+    # database = argv[3] if len(argv) > 3 else "lite"
+
+    # if mode == "prod":
+    # database = "postgre"
+
+    if mode == "dev" or mode == "test":
+        database = argv[2] if len(argv) > 2 else "lite"
+    elif mode == "prod":
+        database = "postgre"
+    else:
+        print("Invalid args")
+        print("Dev args: no args, 'dev lite' or 'dev postgre'")
+        print("Prod args: 'prod'\n")
+        sys.exit(-1)
+
+    print(f"Starting server in {mode} mode with database {database}...")
+    app, sio = create_app(mode, database)
+    sio.run(app)

server/populate.py

@@ -3,6 +3,7 @@ This file will reset and polulate the database with some data.
 """
 
 import random
+import sys
 
 import app.database.controller as dbc
 from app import create_app, db
@@ -102,7 +103,7 @@ def create_default_items():
             )
 
             for k in range(3):
-                dbc.add.question_alternative(f"Alternative {k}", f"Correct {k}", item_question.id)
+                dbc.add.question_alternative(item_question.id, alternative=f"Alternative {k}", correct=f"Correct {k}")
 
             # Add text components
             # TODO: Add images as components
@@ -144,10 +145,27 @@ def create_default_items():
 
 
 if __name__ == "__main__":
-    app, _ = create_app("configmodule.DevelopmentConfig")
+    argv = sys.argv
+
+    mode = argv[1] if len(argv) > 1 else "dev"
+    if mode == "dev" or mode == "test":
+        database = argv[2] if len(argv) > 2 else "lite"
+    elif mode == "prod":
+        database = "postgre"
+    else:
+        print("Invalid args")
+        print("Dev args: no args, 'dev lite' or 'dev postgre'")
+        print("Prod args: 'prod'\n")
+        sys.exit(-1)
+
+    print(f"Populating server in {mode} mode with database {database}...")
+
+    app, _ = create_app(mode, database)
 
     with app.app_context():
 
         db.drop_all()
         db.create_all()
         create_default_items()
+
+    print("Task populating done")

server/secret-webconfig.json

+{
+    "prod":{
+        "JWT_SECRET_KEY": "super-secret",
+        "postgre": {
+            "HOST" : "localhost",
+            "PORT" : 5432,
+            "USER" : "postgres",
+            "PASSWORD" : "password",
+            "DATABASE" : "teknik8"    
+        }
+    },
+    "dev":{
+        "JWT_SECRET_KEY": "super-secret",
+        "postgre": {
+            "HOST" : "localhost",
+            "PORT" : 5432,
+            "USER" : "postgres",
+            "PASSWORD" : "password",
+            "DATABASE" : "teknik8-dev"    
+        },
+        "lite":{
+            "SQLALCHEMY_DATABASE_URI":"sqlite:///database.db"
+        }
+
+
+    },
+    "test":{
+        "JWT_SECRET_KEY": "super-secret",
+        "postgre": {
+            "HOST" : "localhost",
+            "PORT" : 5432,
+            "USER" : "postgres",
+            "PASSWORD" : "password",
+            "DATABASE" : "teknik8-test"    
+        },
+        "lite":{
+            "SQLALCHEMY_DATABASE_URI":"sqlite:///test.db"
+        }
+    }
+}
\ No newline at end of file

server/tests/__init__.py

@@ -6,7 +6,7 @@ DISABLE_TESTS = False
 
 @pytest.fixture
 def app():
-    app, _ = create_app("configmodule.TestingConfig")
+    app, _ = create_app("test","lite")
     app.app_context().push()
     db.drop_all()
     db.create_all()