Skip to content

drop invite indexes if 'invite_expire_seconds' is changed #3334

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

Draft
ikreymer wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

drop invite indexes if 'invite_expire_seconds' is changed #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions backend/btrixcloud/invites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class InviteOps:
def __init__(self, mdb, email: EmailSender):
self.invites = mdb["invites"]
self.orgs = mdb["organizations"]
self.versions = mdb["version"]
self.email = email
self.allow_dupe_invites = is_bool(os.environ.get("ALLOW_DUPE_INVITES", "0"))

Expand All @@ -51,6 +52,22 @@ async def init_index(self) -> None:
expire_after_seconds = int(
os.environ.get("INVITE_EXPIRE_SECONDS", "1209600")
)

res = await self.versions.find_one(
{"curr_invite_expire_seconds": {"$ne": None}}
)
if (
not res
or res.get("curr_invite_expire_seconds") != expire_after_seconds
):
print("Invite Expiration Changed, Dropping Invite Index")
await self.invites.drop_indexes()
await self.versions.find_one_and_update(
{"curr_invite_expire_seconds": {"$ne": None}},
{"$set": {"curr_invite_expire_seconds": expire_after_seconds}},
upsert=True,
)

await self.invites.create_index(
"created", expireAfterSeconds=expire_after_seconds
)
Expand Down
6 changes: 4 additions & 2 deletions backend/btrixcloud/migrations/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async def get_db_version(self):
"""Get current db version from database."""
db_version = None
version_collection = self.mdb["version"]
version_record = await version_collection.find_one()
version_record = await version_collection.find_one({"version": {"$ne": None}})
if not version_record:
return db_version
try:
Expand All @@ -36,7 +36,9 @@ async def set_db_version(self):
"""Set db version to migration_version."""
version_collection = self.mdb["version"]
await version_collection.find_one_and_update(
{}, {"$set": {"version": self.migration_version}}, upsert=True
{"version": {"$ne": None}},
{"$set": {"version": self.migration_version}},
upsert=True,
)

async def migrate_up_needed(self, ignore_rerun=False):
Expand Down
Loading