Merge pull request #830 from code0-tech/more-fixes

Fix some issues

Author: Taucher2003

app/finders/data_type_identifiers_finder.rb

@@ -107,10 +107,11 @@ def add_related_identifiers_recursive_case
   end
 
   def data_type_identifier_by_data_type_condition
+    dt = DataType.arel_table
     dti = DataTypeIdentifier.arel_table
     dtr = DataTypeRule.arel_table
 
-    config_id_condition = dti[:id].eq(
+    basic_rule_condition = dti[:id].eq(
       Arel::Nodes::NamedFunction.new(
         'CAST',
         [
@@ -122,7 +123,7 @@ def data_type_identifier_by_data_type_condition
       )
     )
 
-    array_condition = Arel::Nodes::NamedFunction.new(
+    input_types_any_condition = Arel::Nodes::NamedFunction.new(
       'ANY',
       [
         Arel::Nodes::NamedFunction.new(
@@ -140,10 +141,12 @@ def data_type_identifier_by_data_type_condition
       ]
     )
 
-    array_id_condition = dti[:id].eq(array_condition)
+    input_types_rule_condition = dti[:id].eq(input_types_any_condition)
+
+    parent_type_condition = dt[:parent_type_id].eq(dti[:id])
 
     Arel::Nodes::Grouping.new(
-      config_id_condition.or(array_id_condition)
+      basic_rule_condition.or(input_types_rule_condition).or(parent_type_condition)
     )
   end
 end

app/graphql/types/function_definition_type.rb

@@ -46,6 +46,10 @@ def identifier
       object.runtime_function_definition&.runtime_name
     end
 
+    def generic_keys
+      object.runtime_function_definition&.generic_keys
+    end
+
     def data_type_identifiers
       DataTypeIdentifiersFinder.new({ function_definition: object, expand_recursively: true }).execute
     end

app/graphql/types/parameter_definition_type.rb

@@ -8,7 +8,10 @@ class ParameterDefinitionType < Types::BaseObject
 
     field :identifier, String, null: false, description: 'Identifier of the parameter'
 
-    field :data_type_identifier, Types::DataTypeIdentifierType, null: true, description: 'Data type of the parameter'
+    field :data_type_identifier, Types::DataTypeIdentifierType,
+          null: true,
+          description: 'Data type of the parameter',
+          method: :data_type
 
     field :descriptions, [Types::TranslationType], null: true, description: 'Description of the parameter'
     field :names, [Types::TranslationType], null: true, description: 'Name of the parameter'
@@ -19,5 +22,9 @@ class ParameterDefinitionType < Types::BaseObject
 
     id_field ParameterDefinition
     timestamps
+
+    def identifier
+      object.runtime_parameter_definition&.runtime_name
+    end
   end
 end

app/services/runtimes/grpc/runtime_function_definitions/update_service.rb

@@ -65,6 +65,8 @@ def update_runtime_function_definition(runtime_function_definition, t)
                                                            db_object.display_messages)
           db_object.aliases = update_translations(runtime_function_definition.alias, db_object.aliases)
 
+          db_object.generic_keys = runtime_function_definition.generic_keys.to_a
+
           db_object.throws_error = runtime_function_definition.throws_error
           db_object.version = runtime_function_definition.version
 

spec/finders/data_type_identifiers_finder_spec.rb

@@ -165,6 +165,13 @@
         end
       end
 
+      let!(:data_type_identifier_as_parent_type) do
+        create(:data_type_identifier, data_type: data_type3, runtime: runtime).tap do |dti|
+          data_type1.parent_type = dti
+          data_type1.save!
+        end
+      end
+
       let!(:data_type_identifier_in_generic_mapper_source) do
         create(:data_type_identifier, data_type: data_type1, runtime: runtime)
       end
@@ -204,7 +211,8 @@
           data_type_identifier_with_generic_mapper.id,
           data_type_identifier_in_generic_mapper_source.id,
           data_type_identifier_in_contains_type_rule.id,
-          data_type_identifier_in_input_types_rule.id
+          data_type_identifier_in_input_types_rule.id,
+          data_type_identifier_as_parent_type.id
         )
       end
 
@@ -273,7 +281,8 @@
           second_data_type_identifier_in_generic_mapper_source.id,
           data_type_identifier_in_generic_mapper_source.id,
           data_type_identifier_in_contains_type_rule.id,
-          data_type_identifier_in_input_types_rule.id
+          data_type_identifier_in_input_types_rule.id,
+          data_type_identifier_as_parent_type.id
         )
       end
     end