ShoutViewStorage refactor

orm/__init__.py

@@ -17,4 +17,4 @@ Resource.init_table()
 
 with local_session() as session:
 	rating_storage = ShoutRatingStorage(session)
-	view_storage = ShoutViewStorage(session)
+	ShoutViewStorage.init(session)

orm/shout.py

@@ -1,14 +1,16 @@
 from typing import List
-from datetime import datetime
+from datetime import datetime, timedelta
 from sqlalchemy import Table, Column, Integer, String, ForeignKey, DateTime, Boolean
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm.attributes import flag_modified
 from orm import Permission, User, Topic
 from orm.comment import Comment
-from orm.base import Base
+from orm.base import Base, local_session
 
 from functools import reduce
 
+import asyncio
+
 class ShoutAuthor(Base):
 	__tablename__ = "shout_author"
 	
@@ -68,9 +70,17 @@ class ShoutViewByDay(Base):
 
 class ShoutViewStorage:
 
-	def __init__(self, session):
+	views = []
+	this_day_views = {}
+
+	period = 30*60 #sec
+
+	lock = asyncio.Lock()
+
+	@staticmethod
+	def init(session):
+		self = ShoutViewStorage
 		self.views = session.query(ShoutViewByDay).all()
-		self.this_day_views = {}
 		for view in self.views:
 			shout_id = view.shout_id
 			if not shout_id in self.this_day_views:
@@ -79,28 +89,48 @@ class ShoutViewStorage:
 			if this_day_view.day < view.day:
 				self.this_day_views[shout_id] = view
 
-	def get_view(self, shout_id):
-		shout_views = list(filter(lambda x: x.shout_id == shout_id, self.views))
+	@staticmethod
+	async def get_view(shout_id):
+		async with ShoutViewStorage.lock:
+			shout_views = list(filter(lambda x: x.shout_id == shout_id, ShoutViewStorage.views))
 		return reduce((lambda x, y: x + y.value), shout_views, 0)
 
-	def inc_view(self, shout_id):
-		this_day_view = self.this_day_views.get(shout_id)
-		if not this_day_view:
-			this_day_view = ShoutViewByDay.create(shout_id = shout_id, value = 1)
-			self.this_day_views[shout_id] = this_day_view
-			self.views.append(this_day_view)
-		else:
-			this_day_view.value = this_day_view.value + 1
-			this_day_view.modified = True
+	@staticmethod
+	async def inc_view(shout_id):
+		self = ShoutViewStorage
+		async with ShoutViewStorage.lock:
+			this_day_view = self.this_day_views.get(shout_id)
+			day_start = datetime.now().replace(hour = 0, minute = 0, second = 0)
+			if not this_day_view or this_day_view.day < day_start:
+				this_day_view = ShoutViewByDay.create(shout_id = shout_id, value = 1)
+				self.this_day_views[shout_id] = this_day_view
+				self.views.append(this_day_view)
+			else:
+				this_day_view.value = this_day_view.value + 1
+				this_day_view.modified = True
 
-	def flush_changes(self, session):
-		for view in self.this_day_views.values():
-			if getattr(view, "modified", False):
-				session.add(view)
-				flag_modified(view, "value")
-				view.modified = False
+	@staticmethod
+	async def flush_changes(session):
+		async with ShoutViewStorage.lock:
+			for view in ShoutViewStorage.this_day_views.values():
+				if getattr(view, "modified", False):
+					session.add(view)
+					flag_modified(view, "value")
+					view.modified = False
 		session.commit()
 
+	@staticmethod
+	async def worker():
+		print("ShoutViewStorage worker start")
+		while True:
+			try:
+				print("ShoutViewStorage worker: flush changes")
+				with local_session() as session:
+					await ShoutViewStorage.flush_changes(session)
+			except Exception as err:
+				print("ShoutViewStorage worker: error = %s" % (err))
+			await asyncio.sleep(ShoutViewStorage.period)
+
 
 class Shout(Base):
 	__tablename__ = 'shout'