fix(API): runs sums excludes the filtered runs

carbonserver/carbonserver/api/infra/repositories/repository_runs.py

@@ -164,7 +164,6 @@ def get_experiment_detailed_sums_by_run(
                         SqlModelEmission.timestamp >= start_date,
                         SqlModelEmission.timestamp <= end_date,
                     ),
-                    isouter=True,
                 )
                 .filter(SqlModelRun.experiment_id == experiment_id)
                 .group_by(

carbonserver/tests/api/repository/test_repository_runs.py

@@ -0,0 +1,48 @@
+from datetime import datetime
+from unittest import mock
+from uuid import UUID
+
+import dateutil.relativedelta
+
+from carbonserver.api.infra.repositories.repository_runs import SqlAlchemyRepository
+
+EXPERIMENT_ID = UUID("e52fe339-164d-4c2b-a8c0-f562dfce066d")
+
+
+class SessionContextMock:
+    def __init__(self, session):
+        self.session = session
+
+    def __enter__(self):
+        return self.session
+
+    def __exit__(self, *args):
+        return None
+
+
+def test_experiment_detailed_sums_by_run_excludes_runs_without_emissions_in_date_range():
+    # The repository opens sessions with `with self.session_factory() as session`.
+    # This context mock lets us exercise the real query builder without needing a
+    # live database, and catches a regression to an outer join that would return
+    # runs with null aggregate fields.
+    session_mock = mock.Mock()
+    query_mock = mock.Mock()
+    session_mock.query.return_value = query_mock
+    query_mock.join.return_value = query_mock
+    query_mock.filter.return_value = query_mock
+    query_mock.group_by.return_value = query_mock
+    query_mock.all.return_value = []
+
+    session_factory_mock = mock.Mock(return_value=SessionContextMock(session_mock))
+    repository = SqlAlchemyRepository(session_factory_mock)
+
+    end_date = datetime.now()
+    start_date = end_date - dateutil.relativedelta.relativedelta(months=3)
+
+    actual_run_sums = repository.get_experiment_detailed_sums_by_run(
+        EXPERIMENT_ID, start_date, end_date
+    )
+
+    assert actual_run_sums == []
+    query_mock.join.assert_called_once()
+    assert query_mock.join.call_args.kwargs.get("isouter", False) is False

carbonserver/tests/api/usecase/run/test_experiment_sum_by_run_usecase.py

@@ -31,6 +31,17 @@
 }
 
 
+class SessionContextMock:
+    def __init__(self, session):
+        self.session = session
+
+    def __enter__(self):
+        return self.session
+
+    def __exit__(self, *args):
+        return None
+
+
 def test_detailed_sum_computes_for_experiment_id():
     repository_mock: SqlAlchemyRepository = mock.Mock(spec=SqlAlchemyRepository)
     experiment_id = EXPERIMENT_ID
@@ -46,3 +57,29 @@ def test_detailed_sum_computes_for_experiment_id():
     )
 
     assert actual_experiment_sum_by_run[0]["emissions"] == expected_emission_sum
+
+
+def test_detailed_sum_query_excludes_runs_without_emissions_in_date_range():
+    # Use the real repository with a mocked SQLAlchemy session context so this test
+    # covers the join built by get_experiment_detailed_sums_by_run. Mocking the
+    # repository itself would only test usecase pass-through and would not fail if
+    # the query switched back to an outer join that returns null aggregate rows.
+    session_mock = mock.Mock()
+    query_mock = mock.Mock()
+    session_mock.query.return_value = query_mock
+    query_mock.join.return_value = query_mock
+    query_mock.filter.return_value = query_mock
+    query_mock.group_by.return_value = query_mock
+    query_mock.all.return_value = []
+
+    session_factory_mock = mock.Mock(return_value=SessionContextMock(session_mock))
+    repository = SqlAlchemyRepository(session_factory_mock)
+    experiment_sum_by_run_usecase = ExperimentSumsByRunUsecase(repository)
+
+    actual_experiment_sum_by_run = experiment_sum_by_run_usecase.compute_detailed_sum(
+        EXPERIMENT_ID, START_DATE, END_DATE
+    )
+
+    assert actual_experiment_sum_by_run == []
+    query_mock.join.assert_called_once()
+    assert query_mock.join.call_args.kwargs.get("isouter", False) is False

pyproject.toml

@@ -130,7 +130,7 @@ pre-commit-install = { cmd = "pre-commit install", help = "Install pre-commit ho
 dashboard = "uv run --project carbonserver uvicorn main:app --reload"
 dashboard-ci = "uv run --project carbonserver uvicorn main:app --host 0.0.0.0 --port 8008"
 docker = "docker-compose up -d"
-test-api-unit = "uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/routers && uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/service/ && uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/usecase/"
+test-api-unit = "uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/routers && uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/service/ && uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/usecase/ && uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/repository/"
 test-api-integ = "uv run --project carbonserver --extra dev python -m pytest -vv carbonserver/tests/api/integration/"
 setup-db = "cd carbonserver && uv run --project carbonserver python -m alembic -c carbonserver/database/alembic.ini upgrade head"
 downgrade-db = "cd carbonserver && uv run --project carbonserver python -m alembic -c carbonserver/database/alembic.ini downgrade base"