Merge pull request 'add status changing' (#45) from feature/create-user-post into master

Reviewed-on: #45

app/models/users.py

@@ -11,7 +11,7 @@ class User(BaseModel):
     roles: str = "User"
     status: int = 0
     email: EmailStr
-    birth: str | None = None
+    birth: datetime | None = None
     created_at: datetime = datetime.today()
     connected_at: datetime | None = None
     updated_at: datetime | None = None

app/routers/events.py

@@ -351,10 +351,10 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
     event.longitude = eventSingle.longitude
     event.imgUrl = eventSingle.imgUrl
     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}})
         if tag is None:
-            tag = Tags(name=tag_name)
+            tag = tags.Tags(name=tag_name)
             tags_repository.save(tag)
     event.status = 1
     event.created_at = datetime.today()

app/routers/mail.py

@@ -19,7 +19,7 @@ async def create_user(userSingle: users.UserCreate | None = None):
     if user is not None:
          raise HTTPException(
             status_code=status.HTTP_204_NO_CONTENT,
-            detail="User is already exist"
+            detail="User already exist"
         )
 
     fm = FastMail(mail.conf)
@@ -36,6 +36,7 @@ async def create_user(userSingle: users.UserCreate | None = None):
     
     await fm.send_message(message, template_name="mailer.html") 
     current_user = users.User(username=userSingle.username, password=users_token.get_password_hash(userSingle.password), email=userSingle.email)
+    current_user.status = 0
     user_repository.save(current_user)
     database.connect_redis.set(userSingle.username, key_hashed)
     return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "email has been sent"})
@@ -55,6 +56,6 @@ async def confirm_user(key: str | None = None, username: str | None = None):
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="Key is invalid"
         )
-    user.confirmed = True
+    user.status = 1
     user_repository.save(user)
     return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "user account confirmed"})

app/routers/tags.py

@@ -31,7 +31,7 @@ async def read_tags(
 
 
     if name:
-        filters.append({"name": {"$eq": name, "$options": "i"}})
+        filters.append({"name": {"$regex": name, "$options": "i"}})
 
     # Add ID filter
     if id_tags:
@@ -52,7 +52,7 @@ async def read_tags(
             id=tag_index.id,
             name=tag_index.name
         )
-        list_tags.append(event)
+        list_tags.append(tag)
 
     return list_tags
 

app/routers/users.py

@@ -139,13 +139,17 @@ async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(perm
     response = JSONResponse(content=content)  
     return response
 
+
 @router.put("/users/me",tags=["users"])
 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)
     current_user.username = userSingle.username
-    current_user.password = user_token.get_password_hash(userSingle.password)
-    current_user.roles = userSingle.roles
+    if len(userSingle.password) > 0:
+        current_user.password = user_token.get_password_hash(userSingle.password)
     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)
     content = {"message": "user is updated"}
     response = JSONResponse(content=content)  
@@ -202,7 +206,8 @@ async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permi
         )
         
     user.username = userSingle.username
-    user.password = users_token.get_password_hash(userSingle.password)
+    if len(userSingle.password) > 0:
+        user.password = users_token.get_password_hash(userSingle.password)
     user.roles = userSingle.roles
     user.email = userSingle.email
     user.firstName = userSingle.firstName