Changeup flow setting to allign with code0-tech/tucana#96

Author: Knerio

app/models/flow_setting.rb

@@ -2,11 +2,11 @@
 
 class FlowSetting < ApplicationRecord
   belongs_to :flow, optional: true
-  belongs_to :definition, class_name: 'FlowSettingDefinition'
 
   def to_grpc
     Tucana::Shared::FlowSetting.new(
-      definition: definition.to_grpc,
+      database_id: id,
+      flow_setting_id: flow_setting_id,
       object: Tucana::Shared::Struct.from_ruby(object)
     )
   end

app/models/flow_setting_definition.rb

@@ -52,9 +52,9 @@ def change
       t.references :flow_type, null: false, foreign_key: { to_table: :flow_types, on_delete: :cascade }
 
       t.references :input_type, null: true, foreign_key: { to_table: :data_types,
-                                                                      on_delete: :restrict }
+                                                           on_delete: :restrict }
       t.references :return_type, null: true, foreign_key: { to_table: :data_types,
-                                                                       on_delete: :restrict }
+                                                            on_delete: :restrict }
 
       t.references :starting_node, null: false, foreign_key: { to_table: :node_functions, on_delete: :restrict }
 
@@ -63,17 +63,10 @@ def change
 
     add_reference :data_types, :flows, null: true, foreign_key: { to_table: :flows, on_delete: :restrict }
 
-    create_table :flow_setting_definitions do |t|
-      t.text :identifier, null: false
-      t.text :key, null: false
-
-      t.timestamps_with_timezone
-    end
-
     create_table :flow_settings do |t|
       t.references :flow, null: true, foreign_key: { to_table: :flows, on_delete: :cascade }
 
-      t.references :definition, null: false, foreign_key: { to_table: :flow_setting_definitions, on_delete: :cascade }
+      t.text :flow_setting_id, null: false
       t.jsonb :object, null: false
 
       t.timestamps_with_timezone

db/migrate/20250526124346_create_flows.rb

@@ -182,27 +182,10 @@ CREATE SEQUENCE data_types_id_seq
 
 ALTER SEQUENCE data_types_id_seq OWNED BY data_types.id;
 
-CREATE TABLE flow_setting_definitions (
-    id bigint NOT NULL,
-    identifier text NOT NULL,
-    key text NOT NULL,
-    created_at timestamp with time zone NOT NULL,
-    updated_at timestamp with time zone NOT NULL
-);
-
-CREATE SEQUENCE flow_setting_definitions_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE flow_setting_definitions_id_seq OWNED BY flow_setting_definitions.id;
-
 CREATE TABLE flow_settings (
     id bigint NOT NULL,
     flow_id bigint,
-    definition_id bigint NOT NULL,
+    flow_setting_id text NOT NULL,
     object jsonb NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL
@@ -862,8 +845,6 @@ ALTER TABLE ONLY data_type_rules ALTER COLUMN id SET DEFAULT nextval('data_type_
 
 ALTER TABLE ONLY data_types ALTER COLUMN id SET DEFAULT nextval('data_types_id_seq'::regclass);
 
-ALTER TABLE ONLY flow_setting_definitions ALTER COLUMN id SET DEFAULT nextval('flow_setting_definitions_id_seq'::regclass);
-
 ALTER TABLE ONLY flow_settings ALTER COLUMN id SET DEFAULT nextval('flow_settings_id_seq'::regclass);
 
 ALTER TABLE ONLY flow_type_settings ALTER COLUMN id SET DEFAULT nextval('flow_type_settings_id_seq'::regclass);
@@ -954,9 +935,6 @@ ALTER TABLE ONLY data_type_rules
 ALTER TABLE ONLY data_types
     ADD CONSTRAINT data_types_pkey PRIMARY KEY (id);
 
-ALTER TABLE ONLY flow_setting_definitions
-    ADD CONSTRAINT flow_setting_definitions_pkey PRIMARY KEY (id);
-
 ALTER TABLE ONLY flow_settings
     ADD CONSTRAINT flow_settings_pkey PRIMARY KEY (id);
 
@@ -1107,8 +1085,6 @@ CREATE INDEX index_data_types_on_parent_type_id ON data_types USING btree (paren
 
 CREATE UNIQUE INDEX index_data_types_on_runtime_id_and_identifier ON data_types USING btree (runtime_id, identifier);
 
-CREATE INDEX index_flow_settings_on_definition_id ON flow_settings USING btree (definition_id);
-
 CREATE INDEX index_flow_settings_on_flow_id ON flow_settings USING btree (flow_id);
 
 CREATE INDEX index_flow_type_settings_on_data_type_id ON flow_type_settings USING btree (data_type_id);
@@ -1357,9 +1333,6 @@ ALTER TABLE ONLY flows
 ALTER TABLE ONLY node_functions
     ADD CONSTRAINT fk_rails_8953e1d86a FOREIGN KEY (runtime_function_id) REFERENCES runtime_function_definitions(id) ON DELETE RESTRICT;
 
-ALTER TABLE ONLY flow_settings
-    ADD CONSTRAINT fk_rails_8c9f4f986e FOREIGN KEY (definition_id) REFERENCES flow_setting_definitions(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY data_type_identifiers
     ADD CONSTRAINT fk_rails_8d8385e8ec FOREIGN KEY (runtime_id) REFERENCES runtimes(id) ON DELETE CASCADE;
 

db/structure.sql

@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :flow_setting do
     flow
-    definition factory: %i[flow_setting_definition]
+    flow_setting_id { 'default' }
     object { { enabled: true } }
   end
 end

spec/factories/flow_setting_definitions.rb

@@ -7,6 +7,5 @@
 
   describe 'associations' do
     it { is_expected.to belong_to(:flow).optional }
-    it { is_expected.to belong_to(:definition).class_name('FlowSettingDefinition') }
   end
 end