tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimization: avoid updating whole org when only need to set one field (#1288)

Browse Source 
- add update_users and update_slug_and_name
- rename update to update_full
This commit is contained in:
Ilya Kreymer 2023-10-16 10:54:04 -07:00 committed by GitHub
parent dc8d510b11
commit 1bc4697995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend/btrixcloud/orgs.py
View File

@ -166,7 +166,7 @@ class OrgOps:
else: else:
default_org.name = DEFAULT_ORG default_org.name = DEFAULT_ORG
default_org.slug = slug_from_name(DEFAULT_ORG) default_org.slug = slug_from_name(DEFAULT_ORG)
await self.update(default_org) await self.update_full(default_org)
print(f'Default organization renamed to "{DEFAULT_ORG}"', flush=True) print(f'Default organization renamed to "{DEFAULT_ORG}"', flush=True)
return return
@ -187,12 +187,24 @@ class OrgOps:
) )
await self.add_org(org) await self.add_org(org)
async def update(self, org: Organization): async def update_full(self, org: Organization):
"""Update existing org""" """Update existing org"""
return await self.orgs.find_one_and_update( await self.orgs.find_one_and_update(
{"_id": org.id}, {"$set": org.to_dict()}, upsert=True {"_id": org.id}, {"$set": org.to_dict()}, upsert=True
) )
async def update_users(self, org: Organization):
"""Update org users"""
return await self.orgs.find_one_and_update(
{"_id": org.id}, {"$set": org.dict(include={"users"})}
)
async def update_slug_and_name(self, org: Organization):
"""Update org slug"""
return await self.orgs.find_one_and_update(
{"_id": org.id}, {"$set": {"slug": org.slug, "name": org.name}}
)
async def update_storage( async def update_storage(
self, org: Organization, storage: Union[S3Storage, DefaultStorage] self, org: Organization, storage: Union[S3Storage, DefaultStorage]
): ):
@ -251,7 +263,7 @@ class OrgOps:
): ):
"""Add user to organization with specified role""" """Add user to organization with specified role"""
org.users[str(userid)] = role or UserRole.OWNER org.users[str(userid)] = role or UserRole.OWNER
await self.update(org) await self.update_users(org)
async def get_org_owners(self, org: Organization): async def get_org_owners(self, org: Organization):
"""Return list of org's Owner users.""" """Return list of org's Owner users."""
@ -531,7 +543,7 @@ def init_orgs_api(app, mdb, user_manager, invites, user_dep):
org.slug = slug_from_name(rename.name) org.slug = slug_from_name(rename.name)
try: try:
await ops.update(org) await ops.update_slug_and_name(org)
except DuplicateKeyError: except DuplicateKeyError:
# pylint: disable=raise-missing-from # pylint: disable=raise-missing-from
raise HTTPException(status_code=400, detail="duplicate_org_name") raise HTTPException(status_code=400, detail="duplicate_org_name")
@ -654,7 +666,7 @@ def init_orgs_api(app, mdb, user_manager, invites, user_dep):
# pylint: disable=raise-missing-from # pylint: disable=raise-missing-from
raise HTTPException(status_code=404, detail="no_such_org_user") raise HTTPException(status_code=404, detail="no_such_org_user")
await ops.update(org) await ops.update_users(org)
return {"removed": True} return {"removed": True}
@router.post("/add-user", tags=["invites"]) @router.post("/add-user", tags=["invites"])