bot improvements

Author: MikhailLipanin

cmd/main.go

@@ -4,25 +4,22 @@ import (
 	"context"
 	"flag"
 	"log"
+	"os"
 	"os/signal"
 	"syscall"
 
+	"go.uber.org/multierr"
+
 	"github.com/cool-dudes-alpha-dynamite-wolves/chto-tam-po-peresdacham/internal/bot"
 	"github.com/cool-dudes-alpha-dynamite-wolves/chto-tam-po-peresdacham/internal/parser"
 )
 
 var (
-
 	// хранить секреты в коде плохо, поэтому используем флаги
 	// "1953480583:AAEU7eBaZnCUt525oUkCMRCQxK1TJmaoVd4"
 	botToken = flag.String("tg.token", "", "token for telegram")
-
-	// это не секрет, но для простоты тоже выносим под конфиг
-	// "https://5872-95-165-1-28.eu.ngrok.io"
-	WebhookURL = flag.String("tg.webhook", "", "webhook addr for telegram")
-
 	// запуск выглядит так:
-	// go run bot.go -tg.token="1953480583:AAEU7eBaZnCUt525oUkCMRCQxK1TJmaoVd4" -tg.webhook="https://5872-95-165-1-28.eu.ngrok.io"
+	// go run bot.go -tg.token="1953480583:AAEU7eBaZnCUt525oUkCMRCQxK1TJmaoVd4"
 )
 
 func main() {
@@ -44,19 +41,27 @@ func main() {
 	log.Println("Parsing completed!")
 
 	// Инициализация и запуск бота
-	bot, err := bot.NewTgBot(*botToken)
+	port := os.Getenv("PORT")
+	if port == "" {
+		port = "8081"
+	}
+	log.Println("PORT:", port)
+	if *botToken == "" {
+		*botToken = os.Getenv("BOT_TOKEN")
+	}
+	bot, err := bot.NewTgBot(*botToken, port)
 	if err != nil {
 		log.Fatal("failed to initialize bot", err)
 	}
+
 	ctx, stop := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT)
 	defer stop()
 
-	err = func() error {
-		if err = bot.Start(ctx, data); err != nil {
-			log.Println("failed to start bot:", err.Error())
-			return err
-		}
-		for {
+	err = run(ctx, stop,
+		func(ctx context.Context) error {
+			return bot.Start(ctx, data)
+		},
+		func(ctx context.Context) error {
 			select {
 			case <-ctx.Done():
 				log.Println("got stop signal")
@@ -65,12 +70,34 @@ func main() {
 				log.Println("got err from bot:", err.Error())
 				return err
 			}
-		}
-	}()
-	log.Println("app is shutting down...")
-	stop()
+		},
+	)
+
+	log.Println("application is shutting down...")
+	if err != nil {
+		log.Println("failed to shutdown application", err)
+	}
 
 	if err = bot.Shutdown(ctx); err != nil {
 		log.Println("got error during bot shutdown:", err.Error())
 	}
 }
+
+func run(ctx context.Context, shutdown func(), startUpFuncs ...func(ctx context.Context) error) error {
+	errCh := make(chan error)
+	for i := range startUpFuncs {
+		go func(i int) { errCh <- startUpFuncs[i](ctx) }(i)
+	}
+
+	var err error
+	var closed bool
+	for range startUpFuncs {
+		err = multierr.Append(err, <-errCh)
+		if err != nil && !closed {
+			shutdown()
+			closed = true
+		}
+	}
+
+	return err
+}

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
 	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.28.0 // indirect
 	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/text v0.19.0 // indirect

go.sum

@@ -19,6 +19,8 @@ github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQ
 github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
 github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 h1:hPVCafDV85blFTabnqKgNhDCkJX25eik94Si9cTER4A=
 github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
 golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=

internal/bot/tg_bot.go

@@ -21,12 +21,7 @@ type TgBot struct {
 	subjects []*internal.Subject // Данные из парсера
 }
 
-type Subject struct {
-	Name string    // Название предмета
-	Date time.Time // Дата пересдачи
-}
-
-func NewTgBot(token string) (*TgBot, error) {
+func NewTgBot(token, port string) (*TgBot, error) {
 	errChan := make(chan error, 1)
 	bot, err := telegram.NewBotAPI(token)
 	if err != nil {
@@ -36,7 +31,10 @@ func NewTgBot(token string) (*TgBot, error) {
 	// bot.Debug = true
 
 	return &TgBot{
-		server:  &http.Server{ReadHeaderTimeout: 1 * time.Second},
+		server: &http.Server{
+			ReadHeaderTimeout: 1 * time.Second,
+			Addr:              ":" + port,
+		},
 		errChan: errChan,
 		bot:     bot,
 	}, nil
@@ -85,57 +83,23 @@ func (b *TgBot) Start(_ context.Context, subjects []*internal.Subject) error {
 }
 
 func (b *TgBot) handleSchedule(chatID int64, instituteFilter, groupFilter string) {
-	if len(b.subjects) == 0 {
-		b.sendMessage(chatID, "Нет данных о пересдачах.")
-		return
-	}
-
 	message := "Расписание пересдач:\n"
 	for _, subj := range b.subjects {
-		if subj.Institute != instituteFilter {
+		if !(subj.Institute == instituteFilter && subj.Group == groupFilter) {
 			continue
 		}
-		if !strings.HasPrefix(subj.Group, groupFilter) {
-			continue
-		}
-
-		date := "не указана"
-		timeOfStart := "не указано"
-
-		if subj.Date != nil {
-			date = subj.Date.Format("02.01.2006")
-		}
-		if subj.TimeOfStart != nil {
-			timeOfStart = subj.TimeOfStart.Format("15:04")
-		}
-
-		message += fmt.Sprintf(
-			"- Дисциплина: %s\n  Институт: %s\n  Группа: %s\n  Дата: %s\n  Время: %s\n  Аудитория: %s\n\n",
-			getOrDefault(subj.Discipline, "не указана"),
-			subj.Institute,
-			subj.Group,
-			date,
-			timeOfStart,
-			getOrDefault(subj.Classroom, "не указана"),
-		)
+		message += b.constructSubjectMsg(subj)
 	}
 	if message == "Расписание пересдач:\n" {
 		message = "Нет данных для выбранных фильтров."
 	}
 	b.sendMessage(chatID, message)
 }
 
-func getOrDefault(value *string, defaultValue string) string {
-	if value != nil {
-		return *value
-	}
-	return defaultValue
-}
-
 func (b *TgBot) sendMessage(chatID int64, text string) {
 	msg := telegram.NewMessage(chatID, text)
 	if _, err := b.bot.Send(msg); err != nil {
-		log.Printf("Ошибка отправки сообщения: %v", err)
+		log.Printf("Ошибка отправки сообщения: %v\n", err)
 	}
 }
 

internal/bot/usecase.go

@@ -0,0 +1,35 @@
+package bot
+
+import (
+	"fmt"
+
+	"github.com/cool-dudes-alpha-dynamite-wolves/chto-tam-po-peresdacham/internal"
+)
+
+func (b *TgBot) constructSubjectMsg(subject *internal.Subject) (message string) {
+	message += fmt.Sprintf("- Институт: %s\n", subject.Institute)
+	message += fmt.Sprintf("  Группа: %s\n", subject.Group)
+	if subject.Discipline != nil {
+		message += fmt.Sprintf("  Дисциплина: %s\n", *subject.Discipline)
+	}
+	if subject.Year != nil {
+		message += fmt.Sprintf("  Курс: %d\n", *subject.Year)
+	}
+	if subject.Professor != nil {
+		message += fmt.Sprintf("  Преподаватель: %s\n", *subject.Professor)
+	}
+	if subject.Date != nil {
+		message += fmt.Sprintf("  Дата: %s\n", subject.Date.Format(internal.DateLayout))
+	}
+	if subject.TimeOfStart != nil {
+		message += fmt.Sprintf("  Время: %s\n", subject.TimeOfStart.Format(internal.TimeOfStartLayout))
+	}
+	if subject.Classroom != nil {
+		message += fmt.Sprintf("  Аудитория: %s\n", *subject.Classroom)
+	}
+	if subject.Comment != nil {
+		message += fmt.Sprintf("  Примечание: %s\n", *subject.Comment)
+	}
+	message += "\n"
+	return
+}

internal/models.go

@@ -2,6 +2,11 @@ package internal
 
 import "time"
 
+const (
+	DateLayout        = "02.01.2006"
+	TimeOfStartLayout = "15:04"
+)
+
 type Subject struct {
 	Discipline  *string
 	Institute   string

internal/parser/excel_parser.go

@@ -196,7 +196,7 @@ func (p *ExcelParser) getSubjectOpts(headers []string) (opts []rawSubjectOption)
 			})
 		} else if _, ok = validDateFields[cell]; ok {
 			opts = append(opts, func(s *rawSubject, value string) error {
-				v, err := time.Parse(dateLayout, value)
+				v, err := time.Parse(internal.DateLayout, value)
 				if err != nil {
 					return fmt.Errorf("can not parse date %s; err: %s", value, err)
 				}
@@ -205,7 +205,7 @@ func (p *ExcelParser) getSubjectOpts(headers []string) (opts []rawSubjectOption)
 			})
 		} else if _, ok = validTimeOfStartFields[cell]; ok {
 			opts = append(opts, func(s *rawSubject, value string) error {
-				v, err := time.Parse(timeOfStartLayout, value)
+				v, err := time.Parse(internal.TimeOfStartLayout, value)
 				if err != nil {
 					return fmt.Errorf("can not parse time of start %s; err: %s", value, err)
 				}

internal/parser/models.go

@@ -8,9 +8,6 @@ import (
 const (
 	requiredFieldsInARowMinimum = 3
 
-	dateLayout        = "02.01.2006"
-	timeOfStartLayout = "15:04"
-
 	disciplinePatternRegex = "^[А-Я]{3,4}-\\d{2}-\\d$"
 )