From bce05da4870c2fe7aeb677c0ae2afa9a6e84b740 Mon Sep 17 00:00:00 2001
From: aneuhmanh <aneuhmanh@gmail.com>
Date: Thu, 20 Feb 2025 16:49:57 +0200
Subject: [PATCH] username change fix

---
 app.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app.py b/app.py
index 637e7fd..d939189 100644
--- a/app.py
+++ b/app.py
@@ -26,6 +26,7 @@ from wtforms.validators import DataRequired, EqualTo, Regexp
 from flask_wtf import FlaskForm, RecaptchaField
 from dotenv import load_dotenv, find_dotenv
 import aiofiles.os
+from sqlalchemy import func, or_
 
 dotenv_path = find_dotenv()
 load_dotenv(dotenv_path, override=True)
@@ -234,8 +235,6 @@ class Subscription(db.Model):
     def __repr__(self):
         return f'<Subscription user_id={self.user_id} author_id={self.author_id}>'
 
-from sqlalchemy import func, or_
-
 def get_content_query(model, subscriptions, search_query):
     query = model.query
 
@@ -1042,10 +1041,6 @@ def comic_edit(comic_id):
 
     return render_template('comic_edit.html', comic=comic, comic_pages=comic_pages, form=form)
 
-from flask import flash, redirect, url_for, render_template
-from werkzeug.utils import secure_filename
-import os
-
 def update_related_tables(old_username, new_username):
 
     Comments.query.filter_by(username=old_username).update({"username": new_username})
@@ -1139,8 +1134,9 @@ def profile_edit():
                 elif User.query.filter_by(username=new_username).first():
                     pass
                 else:
+                    old_username = current_user.username
                     current_user.username = new_username
-                    db.session.commit()
+                    update_related_tables(old_username, new_username)
                     return redirect(url_for('profile', username=new_username))
 
         elif section == 'bio':
@@ -1264,7 +1260,7 @@ def profile(username):
 def user_posts(username):
     user = User.query.filter_by(username=username).first_or_404()
     posts = Post.query.filter_by(username=username).order_by(Post.post_date.desc()).all()
-    avatars = {user.username: user.avatar_file for user in User.query.all()}  # Словарь аватаров
+    avatars = {user.username: user.avatar_file for user in User.query.all()}
     return render_template('post.html', username=username, posts=posts, avatars=avatars)
 
 @app.route('/posts/<username>/add_comment/<int:post_id>', methods=['POST'])