refactor

Author: edenhaus

deebot_client/capabilities.py

@@ -174,7 +174,7 @@ class CapabilityMap:
     changed: CapabilityEvent[MapChangedEvent]
     clear: CapabilityExecute[[]] | None = None
     major: CapabilityEvent[MajorMapEvent]
-    minor: CapabilityExecute[[str, int]]
+    minor: CapabilityExecute[[int, str]]
     multi_state: CapabilitySetEnable[MultimapStateEvent] | None = None
     position: CapabilityEvent[PositionsEvent]
     relocation: CapabilityExecute[[]] | None = None

deebot_client/commands/json/map.py

@@ -389,7 +389,7 @@ class GetMinorMap(JsonCommandWithMessageHandling, MessageBodyDataDict):
 
     NAME = "getMinorMap"
 
-    def __init__(self, map_id: str, piece_index: int) -> None:
+    def __init__(self, piece_index: int, map_id: str) -> None:
         super().__init__({"mid": map_id, "type": "ol", "pieceIndex": piece_index})
 
     @classmethod

deebot_client/commands/xml/map.py

@@ -241,10 +241,9 @@ class PullMP(XmlCommandWithMessageHandling):
 
     def __init__(
         self,
-        map_id: str,  # pylint: disable=unused-argument # noqa: ARG002
         piece_index: int,
+        _: str | None = None,
     ) -> None:
-        """Declare the map_id argument not to break compatibility with CapabilityMap."""
         self._piece_index = piece_index
         super().__init__({"pid": str(piece_index)})
 

deebot_client/map.py

@@ -105,7 +105,7 @@ async def on_major_map(event: MajorMapEvent) -> None:
                     ):
                         tg.create_task(
                             self._execute_command(
-                                self._capabilities.minor.execute(event.map_id, idx)
+                                self._capabilities.minor.execute(idx, event.map_id)
                             )
                         )
 

tests/commands/xml/test_map.py

@@ -219,7 +219,7 @@ async def test_PullM_error(xml: str) -> None:
 async def test_PullMP(xml: str, expected_event: MinorMapEvent) -> None:
     json = get_request_xml(xml)
     await assert_command(
-        PullMP(map_id="unused", piece_index=1),
+        PullMP(piece_index=1),
         json,
         expected_event,
         command_result=CommandResult(
@@ -239,7 +239,7 @@ async def test_PullMP(xml: str, expected_event: MinorMapEvent) -> None:
 async def test_PullMP_error(xml: str) -> None:
     json = get_request_xml(xml)
     await assert_command(
-        PullMP(map_id="unused", piece_index=1),
+        PullMP(piece_index=1),
         json,
         None,
         command_result=CommandResult(HandlingState.ANALYSE_LOGGED),