1542

docs/src/content/docs/reference/components/object-helper.md

@@ -121,3 +121,16 @@ Type: BOOLEAN
 
 
 
+### Merge Two Objects
+Merge two objects into one. If there is any property with the same name, the source value will be used.
+
+#### Properties
+
+|      Name      |     Type     |     Control Type     |     Description     |
+|:--------------:|:------------:|:--------------------:|:-------------------:|
+| Source | {} | OBJECT_BUILDER  |  The source object to merge.  |
+| Target | {} | OBJECT_BUILDER  |  The target object to merge into.  |
+
+
+
+

server/libs/modules/components/object-helper/src/main/java/com/bytechef/component/object/helper/ObjectHelperComponentHandler.java

@@ -26,6 +26,7 @@
 import com.bytechef.component.object.helper.action.ObjectHelperContainsAction;
 import com.bytechef.component.object.helper.action.ObjectHelperDeleteKeyValuePairAction;
 import com.bytechef.component.object.helper.action.ObjectHelperEqualsAction;
+import com.bytechef.component.object.helper.action.ObjectHelperMergeTwoObjectsAction;
 import com.google.auto.service.AutoService;
 
 /**
@@ -44,7 +45,8 @@ public class ObjectHelperComponentHandler implements ComponentHandler {
             ObjectHelperAddKeyValuePairsAction.ACTION_DEFINITION,
             ObjectHelperContainsAction.ACTION_DEFINITION,
             ObjectHelperDeleteKeyValuePairAction.ACTION_DEFINITION,
-            ObjectHelperEqualsAction.ACTION_DEFINITION);
+            ObjectHelperEqualsAction.ACTION_DEFINITION,
+            ObjectHelperMergeTwoObjectsAction.ACTION_DEFINITION);
 
     @Override
     public ComponentDefinition getDefinition() {

server/libs/modules/components/object-helper/src/main/java/com/bytechef/component/object/helper/action/ObjectHelperMergeTwoObjectsAction.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.object.helper.action;
+
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.object;
+import static com.bytechef.component.object.helper.constant.ObjectHelperConstants.SOURCE;
+import static com.bytechef.component.object.helper.constant.ObjectHelperConstants.TARGET;
+
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import java.util.HashMap;
+
+/**
+ * @author Monika Kušter
+ */
+public class ObjectHelperMergeTwoObjectsAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("mergeTwoObjects")
+        .title("Merge Two Objects")
+        .description(
+            "Merge two objects into one. If there is any property with the same name, the source value will be used.")
+        .properties(
+            object(SOURCE)
+                .label("Source")
+                .description("The source object to merge.")
+                .required(true),
+            object(TARGET)
+                .label("Target")
+                .description("The target object to merge into.")
+                .required(true))
+        .output()
+        .perform(ObjectHelperMergeTwoObjectsAction::perform);
+
+    private ObjectHelperMergeTwoObjectsAction() {
+    }
+
+    protected static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
+
+        return new HashMap<String, Object>() {
+            {
+                putAll(inputParameters.getRequiredMap(TARGET, Object.class));
+                putAll(inputParameters.getRequiredMap(SOURCE, Object.class));
+            }
+        };
+    }
+}

server/libs/modules/components/object-helper/src/test/java/com/bytechef/component/object/helper/action/ObjectHelperMergeTwoObjectsActionTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.object.helper.action;
+
+import static com.bytechef.component.object.helper.constant.ObjectHelperConstants.SOURCE;
+import static com.bytechef.component.object.helper.constant.ObjectHelperConstants.TARGET;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.component.test.definition.MockParametersFactory;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Monika Kušter
+ */
+class ObjectHelperMergeTwoObjectsActionTest {
+
+    private final ActionContext actionContext = mock(ActionContext.class);
+    private final Parameters mockedParameters = MockParametersFactory.create(
+        Map.of(
+            SOURCE, Map.of("key1", "value1", "key2", "value2"),
+            TARGET, Map.of("key1", "newValue", "key2", "value2")));
+
+    @Test
+    void testPerform() {
+        Object result = ObjectHelperMergeTwoObjectsAction.perform(mockedParameters, mockedParameters, actionContext);
+
+        assertEquals(Map.of("key1", "value1", "key2", "value2"), result);
+    }
+}

server/libs/modules/components/object-helper/src/test/resources/definition/object-helper_v1.json

@@ -1266,9 +1266,67 @@
     "perform" : { },
     "processErrorResponse" : null,
     "workflowNodeDescription" : null
+  }, {
+    "batch" : null,
+    "deprecated" : null,
+    "description" : "Merge two objects into one. If there is any property with the same name, the source value will be used.",
+    "help" : null,
+    "metadata" : null,
+    "name" : "mergeTwoObjects",
+    "outputDefinition" : {
+      "output" : null,
+      "outputResponse" : null,
+      "outputSchema" : null,
+      "sampleOutput" : null
+    },
+    "properties" : [ {
+      "advancedOption" : null,
+      "description" : "The source object to merge.",
+      "displayCondition" : null,
+      "expressionEnabled" : null,
+      "hidden" : null,
+      "metadata" : { },
+      "required" : true,
+      "name" : "source",
+      "type" : "OBJECT",
+      "defaultValue" : null,
+      "exampleValue" : null,
+      "label" : "Source",
+      "placeholder" : null,
+      "additionalProperties" : null,
+      "multipleValues" : null,
+      "options" : null,
+      "properties" : null,
+      "controlType" : "OBJECT_BUILDER",
+      "optionsDataSource" : null
+    }, {
+      "advancedOption" : null,
+      "description" : "The target object to merge into.",
+      "displayCondition" : null,
+      "expressionEnabled" : null,
+      "hidden" : null,
+      "metadata" : { },
+      "required" : true,
+      "name" : "target",
+      "type" : "OBJECT",
+      "defaultValue" : null,
+      "exampleValue" : null,
+      "label" : "Target",
+      "placeholder" : null,
+      "additionalProperties" : null,
+      "multipleValues" : null,
+      "options" : null,
+      "properties" : null,
+      "controlType" : "OBJECT_BUILDER",
+      "optionsDataSource" : null
+    } ],
+    "title" : "Merge Two Objects",
+    "perform" : { },
+    "processErrorResponse" : null,
+    "workflowNodeDescription" : null
   } ],
-  "connection" : null,
-  "triggers" : null,
   "dataStream" : null,
-  "unifiedApi" : null
+  "triggers" : null,
+  "unifiedApi" : null,
+  "connection" : null
 }