From 3a6531bcaa79a7ffc458f349f5ba64acd151024a Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Sun, 31 Oct 2021 18:09:16 +0300
Subject: [PATCH] minirefactoring

---
 resolvers/__init__.py |  5 ++---
 resolvers/zine.py     | 48 +++++++++++--------------------------------
 schema.graphql        |  3 +--
 3 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/resolvers/__init__.py b/resolvers/__init__.py
index fd42c2f8..cde2841d 100644
--- a/resolvers/__init__.py
+++ b/resolvers/__init__.py
@@ -1,7 +1,7 @@
 from resolvers.auth import login, sign_out, is_email_free, register, confirm
 from resolvers.inbox import create_message, delete_message, update_message, get_messages
 from resolvers.zine import create_shout, get_shout_by_slug, top_month, top_overall, \
-    recent_shouts, top_authors, top_shouts_by_rating, top_shouts_by_view
+    recent_shouts, top_authors, top_viewed
 from resolvers.profile import get_user_by_slug, get_current_user
 from resolvers.topics import topic_subscribe, topic_unsubscribe, topics_by_author, \
     topics_by_community, topics_by_slugs
@@ -24,8 +24,7 @@ __all__ = [
     "recent_shouts",
     "top_month",
     "top_overall",
-    "top_shouts_by_views",
-    "top_shouts_by_rating",
+    "top_viewed",
     "topics_by_slugs",
     "topics_by_community",
     "topics_by_author",
diff --git a/resolvers/zine.py b/resolvers/zine.py
index 8a735679..5f35aa91 100644
--- a/resolvers/zine.py
+++ b/resolvers/zine.py
@@ -75,24 +75,6 @@ class TopShouts:
 	month_ago = datetime.now() - timedelta(days = 30)
 	lock = asyncio.Lock()
 
-	@staticmethod
-	async def prepare_shouts_by_rating():
-		with local_session() as session:
-			stmt = select(Shout, func.sum(ShoutRating.value).label("rating")).\
-				join(ShoutRating).\
-				where(ShoutRating.ts > month_ago).\
-				group_by(Shout.id).\
-				order_by(desc("rating")).\
-				limit(TopShouts.limit)
-			shouts = []
-			for row in session.execute(stmt):
-				shout = row.Shout
-				shout.rating = row.rating
-				shout.views = await ShoutViewStorage.get_view(shout.id)
-				shouts.append(shout)
-		async with TopShouts.lock:
-			TopShouts.shouts_by_rating = shouts
-
 	@staticmethod
 	async def prepare_recent_shouts():
 		with local_session() as session:
@@ -128,11 +110,13 @@ class TopShouts:
 
 	@staticmethod
 	async def prepare_top_month():
-		# FIXME: filter by month ago
+		# FIXME: test filter by month ago
+		# where(ShoutRating.ts > month_ago).\
 		with local_session() as session:
 			stmt = select(Shout, func.sum(ShoutRating.value).label("rating")).\
 				join(ShoutRating).\
-				join(ShoutViewByDay).where(ShoutViewByDay.day > month_ago).\
+				join(ShoutViewByDay).\
+				where(ShoutViewByDay.day > TopShouts.month_ago).\
 				group_by(Shout.id).\
 				order_by(desc("rating")).\
 				limit(TopShouts.limit)
@@ -146,11 +130,11 @@ class TopShouts:
 			TopShouts.top_month = shouts
 
 	@staticmethod
-	async def prepare_shouts_by_view():
+	async def prepare_top_viewed():
 		with local_session() as session:
 			stmt = select(Shout, func.sum(ShoutViewByDay.value).label("view")).\
 				join(ShoutViewByDay).\
-				where(ShoutViewByDay.day > month_ago).\
+				where(ShoutViewByDay.day > TopShouts.month_ago).\
 				group_by(Shout.id).\
 				order_by(desc("view")).\
 				limit(TopShouts.limit)
@@ -161,14 +145,14 @@ class TopShouts:
 				shout.view = row.view
 				shouts.append(shout)
 		async with TopShouts.lock:
-			TopShouts.shouts_by_view = shouts
+			TopShouts.top_viewed = shouts
 
 	@staticmethod
 	async def prepare_top_authors():
 		with local_session() as session:
 			shout_with_view = select(Shout.id, func.sum(ShoutViewByDay.value).label("view")).\
 				join(ShoutViewByDay).\
-				where(ShoutViewByDay.day > month_ago).\
+				where(ShoutViewByDay.day > TopShouts.month_ago).\
 				group_by(Shout.id).\
 				order_by(desc("view")).cte()
 			stmt = select(ShoutAuthor.user, func.sum(shout_with_view.c.view).label("view")).\
@@ -193,9 +177,8 @@ class TopShouts:
 				print("shouts cache updating...")
 				await TopShouts.prepare_top_month()
 				await TopShouts.prepare_top_overall()
+				await TopShouts.prepare_top_viewed()
 				await TopShouts.prepare_recent_shouts()
-				await TopShouts.prepare_shouts_by_rating()
-				await TopShouts.prepare_shouts_by_view()
 				await TopShouts.prepare_top_authors()
 				print("shouts cache update finished")
 			except Exception as err:
@@ -203,17 +186,10 @@ class TopShouts:
 			await asyncio.sleep(TopShouts.period)
 
 
-@query.field("topShoutsByView")
-async def top_shouts_by_view(_, info, limit):
+@query.field("topViewed")
+async def top_viewed(_, info, limit):
 	async with TopShouts.lock:
-		return TopShouts.shouts_by_view[:limit]
-
-
-@query.field("topShoutsByRating")
-async def top_shouts_by_rating(_, info, limit):
-	async with TopShouts.lock:
-		return TopShouts.shouts_by_rating[:limit]
-
+		return TopShouts.top_viewed[:limit]
 
 @query.field("topMonth")
 async def top_month(_, info, limit):
diff --git a/schema.graphql b/schema.graphql
index 8e325674..70f15a64 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -105,8 +105,7 @@ type Query {
 	shoutsByCommunity(community: String!, limit: Int!): [Shout]!
 
 	# mainpage
-	topShoutsByView(limit: Int): [Shout]!
-	topShoutsByRating(limit: Int): [Shout]!
+	topViewed(limit: Int): [Shout]!
 	topMonth(limit: Int): [Shout]!
 	topOverall(limit: Int): [Shout]!
 	recents(limit: Int): [Shout]!