Skip to content

Update Firestore example for API changes #47

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

Merged
morganchen12 merged 3 commits into from
Jun 4, 2020
Merged

Update Firestore example for API changes #47

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af2b16e
Update for API changes
mark-grimes Jun 3, 2020
7445988
Change logging from verbose to warning
mark-grimes Jun 3, 2020
c33541f
Add spaces around equals signs
mark-grimes Jun 3, 2020
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
78 changes: 39 additions & 39 deletions firestore/testapp/src/common_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TestEventListener : public Countable,
void OnEvent(const T& value,
const firebase::firestore::Error error) override {
event_count_++;
if (error != firebase::firestore::Ok) {
if (error != firebase::firestore::kOk) {
LogMessage("ERROR: EventListener %s got %d.", name_.c_str(), error);
}
}
Expand Down Expand Up @@ -170,7 +170,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
}
LogMessage("Successfully initialized Firebase Firestore.");

firestore->set_logging_enabled(true);
firestore->set_log_level(firebase::LogLevel::kLogLevelWarning);

if (firestore->app() != app) {
LogMessage("ERROR: failed to get App the Firestore was created with.");
Expand Down Expand Up @@ -219,28 +219,28 @@ extern "C" int common_main(int argc, const char* argv[]) {
}

LogMessage("Testing Set().");
document.Set(firebase::firestore::MapFieldValue{
{"str", firebase::firestore::FieldValue::FromString("foo")},
{"int", firebase::firestore::FieldValue::FromInteger(123LL)}});
Await(document.SetLastResult(), "document.Set");
if (document.SetLastResult().status() != firebase::kFutureStatusComplete) {
auto setResult=document.Set(firebase::firestore::MapFieldValue{
Copy link
Copy Markdown
Contributor

@morganchen12 morganchen12 Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style nit: spaces around = sign (here and throughout file)

{"str", firebase::firestore::FieldValue::String("foo")},
{"int", firebase::firestore::FieldValue::Integer(123LL)}});
Await(setResult, "document.Set");
if (setResult.status() != firebase::kFutureStatusComplete) {
LogMessage("ERROR: failed to write document.");
}

LogMessage("Testing Update().");
document.Update(firebase::firestore::MapFieldValue{
{"int", firebase::firestore::FieldValue::FromInteger(321LL)}});
Await(document.UpdateLastResult(), "document.Update");
if (document.UpdateLastResult().status() != firebase::kFutureStatusComplete) {
auto updateResult=document.Update(firebase::firestore::MapFieldValue{
{"int", firebase::firestore::FieldValue::Integer(321LL)}});
Await(updateResult, "document.Update");
if (updateResult.status() != firebase::kFutureStatusComplete) {
LogMessage("ERROR: failed to write document.");
}

LogMessage("Testing Get().");
document.Get();
Await(document.GetLastResult(), "document.Get");
if (document.GetLastResult().status() == firebase::kFutureStatusComplete) {
auto getDocumentResult=document.Get();
Await(getDocumentResult, "document.Get");
if (getDocumentResult.status() == firebase::kFutureStatusComplete) {
const firebase::firestore::DocumentSnapshot* snapshot =
document.GetLastResult().result();
getDocumentResult.result();
if (snapshot == nullptr) {
LogMessage("ERROR: failed to read document.");
} else {
Expand All @@ -263,9 +263,9 @@ extern "C" int common_main(int argc, const char* argv[]) {
}

LogMessage("Testing Delete().");
document.Delete();
Await(document.DeleteLastResult(), "document.Delete");
if (document.DeleteLastResult().status() != firebase::kFutureStatusComplete) {
auto deleteResult=document.Delete();
Await(deleteResult, "document.Delete");
if (deleteResult.status() != firebase::kFutureStatusComplete) {
LogMessage("ERROR: failed to delete document.");
}
LogMessage("Tested document operations.");
Expand All @@ -282,34 +282,34 @@ extern "C" int common_main(int argc, const char* argv[]) {
firebase::firestore::WriteBatch batch = firestore->batch();
batch.Set(collection.Document("one"),
firebase::firestore::MapFieldValue{
{"str", firebase::firestore::FieldValue::FromString("foo")}});
{"str", firebase::firestore::FieldValue::String("foo")}});
batch.Set(collection.Document("two"),
firebase::firestore::MapFieldValue{
{"int", firebase::firestore::FieldValue::FromInteger(123LL)}});
batch.Commit();
Await(batch.CommitLastResult(), "batch.Commit");
if (batch.CommitLastResult().status() != firebase::kFutureStatusComplete) {
{"int", firebase::firestore::FieldValue::Integer(123LL)}});
auto commitResult=batch.Commit();
Await(commitResult, "batch.Commit");
if (commitResult.status() != firebase::kFutureStatusComplete) {
LogMessage("ERROR: failed to write batch.");
}
LogMessage("Tested batch write.");

LogMessage("Testing transaction.");
firestore->RunTransaction(
[collection](firebase::firestore::Transaction* transaction,
std::string* error_message) -> firebase::firestore::Error {
transaction->Update(
auto runTransactionResult=firestore->RunTransaction(
[collection](firebase::firestore::Transaction& transaction,
std::string& error_message) -> firebase::firestore::Error {
transaction.Update(
collection.Document("one"),
firebase::firestore::MapFieldValue{
{"int", firebase::firestore::FieldValue::FromInteger(123LL)}});
transaction->Delete(collection.Document("two"));
transaction->Set(
{"int", firebase::firestore::FieldValue::Integer(123LL)}});
transaction.Delete(collection.Document("two"));
transaction.Set(
collection.Document("three"),
firebase::firestore::MapFieldValue{
{"int", firebase::firestore::FieldValue::FromInteger(321LL)}});
return firebase::firestore::Ok;
{"int", firebase::firestore::FieldValue::Integer(321LL)}});
return firebase::firestore::kOk;
});
Await(firestore->RunTransactionLastResult(), "firestore.RunTransaction");
if (firestore->RunTransactionLastResult().status() !=
Await(runTransactionResult, "firestore.RunTransaction");
if (runTransactionResult.status() !=
firebase::kFutureStatusComplete) {
LogMessage("ERROR: failed to run transaction.");
}
Expand All @@ -319,13 +319,13 @@ extern "C" int common_main(int argc, const char* argv[]) {
firebase::firestore::Query query =
collection
.WhereGreaterThan("int",
firebase::firestore::FieldValue::FromBoolean(true))
firebase::firestore::FieldValue::Boolean(true))
.Limit(3);
query.Get();
Await(query.GetLastResult(), "query.Get");
if (query.GetLastResult().status() == firebase::kFutureStatusComplete) {
auto getQueryResult=query.Get();
Await(getQueryResult, "query.Get");
if (getQueryResult.status() == firebase::kFutureStatusComplete) {
const firebase::firestore::QuerySnapshot* snapshot =
query.GetLastResult().result();
getQueryResult.result();
if (snapshot == nullptr) {
LogMessage("ERROR: failed to fetch query result.");
} else {
Expand Down