web 2024-12-08

Author: thehighestmath

example/db_adapter.py

@@ -1,9 +1,10 @@
 from datetime import datetime
 
 import sqlalchemy
+from sqlalchemy import select, update
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, Session
 
-from handlers import custom_types
+# from handlers import custom_types
 
 USERNAME = 'umschooluser'
 PASSWORD = 'umschoolpswd'
@@ -129,32 +130,71 @@ def get_personal_stat(telegram_id: int, session: Session) -> list[list]:
 
 
 @decorator_add_session
-def get_random_question(telegram_id: int, session: Session) -> custom_types.Question:
+def get_random_question(telegram_id: int, session: Session):
     """
     получить случайный, неотвеченный вопрос из бд
 
-    return: Question
+    return: tuple
     """
-    return custom_types.Question(id=0, text="")
+    available_ids = set()
+    answered_ids = set()
+    text = ""
+    id_ = -1
+    with session.begin():
+        stmt = select(Question.id).where(1==1)
+        for id_ in session.scalars(stmt):
+            available_ids.add(id_)
+        stmt = select(UserStat).where(UserStat.tg_user_id == telegram_id)
+        for id_ in session.scalars(stmt):
+            answered_ids.add(id_)
+        id_ = list(available_ids - answered_ids)[0]
+        stmt = select(Question.question_text).where(Question.id == id_)
+        for txt in session.scalars(stmt):
+            text = txt
+    return (id_, text)
 
 
 @decorator_add_session
 def get_choices_by_question_id(question_id: int, session: Session) -> list[str]:
     """
     получить ответы по заданному question_id
     """
-    return []
+    choice_text = []
+    with session.begin():
+        stmt = select(Choice).where(Choice.question_id == question_id)
+        for choice in session.scalars(stmt):
+            choice_text.append(choice.choice_text)
+    return choice_text
 
 
 @decorator_add_session
 def add_user_vote_db(choice_id: int, telegram_id: int, session: Session):
     """
     добавить голос пользователя выбранному варианту ответа
     """
-    pass
+    with session.begin():
+        stmt = select(Choice).where(Choice.id == choice_id)
+        result = session.execute(stmt)
+        votes = 0
+        for choice in result.scalars():
+            print(choice)
+            votes = choice.votes
+
+        new_votes = votes + 1
+        stmt = (
+            update(Choice).
+            where(Choice.id == choice_id).
+            values(votes=new_votes)
+        )
+        print(stmt, new_votes, choice_id)
+        session.execute(stmt)
+        session.commit()
+
 
 
 if __name__ == "__main__":
-    create_tables_in_db()
-    add_question_to_db("test-question", datetime.now())
-    add_choice_to_db("test-choice", 20)
+    print(get_random_question(1))
+    print(get_choices_by_question_id(1))
+    # create_tables_in_db()
+    # add_question_to_db("test-question", datetime.now())
+    # add_choice_to_db("test-choice", 20)

example/handlers/__init__.py

@@ -9,7 +9,7 @@
 
 def register_handlers(bot):
     add_question.register_handlers(bot)
+    get_survey.register_handlers(bot)
     delete_question.register_handlers(bot)
     person_stats.register_handlers(bot)
     all_stats.register_handlers(bot)
-    get_survey.register_handlers(bot)

example/handlers/get_survey.py

@@ -1,11 +1,35 @@
 import telebot.types
+from telebot.handler_backends import StatesGroup, State
 
 
+from db_adapter import (
+    get_random_question,
+    get_choices_by_question_id,
+    add_user_vote_db,
+)
+
+class AnswerQuestion(StatesGroup):
+    waiting_answer = State()
+
+logger = telebot.logger
+
 def register_handlers(bot):
-    @bot.message_handler()
+    @bot.message_handler(commands=['get_new_question'])
     def start_survey(message: telebot.types.Message):
-        pass
+        # а что на все вопросы?
+        question = get_random_question(message.from_user.id)
+        choices = get_choices_by_question_id(question[0])
+        bot.set_state(message.from_user.id, AnswerQuestion.waiting_answer)
+        bot.send_message(message.from_user.id, question[1])
+        bot.send_message(
+            message.from_user.id,
+            'Варианты ответа:\n'+ '\n'.join(choices),
+        )
 
-    @bot.message_handler()
+    @bot.message_handler(state=AnswerQuestion.waiting_answer)
     def process_user_answer(message: telebot.types.Message):
-        pass
+        print(message.text)
+        user_answer = int(message.text) # посмотреть
+        add_user_vote_db(user_answer, message.from_user.id)
+        bot.send_message(message.from_user.id, "Записал :)")
+

example/main.py

@@ -8,7 +8,7 @@
 from init_bot import create_bot
 
 
-telebot.logger.setLevel(logging.DEBUG)  # Outputs messages to console.
+# telebot.logger.setLevel(logging.DEBUG)  # Outputs messages to console.
 
 if __name__ == "__main__":
     create_tables_in_db()