Skip to content

Commit e30bfeb

Browse files
committed
Optimize the code.
1 parent d10f362 commit e30bfeb

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

web/setup.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@ class ManageUsers:
166166
@app.command()
167167
@update_sqlite_path
168168
def load_users(input_file: str,
169-
sqlite_path: Optional[str] = None,
170-
json: Optional[bool] = False):
169+
sqlite_path: Optional[str] = None):
171170
"""Load users from a JSON file.
172171
173172
Expected JSON format:
@@ -202,7 +201,6 @@ def load_users(input_file: str,
202201
try:
203202
file_path = unquote(input_file)
204203
except Exception as e:
205-
print(str(e))
206204
return _handle_error(str(e), True)
207205

208206
# Read and parse JSON file
@@ -267,17 +265,21 @@ def load_users(input_file: str,
267265
user_data['confirmPassword'] = user_entry['password']
268266

269267
# Check if user already exists
270-
uid = ManageUsers.get_user(
271-
username=user_data['username'],
272-
auth_source=auth_source)
268+
usr = User.query.filter_by(username=user_data['username'],
269+
auth_source=auth_source).first()
270+
271+
uid = usr.id if usr else None
272+
273273
if uid:
274274
print(f"Skipping user '{user_data['username']}': "
275275
f"already exists")
276276
skipped_count += 1
277277
continue
278278

279279
# Get role ID
280-
rid = ManageRoles.get_role(user_data['role'])
280+
role = Role.query.filter_by(name=user_data['role']).first()
281+
rid = role.id if role else None
282+
281283
if rid is None:
282284
print(f"Skipping user '{user_data['username']}': "
283285
f"role '{user_data['role']}' does not exist")

0 commit comments

Comments
 (0)