Skip to content

Commit 99f379c

Browse files
committed
feat: replaced-flagsmith-id-with-id
1 parent 1bdaad6 commit 99f379c

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

lib/flagsmith.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ def get_identity_segments(identifier, traits = {})
214214

215215
evaluation_result = Flagsmith::Engine.get_evaluation_result(context)
216216
evaluation_result[:segments].filter_map do |segment_result|
217-
flagsmith_id = segment_result.dig(:metadata, :flagsmith_id)
218-
Flagsmith::Segments::Segment.new(id: flagsmith_id, name: segment_result[:name]) if flagsmith_id
217+
id = segment_result.dig(:metadata, :id)
218+
Flagsmith::Segments::Segment.new(id: id, name: segment_result[:name]) if id
219219
end
220220
end
221221

lib/flagsmith/engine/mappers/environment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def self.build_feature_hash(feature_state)
2626
name: feature_state.feature.name,
2727
enabled: feature_state.enabled,
2828
value: feature_state.get_value,
29-
metadata: { flagsmith_id: feature_state.feature.id }
29+
metadata: { id: feature_state.feature.id }
3030
}
3131
add_variants_to_feature(feature_hash, feature_state)
3232
add_priority_to_feature(feature_hash, feature_state)

lib/flagsmith/engine/mappers/identity.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def self.build_overrides_key(identity_features)
5252
enabled: feature_state.enabled,
5353
value: feature_state.get_value,
5454
priority: Mappers::STRONGEST_PRIORITY,
55-
metadata: { flagsmith_id: feature_state.feature.id }
55+
metadata: { id: feature_state.feature.id }
5656
}
5757
end
5858
end

lib/flagsmith/engine/mappers/segments.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def self.build_segment_hash(segment)
2121
overrides: build_overrides(segment.feature_states),
2222
metadata: {
2323
source: 'API',
24-
flagsmith_id: segment.id
24+
id: segment.id
2525
}
2626
}
2727
end
@@ -33,7 +33,7 @@ def self.build_overrides(feature_states) # rubocop:disable Metrics/MethodLength
3333
name: feature_state.feature.name,
3434
enabled: feature_state.enabled,
3535
value: feature_state.get_value,
36-
metadata: { flagsmith_id: feature_state.feature.id }
36+
metadata: { id: feature_state.feature.id }
3737
}
3838
add_priority_to_override(override_hash, feature_state)
3939
override_hash

lib/flagsmith/sdk/models/flags.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,24 @@ def from_api(json_data, **args)
176176

177177
def from_evaluation_result(evaluation_result, **args)
178178
to_flag_object = lambda { |flag_result, acc|
179-
flagsmith_id = flag_result.dig(:metadata, :flagsmith_id)
180-
if flagsmith_id.nil?
179+
id = flag_result.dig(:metadata, :id)
180+
if id.nil?
181181
raise Flagsmith::ClientError,
182-
"FlagResult metadata.flagsmith_id is missing for feature \"#{flag_result[:name]}\". This indicates a bug in the SDK, please report it."
182+
"FlagResult metadata.id is missing for feature \"#{flag_result[:name]}\". This indicates a bug in the SDK, please report it."
183183
end
184184

185-
acc[flag_result[:name]] = Collection.map_evaluated_flag_to_flag_result(flag_result, flagsmith_id)
185+
acc[flag_result[:name]] = Collection.map_evaluated_flag_to_flag_result(flag_result, id)
186186
}
187187

188188
new(evaluation_result[:flags].each_value.each_with_object({}, &to_flag_object), **args)
189189
end
190190

191-
def map_evaluated_flag_to_flag_result(flag_result, flagsmith_id)
191+
def map_evaluated_flag_to_flag_result(flag_result, id)
192192
Flagsmith::Flags::Flag.new(
193193
feature_name: flag_result[:name],
194194
enabled: flag_result[:enabled],
195195
value: flag_result[:value],
196-
feature_id: flagsmith_id,
196+
feature_id: id,
197197
reason: flag_result[:reason]
198198
)
199199
end

spec/engine/unit/evaluation_context_mappers_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
expect(segment[:rules].length).to eq(1)
3434
expect(segment[:overrides]).to be_empty.or be_an(Array)
3535
expect(segment[:metadata][:source]).to eq('API')
36-
expect(segment[:metadata][:flagsmith_id]).to eq(1)
36+
expect(segment[:metadata][:id]).to eq(1)
3737

3838
# Verify segment rules
3939
expect(segment[:rules][0][:type]).to eq('ALL')
@@ -72,7 +72,7 @@
7272
expect(override[:enabled]).to be false
7373
expect(override[:value]).to eq('some-overridden-value')
7474
expect(override[:priority]).to eq(Flagsmith::Engine::Mappers::STRONGEST_PRIORITY)
75-
expect(override[:metadata][:flagsmith_id]).to eq(1)
75+
expect(override[:metadata][:id]).to eq(1)
7676

7777
# Verify features
7878
expect(context[:features]).to be_a(Hash)
@@ -83,7 +83,7 @@
8383
expect(some_feature[:enabled]).to be true
8484
expect(some_feature[:value]).to eq('some-value')
8585
expect(some_feature[:priority]).to be_nil
86-
expect(some_feature[:metadata][:flagsmith_id]).to eq(1)
86+
expect(some_feature[:metadata][:id]).to eq(1)
8787

8888
# Verify multivariate feature
8989
expect(context[:features]).to have_key('test_mv')

0 commit comments

Comments
 (0)