updated login/select

ApiLayers/ApiServices/Token/token_handler.py

@@ -265,7 +265,7 @@ class TokenService:
         redis_rows = cls._get_user_tokens(user)
         for redis_row in redis_rows.all:
             if redis_row.row.get("domain") == domain:
-                redis_row.delete()
+                RedisActions.delete([redis_row.key])
 
     @classmethod
     def remove_all_token(cls, user: Users) -> None:
@@ -284,16 +284,11 @@ class TokenService:
         """Set access token to redis and handle user session."""
         cls.remove_token_with_domain(user=user, domain=domain)
         Users.client_arrow = DateTimeLocal(is_client=True, timezone=user.local_timezone)
-        db_session = UsersTokens.new_session()
-        # Handle login based on user type
-        if user.is_occupant:
-            login_dict = cls.do_occupant_login(
-                request=request, user=user, domain=domain
-            )
+        login_dict, db_session = {}, UsersTokens.new_session()
+        if user.is_occupant:    # Handle login based on user type
+            login_dict = cls.do_occupant_login(request=request, user=user, domain=domain)
         elif user.is_employee:
-            login_dict = cls.do_employee_login(
-                request=request, user=user, domain=domain
-            )
+            login_dict = cls.do_employee_login(request=request, user=user, domain=domain)
 
         # Handle remember me functionality
         if remember:
@@ -321,10 +316,7 @@ class TokenService:
                 ).query.delete(synchronize_session=False)
             user.remember_me = False
         user.save(db=db_session)
-        return {
-            **login_dict,
-            "user": user.get_dict(),
-        }
+        return {**login_dict, "user": user.get_dict()}
 
     @classmethod
     def update_token_at_redis(
@@ -424,9 +416,8 @@ class TokenService:
                 sys_msg="Access token token is not found or unable to retrieve",
             )
         if redis_object := redis_response.first:
-            redis_object_dict = redis_object.data
-            access_token_obj.userUUID = redis_object_dict.get("user_uu_id")
-            return cls._process_redis_object(redis_object_dict)
+            access_token_obj.userUUID = redis_object.get("user_uu_id")
+            return cls._process_redis_object(redis_object)
 
     @classmethod
     def get_object_via_user_uu_id(cls, user_id: str) -> T:
@@ -434,7 +425,7 @@ class TokenService:
         access_token = AccessToken(userUUID=user_id)
         redis_response = RedisActions.get_json(list_keys=access_token.to_list())
 
-        if redis_object := redis_response.first.data:
+        if redis_object := redis_response.first.row:
             access_token.userUUID = redis_object.get("user_uu_id")
             return cls._process_redis_object(redis_object)