From f0796cb9399df649d10fcd653f84be9530142efe Mon Sep 17 00:00:00 2001
From: tonyrewin <anton.rewin@gmail.com>
Date: Wed, 16 Nov 2022 12:23:32 +0300
Subject: [PATCH] migration-email-confirm-fix

---
 main.py                           | 3 +--
 migration/__init__.py             | 8 ++++++--
 migration/tables/content_items.py | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index b0aa0528..965b9e94 100644
--- a/main.py
+++ b/main.py
@@ -31,6 +31,7 @@ middleware = [
 
 async def start_up():
     await redis.connect()
+    await storages_init()
     views_stat_task = asyncio.create_task(ViewStat.worker())
     print(views_stat_task)
     reacted_storage_task = asyncio.create_task(ReactedStorage.worker())
@@ -41,8 +42,6 @@ async def start_up():
     print(topic_stat_task)
     git_task = asyncio.create_task(GitTask.git_task_worker())
     print(git_task)
-    await storages_init()
-    print()
 
 
 async def shutdown():
diff --git a/migration/__init__.py b/migration/__init__.py
index 7bed642b..61593bbd 100644
--- a/migration/__init__.py
+++ b/migration/__init__.py
@@ -7,7 +7,7 @@ import sys
 from datetime import datetime
 
 import bs4
-
+from base.redis import redis
 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
@@ -181,7 +181,11 @@ async def all_handle(storage, args):
     print("[migration] handle everything")
     await users_handle(storage)
     await topics_handle(storage)
+    print("[migration] users and topics are migrated")
+    await redis.connect()
+    print("[migration] redis connected")
     await shouts_handle(storage, args)
+    print("[migration] migrating comments")
     await comments_handle(storage)
     # export_email_subscriptions()
     print("[migration] done!")
@@ -295,9 +299,9 @@ def create_pgdump():
 
 
 async def handle_auto():
-    print("[migration] no option given, auto mode")
     url = os.getenv("MONGODB_URL")
     if url:
+        print("[migration] connecting mongo")
         mongo_download(url)
     bson_handle()
     await all_handle(data_load(), sys.argv)
diff --git a/migration/tables/content_items.py b/migration/tables/content_items.py
index d3b13fff..89392051 100644
--- a/migration/tables/content_items.py
+++ b/migration/tables/content_items.py
@@ -149,6 +149,12 @@ async def migrate(entry, storage):
     if entry.get("published"):
         r["publishedAt"] = date_parse(entry.get("publishedAt", OLD_DATE))
         r["visibility"] = "public"
+        with local_session() as session:
+            # update user.emailConfirmed if published
+            author = session.query(User).where(User.slug == userslug).first()
+            author.emailConfirmed = True
+            session.add(author)
+            session.commit()
     else:
         r["visibility"] = "authors"
     if "deletedAt" in entry: