Revert "store views on the shouts table, remove the viewed table"

orm/__init__.py

@@ -6,6 +6,7 @@ from orm.reaction import Reaction
 from orm.shout import Shout
 from orm.topic import Topic, TopicFollower
 from orm.user import User, UserRating
+from orm.viewed import ViewedEntry
 
 # NOTE: keep orm module isolated
 
@@ -21,6 +22,7 @@ __all__ = [
     "Notification",
     "Reaction",
     "UserRating",
+    "ViewedEntry"
 ]
 
 
@@ -33,4 +35,5 @@ def init_tables():
     Role.init_table()
     UserRating.init_table()
     Shout.init_table()
+    ViewedEntry.init_table()
     print("[orm] tables initialized")

orm/shout.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
-from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String, JSON
-from sqlalchemy.orm import column_property, relationship
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, String, JSON
+from sqlalchemy.orm import relationship
 
 from base.orm import Base, local_session
 from orm.reaction import Reaction
@@ -61,11 +61,6 @@ class Shout(Base):
     authors = relationship(lambda: User, secondary=ShoutAuthor.__tablename__)
     topics = relationship(lambda: Topic, secondary=ShoutTopic.__tablename__)
 
-    # views from the old Discours website
-    viewsOld = Column(Integer, default=0)
-    # views from Ackee tracker on the new Discours website
-    viewsAckee = Column(Integer, default=0)
-    views = column_property(viewsOld + viewsAckee)
     reactions = relationship(lambda: Reaction)
 
     # TODO: these field should be used or modified

orm/viewed.py

@@ -0,0 +1,24 @@
+from datetime import datetime
+from sqlalchemy import Column, DateTime, ForeignKey, Integer
+from base.orm import Base, local_session
+
+
+class ViewedEntry(Base):
+    __tablename__ = "viewed"
+
+    viewer = Column(ForeignKey("user.id"), index=True, default=1)
+    shout = Column(ForeignKey("shout.id"), index=True, default=1)
+    amount = Column(Integer, default=1)
+    createdAt = Column(
+        DateTime, nullable=False, default=datetime.now, comment="Created at"
+    )
+
+    @staticmethod
+    def init_table():
+        with local_session() as session:
+            entry = {
+                "amount": 0
+            }
+            viewed = ViewedEntry.create(**entry)
+            session.add(viewed)
+            session.commit()