Skip to content

Commit 703d578

Browse files
authored
Merge pull request #847 from code0-tech/843-drop-dti-from-reference-value
Drop frontend fields from reference value
2 parents f1da78b + cbba03a commit 703d578

16 files changed

Lines changed: 15 additions & 105 deletions

File tree

app/graphql/types/input/reference_value_input_type.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ class ReferenceValueInputType < Types::BaseInputObject
99
required: true, description: 'The paths associated with this reference value'
1010

1111
argument :node_function_id, GlobalIdType[::NodeFunction], required: true, description: 'The referenced value'
12-
13-
argument :data_type_identifier, Types::Input::DataTypeIdentifierInputType,
14-
required: true, description: 'The identifier of the data type this reference value belongs to'
15-
16-
argument :depth, Int, required: true, description: 'The depth of the reference value'
17-
argument :node, Int, required: true, description: 'The node of the reference'
18-
argument :scope, [Int], required: true, description: 'The scope of the reference value'
1912
end
2013
end
2114
end

app/graphql/types/reference_value_type.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ class ReferenceValueType < Types::BaseObject
66

77
field :node_function_id, GlobalIdType[::NodeFunction], null: false, description: 'The referenced value.'
88

9-
field :data_type_identifier, Types::DataTypeIdentifierType,
10-
null: false, description: 'The identifier of the data type this reference value belongs to.'
11-
12-
field :depth, Int, null: false, description: 'The depth of the reference value.'
13-
field :node, Int, null: false, description: 'The node of the reference value.'
14-
field :scope, [Int], null: false, description: 'The scope of the reference value.'
15-
169
field :reference_path, [Types::ReferencePathType],
1710
null: false,
1811
description: 'The paths associated with this reference value.',

app/models/reference_value.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
class ReferenceValue < ApplicationRecord
44
belongs_to :node_function # real value association
5-
belongs_to :data_type_identifier
65
has_many :reference_paths, inverse_of: :reference_value, autosave: true, dependent: :destroy
76
has_many :node_parameters, inverse_of: :reference_value
87

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,6 @@ def update_node_parameters(t, current_node, current_node_input, all_nodes)
201201
end
202202

203203
if parameter.value.reference_value.present?
204-
data_type_identifier = get_data_type_identifier(
205-
flow.project.primary_runtime,
206-
parameter.value.reference_value.data_type_identifier,
207-
t
208-
)
209-
210204
referenced_node = all_nodes.find do |n|
211205
n[:input].id == parameter.value.reference_value.node_function_id
212206
end
@@ -229,11 +223,7 @@ def update_node_parameters(t, current_node, current_node_input, all_nodes)
229223
end
230224

231225
reference_value.assign_attributes(
232-
data_type_identifier: data_type_identifier,
233226
node_function: referenced_node[:node],
234-
depth: parameter.value.reference_value.depth,
235-
node: parameter.value.reference_value.node,
236-
scope: parameter.value.reference_value.scope,
237227
reference_paths: reference_paths
238228
)
239229
else
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# frozen_string_literal: true
2+
3+
class DropFrontendFieldsFromReferenceValue < Code0::ZeroTrack::Database::Migration[1.0]
4+
def change
5+
remove_reference :reference_values, :data_type_identifier, null: false, foreign_key: {
6+
to_table: :data_type_identifiers, on_delete: :restrict
7+
}
8+
9+
remove_column :reference_values, :scope, :integer, array: true, null: false, default: []
10+
remove_column :reference_values, :node, :integer, null: false, default: 0
11+
remove_column :reference_values, :depth, :integer, null: false, default: 0
12+
end
13+
end
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6ad01c08408e467d3ff1ac8470da7ab77a852632896297e05d1dc2cc77e190b9

db/structure.sql

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -668,11 +668,7 @@ CREATE TABLE reference_values (
668668
id bigint NOT NULL,
669669
created_at timestamp with time zone NOT NULL,
670670
updated_at timestamp with time zone NOT NULL,
671-
node_function_id bigint NOT NULL,
672-
depth integer DEFAULT 0 NOT NULL,
673-
node integer DEFAULT 0 NOT NULL,
674-
scope integer[] DEFAULT '{}'::integer[] NOT NULL,
675-
data_type_identifier_id bigint NOT NULL
671+
node_function_id bigint NOT NULL
676672
);
677673

678674
CREATE SEQUENCE reference_values_id_seq
@@ -1213,8 +1209,6 @@ CREATE INDEX index_parameter_definitions_on_runtime_parameter_definition_id ON p
12131209

12141210
CREATE INDEX index_reference_paths_on_reference_value_id ON reference_paths USING btree (reference_value_id);
12151211

1216-
CREATE INDEX index_reference_values_on_data_type_identifier_id ON reference_values USING btree (data_type_identifier_id);
1217-
12181212
CREATE INDEX index_reference_values_on_node_function_id ON reference_values USING btree (node_function_id);
12191213

12201214
CREATE INDEX index_runtime_function_definitions_on_return_type_id ON runtime_function_definitions USING btree (return_type_id);
@@ -1375,9 +1369,6 @@ ALTER TABLE ONLY flow_type_settings
13751369
ALTER TABLE ONLY flows
13761370
ADD CONSTRAINT fk_rails_ab927e0ecb FOREIGN KEY (project_id) REFERENCES namespace_projects(id) ON DELETE CASCADE;
13771371

1378-
ALTER TABLE ONLY reference_values
1379-
ADD CONSTRAINT fk_rails_bb34a5d62c FOREIGN KEY (data_type_identifier_id) REFERENCES data_type_identifiers(id) ON DELETE RESTRICT;
1380-
13811372
ALTER TABLE ONLY flows
13821373
ADD CONSTRAINT fk_rails_bb587eff6a FOREIGN KEY (input_type_id) REFERENCES data_types(id) ON DELETE RESTRICT;
13831374

docs/graphql/input_object/datatypeidentifierinput.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/graphql/input_object/genericmapperinput.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

docs/graphql/input_object/generictypeinput.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)