Change method name

as requested. Also add test for GridInfoId.

ispyb/model/gridinfo.py

@@ -26,7 +26,7 @@ def __init__(self, dcgid, db_conn, preload=None):
   def reload(self):
     '''Load/update information from the database.'''
     try:
-      self._data = self._db.mx_acquisition.get_dcg_grid(self._dcgid)[0]
+      self._data = self._db.mx_acquisition.retrieve_dcg_grid(self._dcgid)[0]
     except ispyb.exception.ISPyBNoResultException:
       self._data = None
 

ispyb/sp/mxacquisition.py

@@ -84,7 +84,7 @@ def upsert_dcg_grid(self, values):
     '''Insert or update the grid info associated with a data collection group'''
     return self.get_connection().call_sp_write('upsert_dcg_grid', values)
 
-  def get_dcg_grid(self, dcgid):
+  def retrieve_dcg_grid(self, dcgid):
     '''Retrieve a list of dictionaries containing the grid information for
        one data collection group id. Raises ISPyBNoResultException if there
        is no grid information available for the given DCGID.

tests/test_mxacquisition.py

@@ -58,7 +58,7 @@ def test_mxacquisition_methods(testconfig):
         iid = mxacquisition.upsert_image(list(params.values()))
 
         with pytest.raises(ispyb.exception.ISPyBNoResultException):
-          gridinfo = mxacquisition.get_dcg_grid(dcgid)
+          gridinfo = mxacquisition.retrieve_dcg_grid(dcgid)
 
         params = mxacquisition.get_dcg_grid_params()
         params['parentid'] = dcgid
@@ -76,9 +76,10 @@ def test_mxacquisition_methods(testconfig):
         dcg_grid_id = mxacquisition.upsert_dcg_grid(list(params.values()))
         assert dcg_grid_id and dcg_grid_id > 0
 
-        gridinfo = mxacquisition.get_dcg_grid(dcgid)
+        gridinfo = mxacquisition.retrieve_dcg_grid(dcgid)
         assert len(gridinfo) == 1
         gridinfo = gridinfo[0]
+        assert gridinfo['gridInfoId'] == dcg_grid_id
         assert gridinfo['dx_mm'] == params['dx_in_mm']
         assert gridinfo['dy_mm'] == params['dy_in_mm']
         assert gridinfo['meshAngle'] == params['mesh_angle']