[web-db] read drafts from SQLite database and dispatch to store
ClosedPublic
Actions

Authored by kamil on Apr 27 2023, 7:38 AM.

Details

Reviewers

tomek
michal

Commits

rCOMM9d354fce587d: [web-db] read drafts from SQLite database and dispatch to store

Summary

Read drafts from database and propagate to redux store.

Depends on D7664

Test Plan

Reload web app
Log if drafts are queried properly
Check if the same drafts are visible in UI

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

kamil created this revision.Apr 27 2023, 7:38 AM

kamil held this revision as a draft.

Herald added subscribers: atul, ashoat. · View Herald TranscriptApr 27 2023, 7:38 AM

kamil added a child revision: D7666: [web-db] stop persisting drafts in redux-persist.Apr 27 2023, 7:42 AM

Harbormaster completed remote builds in B18872: Diff 25850.Apr 27 2023, 7:56 AM

kamil published this revision for review.Apr 27 2023, 7:58 AM

tomek accepted this revision.Apr 28 2023, 4:29 AM

tomek added inline comments.

web/database/sqlite-data-handler.js
50–64 ↗	(On Diff #25850)	We have two ways of checking if a user is logged in in this effect: `if (currentLoggedInUserID)` and `if (!loggedIn)` - does it make sense to use both?

This revision is now accepted and ready to land.Apr 28 2023, 4:29 AM

address review, rebase before landing

Harbormaster completed remote builds in B19273: Diff 26375.May 11 2023, 3:48 AM

Closed by commit rCOMM9d354fce587d: [web-db] read drafts from SQLite database and dispatch to store (authored by kamil). · Explain WhyMay 11 2023, 4:03 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMM9d354fce587d: [web-db] read drafts from SQLite database and dispatch to store.

Revision Contents
Changeset List

Path

Size

web/

database/

sqlite-data-handler.js

28 lines

Diff 26375

View Options

web/database/sqlite-data-handler.js

Show First 20 Lines • Show All 1,529 Lines • ▼ Show 20 Lines	throw std::system_error(
std::generic_category(),		std::generic_category(),
"Multiple records found for the olm_persist_account table");		"Multiple records found for the olm_persist_account table");
}		}
return (result.size() == 0)		return (result.size() == 0)
? std::nullopt		? std::nullopt
: std::optional<std::string>(result[0].account_data);		: std::optional<std::string>(result[0].account_data);
}		}

void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {		void SQLiteQueryExecutor::storeOlmPersistAccount(
		const std::string &accountData) const {
static std::string replaceOlmPersistAccountSQL =		static std::string replaceOlmPersistAccountSQL =
"REPLACE INTO olm_persist_account (id, account_data) "		"REPLACE INTO olm_persist_account (id, account_data) "
"VALUES (?, ?);";		"VALUES (?, ?);";
static std::string replaceOlmPersistSessionSQL =
"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
"VALUES (?, ?);";

OlmPersistAccount persistAccount = {		OlmPersistAccount persistAccount = {ACCOUNT_ID, accountData};
ACCOUNT_ID, std::string(persist.account.begin(), persist.account.end())};
replaceEntity<OlmPersistAccount>(		replaceEntity<OlmPersistAccount>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistAccountSQL,		replaceOlmPersistAccountSQL,
persistAccount);		persistAccount);
		}

		void SQLiteQueryExecutor::storeOlmPersistSession(
		const OlmPersistSession &session) const {
		static std::string replaceOlmPersistSessionSQL =
		"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
		"VALUES (?, ?);";

for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
OlmPersistSession persistSession = {
it->first, std::string(it->second.begin(), it->second.end())};
replaceEntity<OlmPersistSession>(		replaceEntity<OlmPersistSession>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistSessionSQL,		replaceOlmPersistSessionSQL,
persistSession);		session);
		}

		void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {
		std::string accountData =
		std::string(persist.account.begin(), persist.account.end());

		for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
		OlmPersistSession persistSession = {
		it->first, std::string(it->second.begin(), it->second.end())};
		this->storeOlmPersistSession(persistSession);
}		}
}		}

void SQLiteQueryExecutor::setNotifyToken(std::string token) const {		void SQLiteQueryExecutor::setNotifyToken(std::string token) const {
this->setMetadata("notify_token", token);		this->setMetadata("notify_token", token);
}		}

void SQLiteQueryExecutor::clearNotifyToken() const {		void SQLiteQueryExecutor::clearNotifyToken() const {
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	for (const auto &thread : threads) {
webThreads.emplace_back(thread);		webThreads.emplace_back(thread);
}		}
return webThreads;		return webThreads;
};		};

void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {		void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {
this->replaceThread(thread.toThread());		this->replaceThread(thread.toThread());
};		};

		std::vector<MessageWithMedias> SQLiteQueryExecutor::getAllMessagesWeb() const {
		auto allMessages = this->getAllMessages();

		std::vector<MessageWithMedias> allMessageWithMedias;
		for (auto &messageWitMedia : allMessages) {
		allMessageWithMedias.push_back(
		{std::move(messageWitMedia.first), messageWitMedia.second});
		}

		return allMessageWithMedias;
		}

		void SQLiteQueryExecutor::replaceMessageWeb(const WebMessage &message) const {
		this->replaceMessage(message.toMessage());
		};

		NullableString SQLiteQueryExecutor::getOlmPersistAccountDataWeb() const {
		std::optional<std::string> accountData = this->getOlmPersistAccountData();
		if (!accountData.has_value()) {
		return NullableString();
		}
		return std::make_unique<std::string>(accountData.value());
		}
#else		#else
void SQLiteQueryExecutor::clearSensitiveData() {		void SQLiteQueryExecutor::clearSensitiveData() {
SQLiteQueryExecutor::closeConnection();		SQLiteQueryExecutor::closeConnection();
if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&		if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&
std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {		std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {
std::ostringstream errorStream;		std::ostringstream errorStream;
errorStream << "Failed to delete database file. Details: "		errorStream << "Failed to delete database file. Details: "
<< strerror(errno);		<< strerror(errno);
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines

[web-db] read drafts from SQLite database and dispatch to storeClosedPublicActions