From 6cb2bf47b6623899a59c9c150f0b2ffd7a9b0954 Mon Sep 17 00:00:00 2001 From: Andrei Date: Mon, 9 May 2022 00:49:06 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 90 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/main.py b/main.py index 5684be6..22c6216 100644 --- a/main.py +++ b/main.py @@ -133,27 +133,30 @@ def main_page(): emotion['is_like'] = 1 emotion_you_like_that.append(emotion) quest = session.query(Answer).filter(Answer.user == current_user.id).all() - days_reg = current_user.data_reg - datetime.date.today() - days_reg = abs(days_reg.days) + 1 - if quest: - post_quest = session.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all() - else: - post_quest = [] - while len(post_quest) < days_reg: - post_quest.append( - session.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first()) - ans = [] - for i in post_quest: - if i is not None: - ans_id = session.query(Answer).filter( - Answer.id_question == i.id and Answer.user.id == current_user.id).first() - if ans_id is not None: - ans.append(ans_id) - post_quest = post_quest[::-1] - ans = ans[::-1] - ans2 = {} - for i in ans: - ans2[i.id_question] = i + try: + days_reg = current_user.data_reg - datetime.date.today() + days_reg = abs(days_reg.days) + 1 + if quest: + post_quest = session.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all() + else: + post_quest = [] + while len(post_quest) < days_reg: + post_quest.append( + session.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first()) + ans = [] + for i in post_quest: + if i is not None: + ans_id = session.query(Answer).filter( + Answer.id_question == i.id and Answer.user.id == current_user.id).first() + if ans_id is not None: + ans.append(ans_id) + post_quest = post_quest[::-1] + ans = ans[::-1] + ans2 = {} + for i in ans: + ans2[i.id_question] = i + except Exception: + ans2 = [] else: you_like_that = [] emotion_you_like_that = None @@ -663,27 +666,30 @@ def diary(): emotion['link'] = None lis_emotion.append(emotion) quest = db_sess.query(Answer).filter(Answer.user == current_user.id).all() - days_reg = current_user.data_reg - datetime.date.today() - days_reg = abs(days_reg.days) + 1 - if quest: - post_quest = db_sess.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all() - else: - post_quest = [] - while len(post_quest) < days_reg: - post_quest.append( - db_sess.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first()) - ans = [] - for i in post_quest: - if i is not None: - ans_id = db_sess.query(Answer).filter( - Answer.id_question == i.id and Answer.user.id == current_user.id).first() - if ans_id is not None: - ans.append(ans_id) - post_quest = post_quest[::-1] - ans = ans[::-1] - ans2 = {} - for i in ans: - ans2[i.id_question] = i + try: + days_reg = current_user.data_reg - datetime.date.today() + days_reg = abs(days_reg.days) + 1 + if quest: + post_quest = db_sess.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all() + else: + post_quest = [] + while len(post_quest) < days_reg: + post_quest.append( + db_sess.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first()) + ans = [] + for i in post_quest: + if i is not None: + ans_id = db_sess.query(Answer).filter( + Answer.id_question == i.id and Answer.user.id == current_user.id).first() + if ans_id is not None: + ans.append(ans_id) + post_quest = post_quest[::-1] + ans = ans[::-1] + ans2 = {} + for i in ans: + ans2[i.id_question] = i + except Exception: + ans2 = [] else: posts = None post_quest = None