Fixed bug where all dates are the same based on when the server loaded the file

Author: Seluj78

backend/PyMatcha/models/block.py

@@ -20,6 +20,7 @@
 
 import datetime
 import logging
+from typing import Optional
 
 from PyMatcha.utils import create_blocks_table
 from PyMatcha.utils.orm import Field
@@ -35,7 +36,9 @@ class Block(Model):
     dt_blocked = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
 
     @staticmethod
-    def create(blocker_id: int, blocked_id: int, dt_blocked: datetime.datetime = datetime.datetime.utcnow()) -> Block:
+    def create(blocker_id: int, blocked_id: int, dt_blocked: Optional[datetime.datetime] = None) -> Block:
+        if not dt_blocked:
+            dt_blocked = datetime.datetime.utcnow()
         new_blocked = Block(blocker_id=blocker_id, blocked_id=blocked_id, dt_blocked=dt_blocked)
         new_blocked.save()
         logging.debug("Creating new block")

backend/PyMatcha/models/image.py

@@ -20,6 +20,7 @@
 
 import logging
 from datetime import datetime
+from typing import Optional
 
 from PyMatcha.utils import create_images_table
 from PyMatcha.utils.orm import Field
@@ -36,7 +37,9 @@ class Image(Model):
     is_primary = Field(bool)
 
     @staticmethod
-    def create(user_id: int, link: str, is_primary: bool = False, timestamp: datetime = datetime.utcnow()) -> Image:
+    def create(user_id: int, link: str, is_primary: bool = False, timestamp: Optional[datetime] = None) -> Image:
+        if not timestamp:
+            timestamp = datetime.utcnow()
         new_image = Image(user_id=user_id, link=link, is_primary=is_primary, timestamp=timestamp)
         new_image.save()
         logging.debug("Creating new image")

backend/PyMatcha/models/like.py

@@ -20,6 +20,7 @@
 
 import datetime
 import logging
+from typing import Optional
 
 from PyMatcha.utils import create_likes_table
 from PyMatcha.utils.orm import Field
@@ -37,11 +38,10 @@ class Like(Model):
 
     @staticmethod
     def create(
-        liker_id: int,
-        liked_id: int,
-        is_superlike: str = False,
-        dt_liked: datetime.datetime = datetime.datetime.utcnow(),
+        liker_id: int, liked_id: int, is_superlike: str = False, dt_liked: Optional[datetime.datetime] = None
     ) -> Like:
+        if not dt_liked:
+            dt_liked = datetime.datetime.utcnow()
         new_like = Like(liker_id=liker_id, liked_id=liked_id, is_superlike=is_superlike, dt_liked=dt_liked)
         new_like.save()
         logging.debug("Creating new like")

backend/PyMatcha/models/match.py

@@ -20,6 +20,7 @@
 
 import datetime
 import logging
+from typing import Optional
 
 from PyMatcha.utils import create_matches_table
 from PyMatcha.utils.orm import Field
@@ -35,7 +36,9 @@ class Match(Model):
     dt_matched = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
 
     @staticmethod
-    def create(user_1: int, user_2: int, dt_matched: datetime.datetime = datetime.datetime.utcnow()) -> Match:
+    def create(user_1: int, user_2: int, dt_matched: Optional[datetime.datetime] = None) -> Match:
+        if not dt_matched:
+            dt_matched = datetime.datetime.utcnow()
         new_match = Match(user_1=user_1, user_2=user_2, dt_matched=dt_matched)
         new_match.save()
         logging.debug("Creating new match")

backend/PyMatcha/models/message.py

@@ -21,6 +21,7 @@
 import logging
 from datetime import datetime
 from typing import Dict
+from typing import Optional
 
 from PyMatcha.utils import create_messages_table
 from PyMatcha.utils.orm import Field
@@ -45,11 +46,13 @@ def create(
         from_id: int,
         to_id: int,
         content: str,
-        timestamp: datetime = datetime.utcnow(),
+        timestamp: Optional[datetime] = None,
         seen_timestamp: datetime = None,
         is_seen: bool = False,
         is_liked: bool = False,
     ) -> Message:
+        if not timestamp:
+            datetime.utcnow()
         new_message = Message(
             from_id=from_id,
             to_id=to_id,

backend/PyMatcha/models/notification.py

@@ -46,7 +46,7 @@ def create(
         type: str,
         link_to: Optional[str],
         is_seen: bool = False,
-        dt_received: datetime = datetime.utcnow(),
+        dt_received: Optional[datetime] = None,
     ) -> Optional[Notification]:
         if type not in ["match", "like", "superlike", "unlike", "view", "message", "message_like"]:
             raise ValueError(
@@ -57,6 +57,8 @@ def create(
         blocked_ids = [block.blocked_id for block in get_user(user_id).get_blocks()]
         if trigger_id in blocked_ids:
             return None
+        if not dt_received:
+            dt_received = datetime.utcnow()
         new_notif = Notification(
             user_id=user_id, content=content, type=type, link_to=link_to, is_seen=is_seen, dt_received=dt_received
         )

backend/PyMatcha/models/report.py

@@ -20,6 +20,7 @@
 
 import datetime
 import logging
+from typing import Optional
 
 from PyMatcha.utils import create_reports_table
 from PyMatcha.utils.orm import Field
@@ -43,8 +44,10 @@ def create(
         reporter_id: int,
         reason: str,
         details: str = None,
-        dt_reported: datetime.datetime = datetime.datetime.utcnow(),
+        dt_reported: Optional[datetime.datetime] = None,
     ) -> Report:
+        if not dt_reported:
+            dt_reported = datetime.datetime.utcnow()
         new_report = Report(
             reported_id=reported_id, reporter_id=reporter_id, reason=reason, details=details, dt_reported=dt_reported
         )

backend/PyMatcha/models/user.py

@@ -84,8 +84,8 @@ def create(
         geohash: str,
         heat_score: int = 0,
         is_online: bool = False,
-        date_joined: datetime.datetime = datetime.datetime.utcnow(),
-        date_lastseen: datetime.datetime = datetime.datetime.utcnow(),
+        date_joined: Optional[datetime.datetime] = None,
+        date_lastseen: Optional[datetime.datetime] = None,
         is_profile_completed: bool = False,
         is_confirmed: bool = False,
         confirmed_on: datetime.datetime = None,
@@ -126,6 +126,12 @@ def create(
         # Encrypt password
         password = hash_password(password)
 
+        if not date_joined:
+            date_joined = datetime.datetime.utcnow()
+
+        if not date_lastseen:
+            date_lastseen = datetime.datetime.utcnow()
+
         new_user = User(
             first_name=first_name,
             last_name=last_name,

backend/PyMatcha/models/view.py

@@ -20,6 +20,7 @@
 
 import datetime
 import logging
+from typing import Optional
 
 from PyMatcha.utils import create_views_table
 from PyMatcha.utils.orm import Field
@@ -35,7 +36,9 @@ class View(Model):
     dt_seen = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
 
     @staticmethod
-    def create(profile_id: int, viewer_id: int, dt_seen: datetime.datetime = datetime.datetime.utcnow()) -> View:
+    def create(profile_id: int, viewer_id: int, dt_seen: Optional[datetime.datetime] = None) -> View:
+        if not dt_seen:
+            dt_seen = datetime.datetime.utcnow()
         new_view = View(profile_id=profile_id, viewer_id=viewer_id, dt_seen=dt_seen)
         new_view.save()
         logging.debug("Creating new view")