Page MenuHomePhabricator
Differential D12788

[lib] Introduce `stripMemberPermissionsFromRawThreadInfos`
ClosedPublic
Actions

Authored by atul on Jul 17 2024, 3:34 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 1, 9:37 AM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
Unknown Object (File)
Fri, Feb 21, 2:10 PM
View All Files
Subscribers
None

Details

Reviewers
ashoat
tomek
Commits
rCOMMb84a90848053: [lib] Introduce `stripMemberPermissionsFromRawThreadInfos`
Summary

This is the migrationFunc that will be consumed by createUpdateDBOpsForThreadStoreThreadInfos for the client migrations.

Depends on D12779

Test Plan

Included basic unit test. Will also be tested as part of native and web migrations.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.Jul 17 2024, 3:34 PM
Harbormaster completed remote builds in B30445: Diff 42425.Jul 17 2024, 3:51 PM
atul requested review of this revision.Jul 17 2024, 3:51 PM
atul added a child revision: D12789: [native] Introduce `native` migration to strip member permissions.Jul 17 2024, 4:02 PM
ashoat requested changes to this revision.Jul 18 2024, 12:04 PM
ashoat added inline comments.
lib/utils/member-info-utils.js
45 ↗(On Diff #42425)

I don't understand why this any-cast is necessary – isn't rawThreadInfo already a ThinRawThreadInfoWithPermissions?

Did you perhaps forget to remove the any-cast before diffing this up?

This revision now requires changes to proceed.Jul 18 2024, 12:04 PM
atul updated this revision to Diff 42479.Jul 18 2024, 12:08 PM

remove extraneous any-cast

atul added a comment.Jul 18 2024, 12:09 PM

Did you perhaps forget to remove the any-cast before diffing this up?

Yeah, I narrowed type of stripMemberPermissionsFromRawThreadInfos and should've removed any-cast after.

ashoat accepted this revision.Jul 18 2024, 12:13 PM
This revision is now accepted and ready to land.Jul 18 2024, 12:13 PM
Harbormaster completed remote builds in B30479: Diff 42479.Jul 18 2024, 12:25 PM
atul updated this revision to Diff 42489.Jul 18 2024, 12:41 PM

rebase

Harbormaster completed remote builds in B30487: Diff 42489.Jul 18 2024, 1:13 PM
atul updated this revision to Diff 42500.Jul 18 2024, 2:18 PM

rebase BEFORE re-removing any-cast

atul updated this revision to Diff 42501.Jul 18 2024, 2:20 PM

rebase before landing

This revision was landed with ongoing or failed builds.Jul 18 2024, 2:28 PM
Closed by commit rCOMMb84a90848053: [lib] Introduce `stripMemberPermissionsFromRawThreadInfos` (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMMb84a90848053: [lib] Introduce `stripMemberPermissionsFromRawThreadInfos`.
Harbormaster completed remote builds in B30494: Diff 42500.Jul 18 2024, 2:34 PM
Harbormaster completed remote builds in B30495: Diff 42501.

Revision Contents
Changeset List

Diff 42502

View Options

lib/utils/member-info-utils-test-data.js

Show First 20 Lines • Show All 298 Lines • ▼ Show 20 Linesbool add_not_null_constraint_to_metadata(sqlite3 *db) {
stringStream << "Error adding NOT NULL constraint to metadata table: " stringStream << "Error adding NOT NULL constraint to metadata table: "
<< error; << error;
Logger::log(stringStream.str()); Logger::log(stringStream.str());
sqlite3_free(error); sqlite3_free(error);
return false; return false;
} }
bool add_avatar_column_to_threads_table(sqlite3 *db) {
char *error;
sqlite3_exec(
db,
"ALTER TABLE threads ADD COLUMN avatar TEXT;",
nullptr,
nullptr,
&error);
if (!error) {
return true;
}
std::ostringstream stringStream;
stringStream << "Error adding avatar column to threads table: " << error;
Logger::log(stringStream.str());
sqlite3_free(error);
return false;
}
bool create_schema(sqlite3 *db) { bool create_schema(sqlite3 *db) {
char *error; char *error;
sqlite3_exec( sqlite3_exec(
db, db,
"CREATE TABLE IF NOT EXISTS drafts (" "CREATE TABLE IF NOT EXISTS drafts ("
" key TEXT UNIQUE PRIMARY KEY NOT NULL," " key TEXT UNIQUE PRIMARY KEY NOT NULL,"
" text TEXT NOT NULL" " text TEXT NOT NULL"
");" ");"
Show All 37 Lines sqlite3_exec(
" creation_time BIGINT NOT NULL," " creation_time BIGINT NOT NULL,"
" parent_thread_id TEXT," " parent_thread_id TEXT,"
" containing_thread_id TEXT," " containing_thread_id TEXT,"
" community TEXT," " community TEXT,"
" members TEXT NOT NULL," " members TEXT NOT NULL,"
" roles TEXT NOT NULL," " roles TEXT NOT NULL,"
" current_user TEXT NOT NULL," " current_user TEXT NOT NULL,"
" source_message_id TEXT," " source_message_id TEXT,"
" replies_count INTEGER NOT NULL" " replies_count INTEGER NOT NULL,"
" avatar TEXT"
");" ");"
"CREATE TABLE IF NOT EXISTS metadata (" "CREATE TABLE IF NOT EXISTS metadata ("
" name TEXT UNIQUE PRIMARY KEY NOT NULL," " name TEXT UNIQUE PRIMARY KEY NOT NULL,"
" data TEXT NOT NULL" " data TEXT NOT NULL"
");" ");"
"CREATE INDEX IF NOT EXISTS media_idx_container" "CREATE INDEX IF NOT EXISTS media_idx_container"
▲ Show 20 Lines • Show All 225 Lines • ▼ Show 20 Linesstd::vector<std::pair<uint, SQLiteMigration>> migrations{
{17, {recreate_messages_table, true}}, {17, {recreate_messages_table, true}},
{18, {create_messages_idx_thread_time, true}}, {18, {create_messages_idx_thread_time, true}},
{19, {create_media_idx_container, true}}, {19, {create_media_idx_container, true}},
{20, {create_threads_table, true}}, {20, {create_threads_table, true}},
{21, {update_threadID_for_pending_threads_in_drafts, true}}, {21, {update_threadID_for_pending_threads_in_drafts, true}},
{22, {enable_write_ahead_logging_mode, false}}, {22, {enable_write_ahead_logging_mode, false}},
{23, {create_metadata_table, true}}, {23, {create_metadata_table, true}},
{24, {add_not_null_constraint_to_drafts, true}}, {24, {add_not_null_constraint_to_drafts, true}},
{25, {add_not_null_constraint_to_metadata, true}}}}; {25, {add_not_null_constraint_to_metadata, true}},
{26, {add_avatar_column_to_threads_table, true}}}};
enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED }; enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED };
MigrationResult applyMigrationWithTransaction( MigrationResult applyMigrationWithTransaction(
sqlite3 *db, sqlite3 *db,
const MigrateFunction &migrate, const MigrateFunction &migrate,
int index) { int index) {
sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr); sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr);
▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Lines static auto storage = make_storage(
make_column("creation_time", &Thread::creation_time), make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id), make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id), make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community), make_column("community", &Thread::community),
make_column("members", &Thread::members), make_column("members", &Thread::members),
make_column("roles", &Thread::roles), make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user), make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id), make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)), make_column("replies_count", &Thread::replies_count),
make_column("avatar", &Thread::avatar)),
make_table( make_table(
"metadata", "metadata",
make_column("name", &Metadata::name, unique(), primary_key()), make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data))); make_column("data", &Metadata::data)));
storage.on_open = on_database_open; storage.on_open = on_database_open;
return storage; return storage;
} }
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines
View Options

lib/utils/member-info-utils.js

Show First 20 Lines • Show All 298 Lines • ▼ Show 20 Linesbool add_not_null_constraint_to_metadata(sqlite3 *db) {
stringStream << "Error adding NOT NULL constraint to metadata table: " stringStream << "Error adding NOT NULL constraint to metadata table: "
<< error; << error;
Logger::log(stringStream.str()); Logger::log(stringStream.str());
sqlite3_free(error); sqlite3_free(error);
return false; return false;
} }
bool add_avatar_column_to_threads_table(sqlite3 *db) {
char *error;
sqlite3_exec(
db,
"ALTER TABLE threads ADD COLUMN avatar TEXT;",
nullptr,
nullptr,
&error);
if (!error) {
return true;
}
std::ostringstream stringStream;
stringStream << "Error adding avatar column to threads table: " << error;
Logger::log(stringStream.str());
sqlite3_free(error);
return false;
}
bool create_schema(sqlite3 *db) { bool create_schema(sqlite3 *db) {
char *error; char *error;
sqlite3_exec( sqlite3_exec(
db, db,
"CREATE TABLE IF NOT EXISTS drafts (" "CREATE TABLE IF NOT EXISTS drafts ("
" key TEXT UNIQUE PRIMARY KEY NOT NULL," " key TEXT UNIQUE PRIMARY KEY NOT NULL,"
" text TEXT NOT NULL" " text TEXT NOT NULL"
");" ");"
Show All 37 Lines sqlite3_exec(
" creation_time BIGINT NOT NULL," " creation_time BIGINT NOT NULL,"
" parent_thread_id TEXT," " parent_thread_id TEXT,"
" containing_thread_id TEXT," " containing_thread_id TEXT,"
" community TEXT," " community TEXT,"
" members TEXT NOT NULL," " members TEXT NOT NULL,"
" roles TEXT NOT NULL," " roles TEXT NOT NULL,"
" current_user TEXT NOT NULL," " current_user TEXT NOT NULL,"
" source_message_id TEXT," " source_message_id TEXT,"
" replies_count INTEGER NOT NULL" " replies_count INTEGER NOT NULL,"
" avatar TEXT"
");" ");"
"CREATE TABLE IF NOT EXISTS metadata (" "CREATE TABLE IF NOT EXISTS metadata ("
" name TEXT UNIQUE PRIMARY KEY NOT NULL," " name TEXT UNIQUE PRIMARY KEY NOT NULL,"
" data TEXT NOT NULL" " data TEXT NOT NULL"
");" ");"
"CREATE INDEX IF NOT EXISTS media_idx_container" "CREATE INDEX IF NOT EXISTS media_idx_container"
▲ Show 20 Lines • Show All 225 Lines • ▼ Show 20 Linesstd::vector<std::pair<uint, SQLiteMigration>> migrations{
{17, {recreate_messages_table, true}}, {17, {recreate_messages_table, true}},
{18, {create_messages_idx_thread_time, true}}, {18, {create_messages_idx_thread_time, true}},
{19, {create_media_idx_container, true}}, {19, {create_media_idx_container, true}},
{20, {create_threads_table, true}}, {20, {create_threads_table, true}},
{21, {update_threadID_for_pending_threads_in_drafts, true}}, {21, {update_threadID_for_pending_threads_in_drafts, true}},
{22, {enable_write_ahead_logging_mode, false}}, {22, {enable_write_ahead_logging_mode, false}},
{23, {create_metadata_table, true}}, {23, {create_metadata_table, true}},
{24, {add_not_null_constraint_to_drafts, true}}, {24, {add_not_null_constraint_to_drafts, true}},
{25, {add_not_null_constraint_to_metadata, true}}}}; {25, {add_not_null_constraint_to_metadata, true}},
{26, {add_avatar_column_to_threads_table, true}}}};
enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED }; enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED };
MigrationResult applyMigrationWithTransaction( MigrationResult applyMigrationWithTransaction(
sqlite3 *db, sqlite3 *db,
const MigrateFunction &migrate, const MigrateFunction &migrate,
int index) { int index) {
sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr); sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr);
▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Lines static auto storage = make_storage(
make_column("creation_time", &Thread::creation_time), make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id), make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id), make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community), make_column("community", &Thread::community),
make_column("members", &Thread::members), make_column("members", &Thread::members),
make_column("roles", &Thread::roles), make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user), make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id), make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)), make_column("replies_count", &Thread::replies_count),
make_column("avatar", &Thread::avatar)),
make_table( make_table(
"metadata", "metadata",
make_column("name", &Metadata::name, unique(), primary_key()), make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data))); make_column("data", &Metadata::data)));
storage.on_open = on_database_open; storage.on_open = on_database_open;
return storage; return storage;
} }
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines
View Options

lib/utils/member-info-utils.test.js

Show First 20 Lines • Show All 298 Lines • ▼ Show 20 Linesbool add_not_null_constraint_to_metadata(sqlite3 *db) {
stringStream << "Error adding NOT NULL constraint to metadata table: " stringStream << "Error adding NOT NULL constraint to metadata table: "
<< error; << error;
Logger::log(stringStream.str()); Logger::log(stringStream.str());
sqlite3_free(error); sqlite3_free(error);
return false; return false;
} }
bool add_avatar_column_to_threads_table(sqlite3 *db) {
char *error;
sqlite3_exec(
db,
"ALTER TABLE threads ADD COLUMN avatar TEXT;",
nullptr,
nullptr,
&error);
if (!error) {
return true;
}
std::ostringstream stringStream;
stringStream << "Error adding avatar column to threads table: " << error;
Logger::log(stringStream.str());
sqlite3_free(error);
return false;
}
bool create_schema(sqlite3 *db) { bool create_schema(sqlite3 *db) {
char *error; char *error;
sqlite3_exec( sqlite3_exec(
db, db,
"CREATE TABLE IF NOT EXISTS drafts (" "CREATE TABLE IF NOT EXISTS drafts ("
" key TEXT UNIQUE PRIMARY KEY NOT NULL," " key TEXT UNIQUE PRIMARY KEY NOT NULL,"
" text TEXT NOT NULL" " text TEXT NOT NULL"
");" ");"
Show All 37 Lines sqlite3_exec(
" creation_time BIGINT NOT NULL," " creation_time BIGINT NOT NULL,"
" parent_thread_id TEXT," " parent_thread_id TEXT,"
" containing_thread_id TEXT," " containing_thread_id TEXT,"
" community TEXT," " community TEXT,"
" members TEXT NOT NULL," " members TEXT NOT NULL,"
" roles TEXT NOT NULL," " roles TEXT NOT NULL,"
" current_user TEXT NOT NULL," " current_user TEXT NOT NULL,"
" source_message_id TEXT," " source_message_id TEXT,"
" replies_count INTEGER NOT NULL" " replies_count INTEGER NOT NULL,"
" avatar TEXT"
");" ");"
"CREATE TABLE IF NOT EXISTS metadata (" "CREATE TABLE IF NOT EXISTS metadata ("
" name TEXT UNIQUE PRIMARY KEY NOT NULL," " name TEXT UNIQUE PRIMARY KEY NOT NULL,"
" data TEXT NOT NULL" " data TEXT NOT NULL"
");" ");"
"CREATE INDEX IF NOT EXISTS media_idx_container" "CREATE INDEX IF NOT EXISTS media_idx_container"
▲ Show 20 Lines • Show All 225 Lines • ▼ Show 20 Linesstd::vector<std::pair<uint, SQLiteMigration>> migrations{
{17, {recreate_messages_table, true}}, {17, {recreate_messages_table, true}},
{18, {create_messages_idx_thread_time, true}}, {18, {create_messages_idx_thread_time, true}},
{19, {create_media_idx_container, true}}, {19, {create_media_idx_container, true}},
{20, {create_threads_table, true}}, {20, {create_threads_table, true}},
{21, {update_threadID_for_pending_threads_in_drafts, true}}, {21, {update_threadID_for_pending_threads_in_drafts, true}},
{22, {enable_write_ahead_logging_mode, false}}, {22, {enable_write_ahead_logging_mode, false}},
{23, {create_metadata_table, true}}, {23, {create_metadata_table, true}},
{24, {add_not_null_constraint_to_drafts, true}}, {24, {add_not_null_constraint_to_drafts, true}},
{25, {add_not_null_constraint_to_metadata, true}}}}; {25, {add_not_null_constraint_to_metadata, true}},
{26, {add_avatar_column_to_threads_table, true}}}};
enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED }; enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED };
MigrationResult applyMigrationWithTransaction( MigrationResult applyMigrationWithTransaction(
sqlite3 *db, sqlite3 *db,
const MigrateFunction &migrate, const MigrateFunction &migrate,
int index) { int index) {
sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr); sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr);
▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Lines static auto storage = make_storage(
make_column("creation_time", &Thread::creation_time), make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id), make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id), make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community), make_column("community", &Thread::community),
make_column("members", &Thread::members), make_column("members", &Thread::members),
make_column("roles", &Thread::roles), make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user), make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id), make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)), make_column("replies_count", &Thread::replies_count),
make_column("avatar", &Thread::avatar)),
make_table( make_table(
"metadata", "metadata",
make_column("name", &Metadata::name, unique(), primary_key()), make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data))); make_column("data", &Metadata::data)));
storage.on_open = on_database_open; storage.on_open = on_database_open;
return storage; return storage;
} }
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines