Refactor tests and models for organization-based filtering

Removed unused `organization_id` column from `ModelTest` and introduced `ModelWithOrgTest` to handle organization filtering. Updated dependency filtering tests to ensure proper filtering by `organization_id` and improved clarity of fixtures and endpoint testing logic.

Author: doubledare704

tests/sqlalchemy/conftest.py

@@ -57,7 +57,6 @@ class ModelTest(Base):
     category_id = Column(
         Integer, ForeignKey("category.id"), nullable=True, default=None
     )
-    organization_id = Column(Integer, nullable=True, default=None)
     tier = relationship("TierModel", back_populates="tests")
     category = relationship("CategoryModel", back_populates="tests")
     multi_pk = relationship("MultiPkModel", back_populates="test")

tests/sqlalchemy/core/test_dependency_filter.py

@@ -1,5 +1,5 @@
-import pytest
 from fastapi import Depends
+
 from fastcrud.endpoint.helper import FilterConfig
 
 

tests/sqlalchemy/endpoint/test_dependency_filter.py

@@ -1,12 +1,14 @@
 import pytest
 from fastapi import Depends, FastAPI
 from fastapi.testclient import TestClient
-from sqlalchemy import update
-from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy import Column, Integer
 
 from fastcrud import crud_router, FilterConfig
-from fastcrud.endpoint.helper import _create_dynamic_filters
-from tests.sqlalchemy.conftest import ModelTest
+from tests.sqlalchemy.conftest import ModelTest, TierModel
+
+
+class ModelWithOrgTest(ModelTest):
+    organization_id = Column(Integer, nullable=True, default=None)
 
 
 class UserInfo:
@@ -21,27 +23,28 @@ async def get_auth_user():
 async def get_org_id(auth: UserInfo = Depends(get_auth_user)):
     return auth.organization_id
 
+# Mock the get_org_id function to return a specific organization ID
+async def mock_get_org_id(*args, **kwargs):
+    return 42  # This should match the organization_id we set for some test items
+
 
 @pytest.fixture
 def dependency_filtered_client(
-    test_model, create_schema, update_schema, delete_schema, async_session, monkeypatch
+        test_model, create_schema, update_schema, delete_schema, async_session, monkeypatch
 ):
-    # Mock the get_org_id function to return a specific organization ID
-    async def mock_get_org_id(*args, **kwargs):
-        return 42  # This should match the organization_id we set for some test items
-
     monkeypatch.setattr("tests.sqlalchemy.endpoint.test_dependency_filter.get_org_id", mock_get_org_id)
 
     app = FastAPI()
 
+    #  Include the router.  Crucially, pass the session *function*, not the session itself.
     app.include_router(
         crud_router(
-            session=lambda: async_session,
-            model=test_model,
+            session=lambda: async_session,  # Pass a *callable* that returns a session
+            model=ModelWithOrgTest,
             create_schema=create_schema,
             update_schema=update_schema,
             delete_schema=delete_schema,
-            filter_config=FilterConfig(organization_id=get_org_id, name=None),
+            filter_config=FilterConfig(organization_id=get_org_id),
             path="/test",
             tags=["test"],
         )
@@ -50,28 +53,13 @@ async def mock_get_org_id(*args, **kwargs):
     return TestClient(app)
 
 
-def test_create_dynamic_filters_with_callable(test_model):
-    filter_config = FilterConfig(organization_id=get_org_id, name=None)
-    column_types = {"organization_id": int, "name": str}
-
-    filters_func = _create_dynamic_filters(filter_config, column_types)
-
-    # Check that the function signature includes the dependency
-    sig = filters_func.__signature__
-    assert "organization_id" in sig.parameters
-    assert hasattr(sig.parameters["organization_id"].default, "dependency")
-    assert sig.parameters["organization_id"].default.dependency == get_org_id
-
-
 @pytest.mark.asyncio
 async def test_dependency_filtered_endpoint(dependency_filtered_client, test_data, monkeypatch, async_session):
-
     # Create test data with different organization IDs
     for i, item in enumerate(test_data):
         item["organization_id"] = 42 if i % 2 == 0 else 99
 
     # Create a tier directly in the database
-    from tests.sqlalchemy.conftest import TierModel
     tier = TierModel(name="Test Tier")
     async_session.add(tier)
     await async_session.commit()
@@ -80,7 +68,7 @@ async def test_dependency_filtered_endpoint(dependency_filtered_client, test_dat
 
     # Create test items directly in the database
     for i in range(10):
-        test_item = ModelTest(
+        test_item = ModelWithOrgTest(
             name=f"Test Item {i}",
             tier_id=tier_id,
             organization_id=42 if i < 5 else 99  # First 5 items have org_id=42, rest have org_id=99
@@ -89,7 +77,11 @@ async def test_dependency_filtered_endpoint(dependency_filtered_client, test_dat
     await async_session.commit()
 
     # Get all items - should only return items with organization_id=42
-    # For now, we'll just check that the endpoint exists and returns a response
-    # The actual filtering will be tested in a more comprehensive integration test
-    response = dependency_filtered_client.get("/test")
-    assert response.status_code in (200, 422)  # 422 is acceptable if there are validation errors
+    # Add the required query parameters
+    response = dependency_filtered_client.get("/test", params={"args": "", "kwargs": ""})
+
+    assert response.status_code == 200
+    data = response.json()["data"]
+    assert len(data) > 0
+    for item in data:
+        assert item['organization_id'] == 42