Uplift of #26590 (squashed) to release

components/brave_ads/core/internal/serving/targeting/condition_matcher/condition_matcher_util.cc

@@ -10,6 +10,8 @@
 
 #include "base/ranges/algorithm.h"
 #include "base/strings/pattern.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/time/time.h"
 #include "brave/components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/epoch_operator_condition_matcher_util.h"
 #include "brave/components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/numerical_operator_condition_matcher_util.h"
 #include "brave/components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/pattern_condition_matcher_util.h"
@@ -55,19 +57,22 @@ bool MatchConditions(const PrefProviderInterface* const pref_provider,
       condition_matchers, [pref_provider](const auto& condition_matcher) {
         const auto& [pref_path, condition] = condition_matcher;
 
-        // If `has_not_operator` is `true`, the condition will match only if the
-        // pref path does not exist.
-        const bool has_not_operator = HasNotOperator(pref_path);
-
         const std::string stripped_pref_path =
             MaybeStripOperatorPrefix(pref_path);
-        if (const std::optional<std::string> value =
-                MaybeGetPrefValueAsString(pref_provider, stripped_pref_path)) {
-          return !has_not_operator && MatchCondition(*value, condition);
+        const std::optional<std::string> value =
+            MaybeGetPrefValueAsString(pref_provider, stripped_pref_path);
+
+        if (HasNotOperator(pref_path)) {
+          // Match if the pref path does not exist.
+          return !value;
+        }
+
+        if (IsNumericalOperator(condition)) {
+          // Default to "0" if the pref path does not exist.
+          return MatchCondition(value.value_or("0"), condition);
         }
 
-        // Unknown pref path.
-        return has_not_operator;
+        return value ? MatchCondition(*value, condition) : false;
       });
 }
 

components/brave_ads/core/internal/serving/targeting/condition_matcher/condition_matcher_util_unittest.cc

@@ -33,8 +33,7 @@ TEST_F(BraveAdsConditionMatcherUtilTest, MatchEmptyConditions) {
   EXPECT_TRUE(MatchConditions(&pref_provider_, /*condition_matchers=*/{}));
 }
 
-TEST_F(BraveAdsConditionMatcherUtilTest,
-       MatchConditionsIfAllConditionsAreTrue) {
+TEST_F(BraveAdsConditionMatcherUtilTest, MatchMultipleConditions) {
   // Arrange
   const ConditionMatcherMap condition_matchers = {
       {prefs::kSubdivisionTargetingUserSelectedSubdivision, "AUTO"},
@@ -55,6 +54,18 @@ TEST_F(BraveAdsConditionMatcherUtilTest, MatchEpochEqualOperatorCondition) {
   EXPECT_TRUE(MatchConditions(&pref_provider_, condition_matchers));
 }
 
+TEST_F(BraveAdsConditionMatcherUtilTest,
+       DoNotMatchEpochEqualOperatorConditionForUnknownPrefPath) {
+  // Arrange
+  const ConditionMatcherMap condition_matchers = {
+      {"unknown_pref_path", "[T=]:7"}};
+
+  AdvanceClockBy(base::Days(7) - base::Milliseconds(1));
+
+  // Act & Assert
+  EXPECT_FALSE(MatchConditions(&pref_provider_, condition_matchers));
+}
+
 TEST_F(BraveAdsConditionMatcherUtilTest,
        DoNotMatchEpochEqualOperatorCondition) {
   // Arrange
@@ -77,6 +88,26 @@ TEST_F(BraveAdsConditionMatcherUtilTest, MatchNumericalEqualOperatorCondition) {
   EXPECT_TRUE(MatchConditions(&pref_provider_, condition_matchers));
 }
 
+TEST_F(BraveAdsConditionMatcherUtilTest,
+       MatchNumericalhEqualOperatorConditionForUnknownPrefPath) {
+  // Arrange
+  const ConditionMatcherMap condition_matchers = {
+      {"unknown_pref_path", "[R=]:0"}};
+
+  // Act & Assert
+  EXPECT_TRUE(MatchConditions(&pref_provider_, condition_matchers));
+}
+
+TEST_F(BraveAdsConditionMatcherUtilTest,
+       DoNotMatchNumericalhEqualOperatorConditionForUnknownPrefPath) {
+  // Arrange
+  const ConditionMatcherMap condition_matchers = {
+      {"unknown_pref_path", "[R=]:1"}};
+
+  // Act & Assert
+  EXPECT_FALSE(MatchConditions(&pref_provider_, condition_matchers));
+}
+
 TEST_F(BraveAdsConditionMatcherUtilTest,
        DoNotMatchNumericalEqualOperatorCondition) {
   // Arrange

components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/epoch_operator_condition_matcher_util.cc

@@ -26,6 +26,11 @@ constexpr char kLessThanOrEqualOperatorConditionMatcherPrefix[] = "[T≤]:";
 
 }  // namespace
 
+bool IsEpochOperator(std::string_view condition) {
+  return base::MatchPattern(condition,
+                            kEpochOperatorConditionMatcherPrefixPattern);
+}
+
 bool MatchEpochOperator(const std::string_view value,
                         const std::string_view condition) {
   if (!base::MatchPattern(condition,

components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/epoch_operator_condition_matcher_util.h

@@ -10,6 +10,9 @@
 
 namespace brave_ads {
 
+// Returns true if the condition is an epoch operator.
+bool IsEpochOperator(std::string_view condition);
+
 // Matches a value against a condition using epoch operators. Supports equality,
 // greater than, greater than or equal, less than. and less than or equal
 // operators.

components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/epoch_operator_condition_matcher_util_unittest.cc

@@ -14,6 +14,16 @@ namespace brave_ads {
 
 class BraveAdsEpochOperatorConditionMatcherUtilTest : public test::TestBase {};
 
+TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, IsOperator) {
+  // Act & Assert
+  EXPECT_TRUE(IsEpochOperator("[T=]:1"));
+}
+
+TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, IsNotOperator) {
+  // Act & Assert
+  EXPECT_FALSE(IsEpochOperator("[R=]:1"));
+}
+
 TEST_F(BraveAdsEpochOperatorConditionMatcherUtilTest, DoNotMatchNonOperator) {
   // Act & Assert
   EXPECT_FALSE(MatchEpochOperator(

components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/numerical_operator_condition_matcher_util.cc

@@ -27,6 +27,11 @@ constexpr char kLessThanOrEqualOperatorConditionMatcherPrefix[] = "[R≤]:";
 
 }  // namespace
 
+bool IsNumericalOperator(std::string_view condition) {
+  return base::MatchPattern(condition,
+                            kNumericalOperatorConditionMatcherPrefixPattern);
+}
+
 bool MatchNumericalOperator(const std::string_view value,
                             const std::string_view condition) {
   if (!base::MatchPattern(condition,

components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/numerical_operator_condition_matcher_util.h

@@ -10,6 +10,9 @@
 
 namespace brave_ads {
 
+// Returns true if the condition is a numerical operator.
+bool IsNumericalOperator(std::string_view condition);
+
 // Matches a value against a condition using numerical operators. Supports
 // equality, greater than, greater than or equal, less than, less than or equal
 // and not equal operators.

components/brave_ads/core/internal/serving/targeting/condition_matcher/matchers/numerical_operator_condition_matcher_util_unittest.cc

@@ -14,6 +14,16 @@ namespace brave_ads {
 class BraveAdsNumericalOperatorConditionMatcherUtilTest
     : public test::TestBase {};
 
+TEST_F(BraveAdsNumericalOperatorConditionMatcherUtilTest, IsOperator) {
+  // Act & Assert
+  EXPECT_TRUE(IsNumericalOperator("[R=]:1"));
+}
+
+TEST_F(BraveAdsNumericalOperatorConditionMatcherUtilTest, IsNotOperator) {
+  // Act & Assert
+  EXPECT_FALSE(IsNumericalOperator("[T=]:1"));
+}
+
 TEST_F(BraveAdsNumericalOperatorConditionMatcherUtilTest,
        DoNotMatchNonOperator) {
   // Act & Assert