From 0649bb445cd3700b9a81baf3c2e77673dce28f45 Mon Sep 17 00:00:00 2001 From: Andrey Gumirov Date: Sun, 1 May 2022 12:42:22 +0700 Subject: [PATCH] Fixed circular import in nft_util --- blueprints/test.py | 3 ++- db/db.py | 2 ++ util/__init__.py | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/blueprints/test.py b/blueprints/test.py index 7b05556..03d14c3 100644 --- a/blueprints/test.py +++ b/blueprints/test.py @@ -23,6 +23,7 @@ from locales import INPUT_NAME_TEXT # MENU_KB.add_text_button(text="Бонус", payload={"command": "bonus"}, color=ButtonColor.POSITIVE) # from nft_things.NftSender import NFTSender from util.redis_db import RedisDB +from util.nft_util import get_image test_router = DefaultRouter() @@ -82,7 +83,7 @@ async def main_part_handle(event: BotEvent): big_attachment = await Config().uploader.get_attachments_from_paths( peer_id=user_id, - file_paths=[util.get_image(user_id)], + file_paths=[get_image(user_id)], ) await Config().api_ctx.messages.send( user_id=user_id, attachment=big_attachment, random_id=0 diff --git a/db/db.py b/db/db.py index f87fac6..5744126 100644 --- a/db/db.py +++ b/db/db.py @@ -75,6 +75,8 @@ class DB(metaclass=Singleton): self._session.commit() def add_candidate(self, candidate: Candidate): + if self._session.query(Candidate).filter(Candidate.id == candidate.id).first() is not None: + return tres = TestResult(answers=[]) candidate.test_result = [tres] self._session.add(candidate) diff --git a/util/__init__.py b/util/__init__.py index f317235..ae53f8b 100644 --- a/util/__init__.py +++ b/util/__init__.py @@ -1,2 +1 @@ from .singleton import Singleton -from .nft_util import get_image