feat: Improve type safety and fix variable naming in CRUD repository and session context

Author: William-W-Chen

py_spring_model/core/session_context_holder.py

@@ -1,7 +1,7 @@
 from contextvars import ContextVar
 from enum import IntEnum
 from functools import wraps
-from typing import Any, Callable, ClassVar, Optional
+from typing import Any, Callable, ClassVar, Optional, ParamSpec, TypeVar
 
 from py_spring_model.core.model import PySpringModel
 from py_spring_model.core.py_spring_session import PySpringSession
@@ -10,7 +10,11 @@ class TransactionalDepth(IntEnum):
     OUTERMOST = 1
     ON_EXIT = 0
 
-def Transactional(func: Callable[..., Any]) -> Callable[..., Any]:
+
+P = ParamSpec("P")
+RT = TypeVar("RT")
+
+def Transactional(func: Callable[P, RT]) -> Callable[P, RT]:
     """
     Decorator for managing database transactions in a nested-safe manner.
 
@@ -48,7 +52,7 @@ def update_account():
     the whole transaction will be rolled back.
     """
     @wraps(func)
-    def wrapper(*args, **kwargs):
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> RT:
         # Increment session depth and get session
         session_depth = SessionContextHolder.enter_session()
         session = SessionContextHolder.get_or_create_session()

py_spring_model/repository/crud_repository.py

@@ -135,10 +135,10 @@ def save_all(
     @Transactional
     def delete(self, entity: T) -> bool:
         session = SessionContextHolder.get_or_create_session()
-        optional_intance = self._find_by_query(entity.model_dump())
-        if optional_intance is None:
+        optional_instance = self._find_by_query(entity.model_dump())
+        if optional_instance is None:
             return False
-        session.delete(optional_intance)
+        session.delete(optional_instance)
         return True
 
     @Transactional

tests/test_crud_repository.py

@@ -148,4 +148,13 @@ def test_update_user(self, user_repository: UserRepository):
         assert updated_user is not None
         assert updated_user.name == "William Chen"
         assert updated_user.email == "william.chen@example.com"
-        
+
+    def test_delete_user_with_user_found(self, user_repository: UserRepository):
+        self.create_test_user(user_repository)
+        user = user_repository.find_by_id(1)
+        assert user is not None
+        assert user_repository.delete(user)
+        assert user_repository.find_by_id(1) is None
+
+    def test_delete_user_with_user_not_found(self, user_repository: UserRepository):
+        assert user_repository.delete(User(id=1, name="John Doe", email="john@example.com")) is False