Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use mojo types for PublisherInfo #2432

Merged
merged 2 commits into from
May 15, 2019
Merged

use mojo types for PublisherInfo #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca7243d
use mojo types for PublisherInfo
bridiver May 13, 2019
bbc3e7d
lint fixes
bridiver May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions components/brave_ads/browser/ads_service_impl_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,13 @@ class MockRewardsService : public RewardsService {
MOCK_METHOD2(GetPublisherBanner,
void(const std::string&,
brave_rewards::GetPublisherBannerCallback));
MOCK_METHOD3(OnTip, void(const std::string&,
int,
bool));
MOCK_METHOD4(OnTip, void(const std::string&,
int,
bool,
const ledger::PublisherInfo*));
MOCK_METHOD4(OnTip, void(const std::string&,
int,
bool,
std::unique_ptr<brave_rewards::ContentSite>));
int,
bool,
std::unique_ptr<brave_rewards::ContentSite>));
MOCK_METHOD1(RemoveRecurringTip, void(const std::string&));
MOCK_METHOD1(GetRecurringTipsUI,
void(brave_rewards::GetRecurringTipsCallback));
Expand Down
9 changes: 2 additions & 7 deletions components/brave_rewards/browser/extension_rewards_service_observer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,15 @@ void ExtensionRewardsServiceObserver::OnGetCurrentBalanceReport(
void ExtensionRewardsServiceObserver::OnPanelPublisherInfo(
RewardsService* rewards_service,
int error_code,
std::unique_ptr<ledger::PublisherInfo> info,
const ledger::PublisherInfo* info,
uint64_t windowId) {
auto* event_router = extensions::EventRouter::Get(profile_);
if (!event_router) {
if (!event_router || !info) {
return;
}

extensions::api::brave_rewards::OnPublisherData::Publisher publisher;

if (!info.get()) {
info.reset(new ledger::PublisherInfo());
info->id = "";
}

publisher.percentage = info->percent;
publisher.verified = info->verified;
publisher.excluded = info->excluded == ledger::PUBLISHER_EXCLUDE::EXCLUDED;
Expand Down
2 changes: 1 addition & 1 deletion components/brave_rewards/browser/extension_rewards_service_observer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ExtensionRewardsServiceObserver : public RewardsServiceObserver,
void OnPanelPublisherInfo(
RewardsService* rewards_service,
int error_code,
std::unique_ptr<ledger::PublisherInfo> info,
const ledger::PublisherInfo* info,
uint64_t windowId) override;
void OnGrant(RewardsService* rewards_service,
unsigned int result,
Expand Down
92 changes: 44 additions & 48 deletions components/brave_rewards/browser/publisher_info_database.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <stdint.h>

#include <string>
#include <utility>

#include "base/bind.h"
#include "base/command_line.h"
Expand Down Expand Up @@ -185,19 +186,18 @@ void PublisherInfoDatabase::GetOneTimeTips(ledger::PublisherInfoList* list,
info_sql.BindInt(2, ledger::REWARDS_CATEGORY::ONE_TIME_TIP);

while (info_sql.Step()) {
std::string id(info_sql.ColumnString(0));
auto publisher = ledger::PublisherInfo::New();

ledger::PublisherInfo publisher(id);
publisher->id = info_sql.ColumnString(0);
publisher->name = info_sql.ColumnString(1);
publisher->url = info_sql.ColumnString(2);
publisher->favicon_url = info_sql.ColumnString(3);
publisher->weight = info_sql.ColumnDouble(4);
publisher->reconcile_stamp = info_sql.ColumnInt64(5);
publisher->verified = info_sql.ColumnBool(6);
publisher->provider = info_sql.ColumnString(7);

publisher.name = info_sql.ColumnString(1);
publisher.url = info_sql.ColumnString(2);
publisher.favicon_url = info_sql.ColumnString(3);
publisher.weight = info_sql.ColumnDouble(4);
publisher.reconcile_stamp = info_sql.ColumnInt64(5);
publisher.verified = info_sql.ColumnBool(6);
publisher.provider = info_sql.ColumnString(7);

list->push_back(publisher);
list->push_back(std::move(publisher));
}
}

Expand Down Expand Up @@ -288,7 +288,7 @@ bool PublisherInfoDatabase::InsertOrUpdatePublisherInfo(
return transaction.Commit();
}

std::unique_ptr<ledger::PublisherInfo>
ledger::PublisherInfoPtr
PublisherInfoDatabase::GetPublisherInfo(const std::string& publisher_key) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

Expand All @@ -306,8 +306,7 @@ PublisherInfoDatabase::GetPublisherInfo(const std::string& publisher_key) {
info_sql.BindString(0, publisher_key);

if (info_sql.Step()) {
std::unique_ptr<ledger::PublisherInfo> info;
info.reset(new ledger::PublisherInfo());
auto info = ledger::PublisherInfo::New();
info->id = info_sql.ColumnString(0);
info->name = info_sql.ColumnString(1);
info->url = info_sql.ColumnString(2);
Expand All @@ -323,7 +322,7 @@ PublisherInfoDatabase::GetPublisherInfo(const std::string& publisher_key) {
return nullptr;
}

std::unique_ptr<ledger::PublisherInfo>
ledger::PublisherInfoPtr
PublisherInfoDatabase::GetPanelPublisher(
const ledger::ActivityInfoFilter& filter) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
Expand All @@ -349,8 +348,7 @@ PublisherInfoDatabase::GetPanelPublisher(
info_sql.BindString(2, filter.id);

if (info_sql.Step()) {
std::unique_ptr<ledger::PublisherInfo> info;
info.reset(new ledger::PublisherInfo());
auto info = ledger::PublisherInfo::New();
info->id = info_sql.ColumnString(0);
info->name = info_sql.ColumnString(1);
info->url = info_sql.ColumnString(2);
Expand Down Expand Up @@ -504,7 +502,7 @@ bool PublisherInfoDatabase::InsertOrUpdateActivityInfos(
}

for (const auto& info : list) {
if (!InsertOrUpdateActivityInfo(info)) {
if (!InsertOrUpdateActivityInfo(*info)) {
transaction.Rollback();
return false;
}
Expand Down Expand Up @@ -621,24 +619,23 @@ bool PublisherInfoDatabase::GetActivityList(
}

while (info_sql.Step()) {
std::string id(info_sql.ColumnString(0));

ledger::PublisherInfo info(id);
info.duration = info_sql.ColumnInt64(1);
info.score = info_sql.ColumnDouble(2);
info.percent = info_sql.ColumnInt64(3);
info.weight = info_sql.ColumnDouble(4);
info.verified = info_sql.ColumnBool(5);
info.excluded = static_cast<ledger::PUBLISHER_EXCLUDE>(
auto info = ledger::PublisherInfo::New();
info->id = info_sql.ColumnString(0);
info->duration = info_sql.ColumnInt64(1);
info->score = info_sql.ColumnDouble(2);
info->percent = info_sql.ColumnInt64(3);
info->weight = info_sql.ColumnDouble(4);
info->verified = info_sql.ColumnBool(5);
info->excluded = static_cast<ledger::PUBLISHER_EXCLUDE>(
info_sql.ColumnInt(6));
info.name = info_sql.ColumnString(7);
info.url = info_sql.ColumnString(8);
info.provider = info_sql.ColumnString(9);
info.favicon_url = info_sql.ColumnString(10);
info.reconcile_stamp = info_sql.ColumnInt64(11);
info.visits = info_sql.ColumnInt(12);
info->name = info_sql.ColumnString(7);
info->url = info_sql.ColumnString(8);
info->provider = info_sql.ColumnString(9);
info->favicon_url = info_sql.ColumnString(10);
info->reconcile_stamp = info_sql.ColumnInt64(11);
info->visits = info_sql.ColumnInt(12);

list->push_back(info);
list->push_back(std::move(info));
}

return true;
Expand Down Expand Up @@ -718,7 +715,7 @@ bool PublisherInfoDatabase::InsertOrUpdateMediaPublisherInfo(
return statement.Run();
}

std::unique_ptr<ledger::PublisherInfo>
ledger::PublisherInfoPtr
PublisherInfoDatabase::GetMediaPublisherInfo(const std::string& media_key) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

Expand All @@ -739,7 +736,7 @@ PublisherInfoDatabase::GetMediaPublisherInfo(const std::string& media_key) {
info_sql.BindString(0, media_key);

if (info_sql.Step()) {
std::unique_ptr<ledger::PublisherInfo> info(new ledger::PublisherInfo());
auto info = ledger::PublisherInfo::New();
info->id = info_sql.ColumnString(0);
info->name = info_sql.ColumnString(1);
info->url = info_sql.ColumnString(2);
Expand Down Expand Up @@ -835,18 +832,17 @@ void PublisherInfoDatabase::GetRecurringTips(
"INNER JOIN publisher_info AS pi ON rd.publisher_id = pi.publisher_id "));

while (info_sql.Step()) {
std::string id(info_sql.ColumnString(0));

ledger::PublisherInfo publisher(id);
publisher.name = info_sql.ColumnString(1);
publisher.url = info_sql.ColumnString(2);
publisher.favicon_url = info_sql.ColumnString(3);
publisher.weight = info_sql.ColumnDouble(4);
publisher.reconcile_stamp = info_sql.ColumnInt64(5);
publisher.verified = info_sql.ColumnBool(6);
publisher.provider = info_sql.ColumnString(7);

list->push_back(publisher);
auto publisher = ledger::PublisherInfo::New();
publisher->id = info_sql.ColumnString(0);
publisher->name = info_sql.ColumnString(1);
publisher->url = info_sql.ColumnString(2);
publisher->favicon_url = info_sql.ColumnString(3);
publisher->weight = info_sql.ColumnDouble(4);
publisher->reconcile_stamp = info_sql.ColumnInt64(5);
publisher->verified = info_sql.ColumnBool(6);
publisher->provider = info_sql.ColumnString(7);

list->push_back(std::move(publisher));
}
}

Expand Down
6 changes: 3 additions & 3 deletions components/brave_rewards/browser/publisher_info_database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ class PublisherInfoDatabase {

bool InsertOrUpdatePublisherInfo(const ledger::PublisherInfo& info);

std::unique_ptr<ledger::PublisherInfo> GetPublisherInfo(
ledger::PublisherInfoPtr GetPublisherInfo(
const std::string& media_key);

std::unique_ptr<ledger::PublisherInfo> GetPanelPublisher(
ledger::PublisherInfoPtr GetPanelPublisher(
const ledger::ActivityInfoFilter& filter);

bool RestorePublishers();
Expand All @@ -68,7 +68,7 @@ class PublisherInfoDatabase {
bool InsertOrUpdateMediaPublisherInfo(const std::string& media_key,
const std::string& publisher_id);

std::unique_ptr<ledger::PublisherInfo> GetMediaPublisherInfo(
ledger::PublisherInfoPtr GetMediaPublisherInfo(
const std::string& media_key);

bool InsertOrUpdateRecurringTip(
Expand Down
Loading