fix: transform mapping for trigger data (wraft#177)

Author: Faheemvc

lib/wraft_doc/forms/forms.ex

@@ -615,6 +615,26 @@ defmodule WraftDoc.Forms do
     end)
   end
 
+  @spec transform_trigger_data_by_mapping(FormMapping.t(), map()) :: map() | {:error, String.t()}
+  def transform_trigger_data_by_mapping(
+        %FormMapping{mapping: mappings} = _form_mapping,
+        data
+      ) do
+    mappings
+    |> transform_mappings
+    |> transform_trigger_data(data)
+    |> Enum.into(%{})
+  end
+
+  defp transform_trigger_data(mappings, data) do
+    Enum.flat_map(mappings, fn {content_type_field_name, form_field_name} ->
+      case Map.get(data, form_field_name) do
+        nil -> []
+        value -> [{content_type_field_name, value}]
+      end
+    end)
+  end
+
   @doc """
     Align form fields
   """

lib/wraft_doc/logic_pipeline/pipeline_runner.ex

@@ -72,7 +72,7 @@ defmodule WraftDoc.PipelineRunner do
         try do
           transformed_data =
             case data["trigger_type"] do
-              "webhook" -> data
+              "webhook" -> Forms.transform_trigger_data_by_mapping(form_mapping, data)
               _ -> Forms.transform_data_by_mapping(form_mapping, data)
             end
 

lib/wraft_doc/workers/bulk_worker.ex

@@ -106,7 +106,11 @@ defmodule WraftDoc.Workers.BulkWorker do
   @spec handle_exceptions(tuple(), User.t()) :: any()
   defp handle_exceptions(
          {:error,
-          %PipelineError{error: :form_mapping_not_complete, input: trigger, stage: stage}},
+          %PipelineError{
+            error: :form_mapping_not_complete,
+            input: %{trigger: trigger},
+            stage: stage
+          }},
          _current_user
        ) do
     state = TriggerHistory.states()[:failed]
@@ -140,7 +144,8 @@ defmodule WraftDoc.Workers.BulkWorker do
   end
 
   defp handle_exceptions(
-         {:error, %PipelineError{error: :pipeline_not_found, input: trigger, stage: stage}},
+         {:error,
+          %PipelineError{error: :pipeline_not_found, input: %{trigger: trigger}, stage: stage}},
          _current_user
        ) do
     state = TriggerHistory.states()[:failed]
@@ -175,7 +180,8 @@ defmodule WraftDoc.Workers.BulkWorker do
   end
 
   defp handle_exceptions(
-         {:error, %PipelineError{error: :instance_failed, input: trigger, stage: stage}},
+         {:error,
+          %PipelineError{error: :instance_failed, input: %{trigger: trigger}, stage: stage}},
          _current_user
        ) do
     state = TriggerHistory.states()[:failed]
@@ -210,7 +216,11 @@ defmodule WraftDoc.Workers.BulkWorker do
 
   defp handle_exceptions(
          {:error,
-          %PipelineError{error: %DownloadError{message: message}, input: trigger, stage: stage}},
+          %PipelineError{
+            error: %DownloadError{message: message},
+            input: %{trigger: trigger},
+            stage: stage
+          }},
          _current_user
        ) do
     state = TriggerHistory.states()[:failed]
@@ -245,7 +255,11 @@ defmodule WraftDoc.Workers.BulkWorker do
 
   defp handle_exceptions(
          {:error,
-          %PipelineError{error: %InvalidJsonError{message: message}, input: trigger, stage: stage}},
+          %PipelineError{
+            error: %InvalidJsonError{message: message},
+            input: %{trigger: trigger},
+            stage: stage
+          }},
          _current_user
        ) do
     state = TriggerHistory.states()[:failed]
@@ -400,7 +414,7 @@ defmodule WraftDoc.Workers.BulkWorker do
   end
 
   defp handle_exceptions(
-         {:error, %PipelineError{error: e, input: trigger, stage: stage}},
+         {:error, %PipelineError{error: e, input: %{trigger: trigger}, stage: stage}},
          _current_user
        ) do
     state = TriggerHistory.states()[:failed]
@@ -413,6 +427,8 @@ defmodule WraftDoc.Workers.BulkWorker do
       message: msg,
       stage: stage
     })
+
+    trigger
   end
 
   # Update state and error of a trigger history