[FIX] m2m mapper

Author: bosd

src/odoo_data_flow/lib/mapper.py

@@ -323,38 +323,39 @@ def m2o_fun(line: LineDict, state: StateDict) -> str:
     return m2o_fun
 
 
-def m2m(prefix: str, *fields: Any, sep: str = ",") -> MapperFunc:
+def m2m(prefix: str, *fields: Any, sep: str = ",", default: str = "") -> MapperFunc:
     """Returns a mapper that creates a comma-separated list of Many2many external IDs.
 
-    This mapper has two modes:
-    1.  **Multi-column**: If multiple fields are provided, it treats the value of
-        each field as a single ID.
-    2.  **Single-column**: If one field is provided, it splits the value of that
-        field by the separator `sep`.
+    It processes values from specified source columns, splitting them by 'sep'
+    if they contain the separator, and applies the prefix to each resulting ID.
 
     Args:
         prefix: The XML ID prefix to apply to each value.
-        *fields: One or more source column names.
-        sep: The separator to use when splitting a single field.
+        *fields: One or more source column names from which to get values.
+        sep: The separator to use when splitting values within a single field.
+        default: The value to return if no IDs are generated.
 
     Returns:
         A mapper function that returns a comma-separated string of external IDs.
     """
 
     def m2m_fun(line: LineDict, state: StateDict) -> str:
-        all_values = []
-        if len(fields) > 1:  # Mode 1: Multiple columns
-            for field_name in fields:
-                value = _get_field_value(line, field_name)
-                if value:
-                    all_values.append(to_m2o(prefix, value))
-        elif len(fields) == 1:  # Mode 2: Single column with separator
-            field_name = fields[0]
+        all_ids = []
+        for field_name in fields:
             value = _get_field_value(line, field_name)
             if value and isinstance(value, str):
-                all_values.extend(to_m2o(prefix, v.strip()) for v in value.split(sep))
-
-        return ",".join(all_values)
+                # Always split if the value contains the separator
+                # This makes behavior consistent regardless of # of fields
+                current_field_ids = [
+                    to_m2m(prefix, v.strip()) for v in value.split(sep) if v.strip()
+                ]
+                all_ids.extend(current_field_ids)
+
+        # If no IDs are generated and default is provided, use it
+        if not all_ids and default:
+            return default
+
+        return ",".join(all_ids)
 
     return m2m_fun
 

tests/test_mapper.py

@@ -151,16 +151,23 @@ def test_m2o_map_success() -> None:
 
 def test_m2m_multi_column() -> None:
     """Tests the m2m mapper in multi-column mode."""
+    # With the new m2m logic, this should split both "tags" and "other_tags"
+    # "tags" ("T1, T2") should become "tag_prefix.T1", "tag_prefix.T2"
+    # "other_tags" ("T3") should become "tag_prefix.T3"
+    # Joined by comma: "tag_prefix.T1,tag_prefix.T2,tag_prefix.T3"
     mapper_func = mapper.m2m("tag_prefix", "tags", "other_tags")
     result = mapper_func(LINE_M2M, {})
-    assert result == "tag_prefix.T1, T2,tag_prefix.T3"
+    assert result == "tag_prefix.T1,tag_prefix.T2,tag_prefix.T3"
 
 
 def test_m2m_multi_column_with_missing_field() -> None:
     """Tests the m2m mapper in multi-column mode with a non-existent field."""
+    # "tags" ("T1, T2") should become "tag_prefix.T1", "tag_prefix.T2"
+    # "non_existent_field" will be empty/None
+    # Joined by comma: "tag_prefix.T1,tag_prefix.T2"
     mapper_func = mapper.m2m("tag_prefix", "tags", "non_existent_field")
     result = mapper_func(LINE_M2M, {})
-    assert result == "tag_prefix.T1, T2"
+    assert result == "tag_prefix.T1,tag_prefix.T2"
 
 
 def test_m2m_multi_column_with_empty_value() -> None:
@@ -172,10 +179,28 @@ def test_m2m_multi_column_with_empty_value() -> None:
 
 def test_m2m_single_empty_field() -> None:
     """Tests the m2m mapper in single-column mode with an empty field."""
+    # "empty_tags" is "", so it should return an empty string.
     mapper_func = mapper.m2m("tag_prefix", "empty_tags", sep=",")
     assert mapper_func(LINE_M2M, {}) == ""
 
 
+# Add a specific test for m2m single column with a comma-separated value
+def test_m2m_single_column_splits_value() -> None:
+    """Tests that m2m in single-column mode correctly splits the field value."""
+    line = {"products": "PROD1, PROD2,PROD3"}
+    mapper_func = mapper.m2m("prod_prefix", "products", sep=",")
+    assert (
+        mapper_func(line, {}) == "prod_prefix.PROD1,prod_prefix.PROD2,prod_prefix.PROD3"
+    )
+
+
+def test_m2m_single_column_splits_value_with_custom_sep() -> None:
+    """Tests that m2m in single-column mode correctly splits with custom separator."""
+    line = {"items": "ITEM-A; ITEM-B"}
+    mapper_func = mapper.m2m("item_prefix", "items", sep=";")
+    assert mapper_func(line, {}) == "item_prefix.ITEM-A,item_prefix.ITEM-B"
+
+
 def test_m2m_map_with_concat() -> None:
     """Tests m2m_map wrapping another mapper."""
     concat_mapper = mapper.concat(",", "tags", "other_tags")