fix: address dock feature review comments

Author: Lash-L

roborock/data/v1/v1_containers.py

@@ -241,7 +241,7 @@ def current_map(self) -> int | None:
 
     @property
     def has_am(self) -> bool | None:
-        if not self.dss:
+        if self.dss is None:
             return None
         return (self.dss & 3) == 2
 
@@ -384,7 +384,7 @@ def current_map(self) -> int | None:
 
     @property
     def has_am(self) -> bool | None:
-        if not self.dss:
+        if self.dss is None:
             return None
         return (self.dss & 3) == 2
 

roborock/device_features.py

@@ -846,3 +846,18 @@ def is_hatch_door_dock_cool_fan_supported(self) -> bool:
     @property
     def is_special_support_wash_temp(self) -> bool:
         return self.dock_type in _SPECIAL_WASH_TEMP_DOCK_TYPES
+
+
+WASH_N_FILL_DOCK_TYPES = [
+    dock_type for dock_type in RoborockDockTypeCode if RoborockDockFeatures.from_dock_type(dock_type).is_washable
+]
+
+
+def is_wash_n_fill_dock(dock_type: RoborockDockTypeCode) -> bool:
+    """Check if the dock type is a wash and fill dock."""
+    return RoborockDockFeatures.from_dock_type(dock_type).is_washable
+
+
+def is_valid_dock(dock_type: RoborockDockTypeCode) -> bool:
+    """Check if device supports a dock."""
+    return RoborockDockFeatures.from_dock_type(dock_type).has_dock

roborock/testing/v1_simulator.py

@@ -81,7 +81,7 @@ def _serialize_dataclass(obj: Any) -> dict[str, Any]:
     home_sec_enable_password=0,
     adbumper_status=[0, 0, 0],
     water_shortage_status=0,
-    dock_type=RoborockDockTypeCode.s8_dock,
+    dock_type=RoborockDockTypeCode.o4_dock,
     dust_collection_status=0,
     auto_dust_collection=1,
     avoid_count=19,

tests/data/v1/test_v1_containers.py

@@ -272,6 +272,14 @@ def test_qrevo_s5v_dock_type():
     assert s.dock_type.value == 22
 
 
+def test_has_am_dss_zero_is_not_missing():
+    modified_status = STATUS.copy()
+    modified_status["dss"] = 0
+
+    assert S7MaxVStatus.from_dict(modified_status).has_am is False
+    assert StatusV2.from_dict(modified_status).has_am is False
+
+
 def test_multi_maps_list_info(snapshot: SnapshotAssertion) -> None:
     """Test that MultiMapsListInfo can be deserialized correctly."""
     data = {

tests/test_supported_features.py

@@ -6,7 +6,7 @@
 from roborock import SHORT_MODEL_TO_ENUM
 from roborock.data.code_mappings import RoborockProductNickname
 from roborock.data.v1 import RoborockDockTypeCode
-from roborock.device_features import DeviceFeatures, RoborockDockFeatures
+from roborock.device_features import DeviceFeatures, RoborockDockFeatures, is_valid_dock, is_wash_n_fill_dock
 from tests import mock_data
 
 
@@ -117,6 +117,8 @@ def test_dock_features(dock_type: RoborockDockTypeCode, is_collectable: bool, is
     assert dock_features.has_dock is (dock_type not in {RoborockDockTypeCode.unknown, RoborockDockTypeCode.o0_dock})
     assert dock_features.is_collectable is is_collectable
     assert dock_features.is_washable is is_washable
+    assert is_valid_dock(dock_type) is dock_features.has_dock
+    assert is_wash_n_fill_dock(dock_type) is dock_features.is_washable
 
 
 def test_dock_feature_flags_from_rr_api() -> None: