refactor(academic): update course hash logics

api/pack/academic.go

@@ -31,6 +31,7 @@ func BuildScore(res *model.Score) *academicModel.Score {
 		Term:         res.Term,
 		ExamType:     res.ExamType,
 		ElectiveType: res.ElectiveType,
+		Classroom:    res.Classroom,
 	}
 }
 

idl/model.thrift

@@ -110,6 +110,7 @@ struct Score {
     6: required string term             // 学期
     7: required string exam_type        // 考试类型
     8: required string elective_type    // 选修类型
+    9: required string classroom        // 上课地点
 }
 
 // 绩点排名

internal/academic/pack/score.go

@@ -42,6 +42,7 @@ func BuildScores(data []*jwch.Mark) []*model.Score {
 			Term:         data[i].Semester,
 			ExamType:     data[i].ExamType,
 			ElectiveType: data[i].ElectiveType,
+			Classroom:    data[i].Classroom,
 		}
 	}
 
@@ -68,6 +69,7 @@ func BuildScoresYjsy(data []*yjsy.Mark) []*model.Score {
 			Term:         data[i].Semester,
 			ExamType:     data[i].ExamType,
 			ElectiveType: data[i].ElectiveType,
+			Classroom:    data[i].Classroom,
 		}
 	}
 

internal/academic/service/get_scores.go

@@ -167,7 +167,7 @@ func (s *AcademicService) handleScoreChange(stuID string, scores []*jwch.Mark) (
 		if scores[i].Score != oldScores[i].Score {
 			// 尝试获取课程信息
 			courseHash := utils.GenerateCourseHash(scores[i].Name, scores[i].Semester, scores[i].Teacher,
-				scores[i].ElectiveType)
+				scores[i].ElectiveType, scores[i].Classroom)
 			existingCourse, err := s.db.Academic.GetCourseByHash(s.ctx, courseHash)
 			if err != nil {
 				return err
@@ -189,6 +189,7 @@ func (s *AcademicService) handleScoreChange(stuID string, scores []*jwch.Mark) (
 					Term:         scores[i].Semester,
 					Teacher:      scores[i].Teacher,
 					ElectiveType: scores[i].ElectiveType,
+					Classroom:    scores[i].Classroom,
 					CourseHash:   courseHash,
 				})
 				if err != nil {

pkg/db/model/academic.go

@@ -37,6 +37,7 @@ type CourseOffering struct {
 	Term         string         `json:"term"`
 	Teacher      string         `json:"teacher"`
 	ElectiveType string         `json:"elective_type"`
+	Classroom    string         `json:"classroom"`
 	CourseHash   string         `json:"course_hash"`
 	CreatedAt    time.Time      `json:"created_at"`
 	UpdatedAt    time.Time      `json:"updated_at"`

pkg/utils/jwch.go

@@ -54,7 +54,7 @@ func ParseJwchStuId(id string) string {
 }
 
 // GenerateCourseHash 生成课程的唯一哈希
-func GenerateCourseHash(name, term, teacher, electiveType string) string {
-	input := strings.Join([]string{name, term, teacher, electiveType}, "|")
+func GenerateCourseHash(name, term, teacher, electiveType, classroom string) string {
+	input := strings.Join([]string{name, term, teacher, electiveType, classroom}, "|")
 	return SHA256(input)
 }