Fix handling of invalid definitions

Author: Taucher2003

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

@@ -31,19 +31,8 @@ def execute
             data_type_links_to_update = []
 
             sorted_data_types_response.payload.each do |data_type|
-              db_data_type = update_datatype(data_type)
-              if db_data_type.persisted?
-                data_type_links_to_update << [db_data_type, data_type.linked_data_type_identifiers]
-                next
-              end
-
-              logger.error(message: 'Failed to update data type',
-                           runtime_id: current_runtime.id,
-                           data_type_identifier: data_type.identifier,
-                           errors: db_data_type.errors.full_messages)
-
-              t.rollback_and_return! ServiceResponse.error(message: 'Failed to update data type',
-                                                           error_code: :invalid_data_type, details: db_data_type.errors)
+              db_data_type = update_datatype(data_type, t)
+              data_type_links_to_update << [db_data_type, data_type.linked_data_type_identifiers]
             end
 
             data_type_links_to_update.each do |db_data_type, linked_data_type_identifiers|
@@ -137,7 +126,7 @@ def enqueue_runtime_compatibility_update
           UpdateRuntimeCompatibilityJob.perform_later({ runtime_id: current_runtime.id })
         end
 
-        def update_datatype(data_type)
+        def update_datatype(data_type, t)
           db_object = DataType.find_or_initialize_by(runtime: current_runtime, identifier: data_type.identifier)
           db_object.removed_at = nil
           db_object.type = data_type.type
@@ -149,7 +138,20 @@ def update_datatype(data_type)
           db_object.version = data_type.version
           db_object.definition_source = data_type.definition_source
           db_object.runtime_module = runtime_module_resolver.call(data_type)
-          db_object.save
+
+          unless db_object.save
+            logger.error(message: 'Failed to update data type',
+                         module_identifier: db_object.runtime_module&.identifier,
+                         data_type_identifier: data_type.identifier,
+                         errors: db_object.errors.full_messages)
+
+            t.rollback_and_return! ServiceResponse.error(
+              message: 'Failed to update data type',
+              error_code: :invalid_data_type,
+              details: db_object.errors
+            )
+          end
+
           db_object
         end
 

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

@@ -25,19 +25,7 @@ def execute
                     .update_all(removed_at: Time.zone.now)
             # rubocop:enable Rails/SkipsModelValidations
             flow_types.each do |flow_type|
-              db_flow_type = update_flowtype(flow_type, t)
-              next if db_flow_type.persisted?
-
-              logger.error(
-                message: 'Failed to update flow type',
-                runtime_id: current_runtime.id,
-                flow_type_identifier: flow_type.identifier,
-                errors: db_flow_type.errors.full_messages
-              )
-
-              t.rollback_and_return! ServiceResponse.error(message: 'Failed to update flow type',
-                                                           error_code: :invalid_flow_type,
-                                                           details: db_flow_type.errors)
+              update_flowtype(flow_type, t)
             end
 
             enqueue_runtime_compatibility_update
@@ -73,7 +61,20 @@ def update_flowtype(flow_type, t)
           db_object.runtime_flow_type = find_runtime_flow_type(flow_type, t)
           update_settings(flow_type.settings, db_object.flow_type_settings, t)
           link_data_types(db_object, flow_type.linked_data_type_identifiers, t)
-          db_object.save
+
+          unless db_object.save
+            logger.error(
+              message: 'Failed to update flow type',
+              module_identifier: runtime_module.identifier,
+              flow_type_identifier: flow_type.identifier,
+              errors: db_object.errors.full_messages
+            )
+
+            t.rollback_and_return! ServiceResponse.error(message: 'Failed to update flow type',
+                                                         error_code: :invalid_flow_type,
+                                                         details: db_object.errors)
+          end
+
           db_object
         end
 

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

@@ -22,18 +22,7 @@ def execute
             mark_existing_function_definitions_as_removed
 
             function_definitions.each do |function_definition|
-              db_function_definition = update_function_definition(function_definition, t)
-              next if db_function_definition.persisted?
-
-              logger.error(message: 'Failed to update function definition',
-                           runtime_id: current_runtime.id,
-                           module_identifier: runtime_module.identifier,
-                           definition_identifier: function_definition.runtime_name,
-                           errors: db_function_definition.errors.full_messages)
-
-              t.rollback_and_return! ServiceResponse.error(message: 'Failed to update function definition',
-                                                           error_code: :invalid_function_definition,
-                                                           details: db_function_definition.errors)
+              update_function_definition(function_definition, t)
             end
 
             enqueue_runtime_compatibility_update
@@ -80,9 +69,19 @@ def update_function_definition(function_definition, t)
           db_object.display_messages = update_translations(function_definition.display_message,
                                                            db_object.display_messages)
           db_object.aliases = update_translations(function_definition.alias, db_object.aliases)
-          db_object.save
 
-          update_parameter_definitions(db_object, function_definition.parameter_definitions, t) if db_object.persisted?
+          unless db_object.save
+            logger.error(message: 'Failed to update function definition',
+                         module_identifier: runtime_module.identifier,
+                         definition_identifier: function_definition.runtime_name,
+                         errors: db_object.errors.full_messages)
+
+            t.rollback_and_return! ServiceResponse.error(message: 'Failed to update function definition',
+                                                         error_code: :invalid_function_definition,
+                                                         details: db_object.errors)
+          end
+
+          update_parameter_definitions(db_object, function_definition.parameter_definitions, t)
 
           db_object
         end

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

@@ -21,18 +21,7 @@ def initialize(current_runtime, configuration_definitions, runtime_module:, upda
         def execute
           transactional do |t|
             configuration_definitions.each do |configuration_definition|
-              db_configuration = update_configuration(configuration_definition, t)
-              next if db_configuration.persisted?
-
-              logger.error(message: 'Failed to update module configuration definition',
-                           runtime_id: current_runtime.id,
-                           module_identifier: runtime_module.identifier,
-                           configuration_identifier: configuration_definition.identifier,
-                           errors: db_configuration.errors.full_messages)
-
-              t.rollback_and_return! ServiceResponse.error(message: 'Failed to update module configuration definition',
-                                                           error_code: :invalid_module_configuration_definition,
-                                                           details: db_configuration.errors)
+              update_configuration(configuration_definition, t)
             end
 
             enqueue_runtime_compatibility_update
@@ -64,7 +53,18 @@ def update_configuration(configuration, t)
           db_object.hidden = configuration.hidden
           db_object.names = update_translations(configuration.name, db_object.names)
           db_object.descriptions = update_translations(configuration.description, db_object.descriptions)
-          db_object.save
+
+          unless db_object.save
+            logger.error(message: 'Failed to update module configuration definition',
+                         module_identifier: runtime_module.identifier,
+                         configuration_identifier: configuration.identifier,
+                         errors: db_object.errors.full_messages)
+
+            t.rollback_and_return! ServiceResponse.error(message: 'Failed to update module configuration definition',
+                                                         error_code: :invalid_module_configuration_definition,
+                                                         details: db_object.errors)
+          end
+
           link_data_types(db_object, configuration.linked_data_type_identifiers, t) if db_object.persisted?
           db_object
         end

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

@@ -26,18 +26,7 @@ def execute
             # rubocop:enable Rails/SkipsModelValidations
 
             runtime_flow_types.each do |runtime_flow_type|
-              db_runtime_flow_type = update_runtime_flowtype(runtime_flow_type, t)
-              next if db_runtime_flow_type.persisted?
-
-              logger.error(message: 'Failed to update runtime flow type',
-                           runtime_id: current_runtime.id,
-                           module_identifier: runtime_module.identifier,
-                           runtime_flow_type_identifier: runtime_flow_type.identifier,
-                           errors: db_runtime_flow_type.errors.full_messages)
-
-              t.rollback_and_return! ServiceResponse.error(message: 'Failed to update runtime flow type',
-                                                           error_code: :invalid_flow_type,
-                                                           details: db_runtime_flow_type.errors)
+              update_runtime_flowtype(runtime_flow_type, t)
             end
 
             enqueue_runtime_compatibility_update
@@ -76,7 +65,20 @@ def update_runtime_flowtype(runtime_flow_type, t)
           db_object.version = runtime_flow_type.version
           db_object.definition_source = runtime_flow_type.definition_source
           db_object.display_icon = runtime_flow_type.display_icon
-          db_object.save
+
+          unless db_object.save
+            logger.error(message: 'Failed to update runtime flow type',
+                         module_identifier: runtime_module.identifier,
+                         runtime_flow_type_identifier: runtime_flow_type.identifier,
+                         errors: db_object.errors.full_messages)
+
+            t.rollback_and_return! ServiceResponse.error(
+              message: 'Could not save runtime flow type',
+              error_code: :invalid_flow_type,
+              details: db_object.errors
+            )
+          end
+
           if db_object.persisted?
             update_settings(runtime_flow_type.runtime_settings, db_object.runtime_flow_type_settings, t)
             link_data_types(db_object, runtime_flow_type.linked_data_type_identifiers, t)

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

@@ -26,17 +26,7 @@ def execute
                                             runtime_module: runtime_module).update_all(removed_at: Time.zone.now)
             # rubocop:enable Rails/SkipsModelValidations
             runtime_function_definitions.each do |runtime_function_definition|
-              response = update_runtime_function_definition(runtime_function_definition, t)
-              next if response.persisted?
-
-              logger.error(message: 'Failed to update runtime function definition',
-                           runtime_id: current_runtime.id,
-                           definition_identifier: runtime_function_definition.runtime_name,
-                           errors: response.errors.full_messages)
-
-              t.rollback_and_return! ServiceResponse.error(message: 'Failed to update runtime function definition',
-                                                           error_code: :invalid_runtime_function_definition,
-                                                           details: response.errors)
+              update_runtime_function_definition(runtime_function_definition, t)
             end
 
             enqueue_runtime_compatibility_update
@@ -79,7 +69,18 @@ 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.save
+          unless db_object.save
+            logger.error(message: 'Failed to update runtime function definition',
+                         module_identifier: runtime_module.identifier,
+                         definition_identifier: runtime_function_definition.runtime_name,
+                         errors: db_object.errors.full_messages)
+
+            t.rollback_and_return! ServiceResponse.error(
+              message: 'Could not save runtime function definition',
+              error_code: :invalid_runtime_function_definition,
+              details: db_object.errors
+            )
+          end
 
           db_object.parameters = update_parameters(db_object, runtime_function_definition.runtime_parameter_definitions,
                                                    db_object.parameters, t)