Merged in feature/training-content (pull request #29)

And this is why llm code shouldn't be copy pasted blindly

Approved-by: Tiago Ribeiro
This commit is contained in:
carlos.mesquita
2024-09-08 08:46:06 +00:00
committed by Tiago Ribeiro

View File

@@ -44,7 +44,7 @@ class BatchUsers:
result = self._upload_users('./tmp', file_name) result = self._upload_users('./tmp', file_name)
if result.returncode != 0: if result.returncode != 0:
error_msg = f"Couldn't upload users. Failed to run command firebase auth import -> ```cmd {result.stderr}```" error_msg = f"Couldn't upload users. Failed to run command firebase auth import -> ```cmd {result.stdout}```"
self._logger.error(error_msg) self._logger.error(error_msg)
return error_msg return error_msg
@@ -209,14 +209,14 @@ class BatchUsers:
if corporate_user: if corporate_user:
self._db.codes.update_one( self._db.codes.update_one(
{"id": code}, {"id": code},
{"$set": {"creator": corporate_user.id}}, {"$set": {"creator": corporate_user["id"]}},
upsert=True upsert=True
) )
group_type = "Students" if user.type == "student" else "Teachers" group_type = "Students" if user.type == "student" else "Teachers"
group = self._db.groups.find_one( group = self._db.groups.find_one(
{ {
"admin": corporate_user.id, "admin": corporate_user["id"],
"name": group_type "name": group_type
} }
) )
@@ -226,13 +226,13 @@ class BatchUsers:
if user_id not in participants: if user_id not in participants:
participants.append(user_id) participants.append(user_id)
self._db.groups.update_one( self._db.groups.update_one(
{"id": group.id}, {"id": group["id"]},
{"$set": {"participants": participants}} {"$set": {"participants": participants}}
) )
else: else:
group = { group = {
'admin': corporate_user.id, 'admin': corporate_user["id"],
'id': str(uuid.uuid4()), 'id': str(uuid.uuid4()),
'name': group_type, 'name': group_type,
'participants': [user_id], 'participants': [user_id],
@@ -244,14 +244,14 @@ class BatchUsers:
def _assign_user_to_group_by_name(self, user: UserDTO, maker_id: str): def _assign_user_to_group_by_name(self, user: UserDTO, maker_id: str):
user_id = str(user.id) user_id = str(user.id)
group = self._db.groups.find_one( groups = list(self._db.groups.find(
{ {
"admin": maker_id, "admin": maker_id,
"name": user.group_name.strip() "name": user.groupName.strip()
} }
) ))
if group: if len(groups) == 0:
new_group = { new_group = {
'id': str(uuid.uuid4()), 'id': str(uuid.uuid4()),
'admin': maker_id, 'admin': maker_id,
@@ -261,10 +261,11 @@ class BatchUsers:
} }
self._db.groups.insert_one(new_group) self._db.groups.insert_one(new_group)
else: else:
participants = group.participants group = groups[0]
participants = group["participants"]
if user_id not in participants: if user_id not in participants:
participants.append(user_id) participants.append(user_id)
self._db.groups.update_one( self._db.groups.update_one(
{"id": group.id}, {"id": group["id"]},
{"$set": {"participants": participants}} {"$set": {"participants": participants}}
) )