improvements

Author: MikhailLipanin

internal/bot/tg_bot.go

@@ -61,13 +61,12 @@ func (b *TgBot) Start(_ context.Context, subjects []*internal.Subject) error {
 				b.sendMessage(update.Message.Chat.ID, "Список команд: /start, /help, /schedule")
 			case "schedule":
 				args := strings.Fields(update.Message.Text)
-				if len(args) < 3 {
-					b.sendMessage(update.Message.Chat.ID, "Введите команду в формате: /schedule <Институт> <Группа>")
+				if len(args) != 2 {
+					b.sendMessage(update.Message.Chat.ID, "Введите команду в формате: /schedule <Группа>")
 					return
 				}
-				instituteFilter := args[1]
-				groupFilter := args[2]
-				b.handleSchedule(update.Message.Chat.ID, instituteFilter, groupFilter)
+				groupFilter := args[1]
+				b.handleSchedule(update.Message.Chat.ID, groupFilter)
 			default:
 				b.sendMessage(update.Message.Chat.ID, "Неизвестная команда. Введите /help.")
 			}
@@ -82,15 +81,10 @@ func (b *TgBot) Start(_ context.Context, subjects []*internal.Subject) error {
 	return nil
 }
 
-func (b *TgBot) handleSchedule(chatID int64, instituteFilter, groupFilter string) {
-	// TODO: ИТКН и ИКН - один институт, был ребрендинг ;-)
-	if instituteFilter == "ИТКН" {
-		instituteFilter = "ИКН"
-	}
-
+func (b *TgBot) handleSchedule(chatID int64, groupFilter string) {
 	message := "Расписание пересдач:\n"
 	for _, subj := range b.subjects {
-		if !(subj.Institute == instituteFilter && subj.Group == groupFilter) {
+		if subj.Group != groupFilter {
 			continue
 		}
 		message += b.constructSubjectMsg(subj)

internal/parser/excel_parser.go

@@ -51,9 +51,6 @@ func (p *ExcelParser) Parse() ([]*internal.Subject, error) {
 	subjChan := make(chan *subject)
 	wg := &sync.WaitGroup{}
 	for _, filePath := range files {
-		if filePath != "retakes/obektno-orientirovannoe-programmirovanie.xlsx" {
-			continue
-		}
 		wg.Add(1)
 		go func(filePath string) {
 			defer wg.Done()

internal/parser/models.go

@@ -132,4 +132,8 @@ var (
 	validCommentFields = map[string]struct{}{
 		"Примечание": {},
 	}
+
+	baseDisciplines = map[string]struct{}{
+		"Математика": {},
+	}
 )

internal/parser/usecase.go

@@ -45,7 +45,12 @@ func (s *subject) validate() error {
 		}
 	}
 	if !found {
-		return fmt.Errorf("subject has unknown group")
+		if s.discipline != nil {
+			if _, ok := baseDisciplines[*s.discipline]; ok {
+				return nil
+			}
+		}
+		return fmt.Errorf("subject has unknown group: %s", string(*s.group))
 	}
 
 	return nil