comments resolved

Author: uzair-folio3

optimizely/helpers/condition.py

@@ -162,6 +162,10 @@ def compare_user_version_with_target_version(self, target_version, user_version)
           None:
             - if the user version value format is not a valid semantic version.
         """
+        is_pre_release_in_target_version = self.is_pre_release_version(target_version)
+        is_pre_release_in_user_version = self.is_pre_release_version(user_version)
+        is_build_in_target_version = self.is_build_version(target_version)
+        is_build_in_user_version = self.is_build_version(user_version)
 
         target_version_parts = self.split_version(target_version)
         if target_version_parts is None:
@@ -175,14 +179,14 @@ def compare_user_version_with_target_version(self, target_version, user_version)
 
         for (idx, _) in enumerate(target_version_parts):
             if user_version_parts_len <= idx:
-                return 1 if self.is_pre_release_version(target_version) or self.is_build_version(target_version) else -1
+                return 1 if is_pre_release_in_target_version or is_build_in_target_version else -1
             elif not user_version_parts[idx].isdigit():
                 if user_version_parts[idx] < target_version_parts[idx]:
-                    return 1 if self.is_pre_release_version(target_version) and not \
-                        self.is_pre_release_version(user_version) else -1
+                    return 1 if is_pre_release_in_target_version and not \
+                        is_pre_release_in_user_version else -1
                 elif user_version_parts[idx] > target_version_parts[idx]:
-                    return -1 if not self.is_pre_release_version(target_version) and \
-                        self.is_pre_release_version(user_version) else 1
+                    return -1 if not is_pre_release_in_target_version and \
+                        is_pre_release_in_user_version else 1
             else:
                 user_version_part = int(user_version_parts[idx])
                 target_version_part = int(target_version_parts[idx])
@@ -192,8 +196,8 @@ def compare_user_version_with_target_version(self, target_version, user_version)
                     return -1
 
         # check if user version contains build or pre-release and target version doesn't
-        if (self.is_pre_release_version(user_version) and not self.is_pre_release_version(target_version)) or \
-           (self.is_build_version(user_version) and not self.is_build_version(target_version)):
+        if (is_pre_release_in_user_version and not is_pre_release_in_target_version) or \
+           (is_build_in_user_version and not is_build_in_target_version):
             return -1
         return 0
 

tests/helpers_tests/test_condition.py

@@ -238,7 +238,8 @@ def test_compare_user_version_with_target_version_equal_to_0(self):
             ('2.0.1', '2.0.1'),
             ('2.9.9-beta', '2.9.9-beta'),
             ('2.1', '2.1.0'),
-            ('2', '2.12')
+            ('2', '2.12'),
+            ('2.9', '2.9.1')
         ]
         for target_version, user_version in versions:
             evaluator = condition_helper.CustomAttributeConditionEvaluator(