Refactor generic types and mappers, update data type associations, and enhance validation services

Author: Knerio

Gemfile

@@ -79,7 +79,7 @@ gem 'good_job', '~> 4.0'
 gem 'rotp'
 
 gem 'grpc', '~> 1.67'
-gem 'tucana', '0.0.27'
+gem 'tucana', '0.0.28'
 
 gem 'code0-identities', '~> 0.0.1'
 

Gemfile.lock

@@ -362,7 +362,7 @@ GEM
     test-prof (1.4.4)
     thor (1.3.2)
     timeout (0.4.3)
-    tucana (0.0.27)
+    tucana (0.0.28)
       grpc (~> 1.64)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -416,7 +416,7 @@ DEPENDENCIES
   simplecov (~> 0.22.0)
   simplecov-cobertura (~> 2.1)
   test-prof (~> 1.0)
-  tucana (= 0.0.27)
+  tucana (= 0.0.28)
   tzinfo-data
 
 RUBY VERSION

app/graphql/types/input/generic_type_input_type.rb

@@ -5,7 +5,7 @@ module Input
     class GenericTypeInputType < Types::BaseInputObject
       description 'Input type for generic type operations.'
 
-      argument :data_type_id, Types::GlobaIdType[::DataType], required: true, description: 'The data type associated with this generic type.'
+      argument :data_type_id, Types::GlobalIdType[::DataType], required: true, description: 'The data type associated with this generic type.'
       argument :generic_mappers, [Types::Input::GenericMapperInputType], required: true,
             description: 'The mappers associated with this generic type.'
 

app/models/data_type.rb

@@ -7,8 +7,8 @@ class DataType < ApplicationRecord
     object: 3,
     datatype: 4,
     array: 5,
-    generic: 6,
-    function: 7,
+    error: 6,
+    node: 7,
   }.with_indifferent_access
 
   enum :variant, VARIANTS, prefix: :variant
@@ -20,6 +20,7 @@ class DataType < ApplicationRecord
   has_many :names, -> { by_purpose(:name) }, class_name: 'Translation', as: :owner, inverse_of: :owner
   has_many :rules, class_name: 'DataTypeRule', inverse_of: :data_type
   has_many :data_type_identifiers, class_name: 'DataTypeIdentifier', inverse_of: :data_type
+  has_many :generic_types, class_name: 'GenericType', inverse_of: :data_type
 
   validates :variant, presence: true,
                       inclusion: {

app/models/data_type_identifier.rb

@@ -2,12 +2,11 @@
 
 class DataTypeIdentifier < ApplicationRecord
   belongs_to :data_type, optional: true, inverse_of: :data_type_identifiers
-  belongs_to :generic_type, optional: true, inverse_of: :data_type_identifier
+  belongs_to :generic_type, optional: true, inverse_of: :data_type_identifiers
   belongs_to :runtime, inverse_of: :data_type_identifiers
 
-  has_many :generic_types, inverse_of: :data_type_identifier
-  has_many :generic_mappers, inverse_of: :data_type_identifier
-  has_many :function_generic_mappers, class_name: 'GenericMapper', inverse_of: :data_type_identifier
+  has_many :generic_mappers, inverse_of: :source
+  has_many :function_generic_mappers, class_name: 'FunctionGenericMapper', inverse_of: :source
 
   validate :exactly_one_of_generic_key_data_type_id_generic_type_id
 

app/models/function_generic_mapper.rb

@@ -1,21 +1,11 @@
 # frozen_string_literal: true
 
 class FunctionGenericMapper < ApplicationRecord
-  belongs_to :data_type_identifier, optional: true, inverse_of: :function_generic_mappers
+  belongs_to :source, class_name: 'DataTypeIdentifier', inverse_of: :function_generic_mappers
   belongs_to :runtime_function_definition, class_name: 'RuntimeFunctionDefinition', optional: true,
                                            inverse_of: :generic_mappers
   belongs_to :runtime_parameter_definition, class_name: 'RuntimeParameterDefinition', optional: true,
                                             inverse_of: :function_generic_mappers
 
   validates :target, presence: true
-  validate :exactly_one_of_generic_key_or_data_type_identifier_id
-
-  private
-
-  def exactly_one_of_generic_key_or_data_type_identifier_id
-    values = [generic_key.present?, data_type_identifier.present?]
-    return if values.count(true) == 1
-
-    errors.add(:base, 'Exactly one of generic_key or data_type_identifier_id must be present')
-  end
 end

app/models/node_function.rb

@@ -4,7 +4,8 @@ class NodeFunction < ApplicationRecord
   belongs_to :runtime_function, class_name: 'RuntimeFunctionDefinition'
   belongs_to :next_node, class_name: 'NodeFunction', optional: true
 
-  has_many :node_parameters, inverse_of: :function_value
+  has_many :node_parameter_values, class_name: 'NodeParameter', inverse_of: :function_value
+  has_many :node_parameters, class_name: 'NodeParameter', inverse_of: :node_function
 
 
   validate :validate_recursion, if: :next_node_changed?

app/models/node_parameter.rb

@@ -3,7 +3,8 @@
 class NodeParameter < ApplicationRecord
   belongs_to :runtime_parameter, class_name: 'RuntimeParameterDefinition'
   belongs_to :reference_value, optional: true
-  belongs_to :function_value, class_name: 'NodeFunction', optional: true
+  belongs_to :function_value, class_name: 'NodeFunction', optional: true, inverse_of: :node_parameter_values
+  belongs_to :node_function, class_name: 'NodeFunction', inverse_of: :node_parameters
 
   validate :only_one_value_present
 

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

@@ -44,7 +44,7 @@ def execute
               )
             end
 
-            res = ValidationService.new(current_authentication, flow).execute
+            res = Validation::ValidationService.new(current_authentication, flow).execute
 
             if res.error?
               t.rollback_and_return! ServiceResponse.error(

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

@@ -31,7 +31,7 @@ def execute
               )
             end
 
-            res = ValidationService.new(current_authentication, flow).execute
+            res = Validation::ValidationService.new(current_authentication, flow).execute
 
             if res.error?
               t.rollback_and_return! ServiceResponse.error(