Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
c22af013fd | |||
a6b11a8096 | |||
16949c83d7 | |||
5b347a020a | |||
e5128a9182 | |||
579ac3d303 | |||
ce24b50b8b | |||
587763d808 | |||
531656c169 | |||
7096c1d507 | |||
1ea5948ed0 | |||
216b4bb3f2 | |||
7a502d2bf9 | |||
c3fe5dad79 |
@@ -11,7 +11,7 @@ class User(BaseModel):
|
|||||||
roles: str = "User"
|
roles: str = "User"
|
||||||
status: int = 0
|
status: int = 0
|
||||||
email: EmailStr
|
email: EmailStr
|
||||||
birth: str | None = None
|
birth: datetime | None = None
|
||||||
created_at: datetime = datetime.today()
|
created_at: datetime = datetime.today()
|
||||||
connected_at: datetime | None = None
|
connected_at: datetime | None = None
|
||||||
updated_at: datetime | None = None
|
updated_at: datetime | None = None
|
||||||
|
@@ -351,10 +351,10 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
|
|||||||
event.longitude = eventSingle.longitude
|
event.longitude = eventSingle.longitude
|
||||||
event.imgUrl = eventSingle.imgUrl
|
event.imgUrl = eventSingle.imgUrl
|
||||||
event.tags = eventSingle.tags
|
event.tags = eventSingle.tags
|
||||||
for tag_name in eventSingle:
|
for tag_name in eventSingle.tags:
|
||||||
tag = tags_repository.find_one_by({"name": {'$eq': tag_name}})
|
tag = tags_repository.find_one_by({"name": {'$eq': tag_name}})
|
||||||
if tag is None:
|
if tag is None:
|
||||||
tag = Tags(name=tag_name)
|
tag = tags.Tags(name=tag_name)
|
||||||
tags_repository.save(tag)
|
tags_repository.save(tag)
|
||||||
event.status = 1
|
event.status = 1
|
||||||
event.created_at = datetime.today()
|
event.created_at = datetime.today()
|
||||||
|
@@ -31,7 +31,7 @@ async def read_tags(
|
|||||||
|
|
||||||
|
|
||||||
if name:
|
if name:
|
||||||
filters.append({"name": {"$eq": name, "$options": "i"}})
|
filters.append({"name": {"$regex": name, "$options": "i"}})
|
||||||
|
|
||||||
# Add ID filter
|
# Add ID filter
|
||||||
if id_tags:
|
if id_tags:
|
||||||
@@ -52,7 +52,7 @@ async def read_tags(
|
|||||||
id=tag_index.id,
|
id=tag_index.id,
|
||||||
name=tag_index.name
|
name=tag_index.name
|
||||||
)
|
)
|
||||||
list_tags.append(event)
|
list_tags.append(tag)
|
||||||
|
|
||||||
return list_tags
|
return list_tags
|
||||||
|
|
||||||
|
@@ -143,9 +143,12 @@ async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(perm
|
|||||||
async def update_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
|
async def update_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
|
||||||
user_repository = users.UserRepository(database=database.database)
|
user_repository = users.UserRepository(database=database.database)
|
||||||
current_user.username = userSingle.username
|
current_user.username = userSingle.username
|
||||||
|
if len(userSingle.password) > 0:
|
||||||
current_user.password = user_token.get_password_hash(userSingle.password)
|
current_user.password = user_token.get_password_hash(userSingle.password)
|
||||||
current_user.roles = userSingle.roles
|
|
||||||
current_user.email = userSingle.email
|
current_user.email = userSingle.email
|
||||||
|
current_user.name = userSingle.name
|
||||||
|
current_user.firstName = userSingle.firstName
|
||||||
|
current_user.birth = userSingle.birth
|
||||||
user_repository.save(current_user)
|
user_repository.save(current_user)
|
||||||
content = {"message": "user is updated"}
|
content = {"message": "user is updated"}
|
||||||
response = JSONResponse(content=content)
|
response = JSONResponse(content=content)
|
||||||
@@ -202,6 +205,7 @@ async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permi
|
|||||||
)
|
)
|
||||||
|
|
||||||
user.username = userSingle.username
|
user.username = userSingle.username
|
||||||
|
if len(userSingle.password) > 0:
|
||||||
user.password = users_token.get_password_hash(userSingle.password)
|
user.password = users_token.get_password_hash(userSingle.password)
|
||||||
user.roles = userSingle.roles
|
user.roles = userSingle.roles
|
||||||
user.email = userSingle.email
|
user.email = userSingle.email
|
||||||
|
Reference in New Issue
Block a user