Merge branch 'main' into feat/teacher

# Conflicts:
#	cmd/migrate/migrate.go
#	handler/auth.go
#	repository/course.go
#	repository/teacher.go

.github/workflows/golangci-lint.yml

@@ -0,0 +1,27 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: latest
+          args: --timeout 3m --verbose

.golangci.yml

@@ -0,0 +1,12 @@
+linters:
+  enable:
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    - gocyclo
+    - gofmt
+    - goimports
+  fast: true

cmd/import_from_jwc/import_from_jwc.go

@@ -11,6 +11,7 @@ import (
 	pinyin2 "github.com/mozillazg/go-pinyin"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
+
 	"jcourse_go/dal"
 	"jcourse_go/model/po"
 )
@@ -39,7 +40,9 @@ func initDB() {
 
 func readRawCSV(filename string) [][]string {
 	fs, err := os.Open(filename)
-	defer fs.Close()
+	defer func(fs *os.File) {
+		_ = fs.Close()
+	}(fs)
 	if err != nil {
 		panic(err)
 	}
@@ -229,7 +232,6 @@ func queryAllTeacher() {
 		teacherKeyMap[makeTeacherKey(teacher.Code)] = teacher
 		teacherIDMap[teacher.ID] = teacher
 	}
-	return
 }
 
 func parseCourseFromLine(line []string) po.CoursePO {
@@ -263,7 +265,6 @@ func queryAllCourse() {
 		courseKeyMap[makeCourseKey(course.Code, course.MainTeacherName)] = course
 		courseIDMap[course.ID] = course
 	}
-	return
 }
 
 func parseOfferedCourseFromLine(line []string) po.OfferedCoursePO {
@@ -297,7 +298,6 @@ func queryAllOfferedCourse() {
 		offeredCourseIDMap[offeredCourse.ID] = offeredCourse
 		offeredCourseKeyMap[makeOfferedCourseKey(offeredCourse.CourseID, offeredCourse.Semester)] = offeredCourse
 	}
-	return
 }
 
 func parseOfferedCourseTeacherGroup(line []string) []po.OfferedCourseTeacherPO {
@@ -329,7 +329,6 @@ func queryAllOfferedCourseTeacherGroup() {
 	for _, offeredCourseTeacher := range offeredCourseTeachers {
 		offeredCourseTeacherKeyMap[makeOfferedCourseTeacherKey(offeredCourseTeacher.OfferedCourseID, offeredCourseTeacher.TeacherID)] = offeredCourseTeacher
 	}
-	return
 }
 
 func parseCourseCategories(line []string) []po.CourseCategoryPO {
@@ -364,7 +363,6 @@ func queryAllCourseCategory() {
 		}
 		courseCategoryMap[makeCourseCategoryKey(int64(course.ID), courseCategory.Category)] = courseCategory
 	}
-	return
 }
 
 func generatePinyin(name string) string {

cmd/migrate/migrate.go

@@ -1,10 +1,10 @@
 package main
 
 import (
+	"github.com/joho/godotenv"
+
 	"jcourse_go/dal"
 	"jcourse_go/model/po"
-
-	"github.com/joho/godotenv"
 )
 
 func main() {

dal/sql.go

@@ -5,13 +5,14 @@ import (
 	"log"
 	"os"
 
+	"jcourse_go/util"
+
 	"github.com/DATA-DOG/go-sqlmock"
 	_ "github.com/lib/pq"
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"jcourse_go/util"
 )
 
 var dbClient *gorm.DB

handler/admin.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"jcourse_go/model/domain"
+	"jcourse_go/model/dto"
+	"jcourse_go/service"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+func AdminGetUserList(c *gin.Context) {
+	var request dto.UserListRequest
+	if err := c.ShouldBindQuery(&request); err != nil {
+		c.JSON(http.StatusBadRequest, dto.BaseResponse{Message: "参数错误"})
+		return
+	}
+
+	filter := domain.UserFilter{
+		Page:     request.Page,
+		PageSize: request.PageSize,
+	}
+	users, err := service.AdminGetUserList(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
+	}
+	total, _ := service.GetUserCount(c, filter)
+	response := dto.UserListResponseForAdmin{
+		Page:     request.Page,
+		PageSize: request.PageSize,
+		Total:    total,
+		Data:     users,
+	}
+	c.JSON(http.StatusOK, response)
+}

handler/auth.go

@@ -4,13 +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/course.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
+
 	"jcourse_go/constant"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
@@ -85,6 +86,10 @@ func GetCourseListHandler(c *gin.Context) {
 		return
 	}
 	total, err := service.GetCourseCount(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
+		return
+	}
 
 	resp := dto.CourseListResponse{
 		Total:    total,

handler/review.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+
 	"jcourse_go/middleware"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
@@ -48,6 +49,10 @@ func GetReviewListHandler(c *gin.Context) {
 		return
 	}
 	total, err := service.GetReviewCount(c, filter)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
+		return
+	}
 
 	response := dto.ReviewListResponse{
 		Page:     request.Page,
@@ -96,7 +101,7 @@ func UpdateReviewHandler(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, dto.UpdateReviewResponse{ReviewID: request.ReviewID})
+	c.JSON(http.StatusOK, dto.UpdateReviewResponse{ReviewID: request.ReviewID}) // nolint: gosimple
 }
 
 func DeleteReviewHandler(c *gin.Context) {
@@ -110,7 +115,8 @@ func DeleteReviewHandler(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, dto.BaseResponse{Message: "内部错误。"})
 		return
 	}
-	c.JSON(http.StatusOK, dto.DeleteReviewResponse{ReviewID: request.ReviewID})
+
+	c.JSON(http.StatusOK, dto.DeleteReviewResponse{ReviewID: request.ReviewID}) // nolint: gosimple
 }
 
 func GetReviewListForCourseHandler(c *gin.Context) {}