Refactor flow associations to use input_type and return_type instead of input_type_identifier and return_type_identifier to align with grpc implementation of the flow

Author: Knerio

app/models/flow.rb

@@ -3,8 +3,8 @@
 class Flow < ApplicationRecord
   belongs_to :project, class_name: 'NamespaceProject'
   belongs_to :flow_type
-  belongs_to :input_type_identifier, class_name: 'DataTypeIdentifier', optional: true
-  belongs_to :return_type_identifier, class_name: 'DataTypeIdentifier', optional: true
+  belongs_to :input_type, class_name: 'DataType', optional: true
+  belongs_to :return_type, class_name: 'DataType', optional: true
   belongs_to :starting_node, class_name: 'NodeFunction'
 
   has_many :flow_settings
@@ -15,8 +15,8 @@ def to_grpc
       project_id: project.id,
       flow_type_id: flow_type.identifier,
       data_types: [], # TODO
-      input_type_id: input_type_identifier&.identifier,
-      return_type_id: return_type_identifier&.identifier,
+      input_type_id: input_type&.identifier,
+      return_type_id: return_type&.identifier,
       settings: flow_settings.map(&:to_grpc),
       starting_node: starting_node.to_grpc
     )

db/migrate/20250526124346_create_flows.rb

@@ -51,9 +51,9 @@ def change
                                                          on_delete: :cascade }
       t.references :flow_type, null: false, foreign_key: { to_table: :flow_types, on_delete: :cascade }
 
-      t.references :input_type_identifier, null: true, foreign_key: { to_table: :data_type_identifiers,
+      t.references :input_type, null: true, foreign_key: { to_table: :data_types,
                                                                       on_delete: :restrict }
-      t.references :return_type_identifier, null: true, foreign_key: { to_table: :data_type_identifiers,
+      t.references :return_type, null: true, foreign_key: { to_table: :data_types,
                                                                        on_delete: :restrict }
 
       t.references :starting_node, null: false, foreign_key: { to_table: :node_functions, on_delete: :restrict }

db/structure.sql

@@ -262,8 +262,8 @@ CREATE TABLE flows (
     id bigint NOT NULL,
     project_id bigint NOT NULL,
     flow_type_id bigint NOT NULL,
-    input_type_identifier_id bigint,
-    return_type_identifier_id bigint,
+    input_type_id bigint,
+    return_type_id bigint,
     starting_node_id bigint NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL
@@ -1147,11 +1147,11 @@ CREATE UNIQUE INDEX index_flow_types_on_runtime_id_and_identifier ON flow_types
 
 CREATE INDEX index_flows_on_flow_type_id ON flows USING btree (flow_type_id);
 
-CREATE INDEX index_flows_on_input_type_identifier_id ON flows USING btree (input_type_identifier_id);
+CREATE INDEX index_flows_on_input_type_id ON flows USING btree (input_type_id);
 
 CREATE INDEX index_flows_on_project_id ON flows USING btree (project_id);
 
-CREATE INDEX index_flows_on_return_type_identifier_id ON flows USING btree (return_type_identifier_id);
+CREATE INDEX index_flows_on_return_type_id ON flows USING btree (return_type_id);
 
 CREATE INDEX index_flows_on_starting_node_id ON flows USING btree (starting_node_id);
 
@@ -1285,9 +1285,6 @@ ALTER TABLE ONLY function_definitions
 ALTER TABLE ONLY node_parameters
     ADD CONSTRAINT fk_rails_0ff4fd0049 FOREIGN KEY (runtime_parameter_id) REFERENCES runtime_parameter_definitions(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY flows
-    ADD CONSTRAINT fk_rails_10bea7d7dc FOREIGN KEY (return_type_identifier_id) REFERENCES data_type_identifiers(id) ON DELETE RESTRICT;
-
 ALTER TABLE ONLY data_types
     ADD CONSTRAINT fk_rails_118c914ed0 FOREIGN KEY (runtime_id) REFERENCES runtimes(id) ON DELETE CASCADE;
 
@@ -1309,9 +1306,6 @@ ALTER TABLE ONLY generic_types
 ALTER TABLE ONLY generic_mappers
     ADD CONSTRAINT fk_rails_2adace81b8 FOREIGN KEY (source_id) REFERENCES data_type_identifiers(id) ON DELETE RESTRICT;
 
-ALTER TABLE ONLY flows
-    ADD CONSTRAINT fk_rails_362b88d836 FOREIGN KEY (input_type_identifier_id) REFERENCES data_type_identifiers(id) ON DELETE RESTRICT;
-
 ALTER TABLE ONLY namespace_licenses
     ADD CONSTRAINT fk_rails_38f693332d FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
@@ -1393,6 +1387,9 @@ ALTER TABLE ONLY flow_settings
 ALTER TABLE ONLY data_type_identifiers
     ADD CONSTRAINT fk_rails_8d8385e8ec FOREIGN KEY (runtime_id) REFERENCES runtimes(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY flows
+    ADD CONSTRAINT fk_rails_8f97500cd4 FOREIGN KEY (return_type_id) REFERENCES data_types(id) ON DELETE RESTRICT;
+
 ALTER TABLE ONLY reference_paths
     ADD CONSTRAINT fk_rails_92e51047ea FOREIGN KEY (reference_value_id) REFERENCES reference_values(id) ON DELETE RESTRICT;
 
@@ -1417,6 +1414,9 @@ ALTER TABLE ONLY flows
 ALTER TABLE ONLY reference_values
     ADD CONSTRAINT fk_rails_bb34a5d62c FOREIGN KEY (data_type_identifier_id) REFERENCES data_type_identifiers(id) ON DELETE RESTRICT;
 
+ALTER TABLE ONLY flows
+    ADD CONSTRAINT fk_rails_bb587eff6a FOREIGN KEY (input_type_id) REFERENCES data_types(id) ON DELETE RESTRICT;
+
 ALTER TABLE ONLY function_generic_mappers
     ADD CONSTRAINT fk_rails_be1833ba72 FOREIGN KEY (source_id) REFERENCES data_type_identifiers(id) ON DELETE RESTRICT;
 

spec/models/flow_spec.rb

@@ -9,5 +9,7 @@
     it { is_expected.to belong_to(:project).class_name('NamespaceProject') }
     it { is_expected.to belong_to(:flow_type) }
     it { is_expected.to belong_to(:starting_node).class_name('NodeFunction') }
+    it { is_expected.to belong_to(:input_type).class_name('DataType').optional }
+    it { is_expected.to belong_to(:return_type).class_name('DataType').optional }
   end
 end