Merge pull request #340 from Seluj78/feature/randomonlineusers

Author: Seluj78

backend/PyMatcha/__init__.py

@@ -195,15 +195,17 @@ def expired_token_callback(expired_token):
 @jwt.user_loader_callback_loader
 def jwt_user_callback(identity):
     try:
-        u = get_user(identity["id"])
+        user = get_user(identity["id"])
     except NotFoundError:
         # The user who the server issues the token for was deleted in the db.
         return None
 
     with configure_scope() as scope:
-        scope.user = {"email": u.email, "id": u.id, "username": u.username}
-    redis.set("online_user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
-    return u
+        scope.user = {"email": user.email, "id": user.id, "username": user.username}
+    user.is_online = True
+    user.date_lastseen = datetime.datetime.utcnow()
+    user.save()
+    return user
 
 
 @jwt.token_in_blacklist_loader

backend/PyMatcha/models/user.py

@@ -39,6 +39,7 @@
 from PyMatcha.utils.errors import NotFoundError
 from PyMatcha.utils.orm import Field
 from PyMatcha.utils.orm import Model
+from timeago import format as timeago_format
 
 
 class User(Model):
@@ -194,6 +195,7 @@ def to_dict(self) -> Dict:
         returned_dict["likes"] = {"sent": [], "received": []}
         returned_dict["likes"]["sent"] = [like.to_dict() for like in self.get_likes_sent()]
         returned_dict["likes"]["received"] = [like.to_dict() for like in self.get_likes_received()]
+        returned_dict["last_seen"] = timeago_format(self.date_lastseen, datetime.datetime.utcnow())
         returned_dict.pop("password")
         returned_dict.pop("previous_reset_token")
 

backend/PyMatcha/routes/api/auth/login.py

@@ -72,7 +72,9 @@ def auth_login():
     redis.set("is_revoked_jti:" + refresh_jti, "false", REFRESH_TOKEN_EXPIRES * 1.2)
 
     current_app.logger.debug("/auth/login -> Returning access token for user {}".format(username))
-    redis.set("online_user:" + str(u.id), datetime.datetime.utcnow().timestamp())
+    u.is_online = True
+    u.date_lastseen = datetime.datetime.utcnow()
+    u.save()
     ret = {"access_token": access_token, "refresh_token": refresh_token, "is_profile_completed": u.is_profile_completed}
     return SuccessOutput("return", ret)
 

backend/PyMatcha/routes/api/user.py

@@ -20,7 +20,6 @@
 from flask import current_app
 from flask import jsonify
 from flask_jwt_extended import jwt_required
-from PyMatcha import redis
 from PyMatcha.models.user import get_user
 from PyMatcha.models.user import User
 from PyMatcha.utils.errors import NotFoundError
@@ -56,11 +55,7 @@ def get_one_user(uid):
 @user_bp.route("/users/online", methods=["GET"])
 @jwt_required
 def get_all_online_users():
-    user_id = None  # noqa
-    date_lastseen = None  # noqa
     online_user_list = []
-    for key in redis.scan_iter("online_user:*"):
-        user_id = str(key).split(":")[1]
-        date_lastseen = float(redis.get(key))
-        online_user_list.append({"id": user_id, "date_lastseen": date_lastseen})
+    for user in User.get_multis(is_online=True):
+        online_user_list.append(user.to_dict())
     return jsonify(online_user_list)

backend/PyMatcha/utils/orm/_model.py

@@ -372,6 +372,25 @@ def select_all(cls):
         for item in data:
             yield cls(item)
 
+    @classmethod
+    def select_random(cls, count):
+        logging.debug(f"Getting {count} random entries from {cls.table_name}")
+        temp = cls()
+        with temp.db.cursor() as c:
+            c.execute(
+                """
+                SELECT * FROM {}
+                ORDER BY RAND()
+                LIMIT {}
+                """.format(
+                    temp.table_name, count
+                )
+            )
+            data = c.fetchall()
+            c.close()
+        for item in data:
+            yield cls(item)
+
     @classmethod
     def drop_table(cls):
         logging.warning("Dropping table {}".format(cls.table_name))

backend/PyMatcha/utils/tasks.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-import logging
 from math import ceil
 
 from PyMatcha import celery
@@ -20,9 +19,10 @@
 
 @celery.on_after_configure.connect
 def setup_periodic_tasks(sender, **kwargs):
-    sender.add_periodic_task(60, update_offline_users.s(), name="Update online users every minute")
+    sender.add_periodic_task(60, take_users_offline.s(), name="Update online users every minute")
     sender.add_periodic_task(3600, update_heat_scores.s(), name="Update heat scores every hour")
     sender.add_periodic_task(60, update_user_recommendations.s(), name="Update user recommendations every minute")
+    sender.add_periodic_task(30, take_random_users_online.s(), name="Set 100 random users online every 30 seconds")
     sender.add_periodic_task(
         600, calc_search_min_max.s(), name="Update Minimum and Maximum scores and ages for search every 10 minutes"
     )
@@ -60,47 +60,19 @@ def update_heat_scores():
 
 
 @celery.task
-def update_offline_users():
-    logging.debug("Updating offline users")
-    # Get the last login deadline
-    login_deadline_timestamp = float(datetime.datetime.utcnow().timestamp()) - 120
-    count = 0
-    online_count = 0
-    offline_count = 0
-    # For all user keys
-    for key in redis.scan_iter("online_user:*"):
-        # Get the user id
-        user_id = str(key).split(":")[1]
-        date_lastseen = float(redis.get(key))
-        # If the user has passed the deadline
-        if date_lastseen < login_deadline_timestamp:
-            u = User.get(id=user_id)
-            if u:
-                u.date_lastseen = datetime.datetime.fromtimestamp(date_lastseen)
-                u.is_online = False
-                u.save()
-                offline_count += 1
-            # delete the key in redis, setting the user as offline in redis
-            redis.delete(key)
-            count += 1
+def take_users_offline():
+    went_offline_count = 0
+    stayed_online_count = 0
+    for user in User.get_multis(is_online=True):
+        if user.date_lastseen + datetime.timedelta(minutes=2) < datetime.datetime.utcnow():
+            user.is_online = False
+            user.save()
+            went_offline_count += 1
         else:
-            u = User.get(id=user_id)
-            if not u:
-                # Edge case where the user has been deleted from DB while he was still online
-                redis.delete(key)
-            else:
-                u.date_lastseen = datetime.datetime.fromtimestamp(date_lastseen)
-                u.is_online = True
-                u.save()
-                online_count += 1
-            count += 1
-    logging.debug(
-        "Updated online status for {} users. {} passed offline and {} passed or stayed online.".format(
-            count, offline_count, online_count
-        )
-    )
-    return "Updated online status for {} users. {} passed offline and {} passed or stayed online.".format(
-        count, offline_count, online_count
+            stayed_online_count += 1
+    return (
+        f"{stayed_online_count} stayed online and "
+        f"{went_offline_count} went offline for {went_offline_count + stayed_online_count} users"
     )
 
 
@@ -143,3 +115,15 @@ def calc_search_min_max():
     minmax = {"min_score": min_score, "max_score": max_score, "min_age": min_age, "max_age": max_age}
     redis.set("search_minmax", json.dumps(minmax))
     return "Successfully updated min and max ages and scores"
+
+
+@celery.task
+def take_random_users_online():
+    for user in User.select_random(100):
+        if not user.skip_recommendations:
+            # User isn't a bot, so skip him
+            continue
+        user.is_online = True
+        user.date_lastseen = datetime.datetime.utcnow()
+        user.save()
+    return "Successfully set 100 users online"

backend/requirements.txt

@@ -37,4 +37,6 @@ sentry-sdk==0.18.0
 
 randomuser==1.6
 pyimgur==0.6.0
-Pillow==7.2.0
+Pillow==7.2.0
+
+timeago==1.0.14