Merge branch 'master' into refactor_get_latest_analysis

# Conflicts: # tests/store/test_store_api.py # trailblazer/store/api.py
Clinical-Genomics · Aug 28, 2023 · b8aff88 · b8aff88
2 parents b9cdb9c + b00f857
commit b8aff88
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 33 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 17.0.3
+current_version = 17.0.4
 commit = True
 tag = True
 tag_name = {new_version}

diff --git a/setup.py b/setup.py
@@ -52,7 +52,7 @@ def parse_reqs(req_path="./requirements.txt"):
 
 setup(
     name=NAME,
-    version="17.0.3",
+    version="17.0.4",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",

diff --git a/tests/store/test_store_api.py b/tests/store/test_store_api.py
@@ -76,31 +76,6 @@ def test_add_comment(analysis_store: MockStore, case_name: str):
     assert analysis.comment == comment
 
 
-@pytest.mark.parametrize(
-    "case_name, expected_status",
-    [
-        ("blazinginsect", TrailblazerStatus.RUNNING),
-        ("nicemice", TrailblazerStatus.COMPLETED),
-        ("lateraligator", TrailblazerStatus.FAILED),
-        ("escapedgoat", TrailblazerStatus.PENDING),
-    ],
-)
-def test_get_latest_analysis_status(
-    analysis_store: MockStore, case_name: str, expected_status: str
-):
-    """Test getting the status for the latest case analysis."""
-    # GIVEN an analysis
-    analysis_store.update_ongoing_analyses()
-    analysis: Optional[Analysis] = analysis_store.get_latest_analysis_for_case(case_name=case_name)
-    assert analysis is not None
-
-    # WHEN getting analysis status for case
-    status: Optional[str] = analysis_store.get_latest_analysis_status(case_id=case_name)
-
-    # THEN it should return the expected result
-    assert status == expected_status
-
-
 @pytest.mark.parametrize(
     "case_name, status",
     [

diff --git a/trailblazer/store/api.py b/trailblazer/store/api.py
@@ -84,12 +84,6 @@ def analyses(
 
         return analysis_query.order_by(self.Analysis.started_at.desc())
 
-    def get_latest_analysis_status(self, case_id: str) -> Optional[str]:
-        """Get the latest analysis status for a case name."""
-        latest_analysis = self.get_latest_analysis_for_case(case_name=case_id)
-        if latest_analysis:
-            return latest_analysis.status
-
     def mark_analyses_deleted(self, case_id: str) -> Query:
         """mark analyses connected to a case as deleted"""
         old_analyses = self.analyses(case_id=case_id)