Merge pull request #346 from Seluj78/rework/superlikes

Reworked superlikes

Author: Seluj78

backend/PyMatcha/models/user.py

@@ -65,6 +65,8 @@ class User(Model):
     confirmed_on = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
     previous_reset_token = Field(str)
     skip_recommendations = Field(bool)
+    superlikes_counter = Field(int)
+    superlikes_reset_dt = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
 
     @staticmethod
     def create(
@@ -86,6 +88,8 @@ def create(
         is_confirmed: bool = False,
         confirmed_on: datetime.datetime = None,
         skip_recommendations: bool = False,
+        superlikes_counter: int = 5,
+        superlikes_reset_dt: Optional[datetime.datetime] = None,
     ) -> User:
         # Check email availability
         if User.get(email=email):
@@ -140,6 +144,8 @@ def create(
             confirmed_on=confirmed_on,
             previous_reset_token=None,
             skip_recommendations=skip_recommendations,
+            superlikes_counter=superlikes_counter,
+            superlikes_reset_dt=superlikes_reset_dt,
         )
         new_user.save()
         logging.debug("New user {} created".format(new_user.email))
@@ -180,6 +186,8 @@ def register(email: str, username: str, password: str, first_name: str, last_nam
             confirmed_on=None,
             previous_reset_token=None,
             skip_recommendations=False,
+            superlikes_counter=5,
+            superlikes_reset_dt=None,
         )
         new_user.save()
         logging.debug("New user {} created".format(new_user.email))

backend/PyMatcha/routes/api/like.py

@@ -1,8 +1,10 @@
+from datetime import datetime
+from datetime import timedelta
+
 from flask import Blueprint
 from flask import request
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
-from PyMatcha import redis
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
 from PyMatcha.models.user import get_user
@@ -11,7 +13,6 @@
 from PyMatcha.utils.errors import NotFoundError
 from PyMatcha.utils.success import Success
 from PyMatcha.utils.success import SuccessOutput
-from PyMatcha.utils.tasks import set_user_superlikes
 
 like_bp = Blueprint("like", __name__)
 
@@ -33,12 +34,21 @@ def like_profile(uid):
         raise BadRequestError("You already liked this person.")
 
     if is_superlike:
-        superlike_counter = int(redis.get(f"superlikes:{current_user.id}"))
-        if superlike_counter <= 0:
-            set_user_superlikes.apply_async(current_user.id, amount=5, eta=86400)
-            raise BadRequestError("No more superlikes today !", "Try later")
+        if current_user.superlikes_counter <= 0:
+            if current_user.superlikes_reset_dt < datetime.utcnow():
+                raise BadRequestError("Your superlikes are being restored, try again in a second")
+            else:
+                next_reset_delta = current_user.superlikes_reset_dt - datetime.utcnow()
+                seconds = next_reset_delta.total_seconds()
+                hours = int(seconds // 3600)
+                minutes = int((seconds % 3600) // 60)
+                seconds = int(seconds % 60)
+                raise BadRequestError(f"No more superlikes today, come back in {hours}h:{minutes}m:{seconds}s")
         else:
-            redis.decr(f"superlikes:{current_user.id}")
+            current_user.superlikes_counter -= 1
+            if current_user.superlikes_counter <= 0:
+                current_user.superlikes_reset_dt = datetime.utcnow() + timedelta(hours=12)
+            current_user.save()
 
     Like.create(liker_id=current_user.id, liked_id=u.id, is_superlike=is_superlike)
 

backend/PyMatcha/utils/tables.py

@@ -49,7 +49,9 @@ def _create_user_table(db):
         is_profile_completed BOOLEAN DEFAULT (FALSE),
         is_confirmed         BOOLEAN DEFAULT (FALSE),
         confirmed_on         DATETIME DEFAULT NULL,
-        skip_recommendations BOOLEAN DEFAULT (FALSE)
+        skip_recommendations BOOLEAN DEFAULT (FALSE),
+        superlikes_counter   INT DEFAULT 5,
+        superlikes_reset_dt  DATETIME DEFAULT NULL
         ) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci ;
         """
         )

backend/PyMatcha/utils/tasks.py

@@ -22,6 +22,7 @@ def setup_periodic_tasks(sender, **kwargs):
     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(60, reset_superlikes.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"
@@ -86,8 +87,15 @@ def update_user_recommendations():
 
 
 @celery.task
-def set_user_superlikes(user_id, amount=5):
-    redis.set(f"superlikes:{user_id}", amount)
+def reset_superlikes():
+    count = 0
+    for user in User.select_all():
+        if user.superlikes_counter <= 0 and user.superlikes_reset_dt <= datetime.datetime.utcnow():
+            user.superlikes_counter = 5
+            user.superlikes_reset_dt = None
+            user.save()
+            count += 1
+    return f"Reset superlikes for {count} users"
 
 
 @celery.task