Expire Brave Ads catalog after last_updated + ping

brave · Jul 5, 2022 · d52a18c · d52a18c
1 parent 00127e8
commit d52a18c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/...rnal/ad_events/new_tab_page_ads/new_tab_page_ad_event_handler_if_ads_disabled_unittest.cc b/...rnal/ad_events/new_tab_page_ads/new_tab_page_ad_event_handler_if_ads_disabled_unittest.cc
@@ -16,6 +16,7 @@
 #include "bat/ads/internal/ads_client_helper.h"
 #include "bat/ads/internal/base/unittest/unittest_base.h"
 #include "bat/ads/internal/base/unittest/unittest_time_util.h"
+#include "bat/ads/internal/catalog/catalog_util.h"
 #include "bat/ads/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_info.h"
 #include "bat/ads/internal/creatives/new_tab_page_ads/creative_new_tab_page_ad_unittest_util.h"
 #include "bat/ads/internal/creatives/new_tab_page_ads/new_tab_page_ad_builder.h"
@@ -313,7 +314,7 @@ TEST_F(BatAdsNewTabPageAdEventHandlerIfAdsDisabledTest,
 
   FireAdEvents(ad_event, ads_per_day - 1);
 
-  AdvanceClockBy(base::Days(1) - base::Seconds(1));
+  AdvanceClockBy(GetCatalogPing() - base::Seconds(1));
 
   const std::string placement_id =
       base::GUID::GenerateRandomV4().AsLowercaseString();
@@ -339,7 +340,7 @@ TEST_F(BatAdsNewTabPageAdEventHandlerIfAdsDisabledTest,
 
   FireAdEvents(ad_event, ads_per_day);
 
-  AdvanceClockBy(base::Days(1) - base::Seconds(1));
+  AdvanceClockBy(GetCatalogPing() - base::Seconds(1));
 
   const std::string placement_id =
       base::GUID::GenerateRandomV4().AsLowercaseString();

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc
@@ -127,14 +127,14 @@ void Catalog::OnFetch(const mojom::UrlResponse& url_response) {
     return;
   }
 
-  SetCatalogLastUpdated(base::Time::Now());
-
   if (!HasCatalogChanged(catalog.id)) {
     BLOG(1, "Catalog id " << catalog.id << " is up to date");
     FetchAfterDelay();
     return;
   }
 
+  SetCatalogLastUpdated(base::Time::Now());
+
   SaveCatalog(catalog);
   NotifyDidUpdateCatalog(catalog);
   FetchAfterDelay();

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util.cc
@@ -29,8 +29,6 @@ namespace ads {
 
 namespace {
 
-constexpr base::TimeDelta kCatalogLifespan = base::Days(1);
-
 void Delete() {
   database::DeleteCampaigns();
   database::DeleteCreativeNotificationAds();
@@ -122,7 +120,7 @@ bool HasCatalogChanged(const std::string& catalog_id) {
 }
 
 bool HasCatalogExpired() {
-  if (base::Time::Now() < GetCatalogLastUpdated() + kCatalogLifespan) {
+  if (base::Time::Now() < GetCatalogLastUpdated() + GetCatalogPing()) {
     return false;
   }
 

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc
@@ -87,6 +87,7 @@ TEST_F(BatAdsCatalogUtilTest, CatalogHasNotChanged) {
 
 TEST_F(BatAdsCatalogUtilTest, CatalogHasExpired) {
   // Arrange
+  SetCatalogPing(base::Days(1));
   SetCatalogLastUpdated(Now());
 
   // Act
@@ -99,6 +100,7 @@ TEST_F(BatAdsCatalogUtilTest, CatalogHasExpired) {
 
 TEST_F(BatAdsCatalogUtilTest, CatalogHasNotExpired) {
   // Arrange
+  SetCatalogPing(base::Days(1));
   SetCatalogLastUpdated(Now());
 
   // Act

diff --git a/...-native-ads/src/bat/ads/internal/serving/permission_rules/catalog_permission_rule_test.cc b/...-native-ads/src/bat/ads/internal/serving/permission_rules/catalog_permission_rule_test.cc
@@ -43,9 +43,9 @@ TEST_F(BatAdsCatalogPermissionRuleIntegrationTest, AllowAd) {
 }
 
 TEST_F(BatAdsCatalogPermissionRuleIntegrationTest,
-       AllowAdIfCatalogWasLastUpdated23HoursAnd59MinutesAgo) {
+       AllowAdIfCatalogWasLastUpdatedOnOrBeforeCatalogPing) {
   // Arrange
-  AdvanceClockBy(base::Days(1) - base::Seconds(1));
+  AdvanceClockBy(GetCatalogPing() - base::Seconds(1));
 
   // Act
   CatalogPermissionRule permission_rule;
@@ -56,9 +56,9 @@ TEST_F(BatAdsCatalogPermissionRuleIntegrationTest,
 }
 
 TEST_F(BatAdsCatalogPermissionRuleIntegrationTest,
-       DoNotAllowAdIfCatalogWasLastUpdated1DayAgo) {
+       DoNotAllowAdIfCatalogWasNotUpdatedAfterCatalogPing) {
   // Arrange
-  AdvanceClockBy(base::Days(1));
+  AdvanceClockBy(GetCatalogPing());
 
   // Act
   CatalogPermissionRule permission_rule;