From e9cad18cb31c10e1fb7b37396fa98e2e2827c4f0 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 7 Mar 2023 13:27:18 +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=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D0=B8=D0=BC=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D0=BE=D0=BC=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=B4=D1=83=D0=BF=D0=BB=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ssau_parser/database.go | 23 ++++++++++++++++++----- modules/ssau_parser/ssau_parser_test.go | 5 ++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go index a6d0435..55ec338 100644 --- a/modules/ssau_parser/database.go +++ b/modules/ssau_parser/database.go @@ -5,7 +5,8 @@ import ( "xorm.io/xorm" ) -func uploadShedule(db *xorm.Engine, sh Shedule) { +func uploadShedule(db *xorm.Engine, sh Shedule) error { + var pairs []database.Lesson for _, line := range sh.Lessons { for _, lesson := range line { var pair database.Lesson @@ -16,15 +17,27 @@ func uploadShedule(db *xorm.Engine, sh Shedule) { Type: subLesson.Type, Name: subLesson.Name, TeacherId: subLesson.TeacherId, - Place: subLesson.Place, - Comment: subLesson.Comment, - SubGroup: subLesson.SubGroup, } for _, groupId := range subLesson.GroupId { pair.GroupId = groupId - db.InsertOne(pair) + var existsLessons []database.Lesson + err := db.Find(&existsLessons, pair) + if err != nil { + return err + } + if len(existsLessons) == 0 { + pair.Place = subLesson.Place + pair.Comment = subLesson.Comment + pair.SubGroup = subLesson.SubGroup + pairs = append(pairs, pair) + } } } } } + if len(pairs) > 0 { + _, err := db.Insert(pairs) + return err + } + return nil } diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index d8f5dfd..3038348 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -49,5 +49,8 @@ func TestParse(t *testing.T) { } engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) - uploadShedule(engine, *shedule) + err = uploadShedule(engine, *shedule) + if err != nil { + t.Error(err) + } }