square-administration 3.1.0__py3-none-any.whl → 3.2.1__py3-none-any.whl

square_administration/configuration.py

@@ -3,20 +3,12 @@ import sys
 
 from square_authentication_helper import SquareAuthenticationHelper
 from square_commons import ConfigReader
-from square_database_helper import SquareDatabaseHelper, FiltersV0
-from square_database_helper.pydantic_models import FilterConditionsV0
-from square_database_structure.square import global_string_database_name
-from square_database_structure.square.public import global_string_schema_name
-from square_database_structure.square.public.tables import App
+from square_database_helper import SquareDatabaseHelper
 from square_logger.main import SquareLogger
 
 try:
-    config_file_path = (
-        os.path.dirname(os.path.abspath(__file__))
-        + os.sep
-        + "data"
-        + os.sep
-        + "config.ini"
+    config_file_path = os.path.join(
+        os.path.dirname(os.path.abspath(__file__)), "data", "config.ini"
     )
     ldict_configuration = ConfigReader(config_file_path).read_configuration()
 
@@ -31,6 +23,9 @@ try:
     # environment
     config_str_host_ip = ldict_configuration["ENVIRONMENT"]["HOST_IP"]
     config_int_host_port = int(ldict_configuration["ENVIRONMENT"]["HOST_PORT"])
+    config_list_allow_origins = eval(
+        ldict_configuration["ENVIRONMENT"]["ALLOW_ORIGINS"]
+    )
     config_str_log_file_name = ldict_configuration["ENVIRONMENT"]["LOG_FILE_NAME"]
     config_str_admin_password_hash = ldict_configuration["ENVIRONMENT"][
         "ADMIN_PASSWORD_HASH"
@@ -43,6 +38,10 @@ try:
         "SSL_KEY_FILE_PATH"
     ]
     config_str_cookie_domain = ldict_configuration["ENVIRONMENT"]["COOKIE_DOMAIN"]
+    config_str_db_ip = ldict_configuration["ENVIRONMENT"]["DB_IP"]
+    config_int_db_port = int(ldict_configuration["ENVIRONMENT"]["DB_PORT"])
+    config_str_db_username = ldict_configuration["ENVIRONMENT"]["DB_USERNAME"]
+    config_str_db_password = ldict_configuration["ENVIRONMENT"]["DB_PASSWORD"]
     # ===========================================
 
     # ===========================================
@@ -100,18 +99,7 @@ try:
         param_str_square_authentication_ip=config_str_square_authentication_ip,
         param_int_square_authentication_port=config_int_square_authentication_port,
     )
-    # get app id
-    global_int_app_id = global_object_square_database_helper.get_rows_v0(
-        database_name=global_string_database_name,
-        schema_name=global_string_schema_name,
-        table_name=App.__tablename__,
-        filters=FiltersV0(
-            root={
-                App.app_name.name: FilterConditionsV0(eq=config_str_app_name),
-            }
-        ),
-        columns=[App.app_id.name],
-    )["data"]["main"][0][App.app_id.name]
+
 except Exception as e:
     print(
         "\033[91mMissing or incorrect config.ini file.\n"

square_administration/data/config.ini

@@ -5,6 +5,7 @@ APP_NAME = square_admin
 [ENVIRONMENT]
 HOST_IP = 0.0.0.0
 HOST_PORT = 10111
+ALLOW_ORIGINS = ["http://localhost:10111"]
 
 LOG_FILE_NAME = square_administration
 
@@ -16,6 +17,11 @@ SSL_KEY_FILE_PATH = ssl.key
 
 COOKIE_DOMAIN = localhost
 
+DB_IP = localhost
+DB_PORT = 10001
+DB_USERNAME = postgres
+DB_PASSWORD = dummy
+
 [SQUARE_LOGGER]
 
 # | Log Level | Value |

square_administration/data/config.testing.ini

@@ -0,0 +1,54 @@
+[GENERAL]
+MODULE_NAME = square_administration
+APP_NAME = square_admin
+
+[ENVIRONMENT]
+HOST_IP = 0.0.0.0
+HOST_PORT = 10111
+ALLOW_ORIGINS = ["http://localhost:10111"]
+
+LOG_FILE_NAME = square_administration
+
+ADMIN_PASSWORD_HASH = $2b$12$tDw4ZR0guiF5s5oVve5PcuELhlWO.lUH.OChPoeWVn95ac7QJlndq
+
+# absolute path (mandatory only for http)
+SSL_CRT_FILE_PATH = ssl.crt
+SSL_KEY_FILE_PATH = ssl.key
+
+COOKIE_DOMAIN = localhost
+
+DB_IP = raspi.thepmsquare.com
+DB_PORT = 15432
+DB_USERNAME = postgres
+DB_PASSWORD = testing_password
+
+
+[SQUARE_LOGGER]
+
+# | Log Level | Value |
+# | --------- | ----- |
+# | CRITICAL  | 50    |
+# | ERROR     | 40    |
+# | WARNING   | 30    |
+# | INFO      | 20    |
+# | DEBUG     | 10    |
+# | NOTSET    | 0     |
+
+LOG_LEVEL = 20
+# absolute or relative path
+LOG_PATH = logs
+# number of backup log files to keep during rotation
+# if backupCount is zero, rollover never occurs.
+LOG_BACKUP_COUNT = 3
+
+[SQUARE_DATABASE_HELPER]
+
+SQUARE_DATABASE_PROTOCOL = http
+SQUARE_DATABASE_IP = raspi.thepmsquare.com
+SQUARE_DATABASE_PORT = 20010
+
+[SQUARE_AUTHENTICATION_HELPER]
+
+SQUARE_AUTHENTICATION_PROTOCOL = http
+SQUARE_AUTHENTICATION_IP = raspi.thepmsquare.com
+SQUARE_AUTHENTICATION_PORT = 20011

square_administration/main.py

@@ -11,6 +11,7 @@ from square_administration.configuration import (
     config_str_module_name,
     config_str_ssl_key_file_path,
     config_str_ssl_crt_file_path,
+    config_list_allow_origins,
 )
 from square_administration.routes import core, authentication
 from square_administration.utils.common import is_https
@@ -20,7 +21,7 @@ app = FastAPI()
 app.add_middleware(
     CORSMiddleware,
     allow_credentials=True,
-    allow_origins=["*"],
+    allow_origins=config_list_allow_origins,
     allow_methods=["*"],
     allow_headers=["*"],
 )
@@ -30,7 +31,7 @@ app.include_router(authentication.router)
 
 
 @app.get("/")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def root():
     output_content = get_api_output_in_standard_format(log=config_str_module_name)
     return JSONResponse(status_code=status.HTTP_200_OK, content=output_content)

square_administration/routes/authentication.py

@@ -18,7 +18,6 @@ from square_administration.configuration import (
     global_object_square_logger,
     config_str_admin_password_hash,
     global_object_square_authentication_helper,
-    global_int_app_id,
     config_str_cookie_domain,
     global_object_square_database_helper,
 )
@@ -28,7 +27,7 @@ from square_administration.pydantic_models.authentication import (
     LoginUsernameV0,
     RemoveAppForSelfV0,
 )
-from square_administration.utils.common import is_https
+from square_administration.utils.common import is_https, global_int_app_id
 
 router = APIRouter(
     tags=["authentication"],
@@ -36,7 +35,7 @@ router = APIRouter(
 
 
 @router.post("/register_username/v0")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def register_username_v0(
     body: RegisterUsernameV0,
 ):
@@ -137,7 +136,7 @@ async def register_username_v0(
 
 
 @router.post("/login_username/v0")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def login_username_v0(
     body: LoginUsernameV0,
 ):
@@ -221,7 +220,7 @@ async def login_username_v0(
 
 
 @router.patch("/remove_app_for_self/v0")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def remove_app_for_self_v0(
     access_token: Annotated[str, Header()],
     body: RemoveAppForSelfV0,
@@ -318,7 +317,7 @@ async def remove_app_for_self_v0(
 
 
 @router.delete("/logout/v0")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def logout_v0(request: Request):
 
     try:
@@ -401,7 +400,7 @@ async def logout_v0(request: Request):
 
 
 @router.get("/generate_access_token/v0")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def generate_access_token_v0(
     request: Request,
 ):

square_administration/routes/core.py

@@ -20,10 +20,10 @@ from square_administration.configuration import (
     global_object_square_logger,
     global_object_square_database_helper,
     global_object_square_authentication_helper,
-    global_int_app_id,
 )
 from square_administration.messages import messages
 from square_administration.pydantic_models.core import GetAllGreetingsV0
+from square_administration.utils.common import global_int_app_id
 
 router = APIRouter(
     tags=["core"],
@@ -31,7 +31,7 @@ router = APIRouter(
 
 
 @router.post("/get_all_greetings/v0")
-@global_object_square_logger.async_auto_logger
+@global_object_square_logger.auto_logger()
 async def get_all_greetings_v0(
     access_token: Annotated[str, Header()], body: GetAllGreetingsV0
 ):

square_administration/utils/common.py

@@ -1,14 +1,36 @@
 import os
 
+from square_database_helper import FiltersV0
+from square_database_helper.pydantic_models import FilterConditionsV0
+from square_database_structure.square import global_string_database_name
+from square_database_structure.square.public import global_string_schema_name
+from square_database_structure.square.public.tables import App
+
 from square_administration.configuration import (
     config_str_ssl_key_file_path,
     config_str_ssl_crt_file_path,
     global_object_square_logger,
+    global_object_square_database_helper,
+    config_str_app_name,
 )
 
 
-@global_object_square_logger.auto_logger
+@global_object_square_logger.auto_logger()
 def is_https() -> bool:
     return os.path.exists(config_str_ssl_key_file_path) and os.path.exists(
         config_str_ssl_crt_file_path
     )
+
+
+# get app id
+global_int_app_id = global_object_square_database_helper.get_rows_v0(
+    database_name=global_string_database_name,
+    schema_name=global_string_schema_name,
+    table_name=App.__tablename__,
+    filters=FiltersV0(
+        root={
+            App.app_name.name: FilterConditionsV0(eq=config_str_app_name),
+        }
+    ),
+    columns=[App.app_id.name],
+)["data"]["main"][0][App.app_id.name]

{square_administration-3.1.0.dist-info → square_administration-3.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-administration
-Version: 3.1.0
+Version: 3.2.1
 Summary: common business layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_administration
 Author: thePmSquare
@@ -21,7 +21,7 @@ Requires-Dist: bcrypt>=4.2.0
 Requires-Dist: pytest>=8.0.0
 Requires-Dist: httpx>=0.27.2
 Requires-Dist: square-commons>=1.0.0
-Requires-Dist: square-logger>=1.0.0
+Requires-Dist: square-logger>=2.0.0
 Requires-Dist: square-database-helper>=2.0.0
 Requires-Dist: square-database-structure>=1.0.0
 Requires-Dist: square-authentication-helper>=2.1.0
@@ -44,6 +44,28 @@ pip install square_administration
 
 ## changelog
 
+### v3.2.1
+
+- testing
+    - update get_patched_configuration and create_client_and_cleanup to be session scoped.
+- env
+    - add ALLOW_ORIGINS
+
+### v3.2.0
+
+- move global_int_app_id getting logic from configuration.py to utils->common
+- env
+    - add DB_IP, DB_PORT, DB_USERNAME, DB_PASSWORD
+    - add config.testing.ini
+    - file path reading through os.path.join method.
+- testing
+    - add conftest file to create and cleanup test database, also to patch config file.
+    - update existing tests to use the new fixtures.
+
+### v3.1.1
+
+- bump square_logger to 2.0.0
+
 ### v3.1.0
 
 - add pytest as dependency.

square_administration-3.2.1.dist-info/RECORD

@@ -0,0 +1,21 @@
+square_administration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+square_administration/configuration.py,sha256=kP2zfEvt-knzrzFIeINI1kz7260eXz_DbNjIjakByEY,4433
+square_administration/main.py,sha256=vvKBMn4JkDp8B2L_zwBMIfYaSA41rXxhL3ZFsSv8ly8,1660
+square_administration/messages.py,sha256=VYjJGW0Kvtjrx1Mw7ekksLVMoxcexLol2OckvqhZ3n0,1063
+square_administration/data/config.ini,sha256=kkSbjJP7qR8ah44Oyv2IyCgYfmheYYh4zSU7wD7v3ec,1145
+square_administration/data/config.testing.ini,sha256=vdW01yJdCqdI6uK-jXHfWa9B9IJVuecYdx0n3y7dS2k,1193
+square_administration/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+square_administration/pydantic_models/authentication.py,sha256=QEfM5ezG45hc_qATXpFIPNPl4bjf8ICW_bY5tY4cqO4,259
+square_administration/pydantic_models/core.py,sha256=HUMrBmfKrXeL-126gE5j2povdVmktn8XLg2tHEdeXTk,344
+square_administration/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+square_administration/routes/authentication.py,sha256=-1B82WgFr78_p2Udq0WbOwD3jcgjK8jXHI7KvhtfuJA,16029
+square_administration/routes/core.py,sha256=H5pfPuPDzSn8-HN40gyI7eDVxFW7821urYq0ceI_TDo,5271
+square_administration/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+square_administration/utils/common.py,sha256=bnyBF10EDMLIYXnfV3ZZOApNKScHRmw-Jcj2zIFE8kE,1157
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/conftest.py,sha256=Lu7qQkrnSeV1WKlN0zVyNLLXRf3Sv8ghPlIWAByv1NQ,1921
+tests/test_1.py,sha256=hikxL01-2dcax594y8ceanjRmLJXvuhLpcY-FMPIdY8,378
+square_administration-3.2.1.dist-info/METADATA,sha256=NzJek8yM3W4b1tqj7kRkXvXxc7-HhWnvmcZN6PQQLQM,3011
+square_administration-3.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+square_administration-3.2.1.dist-info/top_level.txt,sha256=tyroqpdXXQAiA7Y_V1wCqPPt6nnS_orcY9txLeHjm1s,28
+square_administration-3.2.1.dist-info/RECORD,,

tests/conftest.py

@@ -1,11 +1,65 @@
+import importlib
+import os
+
 import pytest
+from fastapi.testclient import TestClient
+
+
+@pytest.fixture(scope="session")
+def get_patched_configuration():
+    def patched_join(*args):
+        *rest, last = args
+        if last == "config.ini":
+            last = "config.testing.ini"
+
+        return original_join(*rest, last)
+
+    original_join = os.path.join
+    os.path.join = patched_join
+
+    import square_administration.configuration
+
+    importlib.reload(square_administration.configuration)
+    config = square_administration.configuration
+
+    yield config
+
+    # cleanup
+    os.path.join = original_join
+
+
+@pytest.fixture(scope="session")
+def create_client_and_cleanup(get_patched_configuration):
+    from square_database_structure import create_database_and_tables
+
+    create_database_and_tables(
+        db_username=get_patched_configuration.config_str_db_username,
+        db_port=get_patched_configuration.config_int_db_port,
+        db_password=get_patched_configuration.config_str_db_password,
+        db_ip=get_patched_configuration.config_str_db_ip,
+    )
+    from square_administration.main import (
+        app,
+    )
+
+    client = TestClient(app)
+    yield client
+    from sqlalchemy import text, create_engine
+    from square_database_structure.main import global_list_create
+
+    local_str_postgres_url = (
+        f"postgresql://{get_patched_configuration.config_str_db_username}:{get_patched_configuration.config_str_db_password}@"
+        f"{get_patched_configuration.config_str_db_ip}:{str(get_patched_configuration.config_int_db_port)}/"
+    )
+
+    postgres_engine = create_engine(local_str_postgres_url)
+
+    with postgres_engine.connect() as postgres_connection:
+
+        postgres_connection.execute(text("commit"))
 
+        for database in global_list_create:
 
-@pytest.fixture
-def set_env(monkeypatch):
-    monkeypatch.setenv("SQUARE_DATABASE_PROTOCOL", "http")
-    monkeypatch.setenv("SQUARE_DATABASE_IP", "raspi.thepmsquare.com")
-    monkeypatch.setenv("SQUARE_DATABASE_PORT", "20010")
-    monkeypatch.setenv("SQUARE_AUTHENTICATION_PROTOCOL", "http")
-    monkeypatch.setenv("SQUARE_AUTHENTICATION_IP", "raspi.thepmsquare.com")
-    monkeypatch.setenv("SQUARE_AUTHENTICATION_PORT", "20011")
+            postgres_connection.execute(
+                text(f"DROP DATABASE {database['database']} WITH (FORCE)")
+            )

tests/test_1.py

@@ -1,16 +1,10 @@
-from fastapi.testclient import TestClient
 from square_commons import get_api_output_in_standard_format
 
 
-def test_read_main(set_env):
-    from square_administration.configuration import config_str_module_name
-    from square_administration.main import (
-        app,
-    )
-
-    client = TestClient(app)
+def test_read_main(get_patched_configuration, create_client_and_cleanup):
+    client = create_client_and_cleanup
     response = client.get("/")
     assert response.status_code == 200
     assert response.json() == get_api_output_in_standard_format(
-        log=config_str_module_name
+        log=get_patched_configuration.config_str_module_name
     )

square_administration-3.1.0.dist-info/RECORD

@@ -1,20 +0,0 @@
-square_administration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/configuration.py,sha256=k4ZxGB-RBvHLWQ5ksv-fj0UfAXJ25bSNu5uLNn_rnVc,4816
-square_administration/main.py,sha256=YHala3fQjbj4wQuIzCWEZ3xeeVsidPLHabCUsADr4tE,1613
-square_administration/messages.py,sha256=VYjJGW0Kvtjrx1Mw7ekksLVMoxcexLol2OckvqhZ3n0,1063
-square_administration/data/config.ini,sha256=sTWBnaNGXqLi0Ckk2cNzBC7pqrlboyU_ClLl04luOZY,1024
-square_administration/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/pydantic_models/authentication.py,sha256=QEfM5ezG45hc_qATXpFIPNPl4bjf8ICW_bY5tY4cqO4,259
-square_administration/pydantic_models/core.py,sha256=HUMrBmfKrXeL-126gE5j2povdVmktn8XLg2tHEdeXTk,344
-square_administration/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/routes/authentication.py,sha256=vOkuAmnPkTl-PSDmSkyui2tvhFxvo0WzMAAuz3st-QY,16053
-square_administration/routes/core.py,sha256=lKI1yAZG4LYKk-Z0pgdFwKW3wSl0ArziTylEKvp4DD0,5233
-square_administration/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_administration/utils/common.py,sha256=Uk2clDugVI8U6-bgjs77fxC4DuqmJEJ_IznBs1jAtWc,350
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=WU4jzo4E6M0E2U-DkrnUAwlW8G54DmNS4KydLceDhiU,446
-tests/test_1.py,sha256=TKBO9xomDrIGJMKoBQsPK6TrJtAZp9aYv-d-SQNzgPA,479
-square_administration-3.1.0.dist-info/METADATA,sha256=b8vram0yxkRiAGxCxRmHTcuD-al-SIWadZ0-CoQNOww,2443
-square_administration-3.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-square_administration-3.1.0.dist-info/top_level.txt,sha256=tyroqpdXXQAiA7Y_V1wCqPPt6nnS_orcY9txLeHjm1s,28
-square_administration-3.1.0.dist-info/RECORD,,