Merge pull request #708 from code0-tech/704-add-displaymessages-and-aliases-to-functiondefinition

Taucher2003 · web-flow · commit b3e48023d056 · 2025-11-22T10:25:19.000+01:00
Update tucana and add aliases and display messages
diff --git a/Gemfile b/Gemfile
@@ -79,7 +79,7 @@ gem 'good_job', '~> 4.0'
 gem 'rotp'
 
 gem 'grpc', '~> 1.67'
-gem 'tucana', '0.0.40'
+gem 'tucana', '0.0.41'
 
 gem 'code0-identities', '~> 0.0.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -376,7 +376,7 @@ GEM
     thor (1.4.0)
     timeout (0.4.3)
     tsort (0.2.0)
-    tucana (0.0.40)
+    tucana (0.0.41)
       grpc (~> 1.64)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -430,7 +430,7 @@ DEPENDENCIES
   simplecov (~> 0.22.0)
   simplecov-cobertura (~> 3.0)
   test-prof (~> 1.0)
-  tucana (= 0.0.40)
+  tucana (= 0.0.41)
   tzinfo-data
 
 RUBY VERSION
diff --git a/app/models/data_type.rb b/app/models/data_type.rb
@@ -21,6 +21,10 @@ class DataType < ApplicationRecord
   has_many :data_type_identifiers, class_name: 'DataTypeIdentifier', inverse_of: :data_type
   has_many :generic_types, class_name: 'GenericType', inverse_of: :data_type
 
+  has_many :display_messages, -> { by_purpose(:display_message) },
+           class_name: 'Translation', as: :owner, inverse_of: :owner
+  has_many :aliases, -> { by_purpose(:alias) }, class_name: 'Translation', as: :owner, inverse_of: :owner
+
   validates :variant, presence: true,
                       inclusion: {
                         in: VARIANTS.keys.map(&:to_s),
diff --git a/app/models/flow_type.rb b/app/models/flow_type.rb
@@ -15,6 +15,10 @@ class FlowType < ApplicationRecord
   has_many :descriptions, -> { by_purpose(:description) }, class_name: 'Translation', as: :owner, inverse_of: :owner
   has_many :documentations, -> { by_purpose(:documentation) }, class_name: 'Translation', as: :owner, inverse_of: :owner
 
+  has_many :display_messages, -> { by_purpose(:display_message) },
+           class_name: 'Translation', as: :owner, inverse_of: :owner
+  has_many :aliases, -> { by_purpose(:alias) }, class_name: 'Translation', as: :owner, inverse_of: :owner
+
   def parsed_version
     Gem::Version.new(version)
   end
diff --git a/app/models/function_definition.rb b/app/models/function_definition.rb
@@ -11,4 +11,7 @@ class FunctionDefinition < ApplicationRecord
   has_many :documentations, -> { by_purpose(:documentation) }, class_name: 'Translation', as: :owner, inverse_of: :owner
   has_many :deprecation_messages, -> { by_purpose(:deprecation_message) },
            class_name: 'Translation', as: :owner, inverse_of: :owner
+  has_many :display_messages, -> { by_purpose(:display_message) },
+           class_name: 'Translation', as: :owner, inverse_of: :owner
+  has_many :aliases, -> { by_purpose(:alias) }, class_name: 'Translation', as: :owner, inverse_of: :owner
 end
diff --git a/app/models/runtime_function_definition.rb b/app/models/runtime_function_definition.rb
@@ -14,6 +14,10 @@ class RuntimeFunctionDefinition < ApplicationRecord
     by_purpose(:deprecation_message)
   }, class_name: 'Translation', as: :owner, inverse_of: :owner
 
+  has_many :display_messages, -> { by_purpose(:display_message) },
+           class_name: 'Translation', as: :owner, inverse_of: :owner
+  has_many :aliases, -> { by_purpose(:alias) }, class_name: 'Translation', as: :owner, inverse_of: :owner
+
   validates :runtime_name, presence: true,
                            length: { minimum: 3, maximum: 50 },
                            uniqueness: { case_sensitive: false, scope: :runtime_id }
diff --git a/app/services/runtimes/data_types/update_service.rb b/app/services/runtimes/data_types/update_service.rb
@@ -75,6 +75,8 @@ def update_datatype(data_type, t)
         end
         db_object.rules = update_rules(data_type.rules, db_object)
         db_object.names = update_translations(data_type.name, db_object.names)
+        db_object.aliases = update_translations(data_type.alias, db_object.aliases)
+        db_object.display_messages = update_translations(data_type.display_message, db_object.display_messages)
         db_object.generic_keys = data_type.generic_keys.to_a
         db_object.version = "#{data_type.version.major}.#{data_type.version.minor}.#{data_type.version.patch}"
         db_object.save
diff --git a/app/services/runtimes/flow_types/update_service.rb b/app/services/runtimes/flow_types/update_service.rb
@@ -44,6 +44,9 @@ def update_flowtype(flow_type, t)
         db_object.editable = flow_type.editable
         db_object.descriptions = update_translations(flow_type.description, db_object.descriptions)
         db_object.names = update_translations(flow_type.name, db_object.names)
+        db_object.documentations = update_translations(flow_type.documentation, db_object.documentations)
+        db_object.display_messages = update_translations(flow_type.display_message, db_object.display_messages)
+        db_object.aliases = update_translations(flow_type.alias, db_object.aliases)
         db_object.version = "#{flow_type.version.major}.#{flow_type.version.minor}.#{flow_type.version.patch}"
         db_object.save
       end
diff --git a/app/services/runtimes/runtime_function_definitions/update_service.rb b/app/services/runtimes/runtime_function_definitions/update_service.rb
@@ -48,6 +48,9 @@ def update_runtime_function_definition(runtime_function_definition, t)
                                                        db_object.documentations)
         db_object.deprecation_messages = update_translations(runtime_function_definition.deprecation_message,
                                                              db_object.deprecation_messages)
+        db_object.display_messages = update_translations(runtime_function_definition.display_message,
+                                                         db_object.display_messages)
+        db_object.aliases = update_translations(runtime_function_definition.alias, db_object.aliases)
 
         db_object.throws_error = runtime_function_definition.throws_error
         definition_version = runtime_function_definition.version
@@ -60,6 +63,9 @@ def update_runtime_function_definition(runtime_function_definition, t)
                                                         definition.descriptions)
           definition.documentations = update_translations(runtime_function_definition.documentation,
                                                           definition.documentations)
+          definition.display_messages = update_translations(runtime_function_definition.display_message,
+                                                            definition.display_messages)
+          definition.aliases = update_translations(runtime_function_definition.alias, definition.aliases)
           definition.return_type = db_object.return_type
 
           db_object.function_definitions << definition
diff --git a/spec/models/data_type_spec.rb b/spec/models/data_type_spec.rb
@@ -9,6 +9,8 @@
     it { is_expected.to belong_to(:parent_type).class_name('DataTypeIdentifier').inverse_of(:child_types).optional }
     it { is_expected.to belong_to(:runtime).inverse_of(:data_types) }
     it { is_expected.to have_many(:names).class_name('Translation') }
+    it { is_expected.to have_many(:aliases).class_name('Translation') }
+    it { is_expected.to have_many(:display_messages).class_name('Translation') }
     it { is_expected.to have_many(:rules).class_name('DataTypeRule').inverse_of(:data_type) }
   end
 
diff --git a/spec/models/flow_type_spec.rb b/spec/models/flow_type_spec.rb
@@ -10,6 +10,11 @@
     it { is_expected.to belong_to(:input_type).class_name('DataType').optional }
     it { is_expected.to belong_to(:return_type).class_name('DataType').optional }
     it { is_expected.to have_many(:flow_type_settings).inverse_of(:flow_type) }
+    it { is_expected.to have_many(:aliases).class_name('Translation') }
+    it { is_expected.to have_many(:display_messages).class_name('Translation') }
+    it { is_expected.to have_many(:descriptions).class_name('Translation') }
+    it { is_expected.to have_many(:documentations).class_name('Translation') }
+    it { is_expected.to have_many(:names).class_name('Translation') }
   end
 
   describe 'validations' do
diff --git a/spec/models/function_definition_spec.rb b/spec/models/function_definition_spec.rb
@@ -12,5 +12,7 @@
     it { is_expected.to have_many(:descriptions).class_name('Translation').inverse_of(:owner) }
     it { is_expected.to have_many(:documentations).class_name('Translation').inverse_of(:owner) }
     it { is_expected.to have_many(:deprecation_messages).class_name('Translation').inverse_of(:owner) }
+    it { is_expected.to have_many(:aliases).class_name('Translation') }
+    it { is_expected.to have_many(:display_messages).class_name('Translation') }
   end
 end
diff --git a/spec/requests/grpc/sagittarius/data_type_service_spec.rb b/spec/requests/grpc/sagittarius/data_type_service_spec.rb
@@ -16,6 +16,12 @@
           name: [
             { code: 'de_DE', content: 'Positive Zahl' }
           ],
+          alias: [
+            { code: 'de_DE', content: 'Positive Nummer' }
+          ],
+          display_message: [
+            { code: 'de_DE', content: 'Zahl: ${0}' }
+          ],
           rules: [
             Tucana::Shared::DefinitionDataTypeRule.create(:number_range, { from: 1, to: 10 })
           ],
@@ -45,6 +51,12 @@
       expect(data_type.names.count).to eq(1)
       expect(data_type.names.first.code).to eq('de_DE')
       expect(data_type.names.first.content).to eq('Positive Zahl')
+      expect(data_type.aliases.count).to eq(1)
+      expect(data_type.aliases.first.code).to eq('de_DE')
+      expect(data_type.aliases.first.content).to eq('Positive Nummer')
+      expect(data_type.display_messages.count).to eq(1)
+      expect(data_type.display_messages.first.code).to eq('de_DE')
+      expect(data_type.display_messages.first.content).to eq('Zahl: ${0}')
       expect(data_type.rules.count).to eq(1)
       expect(data_type.rules.first.variant).to eq('number_range')
       expect(data_type.rules.first.config).to eq({ 'from' => 1, 'to' => 10, 'steps' => 0 })
diff --git a/spec/requests/grpc/sagittarius/flow_type_service_spec.rb b/spec/requests/grpc/sagittarius/flow_type_service_spec.rb
@@ -24,6 +24,12 @@
           description: [
             { code: 'en_US', content: "That's a description" }
           ],
+          display_message: [
+            { code: 'en_US', content: 'Flow Type: ${0}' }
+          ],
+          alias: [
+            { code: 'de_DE', content: 'Irgendein Flow Typ' }
+          ],
           editable: true,
           return_type_identifier: data_type.identifier,
           version: {
@@ -52,6 +58,14 @@
       expect(flow_type.descriptions.first.code).to eq('en_US')
       expect(flow_type.descriptions.first.content).to eq("That's a description")
 
+      expect(flow_type.display_messages.count).to eq(1)
+      expect(flow_type.display_messages.first.code).to eq('en_US')
+      expect(flow_type.display_messages.first.content).to eq('Flow Type: ${0}')
+
+      expect(flow_type.aliases.count).to eq(1)
+      expect(flow_type.aliases.first.code).to eq('de_DE')
+      expect(flow_type.aliases.first.content).to eq('Irgendein Flow Typ')
+
       expect(flow_type.editable).to be true
       expect(flow_type.return_type.identifier).to eq('some_return_type_identifier')
       expect(flow_type.version).to eq('0.0.0')
diff --git a/spec/requests/grpc/sagittarius/runtime_function_definition_service_spec.rb b/spec/requests/grpc/sagittarius/runtime_function_definition_service_spec.rb
@@ -35,6 +35,12 @@
             deprecation_message: [
               { code: 'de_DE', content: 'Eine Deprecationsmeldung' }
             ],
+            display_message: [
+              { code: 'de_DE', content: 'Eine Funktionsanzeige' }
+            ],
+            alias: [
+              { code: 'de_DE', content: 'Ein Funktionsalias' }
+            ],
             return_type_identifier: {
               generic_type: {
                 data_type_identifier: return_type.generic_type.data_type.identifier,
@@ -90,6 +96,8 @@
         expect(function.descriptions.first.content).to eq('Eine Funktionsbeschreibung')
         expect(function.documentations.first.content).to eq('Eine Funktionsdokumentation')
         expect(function.deprecation_messages.first.content).to eq('Eine Deprecationsmeldung')
+        expect(function.aliases.first.content).to eq('Ein Funktionsalias')
+        expect(function.display_messages.first.content).to eq('Eine Funktionsanzeige')
         expect(function.throws_error).to be(true)
         expect(function.version).to eq('0.0.0')
         parameter = function.parameters.first
@@ -104,6 +112,8 @@
         expect(function_definition.names.first.content).to eq('Eine Funktion')
         expect(function_definition.descriptions.first.content).to eq('Eine Funktionsbeschreibung')
         expect(function_definition.documentations.first.content).to eq('Eine Funktionsdokumentation')
+        expect(function_definition.aliases.first.content).to eq('Ein Funktionsalias')
+        expect(function_definition.display_messages.first.content).to eq('Eine Funktionsanzeige')
         expect(function_definition.return_type.generic_type.reload.data_type.identifier)
           .to eq(return_type.generic_type.data_type.identifier)
         parameter_definition = ParameterDefinition.first
