migration-hotfix

This commit is contained in:
tonyrewin 2023-01-25 14:55:12 +03:00
parent d3703ab17c
commit 3567e9f625

View File

@ -38,56 +38,57 @@ def get_shout_slug(entry):
def create_author_from_app(app): def create_author_from_app(app):
user = None
userdata = None userdata = None
if app: with local_session() as session:
try: # check if email is used
with local_session() as session: user = session.query(User).where(User.email == app['email']).first()
# check if email is used if not user:
user = session.query(User).where(User.email == app['email']).first() # print('[migration] app %r' % app)
if not user: name = app.get('name')
print('[migration] creating user...') if name:
name = app.get('name') slug = translit(name, "ru", reversed=True).lower()
if name: slug = re.sub('[^0-9a-zA-Z]+', '-', slug)
slug = translit(name, "ru", reversed=True).lower() # check if slug is used
slug = re.sub('[^0-9a-zA-Z]+', '-', slug) if slug:
# check if slug is used user = session.query(User).where(User.slug == slug).first()
if slug:
# get slug from email
if user:
slug = app['email'].split('@')[0]
user = session.query(User).where(User.slug == slug).first()
# one more try
if user:
slug += '-author'
user = session.query(User).where(User.slug == slug).first() user = session.query(User).where(User.slug == slug).first()
else:
# print(f'[migration] author @{slug} is found by email')
pass
# get slug from email else:
if user: # print(f'[migration] author @{slug} is found')
slug = app['email'].split('@')[0] pass
user = session.query(User).where(User.slug == slug).first()
# one more try
if user:
slug += '-author'
user = session.query(User).where(User.slug == slug).first()
else:
print(f'[migration] author @{slug} is found by email')
else:
print(f'[migration] author @{slug} is found')
# create user with application data # create user with application data
if not user: if not user:
userdata = { userdata = {
"username": app["email"], "username": app["email"],
"email": app["email"], "email": app["email"],
"name": app.get("name", ""), "name": app.get("name", ""),
"bio": app.get("bio", ""), "bio": app.get("bio", ""),
"emailConfirmed": False, "emailConfirmed": False,
"slug": slug, "slug": slug,
"createdAt": ts, "createdAt": ts,
"lastSeen": ts, "lastSeen": ts,
} }
user = User.create(**userdata) # print('[migration] userdata %r' % userdata)
session.add(user) user = User.create(**userdata)
session.commit() session.add(user)
session.commit()
if not userdata:
userdata = user.dict() userdata = user.dict()
except Exception as e:
print(app)
raise e
return userdata return userdata
@ -108,13 +109,23 @@ async def create_shout(shout_dict):
async def get_user(entry, storage): async def get_user(entry, storage):
app = entry.get("application")
userdata = None
if app:
userdata = create_author_from_app(app)
# print("[migration] from app")
user_oid = entry.get("createdBy") user_oid = entry.get("createdBy")
userdata = storage["users"]["by_oid"].get(user_oid) if user_oid == "0":
userdata = discours
if not userdata: if not userdata:
userdata = create_author_from_app(entry.get("application")) userdata = storage["users"]["by_oid"].get(user_oid)
print("[migration] from user_oid") # print("[migration] user from user_oid")
if not userdata: if not userdata:
print("[migration] no app no user_oid") # print("[migration] no app, no user_oid")
userdata = anondict userdata = anondict
# cleanup slug # cleanup slug
slug = userdata.get("slug", "") slug = userdata.get("slug", "")