Merge branch 'fix-formula-recursion-error' into 'develop'

Fix formula recursion error

Closes #2506

See merge request baserow/baserow!2313

Author: Jérémie Pardou

backend/src/baserow/contrib/integrations/local_baserow/service_types.py

@@ -1214,6 +1214,7 @@ def resolve_service_formulas(
         resolved_values = super().resolve_service_formulas(service, dispatch_context)
         field_mappings = service.field_mappings.select_related("field").all()
         for field_mapping in field_mappings:
+            dispatch_context.reset_call_stack()
             try:
                 resolved_values[field_mapping.id] = resolve_formula(
                     field_mapping.value,
@@ -1229,7 +1230,7 @@ def resolve_service_formulas(
             except Exception as e:
                 message = (
                     "Unknown error in formula for "
-                    f"field {field_mapping.field.name}({field_mapping.field.id})"
+                    f"field {field_mapping.field.name}({field_mapping.field.id}): {str(e)}"
                 )
                 raise ServiceImproperlyConfigured(message) from e
 
@@ -1239,6 +1240,7 @@ def resolve_service_formulas(
             return resolved_values
 
         try:
+            dispatch_context.reset_call_stack()
             resolved_values["row_id"] = ensure_integer(
                 resolve_formula(
                     service.row_id,
@@ -1258,6 +1260,7 @@ def resolve_service_formulas(
             raise ServiceImproperlyConfigured(
                 f"The `row_id` formula can't be resolved: {e}"
             )
+
         return resolved_values
 
     def dispatch_data(
@@ -1282,6 +1285,7 @@ def dispatch_data(
 
         field_values = {}
         field_mappings = service.field_mappings.select_related("field").all()
+
         for field_mapping in field_mappings:
             if field_mapping.id not in resolved_values:
                 continue
@@ -1296,11 +1300,7 @@ def dispatch_data(
             if field_type.read_only:
                 continue
 
-            resolved_value = resolve_formula(
-                field_mapping.value,
-                formula_runtime_function_registry,
-                dispatch_context,
-            )
+            resolved_value = resolved_values[field_mapping.id]
 
             # Transform and validate the resolved value with the field type's DRF field.
             serializer_field = field_type.get_serializer_field(field.specific)
@@ -1326,10 +1326,10 @@ def dispatch_data(
                     values=field_values,
                     values_already_prepared=True,
                 )
-            except RowDoesNotExist:
+            except RowDoesNotExist as exc:
                 raise ServiceImproperlyConfigured(
                     f"The row with id {resolved_values['row_id']} does not exist."
-                )
+                ) from exc
         else:
             row = RowHandler().create_row(
                 user=integration.authorized_user,

backend/tests/baserow/contrib/integrations/local_baserow/test_service_types.py

@@ -2006,6 +2006,64 @@ def test_local_baserow_upsert_row_service_dispatch_data_with_row_id(
     assert getattr(row, cost.db_column) == fake_request.data["page_parameter"]["id"]
 
 
+@pytest.mark.django_db
+def test_local_baserow_upsert_row_service_dispatch_data_with_multiple_formulas(
+    data_fixture,
+):
+    user = data_fixture.create_user()
+    builder = data_fixture.create_builder_application(user=user)
+    page = data_fixture.create_builder_page(builder=builder)
+    integration = data_fixture.create_local_baserow_integration(
+        application=builder, user=user, authorized_user=user
+    )
+    database = data_fixture.create_database_application(workspace=builder.workspace)
+    table = TableHandler().create_table_and_fields(
+        user=user,
+        database=database,
+        name=data_fixture.fake.name(),
+        fields=[
+            ("Cost", "number", {}),
+            ("Name", "text", {}),
+        ],
+    )
+    cost = table.field_set.get(name="Cost")
+    name = table.field_set.get(name="Name")
+    row = RowHandler().create_row(
+        user=user,
+        table=table,
+        values={cost.db_column: 5, name.db_column: "test"},
+    )
+
+    data_source = data_fixture.create_builder_local_baserow_get_row_data_source(
+        page=page, table=table, integration=integration
+    )
+
+    service = data_fixture.create_local_baserow_upsert_row_service(
+        table=table,
+        row_id=f'get("data_source.{data_source.id}.id")',
+        integration=integration,
+    )
+    service_type = service.get_type()
+    service.field_mappings.create(
+        field=cost, value=f'get("data_source.{data_source.id}.{cost.db_column}")'
+    )
+    service.field_mappings.create(
+        field=name, value=f'get("data_source.{data_source.id}.{name.db_column}")'
+    )
+
+    fake_request = Mock()
+    fake_request.data = {"page_parameter": {"id": 10}}
+
+    dispatch_context = BuilderDispatchContext(fake_request, page)
+    dispatch_values = service_type.resolve_service_formulas(service, dispatch_context)
+    dispatch_data = service_type.dispatch_data(
+        service, dispatch_values, dispatch_context
+    )
+
+    row.refresh_from_db()
+    assert getattr(row, cost.db_column) == 5
+
+
 @pytest.mark.django_db
 def test_local_baserow_upsert_row_service_dispatch_data_with_unknown_row_id(
     data_fixture,

changelog/entries/unreleased/bug/2506_fix_formula_recursion_error_in_createupdate_row_action_when_.json

@@ -0,0 +1,7 @@
+{
+    "type": "bug",
+    "message": "Fix formula recursion error in create/update row action when using multiple formule with the same data source",
+    "issue_number": 2506,
+    "bullet_points": [],
+    "created_at": "2024-04-26"
+}