Should have a test for this

Author: stephen-riggs

src/murfey/client/contexts/atlas.py

@@ -160,11 +160,7 @@ def post_transfer_epu(
                     f"Registered data collection group for atlas {str(transferred_atlas_jpg)!r}"
                 )
 
-        elif (
-            environment
-            and "Atlas_" in transferred_file.stem
-            and transferred_file.suffix == ".dm"
-        ):
+        elif environment and transferred_file.name == "Atlas.dm":
             # Register all grid squares on this atlas
             gs_pix_positions = get_grid_square_atlas_positions(transferred_file)
             for gs, pos_data in gs_pix_positions.items():

tests/client/contexts/test_atlas.py

@@ -33,10 +33,7 @@ def test_atlas_context_mrc(mock_capture_post, tmp_path):
     atlas_mrc.parent.mkdir(parents=True)
     atlas_mrc.touch()
 
-    context.post_transfer(
-        atlas_mrc,
-        environment=env,
-    )
+    context.post_transfer(atlas_mrc, environment=env)
     mock_capture_post.assert_called_once_with(
         base_url="http://localhost:8000",
         router_name="session_control.spa_router",
@@ -72,10 +69,7 @@ def test_atlas_context_xml(mock_capture_post, tmp_path):
             "</numericValue></x></pixelSize></SpatialScale></MicroscopeImage>"
         )
 
-    context.post_transfer(
-        atlas_xml,
-        environment=env,
-    )
+    context.post_transfer(atlas_xml, environment=env)
     dcg_data = {
         "experiment_type_id": 44,  # Atlas
         "tag": str(atlas_xml.parent),
@@ -95,3 +89,87 @@ def test_atlas_context_xml(mock_capture_post, tmp_path):
         session_id=1,
         data=dcg_data,
     )
+
+
+@patch("murfey.client.contexts.atlas.capture_post")
+def test_atlas_context_dm(mock_capture_post, tmp_path):
+    env = MurfeyInstanceEnvironment(
+        url=urlparse("http://localhost:8000"),
+        client_id=0,
+        sources=[tmp_path / "cm12345-6"],
+        default_destinations={
+            tmp_path / "cm12345-6": f"{tmp_path}/destination/cm12345-6"
+        },
+        instrument_name="m01",
+        visit="cm12345-6",
+        murfey_session=1,
+        acquisition_uuid="uuid1",
+    )
+
+    # Write sample dm file
+    atlas_dm = tmp_path / "cm12345-6/Supervisor_atlas/Sample2/Atlas/Atlas.dm"
+    atlas_dm.parent.mkdir(parents=True)
+    grid_square_values = (
+        "<value><b:PositionOnTheAtlas>"
+        "<c:Center><d:x>1200</d:x><d:y>1500</d:y></c:Center>"
+        "<c:Physical><d:x>2</d:x><d:y>3</d:y></c:Physical>"
+        "<c:Size><d:width>130</d:width><d:height>560</d:height></c:Size>"
+        "<c:Rotation>0.14</c:Rotation>"
+        "</b:PositionOnTheAtlas></value>"
+    )
+    with open(atlas_dm, "w") as new_xml:
+        new_xml.write(
+            "<AtlasSessionXml><Atlas><TilesEfficient><_items>"
+            # First tile with two grid squares
+            "<TileXml><Nodes><KeyValuePairs><KeyValuePairOfintNodeXml1>"
+            f"<key>101</key>{grid_square_values}"
+            "</KeyValuePairOfintNodeXml1><KeyValuePairOfintNodeXml1>"
+            f"<key>102</key>{grid_square_values}"
+            "</KeyValuePairOfintNodeXml1></KeyValuePairs></Nodes></TileXml>"
+            # Second tile with two grid squares
+            "<TileXml><Nodes><KeyValuePairs><KeyValuePairOfintNodeXml1>"
+            f"<key>103</key>{grid_square_values}"
+            "</KeyValuePairOfintNodeXml1><KeyValuePairOfintNodeXml1>"
+            f"<key>104</key>{grid_square_values}"
+            "</KeyValuePairOfintNodeXml1></KeyValuePairs></Nodes></TileXml>"
+            # Close all
+            "</_items></TilesEfficient></Atlas></AtlasSessionXml>"
+        )
+
+    context = AtlasContext("tomo", tmp_path, {}, "token")
+    context.post_transfer(atlas_dm, environment=env)
+
+    assert mock_capture_post.call_count == 5
+    mock_capture_post.assert_any_call(
+        base_url="http://localhost:8000",
+        router_name="session_control.spa_router",
+        function_name="register_grid_square",
+        token="token",
+        instrument_name="m01",
+        session_id=1,
+        gsid=101,
+        data={
+            "tag": str(atlas_dm.parent),
+            "x_location": 1200,
+            "y_location": 1500,
+            "x_stage_position": 2e9,
+            "y_stage_position": 3e9,
+            "width": 130,
+            "height": 560,
+            "angle": 0.14,
+        },
+    )
+    mock_capture_post.assert_any_call(
+        base_url="http://localhost:8000",
+        router_name="session_control.spa_router",
+        function_name="register_atlas",
+        token="token",
+        instrument_name="m01",
+        session_id=1,
+        data={
+            "name": "cm12345-6-sample-2",
+            "acquisition_uuid": "uuid1",
+            "register_grid": True,
+            "tag": str(atlas_dm.parent),
+        },
+    )