Merge pull request #846 from code0-tech/821-add-datatype-creation

Add DataType creation for Flow Input and Return Types

Author: Taucher2003

app/graphql/types/input/flow_input_type.rb

@@ -17,6 +17,10 @@ class FlowInputType < Types::BaseInputObject
 
       argument :type, Types::GlobalIdType[::FlowType], required: true,
                                                        description: 'The identifier of the flow type'
+
+      argument :input_type, String, required: false, description: 'The input type of the flow'
+
+      argument :return_type, String, required: false, description: 'The return type of the flow'
     end
   end
 end

app/services/namespaces/projects/flows/create_service.rb

@@ -38,11 +38,12 @@ def execute
             flow = Flow.new(
               project: namespace_project,
               name: flow_input.name,
-              flow_type: flow_type,
-              input_type: flow_type.input_type,
-              return_type: flow_type.return_type
+              flow_type: flow_type
             )
 
+            flow_input.send(:overwrite_argument, :input_type, flow_type.input_type) if flow_input.input_type.blank?
+            flow_input.send(:overwrite_argument, :return_type, flow_type.return_type) if flow_input.return_type.blank?
+
             unless flow.save
               t.rollback_and_return! ServiceResponse.error(
                 message: 'Flow is invalid',

app/services/namespaces/projects/flows/update_service.rb

@@ -48,6 +48,8 @@ def update_flow(t)
 
         def update_flow_attributes
           flow.name = flow_input.name
+          flow.input_type = flow_input.input_type
+          flow.return_type = flow_input.return_type
         end
 
         def update_settings(t)

docs/graphql/input_object/flowinput.md

@@ -8,8 +8,10 @@ Input type for creating or updating a flow
 
 | Name | Type | Description |
 |------|------|-------------|
+| `inputType` | [`String`](../scalar/string.md) | The input type of the flow |
 | `name` | [`String!`](../scalar/string.md) | The name of the flow |
 | `nodes` | [`[NodeFunctionInput!]!`](../input_object/nodefunctioninput.md) | The node functions of the flow |
+| `returnType` | [`String`](../scalar/string.md) | The return type of the flow |
 | `settings` | [`[FlowSettingInput!]`](../input_object/flowsettinginput.md) | The settings of the flow |
 | `startingNodeId` | [`NodeFunctionID`](../scalar/nodefunctionid.md) | The starting node of the flow |
 | `type` | [`FlowTypeID!`](../scalar/flowtypeid.md) | The identifier of the flow type |

spec/requests/graphql/mutation/namespace/projects/flows/create_mutation_spec.rb

@@ -14,6 +14,8 @@
           #{error_query}
           flow {
             id
+            inputType
+            returnType
             startingNodeId
             nodes {
               count
@@ -59,7 +61,7 @@
 
   let(:runtime) { create(:runtime) }
   let(:project) { create(:namespace_project, primary_runtime: runtime) }
-  let(:flow_type) { create(:flow_type, runtime: runtime) }
+  let(:flow_type) { create(:flow_type, runtime: runtime, input_type: 'input_type', return_type: 'return_type') }
   let(:function_definition) do
     rfd = create(:runtime_function_definition, runtime: runtime)
     rpd = create(:runtime_parameter_definition, runtime_function_definition: rfd)
@@ -164,6 +166,18 @@
       expect(created_flow_id).to be_present
       flow = SagittariusSchema.object_from_id(created_flow_id)
 
+      expect(
+        graphql_data_at(:namespaces_projects_flows_create, :flow)
+      ).to match a_graphql_entity_for(
+        flow,
+        :input_type,
+        :return_type,
+        starting_node_id: flow.starting_node.to_global_id.to_s
+      )
+
+      expect(flow.input_type).to eq(flow_type.input_type)
+      expect(flow.return_type).to eq(flow_type.return_type)
+
       expect(graphql_data_at(:namespaces_projects_flows_create, :flow, :settings).size).to eq(1)
 
       nodes = graphql_data_at(:namespaces_projects_flows_create, :flow, :nodes, :nodes)

spec/requests/graphql/mutation/namespace/projects/flows/update_mutation_spec.rb

@@ -14,6 +14,8 @@
           #{error_query}
           flow {
             id
+            inputType
+            returnType
             startingNodeId
             nodes {
               count
@@ -78,6 +80,8 @@
       flowInput: {
         name: generate(:flow_name),
         type: flow_type.to_global_id.to_s,
+        inputType: 'updated_input_type',
+        returnType: 'updated_return_type',
         startingNodeId: 'gid://sagittarius/NodeFunction/1000',
         settings: {
           flowSettingIdentifier: 'key',
@@ -166,6 +170,18 @@
       expect(updated_flow_id).to be_present
       flow = SagittariusSchema.object_from_id(updated_flow_id)
 
+      expect(
+        graphql_data_at(:namespaces_projects_flows_update, :flow)
+      ).to match a_graphql_entity_for(
+        flow,
+        :input_type,
+        :return_type,
+        starting_node_id: flow.starting_node.to_global_id.to_s
+      )
+
+      expect(flow.input_type).to eq(input[:flowInput][:inputType])
+      expect(flow.return_type).to eq(input[:flowInput][:returnType])
+
       expect(graphql_data_at(:namespaces_projects_flows_update, :flow, :settings).size).to eq(1)
 
       nodes = graphql_data_at(:namespaces_projects_flows_update, :flow, :nodes, :nodes)

spec/services/namespaces/projects/flows/create_service_spec.rb

@@ -12,9 +12,11 @@
   let(:namespace_project) { create(:namespace_project, primary_runtime: runtime) }
 
   let(:flow_input) do
-    Struct.new(:settings, :type, :starting_node_id, :nodes, :name).new(
+    Struct.new(:settings, :type, :input_type, :return_type, :starting_node_id, :nodes, :name).new(
       [],
       create(:flow_type, runtime: runtime).to_global_id,
+      'input_type',
+      'return_type',
       'gid://sagittarius/NodeFunction/12345',
       [
         Struct.new(:id, :function_definition_id, :next_node_id, :parameters).new(
@@ -53,9 +55,11 @@
   context 'when starting node is nil' do
     let(:current_user) { create(:user) }
     let(:flow_input) do
-      Struct.new(:settings, :type, :starting_node_id, :nodes, :name).new(
+      Struct.new(:settings, :type, :input_type, :return_type, :starting_node_id, :nodes, :name).new(
         [],
         create(:flow_type, runtime: runtime).to_global_id,
+        'input_type',
+        'return_type',
         nil,
         [
           Struct.new(:id, :function_definition_id, :next_node_id, :parameters).new(

spec/services/namespaces/projects/flows/update_service_spec.rb

@@ -23,8 +23,10 @@
   end
   let(:flow) { create(:flow, project: namespace_project, flow_type: create(:flow_type, runtime: runtime)) }
   let(:flow_input) do
-    Struct.new(:settings, :starting_node_id, :nodes, :name).new(
+    Struct.new(:settings, :input_type, :return_type, :starting_node_id, :nodes, :name).new(
       [],
+      'input_type',
+      'return_type',
       starting_node.to_global_id,
       [
         Struct.new(:id, :function_definition_id, :next_node_id, :parameters).new(