@@ -14,13 +14,13 @@ module Mappers
1414 def self . get_evaluation_context ( environment , identity = nil , override_traits = nil )
1515 environment_context = map_environment_model_to_evaluation_context ( environment )
1616 identity_context = identity ? map_identity_model_to_identity_context ( identity , override_traits ) : nil
17-
17+
1818 context = environment_context . dup
1919 context [ :identity ] = identity_context if identity_context
20-
20+
2121 context
2222 end
23-
23+
2424 # Maps environment model to evaluation context
2525 #
2626 # @param environment [Flagsmith::Engine::Environment] The environment model
@@ -105,7 +105,7 @@ def self.map_environment_model_to_evaluation_context(environment)
105105 def self . uuid_to_big_int ( uuid )
106106 uuid . gsub ( '-' , '' ) . to_i ( 16 )
107107 end
108-
108+
109109 # Maps identity model to identity context
110110 #
111111 # @param identity [Flagsmith::Engine::Identity] The identity model
@@ -127,7 +127,7 @@ def self.map_identity_model_to_identity_context(identity, override_traits = nil)
127127 traits : traits_hash
128128 }
129129 end
130-
130+
131131 # Maps segment rule model to rule hash
132132 #
133133 # @param rule [Flagsmith::Engine::Segments::Rule] The segment rule model
@@ -138,33 +138,32 @@ def self.map_segment_rule_model_to_rule(rule)
138138 }
139139
140140 # Map conditions if present
141- if rule . conditions &.any?
142- result [ :conditions ] = rule . conditions . map do |condition |
143- {
144- property : condition . property ,
145- operator : condition . operator ,
146- value : condition . value
147- }
148- end
149- else
150- result [ :conditions ] = [ ]
151- end
152-
153- if rule . rules &.any?
154- result [ :rules ] = rule . rules . map { |nested_rule | map_segment_rule_model_to_rule ( nested_rule ) }
155- else
156- result [ :rules ] = [ ]
157- end
141+ result [ :conditions ] = if rule . conditions &.any?
142+ rule . conditions . map do |condition |
143+ {
144+ property : condition . property ,
145+ operator : condition . operator ,
146+ value : condition . value
147+ }
148+ end
149+ else
150+ [ ]
151+ end
152+
153+ result [ :rules ] = if rule . rules &.any?
154+ rule . rules . map { |nested_rule | map_segment_rule_model_to_rule ( nested_rule ) }
155+ else
156+ [ ]
157+ end
158158
159159 result
160160 end
161-
161+
162162 # Maps identity overrides to segments
163163 #
164164 # @param identity_overrides [Array<Flagsmith::Engine::Identity>] Array of identity override models
165165 # @return [Hash] Segments hash for identity overrides
166166 def self . map_identity_overrides_to_segments ( identity_overrides )
167-
168167 segments = { }
169168 features_to_identifiers = { }
170169
@@ -228,4 +227,3 @@ def self.map_identity_overrides_to_segments(identity_overrides)
228227 end
229228 end
230229end
231-
0 commit comments