From 1660cced6676bb34520a58643d2118a356afeb4d Mon Sep 17 00:00:00 2001 From: Hermes Date: Mon, 14 Sep 2026 14:14:37 +0200 Subject: [PATCH] =?UTF-8?q?feat(schedule):=20=D0=B4=D0=BD=D0=B8=20SMS=20?= =?UTF-8?q?=D0=B2=20=D0=9B=D0=9A=20=D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D1=8E=D1=82?= =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=D0=BC=D0=B8?= =?UTF-8?q?=20=E2=80=94=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B=20?= =?UTF-8?q?=D1=87=D0=B8=D1=82=D0=B0=D1=8E=D1=82=20sms=5Fdays=20=D0=B8?= =?UTF-8?q?=D0=B7=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/sms_first_campaign_ref.py | 19 ++++++++++++++++++- scripts/sms_manual_campaign.py | 19 ++++++++++++++++++- scripts/sms_paid_storage_campaign.py | 19 ++++++++++++++++++- scripts/sms_second_campaign.py | 19 ++++++++++++++++++- 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/scripts/sms_first_campaign_ref.py b/scripts/sms_first_campaign_ref.py index 473f6da..d2051a5 100644 --- a/scripts/sms_first_campaign_ref.py +++ b/scripts/sms_first_campaign_ref.py @@ -84,6 +84,22 @@ def get_db_conn(): user=DB_USER, password=DB_PASS, ) +def apply_schedule_work_days(conn, settings): + """Дни отправки — из «Графика работы» в ЛК (единый источник правды). + + Если график прочитать не удалось, остаются прежние дни кампании. + """ + try: + with conn.cursor(cursor_factory=RealDictCursor) as cur: + cur.execute("SELECT sms_days FROM business_schedule_settings WHERE id = 1") + row = cur.fetchone() or {} + days = row.get("sms_days") or [] + if days: + settings["work_days"] = ",".join(str(int(d)) for d in days) + except Exception as exc: # noqa: BLE001 — не роняем рассылку из-за графика + print(f"График работы не прочитан, дни SMS из настроек кампании: {exc}") + return settings + def load_settings(conn): with conn.cursor(cursor_factory=RealDictCursor) as cur: cur.execute("SELECT * FROM sms_campaign_settings WHERE campaign_type = 'first_sms'") @@ -99,7 +115,8 @@ def load_settings(conn): "test_mode": True, "test_phone": "79788382260", } - return dict(row) + settings = dict(row) + return apply_schedule_work_days(conn, settings) # ─── SMS API ───────────────────────────────────────────────────────────────── diff --git a/scripts/sms_manual_campaign.py b/scripts/sms_manual_campaign.py index 53e46b5..2ae8fdd 100644 --- a/scripts/sms_manual_campaign.py +++ b/scripts/sms_manual_campaign.py @@ -61,13 +61,30 @@ def get_db_conn(): user=DB_USER, password=DB_PASS, ) +def apply_schedule_work_days(conn, settings): + """Дни отправки — из «Графика работы» в ЛК (единый источник правды). + + Если график прочитать не удалось, остаются прежние дни кампании. + """ + try: + with conn.cursor(cursor_factory=RealDictCursor) as cur: + cur.execute("SELECT sms_days FROM business_schedule_settings WHERE id = 1") + row = cur.fetchone() or {} + days = row.get("sms_days") or [] + if days: + settings["work_days"] = ",".join(str(int(d)) for d in days) + except Exception as exc: # noqa: BLE001 — не роняем рассылку из-за графика + print(f"График работы не прочитан, дни SMS из настроек кампании: {exc}") + return settings + def load_settings(conn): with conn.cursor(cursor_factory=RealDictCursor) as cur: cur.execute("SELECT * FROM sms_campaign_settings WHERE campaign_type = %s", (CAMPAIGN_TYPE,)) row = cur.fetchone() if not row: return {"enabled": True, "auto_manual_after_hours": 3, "telegram_chat_id": TELEGRAM_CHAT_ID} - return dict(row) + settings = dict(row) + return apply_schedule_work_days(conn, settings) # ─── Telegram ──────────────────────────────────────────────────────────────── diff --git a/scripts/sms_paid_storage_campaign.py b/scripts/sms_paid_storage_campaign.py index 375de31..fe38ca4 100644 --- a/scripts/sms_paid_storage_campaign.py +++ b/scripts/sms_paid_storage_campaign.py @@ -71,6 +71,22 @@ def get_db_conn(): user=DB_USER, password=DB_PASS, ) +def apply_schedule_work_days(conn, settings): + """Дни отправки — из «Графика работы» в ЛК (единый источник правды). + + Если график прочитать не удалось, остаются прежние дни кампании. + """ + try: + with conn.cursor(cursor_factory=RealDictCursor) as cur: + cur.execute("SELECT sms_days FROM business_schedule_settings WHERE id = 1") + row = cur.fetchone() or {} + days = row.get("sms_days") or [] + if days: + settings["work_days"] = ",".join(str(int(d)) for d in days) + except Exception as exc: # noqa: BLE001 — не роняем рассылку из-за графика + print(f"График работы не прочитан, дни SMS из настроек кампании: {exc}") + return settings + def load_settings(conn): with conn.cursor(cursor_factory=RealDictCursor) as cur: cur.execute("SELECT * FROM sms_campaign_settings WHERE campaign_type = %s", (CAMPAIGN_TYPE,)) @@ -82,7 +98,8 @@ def load_settings(conn): "telegram_chat_id": TELEGRAM_CHAT_ID, "sms_api_id": SMS_API_ID, "work_hours_start": 8, "work_hours_end": 21, "work_days": "1,2,3,4,5", } - return dict(row) + settings = dict(row) + return apply_schedule_work_days(conn, settings) # ─── SMS API ───────────────────────────────────────────────────────────────── diff --git a/scripts/sms_second_campaign.py b/scripts/sms_second_campaign.py index d8f605f..85f6770 100644 --- a/scripts/sms_second_campaign.py +++ b/scripts/sms_second_campaign.py @@ -83,6 +83,22 @@ def get_db_conn(): user=DB_USER, password=DB_PASS, ) +def apply_schedule_work_days(conn, settings): + """Дни отправки — из «Графика работы» в ЛК (единый источник правды). + + Если график прочитать не удалось, остаются прежние дни кампании. + """ + try: + with conn.cursor(cursor_factory=RealDictCursor) as cur: + cur.execute("SELECT sms_days FROM business_schedule_settings WHERE id = 1") + row = cur.fetchone() or {} + days = row.get("sms_days") or [] + if days: + settings["work_days"] = ",".join(str(int(d)) for d in days) + except Exception as exc: # noqa: BLE001 — не роняем рассылку из-за графика + print(f"График работы не прочитан, дни SMS из настроек кампании: {exc}") + return settings + def load_settings(conn): with conn.cursor(cursor_factory=RealDictCursor) as cur: cur.execute("SELECT * FROM sms_campaign_settings WHERE campaign_type = %s", (CAMPAIGN_TYPE,)) @@ -104,7 +120,8 @@ def load_settings(conn): "second_sms_delay_hours": 3, "auto_manual_after_hours": 3, } - return dict(row) + settings = dict(row) + return apply_schedule_work_days(conn, settings) # ─── SMS API ─────────────────────────────────────────────────────────────────