diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index 08c8d2c..9a3ba83 100644 --- a/back/tgbot/tgbot.py +++ b/back/tgbot/tgbot.py @@ -156,15 +156,14 @@ class TgBot: await query.answer() inv = await TgItem.objects.aget(id=context.chat_data["inv"]) - tmc = await CustomTable.objects.aget(id=context.chat_data["tmc"]) + tmc = await inv.tmc.aget(id=context.chat_data["tmc"]) field_id = query.data.split("@")[-1] - name = await BaseCustomField.objects.aget(id=field_id) - element = await TmcElement.objects.acreate(name=name, tmc=tmc) + field = await BaseCustomField.objects.aget(id=field_id) - await inv.element.aadd(element) + await tmc.element.aadd(field) - context.chat_data["element"] = element.id + context.chat_data["element"] = field.id context.chat_data["step"] = "add_element" await self.inv(update, context) @@ -231,9 +230,7 @@ class TgBot: elif current_step == "add_tmc": inv = await TgItem.objects.aget(id=context.chat_data["inv"]) tmc_element = await inv.tmc.aget(id=context.chat_data["tmc"]) - logger.info(tmc_element) tmc = await CustomTable.objects.aget(id=tmc_element.tmc_id) - logger.info(tmc) fields = [] async for e in tmc.fields.all(): @@ -269,8 +266,8 @@ class TgBot: elif current_step == "add_element": inv = await TgItem.objects.aget(id=context.chat_data["inv"]) - tmc = inv.tmc.aget(id=context.chat_data["tmc"]) - element = inv.element.aget(id=context.chat_data["element"]) + tmc = await inv.tmc.aget(id=context.chat_data["tmc"]) + element = await tmc.element.aget(id=context.chat_data["element"]) context.chat_data["step"] = "add_element_data" @@ -289,8 +286,8 @@ class TgBot: ) elif current_step == "add_element_data": inv = await TgItem.objects.aget(id=context.chat_data["inv"]) - tmc = inv.tmc.aget(id=context.chat_data["tmc"]) - element = inv.element.aget(id=context.chat_data["element"]) + tmc = await inv.tmc.aget(id=context.chat_data["tmc"]) + element = await tmc.element.aget(id=context.chat_data["element"]) if update.message.photo: element.photoid = update.message.photo[-1].file_id