Merge branch 'main' of github.com:Discours/discours-backend

migration/__init__.py

@@ -1,22 +1,23 @@
 """ cmd managed migration """
 import asyncio
+import gc
 import json
 import sys
 from datetime import datetime, timezone
-import gc
+
 import bs4
+
+from migration.export import export_mdx
 from migration.tables.comments import migrate as migrateComment
 from migration.tables.comments import migrate_2stage as migrateComment_2stage
 from migration.tables.content_items import get_shout_slug
 from migration.tables.content_items import migrate as migrateShout
-from migration.tables.topics import migrate as migrateTopic
-from migration.tables.users import migrate as migrateUser
 from migration.tables.remarks import migrate as migrateRemark
+from migration.tables.topics import migrate as migrateTopic
+from migration.tables.users import migrate as migrateUser, post_migrate as users_post_migrate
 from migration.tables.users import migrate_2stage as migrateUser_2stage
-from orm.reaction import Reaction
 from orm import init_tables
-from migration.export import export_mdx
-
+from orm.reaction import Reaction
 
 TODAY = datetime.strftime(datetime.now(tz=timezone.utc), "%Y%m%d")
 OLD_DATE = "2016-03-05 22:22:00.350000"
@@ -42,6 +43,7 @@ async def users_handle(storage):
     ce = 0
     for entry in storage["users"]["data"]:
         ce += migrateUser_2stage(entry, id_map)
+    users_post_migrate()
 
 
 async def topics_handle(storage):
@@ -180,8 +182,8 @@ async def all_handle(storage, args):
     await topics_handle(storage)
     print("[migration] users and topics are migrated")
     await shouts_handle(storage, args)
-    print("[migration] remarks...")
-    await remarks_handle(storage)
+    # print("[migration] remarks...")
+    # await remarks_handle(storage)
     print("[migration] migrating comments")
     await comments_handle(storage)
     # export_email_subscriptions()

migration/tables/content_items.py

@@ -176,7 +176,7 @@ async def migrate(entry, storage):
     await content_ratings_to_reactions(entry, shout_dict["slug"])
 
     # shout views
-    await ViewedStorage.increment(shout_dict["slug"], amount=entry.get("views", 1))
+    await ViewedStorage.increment(shout_dict["slug"], amount=entry.get("views", 1), viewer='old-discours')
     # del shout_dict['ratings']
 
     storage["shouts"]["by_oid"][entry["_id"]] = shout_dict

migration/tables/users.py

@@ -1,7 +1,9 @@
+import re
+
+from bs4 import BeautifulSoup
 from dateutil.parser import parse
 from sqlalchemy.exc import IntegrityError
-from bs4 import BeautifulSoup
-import re
+
 from base.orm import local_session
 from orm.user import AuthorFollower, User, UserRating
 
@@ -108,6 +110,20 @@ def migrate(entry):
     return user_dict
 
 
+def post_migrate():
+    old_discours_dict = {
+        "slug": "old-discours",
+        "username": "old-discours",
+        "email": "old@discours.io",
+        "name": "Просмотры на старой версии сайта"
+    }
+
+    with local_session() as session:
+        old_discours_user = User.create(**old_discours_dict)
+        session.add(old_discours_user)
+        session.commit()
+
+
 def migrate_2stage(entry, id_map):
     ce = 0
     for rating_entry in entry.get("ratings", []):