From 106e6b98e896fd2d91ef0ba3739a177041afb8b7 Mon Sep 17 00:00:00 2001
From: far-galaxy <far.galaxy.klg@gmail.com>
Date: Tue, 7 Mar 2023 13:38:50 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE:=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=B2=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.go                                 | 10 ++++++++--
 modules/database/mysql.go               | 15 +++++++--------
 modules/ssau_parser/ssau_parser_test.go |  2 +-
 modules/tg/handlers.go                  | 15 +++++++++------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/main.go b/main.go
index 68e6659..ebbee97 100644
--- a/main.go
+++ b/main.go
@@ -14,7 +14,10 @@ func main() {
 		log.Fatal("No .env file found")
 	}
 
-	engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB"))
+	engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB"))
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	bot := new(tg.Bot)
 	bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine)
@@ -25,7 +28,10 @@ func main() {
 		if update.Message != nil {
 			log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text)
 
-			tg_user := bot.InitUser(update.Message)
+			tg_user, err := bot.InitUser(update.Message)
+			if err != nil {
+				log.Fatal(err)
+			}
 
 			if tg_user.PosTag == "not_started" {
 				bot.Start()
diff --git a/modules/database/mysql.go b/modules/database/mysql.go
index d58217b..dd0611f 100644
--- a/modules/database/mysql.go
+++ b/modules/database/mysql.go
@@ -1,7 +1,6 @@
 package database
 
 import (
-	"log"
 	"math/rand"
 
 	_ "github.com/go-sql-driver/mysql"
@@ -9,10 +8,10 @@ import (
 	"xorm.io/xorm/names"
 )
 
-func Connect(user, pass, db string) *xorm.Engine {
+func Connect(user, pass, db string) (*xorm.Engine, error) {
 	engine, err := xorm.NewEngine("mysql", user+":"+pass+"@tcp(localhost:3306)/"+db+"?charset=utf8")
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 
 	engine.ShowSQL(true)
@@ -20,22 +19,22 @@ func Connect(user, pass, db string) *xorm.Engine {
 
 	err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{})
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
-	return engine
+	return engine, nil
 }
 
-func GenerateID(engine *xorm.Engine) int64 {
+func GenerateID(engine *xorm.Engine) (int64, error) {
 	id := rand.Int63n(899999999) + 100000000
 
 	exists, err := engine.ID(id).Exist(&User{})
 	if err != nil {
-		log.Fatal(err)
+		return 0, err
 	}
 
 	if exists {
 		return GenerateID(engine)
 	} else {
-		return id
+		return id, nil
 	}
 }
diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go
index 3038348..e6d5e79 100644
--- a/modules/ssau_parser/ssau_parser_test.go
+++ b/modules/ssau_parser/ssau_parser_test.go
@@ -48,7 +48,7 @@ func TestParse(t *testing.T) {
 		log.Fatal("No .env file found")
 	}
 
-	engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB"))
+	engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB"))
 	err = uploadShedule(engine, *shedule)
 	if err != nil {
 		t.Error(err)
diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go
index 915b04d..59bfb5e 100644
--- a/modules/tg/handlers.go
+++ b/modules/tg/handlers.go
@@ -7,7 +7,7 @@ import (
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
 )
 
-func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser {
+func (bot *Bot) InitUser(msg *tgbotapi.Message) (*database.TgUser, error) {
 	db := &bot.DB
 	var users []database.TgUser
 	err := db.Find(&users, &database.TgUser{TgId: msg.Chat.ID})
@@ -17,7 +17,10 @@ func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser {
 
 	var tg_user database.TgUser
 	if len(users) == 0 {
-		l9id := database.GenerateID(db)
+		l9id, err := database.GenerateID(db)
+		if err != nil {
+			return nil, err
+		}
 
 		user := database.User{
 			L9Id: l9id,
@@ -29,19 +32,19 @@ func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser {
 			TgId:   msg.Chat.ID,
 			PosTag: "not_started",
 		}
-		_, err := db.Insert(user, tg_user)
+		_, err = db.Insert(user, tg_user)
 		if err != nil {
-			log.Fatal(err)
+			return nil, err
 		}
 	} else {
 		tg_user = users[0]
 	}
 	bot.TG_user = tg_user
-	return &tg_user
+	return &tg_user, nil
 }
 
 func (bot *Bot) Start() {
-	bot.TG_user.PosTag = "started"
+	bot.TG_user.PosTag = "add"
 	_, err := bot.DB.Update(bot.TG_user)
 	if err != nil {
 		log.Fatal(err)