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

square_administration/routes/core.py

@@ -12,7 +12,7 @@ from square_database_structure.square import global_string_database_name
 from square_database_structure.square.authentication import (
     global_string_schema_name as global_string_schema_name_authentication,
 )
-from square_database_structure.square.authentication.tables import UserCredential
+from square_database_structure.square.authentication.tables import UserProfile
 from square_database_structure.square.greeting import global_string_schema_name
 from square_database_structure.square.greeting.tables import Greeting
 
@@ -77,33 +77,29 @@ async def get_all_greetings_v0(
             for x in response["data"]["main"]
             if x[Greeting.user_id.name] is not None
         }
-        user_credentials_response = global_object_square_database_helper.get_rows_v0(
+        user_profile_response = global_object_square_database_helper.get_rows_v0(
             database_name=global_string_database_name,
             schema_name=global_string_schema_name_authentication,
-            table_name=UserCredential.__tablename__,
+            table_name=UserProfile.__tablename__,
             filters=FiltersV0(
                 root={
-                    UserCredential.user_id.name: FilterConditionsV0(
-                        in_=list(all_user_ids)
-                    )
+                    UserProfile.user_id.name: FilterConditionsV0(in_=list(all_user_ids))
                 }
             ),
             columns=[
-                UserCredential.user_id.name,
-                UserCredential.user_credential_username.name,
+                UserProfile.user_id.name,
+                UserProfile.user_profile_username.name,
             ],
         )["data"]["main"]
-        user_credentials_map = {
-            x[UserCredential.user_id.name]: x[
-                UserCredential.user_credential_username.name
-            ]
-            for x in user_credentials_response
+        user_map = {
+            x[UserProfile.user_id.name]: x[UserProfile.user_profile_username.name]
+            for x in user_profile_response
         }
         response_clone = response
         response_clone["data"]["main"] = [
             {
                 **greeting,
-                UserCredential.user_credential_username.name: user_credentials_map.get(
+                UserProfile.user_profile_username.name: user_map.get(
                     greeting[Greeting.user_id.name]
                 ),
             }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-administration
-Version: 3.0.1
+Version: 3.1.0
 Summary: common business layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_administration
 Author: thePmSquare
@@ -18,6 +18,8 @@ Requires-Dist: fastapi>=0.104.1
 Requires-Dist: pydantic>=2.5.3
 Requires-Dist: requests>=2.32.3
 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-database-helper>=2.0.0
@@ -42,6 +44,15 @@ pip install square_administration
 
 ## changelog
 
+### v3.1.0
+
+- add pytest as dependency.
+- add dummy test case.
+
+### v3.0.2
+
+- update logic to get usernames for non-anonymous greetings in get_all_greetings_v0.
+
 ### v3.0.1
 
 - add logging decorator to all functions.

{square_administration-3.0.1.dist-info → square_administration-3.1.0.dist-info}/RECORD

@@ -8,10 +8,13 @@ square_administration/pydantic_models/authentication.py,sha256=QEfM5ezG45hc_qATX
 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=65_FIZilintZvbHx7r25UQbgN-oKdQ92-Nv3kpwKX6s,5374
+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
-square_administration-3.0.1.dist-info/METADATA,sha256=aviG8xNbrRwAs9SfhngddFLisn1_7RY3jsFgmYH2dec,2223
-square_administration-3.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-square_administration-3.0.1.dist-info/top_level.txt,sha256=8WFipDrMQUPRDo5AvipxU1YK3wZtWZyCUMWaR416zAw,22
-square_administration-3.0.1.dist-info/RECORD,,
+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,,

{square_administration-3.0.1.dist-info → square_administration-3.1.0.dist-info}/top_level.txt

@@ -1 +1,2 @@
 square_administration
+tests

tests/conftest.py

@@ -0,0 +1,11 @@
+import pytest
+
+
+@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")

tests/test_1.py

@@ -0,0 +1,16 @@
+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)
+    response = client.get("/")
+    assert response.status_code == 200
+    assert response.json() == get_api_output_in_standard_format(
+        log=config_str_module_name
+    )