Feat/teacher

.gitignore

@@ -9,7 +9,7 @@
 *.dylib
 /output
 /data
-
+**/data
 # Test binary, built with `go test -c`
 *.test
 
@@ -27,3 +27,27 @@ go.work.sum
 .env
 
 *.sqlite
+
+
+# my dev
+util/__pycache__
+util/jac-auth.py
+util/jaccount-scrapy.go
+util/selenium_get.go
+util/selenium-get.py
+cmd/import_from_jwc/import_from_jwc.go
+main.go
+dal
+**/data
+log
+*.db
+cmd/**/*.py
+
+.gitignore
+*.pdf
+**/*.txt
+
+*.db
+.gitignore
+.github
+.idea

cmd/load/extend_teacher_profile.go

@@ -0,0 +1,60 @@
+package main
+
+import (
+	"jcourse_go/dal"
+	"jcourse_go/model/po"
+	seleniumget "jcourse_go/util/selenium-get"
+	"log"
+	"os"
+)
+
+func main() {
+	dal.InitDBClient()
+	db := dal.GetDBClient()
+	extend_teacher_data_path := "./data/teachers.json"
+	log_file, err := os.OpenFile("./log/logfile.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	if err != nil {
+		panic(err)
+	}
+	defer log_file.Close()
+	defer log.SetOutput(os.Stdout)
+
+	log.SetOutput(log_file)
+
+	extend_teachers := seleniumget.LoadTeacherProfiles(extend_teacher_data_path)
+
+	// to extend: email, profile_url, profile_desc, picture
+	for _, t := range extend_teachers {
+		// t.department 是全名，jwc是简称
+		var teachers []po.TeacherPO
+		db.Model(po.TeacherPO{}).Where("name = ?", t.Name).Find(&teachers)
+		if len(teachers) == 1 {
+			teachers[0].Email = t.Mail
+			teachers[0].ProfileURL = t.ProfileUrl
+			teachers[0].Biography = t.Biography
+			teachers[0].Picture = t.HeadImage
+			db.Save(&teachers[0])
+			continue
+		}
+		// len == 0, no need to extend
+		if len(teachers) > 1 {
+			confirm := false
+			for _, tt := range teachers {
+				if tt.Department == t.Department {
+					tt.Email = t.Mail
+					tt.ProfileURL = t.ProfileUrl
+					tt.Biography = t.Biography
+					tt.Picture = t.HeadImage
+					db.Save(&tt)
+					confirm = true
+					break
+				}
+			}
+			if !confirm {
+				log.Printf("name %s has multiple teachers, please extend by hand", t.Name)
+			}
+		}
+
+	}
+
+}

cmd/load/extend_training_plan.go

@@ -0,0 +1,78 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"gorm.io/gorm"
+	"jcourse_go/dal"
+	"jcourse_go/model/po"
+	seleniumget "jcourse_go/util/selenium-get"
+	"log"
+	"os"
+	"strconv"
+)
+
+func main() {
+	dal.InitDBClient()
+	db := dal.GetDBClient()
+	data_path := "./data/trainingPlan.txt"
+	log_file, err := os.OpenFile(fmt.Sprintf("./log/logfile.log"), os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	if err != nil {
+		panic(err)
+	}
+	defer log_file.Close()
+	defer log.SetOutput(os.Stdout)
+	log.SetOutput(log_file)
+	allTrainingPlans := seleniumget.LoadTrainingPLans(data_path)
+
+	// 对齐trainingplan course 和 basecourse
+	var all_courses []po.BaseCoursePO
+	db.Model(po.BaseCoursePO{}).Find(&all_courses)
+
+	var tp_courses []seleniumget.LoadedCourse
+	for _, tp := range allTrainingPlans {
+		tp_courses = append(tp_courses, tp.Courses...)
+	}
+
+	for _, tp := range allTrainingPlans {
+		tp_po := po.TrainingPlanPO{
+			Degree:     tp.Degree,
+			Major:      tp.Name,
+			Department: tp.Department,
+			EntryYear:  strconv.Itoa(tp.EntryYear),
+			TotalYear:  tp.TotalYear,
+			MinCredits: tp.MinCredits,
+			MajorCode:  tp.Code,
+			MajorClass: tp.MajorClass,
+		}
+		result := db.Model(po.TrainingPlanPO{}).Create(&tp_po)
+		if result.Error != nil {
+			log.Fatalf("In create training plan %#v:%#v", tp, result.Error)
+		}
+		for _, c := range tp.Courses {
+			course := po.BaseCoursePO{}
+			cresult := db.Model(po.BaseCoursePO{}).Where("code = ?", c.Code).First(&course)
+			if cresult.Error != nil {
+				if !errors.Is(cresult.Error, gorm.ErrRecordNotFound) {
+					log.Fatalf("In bind course %#v totraining plan %#v:%#v", c, tp, cresult.Error)
+				}
+				// HINT:for production
+				log.Printf("In bind course %#v totraining plan %#v:course not found", c, tp)
+				continue
+			}
+			tpc_po := po.TrainingPlanCoursePO{
+				TrainingPlanID:  int64(tp_po.ID),
+				CourseID:        int64(course.ID),
+				SuggestSemester: c.SuggestSemester,
+				Department:      c.Department,
+			}
+			cresult = db.Model(po.TrainingPlanCoursePO{}).Create(&tpc_po)
+			if cresult.Error != nil {
+				if !errors.Is(cresult.Error, gorm.ErrRecordNotFound) {
+					log.Fatalf("In bind course %#v totraining plan %#v:%#v", c, tp, cresult.Error)
+				}
+				log.Printf("In bind course %#v totraining plan %#v:course not found", c, tp)
+			}
+		}
+	}
+}

cmd/migrate/migrate.go

@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/joho/godotenv"
 	"jcourse_go/dal"
 	"jcourse_go/model/po"
+
+	"github.com/joho/godotenv"
 )
 
 func main() {
@@ -13,7 +14,7 @@ func main() {
 	err := db.AutoMigrate(&po.UserPO{},
 		&po.BaseCoursePO{}, &po.CoursePO{}, &po.TeacherPO{}, &po.CourseCategoryPO{},
 		&po.OfferedCoursePO{}, &po.OfferedCourseTeacherPO{},
-		&po.ReviewPO{}, &po.RatingPO{})
+		&po.ReviewPO{}, &po.RatingPO{}, &po.TrainingPlanPO{}, &po.TrainingPlanCoursePO{})
 	if err != nil {
 		panic(err)
 	}

handler/auth.go

@@ -4,12 +4,13 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/gin-gonic/contrib/sessions"
-	"github.com/gin-gonic/gin"
 	"jcourse_go/constant"
 	"jcourse_go/model/domain"
 	"jcourse_go/model/dto"
 	"jcourse_go/service"
+
+	"github.com/gin-gonic/contrib/sessions"
+	"github.com/gin-gonic/gin"
 )
 
 func LoginHandler(c *gin.Context) {

handler/teacher.go

@@ -1,7 +1,113 @@
 package handler
 
-import "github.com/gin-gonic/gin"
+import (
+	"jcourse_go/constant"
+	"jcourse_go/model/converter"
+	"jcourse_go/model/domain"
+	"jcourse_go/model/dto"
+	"net/http"
 
-func GetTeacherListHandler(c *gin.Context) {}
+	"jcourse_go/service"
 
-func GetTeacherDetailHandler(c *gin.Context) {}
+	"github.com/gin-gonic/gin"
+)
+
+func convertTeacherListFilter(request dto.TeacherListRequest) domain.TeacherListFilter {
+	filter := domain.TeacherListFilter{
+		Page:       request.Page,
+		PageSize:   request.PageSize,
+		Name:       request.Name,
+		Department: request.Department,
+		Pinyin:     request.Pinyin,
+		PinyinAbbr: request.PinyinAbbr,
+	}
+
+	return filter
+}
+
+func GetTeacherListHandler(c *gin.Context) {
+	request := dto.TeacherListRequest{
+		Page:     constant.DefaultPage,
+		PageSize: constant.DefaultPageSize,
+	}
+	if err := c.ShouldBindQuery(&request); err != nil {
+		c.JSON(http.StatusBadRequest, dto.BaseResponse{Message: "参数错误"})
+		return
+	}
+	filter := convertTeacherListFilter(request)
+
+	teachers, err := service.SearchTeacherList(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
+		return
+	}
+
+	total, err := service.GetTeacherCount(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "查无此人。"})
+		return
+	}
+
+	resp := dto.TeacherListResponse{
+		Total:    total,
+		Data:     converter.ConvertTeacherListDomainToDTO(teachers),
+		Page:     request.Page,
+		PageSize: int64(len(teachers)),
+	}
+	c.JSON(http.StatusOK, resp)
+}
+
+func GetTeacherDetailHandler(c *gin.Context) {
+	var request dto.TeacherDetailRequest
+	if err := c.ShouldBindUri(&request); err != nil {
+		c.JSON(http.StatusNotFound, dto.BaseResponse{Message: "参数错误"})
+	}
+
+	teacher, err := service.GetTeacherDetail(c, request.TeacherID)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
+		return
+	}
+	c.JSON(http.StatusOK, converter.ConvertTeacherDomainToDTO(*teacher))
+}
+
+func SearchTeacherListHandler(c *gin.Context) {
+	var request dto.TeacherListRequest
+	if err := c.ShouldBind(&request); err != nil {
+		c.JSON(http.StatusBadRequest, dto.BaseResponse{Message: "参数错误"})
+		return
+	}
+
+	filter := domain.TeacherListFilter{
+		Name:       request.Name,
+		Department: request.Department,
+		Pinyin:     request.Pinyin,
+		PinyinAbbr: request.PinyinAbbr,
+		Page:       request.Page,
+		PageSize:   request.PageSize,
+	}
+
+	teachers, err := service.SearchTeacherList(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
+		return
+	}
+
+	total, err := service.GetTeacherCount(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "查无此人。"})
+		return
+	}
+
+	resp := dto.TeacherListResponse{
+		Total:    total,
+		Data:     converter.ConvertTeacherListDomainToDTO(teachers),
+		Page:     request.Page,
+		PageSize: int64(len(teachers)),
+	}
+	c.JSON(http.StatusOK, resp)
+}
+
+func CreateTeacherHandler(c *gin.Context) {}
+
+func UpdateTeacherHandler(c *gin.Context) {}

handler/teacher_test.go

@@ -0,0 +1,57 @@
+package handler
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestGetTeacherDetailHandler(t *testing.T) {
+	w, r := baseConfig()
+
+	r.GET("/api/teacher/:teacherID", GetTeacherDetailHandler)
+	req, _ := http.NewRequest("GET", "/api/teacher/1", nil)
+	r.ServeHTTP(w, req)
+	// log
+
+	prettyJsonLog(w)
+}
+
+func TestGetTeacherListHandler(t *testing.T) {
+	w, r := baseConfig()
+
+	r.GET("/api/teacher", GetTeacherListHandler)
+	req, _ := http.NewRequest("GET", "/api/teacher", nil)
+	r.ServeHTTP(w, req)
+	// log
+
+	prettyJsonLog(w)
+}
+
+func TestSearchTeacherListHandler(t *testing.T) {
+	querys := map[string]struct {
+		q      string
+		status int
+	}{
+		"valid-multi-req":   {"name=古金宇&page=1&page_size=3", http.StatusOK},
+		"valid-single-req":  {"name=古金宇&department=电子信息与电气工程学院&page=1&page_size=3", http.StatusOK},
+		"invalid-value-req": {"name=你谁", http.StatusOK},
+		"invalid-page-req":  {"page=-1&page_size=10086", http.StatusOK},
+		"overflow-page-req": {"page=10086&page_size=1", http.StatusOK},
+		"invalid-key-req":   {"hello=1", http.StatusBadRequest},
+	}
+
+	for name, s := range querys {
+		t.Run(name, func(t *testing.T) {
+			w, r := baseConfig()
+			r.GET("/api/teacher/query", SearchTeacherListHandler)
+			req, _ := http.NewRequest("GET", "/api/teacher/query", nil)
+			req.URL.RawQuery = s.q
+			r.ServeHTTP(w, req)
+			// log
+			if w.Code != s.status {
+				t.Errorf("Expected status code %d, but got %d", s.status, w.Code)
+			}
+			prettyJsonLog(w)
+		})
+	}
+}