aiteamutils 0.2.166__py3-none-any.whl → 0.2.168__py3-none-any.whl

aiteamutils/base_service.py

@@ -463,20 +463,20 @@ class BaseService(Generic[ModelType]):
         order: Optional[str] = None,
         token_settings: Dict[str, Any] | None = None
     ) -> List[Dict[str, Any]]:
-        filters = list(filters) if filters is not None else []
-
-        if role_permission:
-            permission_result = await verify_role_permission(
-                request=request,
-                role_permission=role_permission,
-                token_settings=token_settings,
-                org_ulid_position=org_ulid_position
-            )
+        try:
+            filters = list(filters) if filters is not None else []
+
+            if role_permission:
+                permission_result = await verify_role_permission(
+                    request=request,
+                    role_permission=role_permission,
+                    token_settings=token_settings,
+                    org_ulid_position=org_ulid_position
+                )
 
-            if permission_result and isinstance(permission_result, dict):
-                filters.append(permission_result)
+                if permission_result and isinstance(permission_result, dict):
+                    filters.append(permission_result)
 
-        try:
             if order is None:
                 order = "created_at|desc"
 
@@ -491,7 +491,11 @@ class BaseService(Generic[ModelType]):
                 loading_joins=loading_joins,
                 order=order
             )
-            return [process_response(entity, response_model) for entity in entities]
+            print("[base_service.list] Repository 결과:", entities)
+            
+            processed = [process_response(entity, response_model) for entity in entities]
+            print("[base_service.list] 최종 처리 결과:", processed)
+            return processed
         
         except CustomException as e:
             raise e

aiteamutils/database.py

@@ -159,9 +159,23 @@ def process_response(
     if not entity:
         return None
 
-    # 모든 필드 처리
-    result = process_columns(entity)
-    
+    if isinstance(entity, tuple):
+        print("[process_response] 조인된 엔티티:", entity)  # 로그 추가
+        main_entity = entity[0]
+        joined_entities = entity[1:]
+        
+        result = process_columns(main_entity)
+        print("[process_response] 메인 엔티티 처리 결과:", result)  # 로그 추가
+        
+        for joined_entity in joined_entities:
+            if joined_entity:
+                table_name = joined_entity.__table__.name
+                joined_data = process_columns(joined_entity)
+                result[table_name] = joined_data
+                print(f"[process_response] 조인된 엔티티({table_name}) 처리 결과:", joined_data)  # 로그 추가
+    else:
+        result = process_columns(entity)
+        
     # Relationship 처리 (이미 로드된 관계만 처리)
     for relationship in entity.__mapper__.relationships:
         if not relationship.key in entity.__dict__:
@@ -506,7 +520,8 @@ async def list_entities(
         if has_explicit_joins:
             # 명시적 조인이 있는 경우
             entities = result.unique().all()
-            return [entity[0] for entity in entities]
+            print("[list_entities] 조인 결과:", entities)  # 로그 추가
+            return entities
         else:
             # 기존 방식 유지
             return result.unique().scalars().all()

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.166"
+__version__ = "0.2.168"

{aiteamutils-0.2.166.dist-info → aiteamutils-0.2.168.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiteamutils
-Version: 0.2.166
+Version: 0.2.168
 Summary: AI Team Utilities
 Project-URL: Homepage, https://github.com/yourusername/aiteamutils
 Project-URL: Issues, https://github.com/yourusername/aiteamutils/issues

{aiteamutils-0.2.166.dist-info → aiteamutils-0.2.168.dist-info}/RECORD

@@ -1,16 +1,16 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
 aiteamutils/base_model.py,sha256=Jw5Fyfrtdc_jyg-LmC35c-D6w3-2_dh2CBeiKjM9GPE,4497
 aiteamutils/base_repository.py,sha256=Oy2zE1i5qx60Xf1tnsaKLyFWapiPqt5JH8NejwNrPWg,4647
-aiteamutils/base_service.py,sha256=JIeRtFn1Ll4Qcq3v88pgS9lmEQLQoVyyOKqYR8n02S4,21192
+aiteamutils/base_service.py,sha256=bxGsgvjVBDaC8-Ei_nRYSLd0f9hrINWz1yAKK2ESSMI,21423
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
-aiteamutils/database.py,sha256=Kcp_NyXT2DassWovVFBmpFaqgCBzIpP4BRzRhsFKeMM,21892
+aiteamutils/database.py,sha256=fC4Vc9Z4a99G76kaIy06XrI4dSwCP3-SCPCzc6vZQ0s,22646
 aiteamutils/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=sgIVulllKMM9InTltaB7VD6i7DiQvCoycexsV-BiIBY,16570
 aiteamutils/files.py,sha256=fxnCu9rErd4vCovMi0jy4adLUiA7rx_q4RdOL4wSgsU,14258
 aiteamutils/security.py,sha256=McUl3t5Z5SyUDVUHymHdDkYyF4YSeg4g9fFMML4W6Kw,11630
 aiteamutils/validators.py,sha256=_WHN6jqJQzKM5uPTg-Da8U2qqevS84XeKMkCCF4C_lY,9591
-aiteamutils/version.py,sha256=L8NwAUPTaxDs2LSIrJScDZnaZSAHV_U69VXVSwErXCA,43
-aiteamutils-0.2.166.dist-info/METADATA,sha256=qy8U-j7_6Pagb_h71FasRTBQVXpzpPf2mHBUPde9q0Y,1743
-aiteamutils-0.2.166.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.166.dist-info/RECORD,,
+aiteamutils/version.py,sha256=5FMXoLuaR7hJ2rd0Xw1adK2Dq7ikWaVNUbIeMu74Gvc,43
+aiteamutils-0.2.168.dist-info/METADATA,sha256=VwpysetAqgamTVMPyg1vGUR7enq4Ipk6v5u7tYoOs_g,1743
+aiteamutils-0.2.168.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.168.dist-info/RECORD,,