From a8d45bab201c94fcc109f015aa9eaf589b541fc7 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Fri, 25 Sep 2026 10:46:49 +0300 Subject: [PATCH] Update monthly order app --- core/lib/internally/monthly_orders/service.go | 4 +-- service/telegram_service/cmd/app.go | 34 +++++++++++-------- .../scheduler/monthly_order_checker.go | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/core/lib/internally/monthly_orders/service.go b/core/lib/internally/monthly_orders/service.go index d89c9be..dbe9dae 100644 --- a/core/lib/internally/monthly_orders/service.go +++ b/core/lib/internally/monthly_orders/service.go @@ -290,10 +290,10 @@ func (s *MonthlyOrderService) SubmitOrdersToTelegram(ctx context.Context, manage contentBuilder.WriteString(fmt.Sprintf("Доставка: %s\n", *order.Delivery)) } if order.Conditions != nil { - contentBuilder.WriteString(fmt.Sprintf("⚖️ Условия: %s\n", *order.Conditions)) + contentBuilder.WriteString(fmt.Sprintf("⚖Условия: %s\n", *order.Conditions)) } if order.PaymentForm != nil { - contentBuilder.WriteString(fmt.Sprintf("💳 Оплата: %s\n", *order.PaymentForm)) + contentBuilder.WriteString(fmt.Sprintf("Оплата: %s\n", *order.PaymentForm)) } contentBuilder.WriteString("\n📦 Заказ:\n") diff --git a/service/telegram_service/cmd/app.go b/service/telegram_service/cmd/app.go index c5733f7..d958380 100644 --- a/service/telegram_service/cmd/app.go +++ b/service/telegram_service/cmd/app.go @@ -4,10 +4,14 @@ import ( _ "embed" configcore "bitrix_balancer_api/core/config" + "bitrix_balancer_api/core/lib/external/googlesheets" clientcontrollers "bitrix_balancer_api/core/lib/internally/client-controllers" + "bitrix_balancer_api/core/lib/internally/monthly_orders" tgupdatehandler "bitrix_balancer_api/telegram_service/common/update" "bitrix_balancer_api/telegram_service/scheduler" "bitrix_balancer_api/telegram_service/types" + "context" + "github.com/sirupsen/logrus" "log" "runtime/debug" ) @@ -40,11 +44,11 @@ func initService() error { dailyReminder := scheduler.NewDailyReminder(ipc) dailyReminder.Start() - //ctx := context.Background() - //gsClient, err := googlesheets.NewClient(ctx, googleCredsJSON) - //if err != nil { - // logrus.Errorf("Не удалось инициализировать Google Sheets API: %v", err) - //} + ctx := context.Background() + gsClient, err := googlesheets.NewClient(ctx, googleCredsJSON) + if err != nil { + logrus.Errorf("Не удалось инициализировать Google Sheets API: %v", err) + } // НОВОЕ: Перенесли создание UpdateHandler ВЫШЕ update := tgupdatehandler.NewUpdateHandler(ipc) @@ -53,17 +57,17 @@ func initService() error { update.GetUpdateTelegram() }() - //// НОВОЕ: Передаем update.GetApprovalHandler() как интерфейс - //moService := monthly_orders.NewMonthlyOrderService( - // ipc, - // gsClient, - // "1F1ansQeSuAwhe3Y_mhfm4ja370k5hq67RruE-CVp83w", - // "1C4Tl-AQRJENW4THzwH-7yP2Ni0ckMSdm3ndLCrdKr2Y", - // update.GetApprovalHandler(), // <-- Инъекция зависимости - //) + // НОВОЕ: Передаем update.GetApprovalHandler() как интерфейс + moService := monthly_orders.NewMonthlyOrderService( + ipc, + gsClient, + "1F1ansQeSuAwhe3Y_mhfm4ja370k5hq67RruE-CVp83w", + "1C4Tl-AQRJENW4THzwH-7yP2Ni0ckMSdm3ndLCrdKr2Y", + update.GetApprovalHandler(), // <-- Инъекция зависимости + ) - //monthlyOrderChecker := scheduler.NewMonthlyOrderChecker(ipc, moService) - //monthlyOrderChecker.Start() + monthlyOrderChecker := scheduler.NewMonthlyOrderChecker(ipc, moService) + monthlyOrderChecker.Start() return nil } diff --git a/service/telegram_service/scheduler/monthly_order_checker.go b/service/telegram_service/scheduler/monthly_order_checker.go index b5d4a98..03194e5 100644 --- a/service/telegram_service/scheduler/monthly_order_checker.go +++ b/service/telegram_service/scheduler/monthly_order_checker.go @@ -23,7 +23,6 @@ func (c *MonthlyOrderChecker) Start() { func (c *MonthlyOrderChecker) loop() { logrus.Info("🚀 [MonthlyOrderChecker] Воркер автоотправки заказов запущен. Интервал проверки: 15 минут") - time.Sleep(15 * time.Minute) for { now := time.Now() @@ -55,5 +54,6 @@ func (c *MonthlyOrderChecker) loop() { } else { logrus.Debugf("⏳ [MonthlyOrderChecker] Дедлайн (%s) еще не наступил. Спим дальше.", settings.DeadlineDate.Format("02.01.2006 15:04")) } + time.Sleep(15 * time.Minute) } } -- 2.43.0