xync-bot 0.3.24.dev11__tar.gz → 0.3.24.dev12__tar.gz

{xync_bot-0.3.24.dev11/xync_bot.egg-info → xync_bot-0.3.24.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.24.dev11
+Version: 0.3.24.dev12
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later

{xync_bot-0.3.24.dev11 → xync_bot-0.3.24.dev12}/xync_bot/routers/pay/dep.py

@@ -1,3 +1,4 @@
+import logging
 from asyncio import gather
 from enum import IntEnum
 
@@ -206,10 +207,16 @@ async def edt(msg: Message, txt: str, rm: InlineKeyboardMarkup):
             print(msg.bot.store.perm.msg_id, e)
 
 
-async def have_coin_amount(store: Store) -> bool:
-    actor_id = store.perm.actors[store.pay.t_ex_id]
-    asset = await models.Asset.get_or_none(addr__coin_id=store.pay.t_coin_id, addr__actor_id=actor_id)
-    return store.pay.amount <= asset.free
+async def xync_have_coin_amount(store: Store) -> bool:
+    assets = await models.Asset.filter(
+        addr__coin_id=store.pay.t_coin_id, addr__ex_id=store.pay.t_ex_id, addr__actor__user__role__in=Role.ADMIN
+    )
+    return store.pay.amount <= sum(a.free for a in assets)
+
+
+async def client_have_coin_amount(store: Store) -> bool:
+    assets = await models.Asset.filter(addr__coin_id=store.pay.t_coin_id, addr__actor_id__in=store.perm.actors.values())
+    return store.pay.amount <= sum(a.free for a in assets)
 
 
 async def need_ppo(store: Store):
@@ -223,22 +230,61 @@ async def need_ppo(store: Store):
         return 1
 
 
-async def get_in(store: Store) -> tuple[models.Addr | models.Cred, str]:
+async def client_target_repr(store: Store) -> tuple[models.Addr | models.Cred, str]:
+    if store.pay.t_ex_id:
+        addr_to = (
+            await models.Addr.filter(
+                actor__ex_id=store.pay.t_ex_id, coin_id=store.pay.t_coin_id, actor__user=store.perm.user
+            )
+            .prefetch_related("actor")
+            .first()
+        )
+        ex, coin = store.glob.exs[store.pay.s_ex_id], store.glob.coins[store.pay.s_coin_id]
+        if not addr_to:
+            logging.error(f"No {coin} addr in {ex} for user: {store.perm.user.username_id}")
+        return addr_to, f"{coin} на {ex} по id: `{addr_to.actor.exid}`"
+    # иначе: реквизиты для фиата
+    cur, pm = store.glob.curs[store.pay.t_cur_id], store.glob.pmcurs[store.pay.t_pmcur_id]
+    cred = store.perm.creds[store.pay.cred_id]
+    return cred, f"{cur.ticker} на {pm} по номеру: {cred.repr()}"
+
+
+async def get_merch_target(store: Store) -> tuple[models.Addr | models.Cred, str]:
     if store.pay.s_ex_id:
-        addr_in = await models.Addr.get(
-            actor__ex_id=store.pay.s_ex_id, coin_id=store.pay.s_coin_id, actor__user__role__gte=Role.ADMIN
-        ).prefetch_related("actor")
-        return addr_in, (
-            f"{store.glob.coins[store.pay.s_coin_id]} на {store.glob.exs[store.pay.s_ex_id]}, "
-            f"по id: `{addr_in.actor.exid}`"
+        addr_in = (
+            await models.Addr.filter(
+                actor__ex_id=store.pay.s_ex_id, coin_id=store.pay.s_coin_id, actor__user__role__gte=Role.ADMIN
+            )
+            .prefetch_related("actor")
+            .first()
         )
+        ex, coin = store.glob.exs[store.pay.s_ex_id], store.glob.coins[store.pay.s_coin_id]
+        if not addr_in:
+            logging.error(f"No {coin} addr in {ex}")
+        return addr_in, f"{coin} на {ex} по id: `{addr_in.actor.exid}`"
+    # иначе: реквизиты для фиатной оплаты
+    s_pmcur = await models.Pmcur.get(id=store.pay.s_pmcur_id).prefetch_related("pm__grp")
+    cred = await models.Cred.filter(
+        **({"pmcur__pm__grp": s_pmcur.pm.grp} if s_pmcur.pm.grp else {"pmcur_id": store.pay.s_pmcur_id}),
+        person__user__role__gte=Role.ADMIN,
+    ).first()  # todo: order by fiat.target-fiat.amount
+    cur, pm = store.glob.curs[store.pay.s_cur_id], store.glob.pmcurs[store.pay.s_pmcur_id]
+    if not cred:
+        logging.error(f"No {cur.ticker} cred for {pm}")
+    return cred, f"{cur.ticker} на {pm} по номеру: {cred.repr()}"
+
+
+def fmt_sec(sec: int):
+    days = sec // (24 * 3600)
+    sec %= 24 * 3600
+    hours = sec // 3600
+    sec %= 3600
+    minutes = sec // 60
+    sec %= 60
+
+    if days > 0:
+        return f"{days}д {hours:02d}:{minutes:02d}:{sec:02d}"
+    elif hours > 0:
+        return f"{hours:02d}:{minutes:02d}:{sec:02d}"
     else:
-        s_pmcur = await models.Pmcur.get(id=store.pay.s_pmcur_id).prefetch_related("pm__grp")
-        cred_id = await models.Cred.get(  # todo: extend cred search conditions
-            **({"pmcur__pm__grp": s_pmcur.pm.grp} if s_pmcur.pm.grp else {"pmcur_id": store.pay.s_pmcur_id}),
-            person__user__role__gte=Role.ADMIN,
-        )
-        return cred_id, (
-            f"{store.glob.curs[store.pay.s_cur_id]} на {store.glob.pmcurs[store.pay.s_pmcur_id]} "
-            f"по номеру: `{cred_id.detail}`, имя: {cred_id.name}{cred_id.extra and f' ({cred_id.extra})' or ''}"
-        )
+        return f"{minutes:02d}:{sec:02d}"

{xync_bot-0.3.24.dev11 → xync_bot-0.3.24.dev12}/xync_bot/routers/pay/handler.py

@@ -22,6 +22,7 @@ async def h_start(msg: Message):
     await gather(window.type_select(msg), dlt(msg))
     store.perm.user = await models.User.get(username_id=msg.from_user.id)
     store.perm.creds, store.perm.cur_creds = await fill_creds(store.perm.user.person_id)
+    store.perm.actors = await fill_actors(store.perm.user.person_id)
 
 
 @pay.callback_query(cd.MoneyType.filter(F.is_fiat))
@@ -35,9 +36,7 @@ async def h_got_fiat_type(query: CallbackQuery, bot: PGram):
 async def h_got_crypto_type(query: CallbackQuery, bot: PGram):
     """Step 2c: Select coin"""
     bot.store.curr.is_fiat = False
-    bot.store.perm.actors, *_ = await gather(
-        fill_actors(bot.store.perm.user.person_id), window.coin_select(query.message), ans(query, "Понял, крипта")
-    )
+    await gather(window.coin_select(query.message), ans(query, "Понял, крипта"))
 
 
 @pay.callback_query(cd.Coin.filter())

{xync_bot-0.3.24.dev11 → xync_bot-0.3.24.dev12}/xync_bot/routers/pay/window.py

@@ -6,7 +6,15 @@ from aiogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from xync_schema import models
 
-from xync_bot.routers.pay.dep import edt, need_ppo, have_coin_amount, get_in, Store
+from xync_bot.routers.pay.dep import (
+    edt,
+    need_ppo,
+    Store,
+    get_merch_target,
+    fmt_sec,
+    client_have_coin_amount,
+    client_target_repr,
+)
 
 from xync_bot.routers.pay import cd, dep
 
@@ -174,7 +182,7 @@ async def set_ppo(msg: Message):
 
 async def set_urgency(msg: Message):
     store: Store = msg.bot.store
-    if not store.curr.is_fiat or have_coin_amount(store):
+    if not store.curr.is_fiat or await client_have_coin_amount(store):
         return await create_payreq(msg)  # next
     builder = InlineKeyboardBuilder()
     (
@@ -183,7 +191,7 @@ async def set_urgency(msg: Message):
         .button(text="30 мин", callback_data=cd.Time(minutes=30))
         .button(text="3 часа", callback_data=cd.Time(minutes=180))
         .button(text="сутки", callback_data=cd.Time(minutes=60 * 24))
-        .button(text="Назад к вводу платежей", callback_data=cd.PayNav(to=cd.PayStep.t_pm))
+        .button(text="Назад к выбору платежной\nсистемы для отправки", callback_data=cd.PayNav(to=cd.PayStep.s_pm))
         .button(text="Домой", callback_data=cd.PayNav(to=cd.PayStep.t_type))
         .adjust(2, 2, 1, 1, 1)
     )
@@ -201,41 +209,29 @@ async def create_payreq(msg: Message):
         user=store.perm.user,
     )
     store.pay.pr_id = pay_req.id
-    inp, txt = await get_in(store)
+    inp, txt = await get_merch_target(store)
+    ccred, ctxt = await client_target_repr(store)
+    txt += f"\nИ получите {store.pay.amount} {ctxt} в течение {fmt_sec(store.pay.urg * 60)}"
+    if store.pay.ppo > 1:
+        txt += f" максимум {store.pay.ppo} платежами"
     rm = InlineKeyboardMarkup(
         inline_keyboard=[
             [InlineKeyboardButton(text="Отправил", callback_data=cd.Action(act=cd.ActionType.sent).pack())],
         ]
     )
-    await edt(msg, f"Отправь {store.pay.amount}" + txt, rm.as_markup())
+    await edt(msg, f"Отправьте {100500} " + txt, rm)  # todo: get rate
 
-    # create_task(window.run_timer(msg))
+    # create_task(window.run_timer(msg))В
 
 
 async def run_timer(message, state: FSMContext):
     builder = InlineKeyboardBuilder()
     builder.button(text="Платеж получен", callback_data=cd.Action(act=cd.ActionType.received))
 
-    data = await state.get_value("timer")
-    seconds = data * 60
-
-    def format(sec):
-        days = sec // (24 * 3600)
-        sec %= 24 * 3600
-        hours = sec // 3600
-        sec %= 3600
-        minutes = sec // 60
-        sec %= 60
-
-        if days > 0:
-            return f"{days}д {hours:02d}:{minutes:02d}:{sec:02d}"
-        elif hours > 0:
-            return f"{hours:02d}:{minutes:02d}:{sec:02d}"
-        else:
-            return f"{minutes:02d}:{sec:02d}"
+    seconds = await state.get_value("timer") * 60
 
     try:
-        await message.edit_text(f"⏳ Осталось {format(seconds)}", reply_markup=builder.as_markup())
+        await message.edit_text(f"⏳ Осталось {fmt_sec(seconds)}", reply_markup=builder.as_markup())
     except Exception:
         return
 
@@ -243,7 +239,7 @@ async def run_timer(message, state: FSMContext):
         await sleep(1)
         seconds -= 1
         try:
-            await message.edit_text(f"⏳ Осталось {format(seconds)}", reply_markup=builder.as_markup())
+            await message.edit_text(f"⏳ Осталось {fmt_sec(seconds)}", reply_markup=builder.as_markup())
             await state.update_data(timer=seconds)
         except Exception:
             break

{xync_bot-0.3.24.dev11 → xync_bot-0.3.24.dev12/xync_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.24.dev11
+Version: 0.3.24.dev12
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later