'get_data_collection_group_ids' does not appear to be in use; deleted from Murfey

Author: tieneupin

src/murfey/server/ispyb.py

@@ -667,16 +667,3 @@ def get_all_ongoing_visits(microscope: str, db: Session | None) -> list[Visit]:
         )
         for row in query
     ]
-
-
-def get_data_collection_group_ids(session_id):
-    query = (
-        ISPyBSession()
-        .query(DataCollectionGroup)
-        .filter(
-            DataCollectionGroup.sessionId == session_id,
-        )
-        .all()
-    )
-    dcgids = [row.dataCollectionGroupId for row in query]
-    return dcgids

tests/server/test_ispyb.py

@@ -1,14 +1,10 @@
-from ispyb.sqlalchemy import BLSession, DataCollectionGroup, Proposal
+from ispyb.sqlalchemy import BLSession, Proposal
 from pytest import mark
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from murfey.server.ispyb import (
-    get_data_collection_group_ids,
-    get_proposal_id,
-    get_session_id,
-)
-from tests.conftest import ExampleVisit, ISPyBTableValues
+from murfey.server.ispyb import get_proposal_id, get_session_id
+from tests.conftest import ExampleVisit
 
 
 def test_get_session_id(
@@ -48,7 +44,7 @@ def test_get_proposal_id(
         ispyb_db_session.execute(
             select(Proposal)
             .where(Proposal.proposalCode == ExampleVisit.proposal_code)
-            .where(Proposal.proposalNumber == ExampleVisit.proposal_number)
+            .where(Proposal.proposalNumber == str(ExampleVisit.proposal_number))
         )
         .scalar_one()
         .proposalId
@@ -57,7 +53,7 @@ def test_get_proposal_id(
     # Test function
     result = get_proposal_id(
         proposal_code=ExampleVisit.proposal_code,
-        proposal_number=ExampleVisit.proposal_number,
+        proposal_number=str(ExampleVisit.proposal_number),
         db=ispyb_db_session,
     )
     assert proposal_id == result
@@ -71,35 +67,3 @@ def test_get_sub_samples_from_visit():
 @mark.skip
 def test_get_all_ongoing_visits():
     pass
-
-
-def test_get_data_collection_group_ids(
-    ispyb_db_session: Session,
-):
-    # Get the BLSession ID from test database
-    bl_session_id = get_session_id(
-        microscope=ExampleVisit.instrument_name,
-        proposal_code=ExampleVisit.proposal_code,
-        proposal_number=str(ExampleVisit.proposal_number),
-        visit_number=str(ExampleVisit.visit_number),
-        db=ispyb_db_session,
-    )
-
-    # Add example data collections
-    dcgs = [
-        {
-            "sessionId": bl_session_id,
-            "experimentTypeId": ISPyBTableValues.experiment_types.get(name),
-        }
-        for name, id in ISPyBTableValues.experiment_types.items()
-    ]
-    dcg_entries = [DataCollectionGroup(**dcg) for dcg in dcgs]
-    for entry in dcg_entries:
-        ispyb_db_session.add(entry)
-        ispyb_db_session.commit()
-
-    # Test the function
-    results = get_data_collection_group_ids(
-        session_id=bl_session_id,
-    )
-    assert len(results) == len(dcg_entries)