🏦 Database Change: convert created utc to datetimez for viewers (#697)

* passed the test

* this works better

* Remove commented-out code.

* Remove commented-out code.

---------

Co-authored-by: Ben Rog-Wilhelm <zorba-github@pavlovian.net>

files/classes/views.py

@@ -2,6 +2,7 @@ import time
 
 from sqlalchemy import *
 from sqlalchemy.orm import relationship
+from sqlalchemy.sql.functions import now
 
 from files.classes.base import Base
 from files.helpers.lazy import lazy
@@ -13,17 +14,18 @@ class ViewerRelationship(Base):
 
 	user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
 	viewer_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
-	last_view_utc = Column(Integer, nullable=False)
+	last_view_datetimez = Column(DateTime(timezone=True), nullable=False, server_default=now())
 
 	Index('fki_view_viewer_fkey', viewer_id)
 
 	viewer = relationship("User", primaryjoin="ViewerRelationship.viewer_id == User.id", viewonly=True)
 
-	def __init__(self, **kwargs):
-		if 'last_view_utc' not in kwargs:
-			kwargs['last_view_utc'] = int(time.time())
-
-		super().__init__(**kwargs)
+	@property
+	def last_view_utc(self):
+		"""
+		the last view timestamp in UTC seconds. Milliseconds are truncated/rounded down.
+		"""
+		return int(self.last_view_datetimez.timestamp())
 
 	@property
 	@lazy

files/routes/users.py

@@ -2,6 +2,7 @@ import io
 import math
 import time
 from collections import Counter
+from datetime import datetime
 from urllib.parse import urlparse
 
 import gevent
@@ -633,7 +634,7 @@ def following(v, username):
 @auth_required
 def visitors(v):
 	if v.admin_level < 2 and not v.patron: return render_template("errors/patron.html", v=v)
-	viewers=sorted(v.viewers, key = lambda x: x.last_view_utc, reverse=True)
+	viewers=sorted(v.viewers, key = lambda x: x.last_view_datetimez, reverse=True)
 	return render_template("viewers.html", v=v, viewers=viewers)
 
 
@@ -651,7 +652,7 @@ def u_username(username, v=None):
 	if v and v.id != u.id and (u.patron or u.admin_level > 1):
 		view = g.db.query(ViewerRelationship).filter_by(viewer_id=v.id, user_id=u.id).one_or_none()
 
-		if view: view.last_view_utc = int(time.time())
+		if view: view.last_view_datetimez = datetime.utcnow()
 		else: view = ViewerRelationship(viewer_id=v.id, user_id=u.id)
 
 		g.db.add(view)