aiteamutils 0.2.96__py3-none-any.whl → 0.2.97__py3-none-any.whl

aiteamutils/base_service.py

@@ -45,9 +45,23 @@ class BaseService(Generic[ModelType]):
         fk_check: List[Dict[str, Any]] | None = None,
         org_ulid_position: str = "organization_ulid",
         role_permission: str = "create",
-        token_settings: Dict[str, Any] = None
+        token_settings: Dict[str, Any] | None = None
     ) -> ModelType:
         
+        permission_result = await verify_role_permission(
+            request=request,
+            role_permission=role_permission,
+            token_settings=token_settings,
+            org_ulid_position=org_ulid_position
+        )
+        
+        if not permission_result:
+            raise CustomException(
+                ErrorCode.FORBIDDEN,
+                detail=f"{role_permission}",
+                source_function=f"{self.__class__.__name__}.create"
+            )
+        
         try:
             body = await request.json()
 
@@ -59,16 +73,6 @@ class BaseService(Generic[ModelType]):
                 if fk_check:
                     await validate_unique_fields(self.db_session, fk_check, find_value=False)
                 
-                if org_ulid_position:
-                    organization_ulid = body.get(org_ulid_position)
-
-                    if not organization_ulid == payload.get("organization_ulid"):
-                        raise CustomException(
-                            ErrorCode.INVALID_INPUT,
-                            detail="organization_ulid is required",
-                            source_function=f"{self.__class__.__name__}.create"
-                        )
-
                 result = await self.repository.create(
                     entity_data=entity_data,
                     exclude_entities=exclude_entities
@@ -102,7 +106,7 @@ class BaseService(Generic[ModelType]):
         response_model: Any = None,
         org_ulid_position: str = "organization_ulid",
         role_permission: str = "update",
-        token_settings: Dict[str, Any] = None
+        token_settings: Dict[str, Any] | None = None
     ) -> ModelType:
         try:
             async with self.db_session.begin():
@@ -155,7 +159,7 @@ class BaseService(Generic[ModelType]):
         conditions: Dict[str, Any] | None = None,
         org_ulid_position: str = "organization_ulid",
         role_permission: str = "delete",
-        token_settings: Dict[str, Any] = None
+        token_settings: Dict[str, Any] | None = None
     ) -> bool:
         try:
             if not ULID.from_str(ulid):
@@ -206,7 +210,7 @@ class BaseService(Generic[ModelType]):
         explicit_joins: Optional[List[Any]] = None,
         loading_joins: Optional[List[Any]] = None,
         order: Optional[str] = None,
-        token_settings: Dict[str, Any] = None
+        token_settings: Dict[str, Any] | None = None
     ) -> List[Dict[str, Any]]:
         permission_result = await verify_role_permission(
             request=request,
@@ -215,6 +219,9 @@ class BaseService(Generic[ModelType]):
             org_ulid_position=org_ulid_position
         )
 
+        # 매번 새로운 리스트 생성
+        filters = list(filters) if filters is not None else []
+
         if permission_result and isinstance(permission_result, dict):
             filters.append(permission_result)
 
@@ -255,7 +262,7 @@ class BaseService(Generic[ModelType]):
         loading_joins: Optional[List[Any]] = None,
         org_ulid_position: str = "organization_ulid",
         role_permission: str = "get",
-        token_settings: Dict[str, Any] = None
+        token_settings: Dict[str, Any] | None = None
     ):
         try:
             if not ulid and not conditions:

aiteamutils/security.py

@@ -315,5 +315,17 @@ async def verify_role_permission(
             "operator": "eq",
             "fields": [org_ulid_position]
         }
-
-    return False
+    elif "create" in role_permission:
+        body = await request.json()
+        body_org_ulid = body.get(org_ulid_position)
+        
+        if not body_org_ulid or body_org_ulid != organization_ulid:
+            raise CustomException(
+                ErrorCode.FORBIDDEN,
+                detail=f"{org_ulid_position}|{body_org_ulid}",
+                source_function="security.verify_role_permission"
+            )
+            
+        return True
+    else:
+        return False

aiteamutils/version.py

@@ -1,2 +1,2 @@
 """버전 정보"""
-__version__ = "0.2.96"
+__version__ = "0.2.97"

{aiteamutils-0.2.96.dist-info → aiteamutils-0.2.97.dist-info}/METADATA

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

{aiteamutils-0.2.96.dist-info → aiteamutils-0.2.97.dist-info}/RECORD

@@ -1,15 +1,15 @@
 aiteamutils/__init__.py,sha256=kRBpRjark0M8ZwFfmKiMFol6CbIILN3WE4f6_P6iIq0,1089
 aiteamutils/base_model.py,sha256=bnRJJaGXGS3TKxfCWWV3arFjdG0qLsPFDXuguYsDyVM,3008
 aiteamutils/base_repository.py,sha256=HKcgYyEb0JypojoXBFcIT39hPC5CqnjBkHT__GV-lfQ,4615
-aiteamutils/base_service.py,sha256=-WWjgfH9hXT5ptuG6GiN1ge19e2W1-9Ig6drjrR0cJA,10448
+aiteamutils/base_service.py,sha256=e16_-cbMj5qJRunFdZvtMMpwHhdgMA2mq7QkQJk-S-4,10611
 aiteamutils/cache.py,sha256=07xBGlgAwOTAdY5mnMOQJ5EBxVwe8glVD7DkGEkxCtw,1373
 aiteamutils/config.py,sha256=YdalpJb70-txhGJAS4aaKglEZAFVWgfzw5BXSWpkUz4,3232
 aiteamutils/database.py,sha256=b4fN0XHNWxMJeS5M95JcJ7tujAJ1x3SPTAfDvJdB4sE,19696
 aiteamutils/enums.py,sha256=7WLqlcJqQWtETAga2WAxNp3dJTQIAd2TW-4WzkoHHa8,2498
 aiteamutils/exceptions.py,sha256=wls-R8qbD7fWzEgDDY1Eiy1vXl59R5IsCXTRkZpBiGU,16021
-aiteamutils/security.py,sha256=QVZFh0bOJX7Kz07dPJe6Tcs_UQmFOHPKp5yW3NlW1yE,11251
+aiteamutils/security.py,sha256=9mX6ivjxdaFgIfb-9YBZqXW8DZiZAvqJMLxCnbEf_mw,11715
 aiteamutils/validators.py,sha256=PvI9hbMEAqTawgxPbiWRyx2r9yTUrpNBQs1AD3w4F2U,7726
-aiteamutils/version.py,sha256=krAl-XdHJbryhUq2SAxCy94J_JstFTtWBxWRB9eiXPg,42
-aiteamutils-0.2.96.dist-info/METADATA,sha256=pPdMKGZUfZiRfWr-s6IDxjc8H-o6UZuJuJR4mQp9RW4,1718
-aiteamutils-0.2.96.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aiteamutils-0.2.96.dist-info/RECORD,,
+aiteamutils/version.py,sha256=4paZn1JjWekVaaFRQRRPRldO0uHiadnKCMb-2RMWNyI,42
+aiteamutils-0.2.97.dist-info/METADATA,sha256=PTIGPsXaqlkOu1TucLT8aoAQCeSXM7UDIafT-zxO6RM,1718
+aiteamutils-0.2.97.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aiteamutils-0.2.97.dist-info/RECORD,,