fix: ensure correct values are returned for user tags in context variables (#692)

Author: matthv

app/services/forest_liana/utils/context_variables.rb

@@ -29,8 +29,9 @@ def get_current_user_data(context_variable_key)
         end
 
         if context_variable_key.start_with?(USER_VALUE_TAG_PREFIX)
+          tag_key = context_variable_key[USER_VALUE_TAG_PREFIX.length..]
           user['tags'].each do |tag|
-            return tag[context_variable_key[USER_VALUE_TAG_PREFIX.length..]] if tag.key?(context_variable_key[USER_VALUE_TAG_PREFIX.length..])
+            return tag['value'] if tag['key'] == tag_key
           end
         end
 

spec/services/forest_liana/utils/context_variables_injector_spec.rb

@@ -10,7 +10,7 @@ module Utils
           'lastName' => 'Doe',
           'fullName' => 'John Doe',
           'email' => '[email protected]',
-          'tags' => [{ 'planet' => 'Death Star' }],
+          'tags' => [{'key' => 'planet', 'value' => 'Death Star' }],
           'roleId' => 1,
           'permissionLevel' => 'admin'
         }
@@ -87,7 +87,7 @@ module Utils
             { key: 'id', expected_value: user['id'] },
             { key: 'permissionLevel', expected_value: user['permissionLevel'] },
             { key: 'roleId', expected_value: user['roleId'] },
-            { key: 'tags.planet', expected_value: user['tags'][0]['planet'] },
+            { key: 'tags.planet', expected_value: user['tags'][0]['value'] },
             { key: 'team.id', expected_value: team['id'] },
             { key: 'team.name', expected_value: team['name'] }
           ].each do |value|

spec/services/forest_liana/utils/context_variables_spec.rb

@@ -35,9 +35,24 @@ module Utils
       it 'returns the corresponding value from the key provided of the user data' do
         context_variables = described_class.new(team, user, request_context_variables)
         expect(context_variables.get_value('currentUser.first_name')).to eq('John')
-        expect(context_variables.get_value('currentUser.tags.key')).to eq('tag1')
+        expect(context_variables.get_value('currentUser.tags.tag1')).to eq('value1')
         expect(context_variables.get_value('currentUser.team.id')).to eq(1)
       end
+
+      it 'returns nil when the user key does not exist' do
+        context_variables = described_class.new(team, user, request_context_variables)
+        expect(context_variables.get_value('currentUser.non_existent_key')).to eq(nil)
+      end
+
+      it 'returns nil when the tag key does not exist' do
+        context_variables = described_class.new(team, user, request_context_variables)
+        expect(context_variables.get_value('currentUser.tags.non_existent_tag')).to eq(nil)
+      end
+
+      it 'returns nil when the request context variable key does not exist' do
+        context_variables = described_class.new(team, user, request_context_variables)
+        expect(context_variables.get_value('non_existent_key')).to eq(nil)
+      end
     end
   end
 end