fix: make on_hold fields None when user is activate (#1444)

app/db/crud.py

@@ -814,9 +814,6 @@ def update_user_status(db: Session, dbuser: User, status: UserStatus) -> User:
     Returns:
         User: The updated user object.
     """
-    if dbuser.status == UserStatus.on_hold and status == UserStatus.active:
-        dbuser.on_hold_expire_duration = None
-        dbuser.on_hold_timeout = None
     dbuser.status = status
     dbuser.last_status_change = datetime.utcnow()
     db.commit()
@@ -855,6 +852,8 @@ def start_user_expire(db: Session, dbuser: User) -> User:
     """
     expire = int(datetime.utcnow().timestamp()) + dbuser.on_hold_expire_duration
     dbuser.expire = expire
+    dbuser.on_hold_expire_duration = None
+    dbuser.on_hold_timeout = None
     db.commit()
     db.refresh(dbuser)
     return dbuser