<feat>(all)希望是最后一次

Author: luohuixi

circle/api.md

@@ -1244,6 +1244,40 @@ Response：JSON
 }
 ```
 
+###  取消关注圈子/unfollowcircle
+
+POST   
+
+Body：JSON
+
+| circleid | 圈子id |
+| -------- | ------ |
+
+Response：JSON
+
+```json
+{
+    "message": "取消关注成功"
+}
+```
+
+###  是否关注圈子/showfollowcircle
+
+POST   
+
+Body：JSON
+
+| circleid | 圈子id |
+| -------- | ------ |
+
+Response：JSON
+
+```json
+{
+    "message": "已关注/未关注"
+}
+```
+
 # 搜索 /search/..
 
 ###  搜索圈子/searchcircle

circle/configs/data2.json

@@ -1,3 +1,3 @@
 {
-    "email":"cmuusgyezivbeccj"
+    "email":"NArNLRpUAeGK8QkA"
 }

circle/controllers/circle_contorllers.go

@@ -68,4 +68,26 @@ func (uc *CircleControllers) FollowCircle(c *gin.Context){
 	n,_:=name.(string)
     message:=uc.us.FollowCircle(n,get)
     c.JSON(200,gin.H{"message":message})
+}
+func (uc *CircleControllers) UnFollowCircle(c *gin.Context){
+    var get request.Circleid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	message:=uc.us.UnFollowCircle(n,get)
+	c.JSON(200,gin.H{"message":message})
+}
+func (uc *CircleControllers) ShowFollowCircle(c *gin.Context){
+	var get request.Circleid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	message:=uc.us.ShowFollowCircle(n,get)
+	c.JSON(200,gin.H{"message":message})
 }

circle/controllers/practice_contorllers.go

@@ -152,4 +152,37 @@ func (uc *PracticeControllers) GetPracticeSituation(c *gin.Context) {
 	}
 	message:=uc.us.GetPracticeSituation(get)
 	c.JSON(200, gin.H{"message":message})
+}
+func (uc *PracticeControllers) Lovepracticecomment(c *gin.Context) {
+	var get request.Commentid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	message:= uc.us.Lovepracticecomment(n,get)
+	c.JSON(200, gin.H{"message": message})
+}
+func (uc *PracticeControllers) Unlovepracticecomment(c *gin.Context) {
+	var get request.Commentid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	message:= uc.us.Unlovepracticecomment(n,get)
+	c.JSON(200, gin.H{"message": message})
+}
+func (uc *PracticeControllers) Showlovepracticecomment(c *gin.Context) {
+	var get request.Commentid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	test:= uc.us.Showlovepracticecomment(n,get)
+	c.JSON(200, gin.H{"message": test})
 }

circle/controllers/test_contorllesrs.go

@@ -210,3 +210,36 @@ func (uc *TestControllers) FollowCircleTest(c *gin.Context) {
 	test:=uc.us.FollowCircleTest(n)
 	c.JSON(200, gin.H{"test": test})
 }
+func (uc *TestControllers) Lovetestcomment(c *gin.Context) {
+	var get request.Commentid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	message:= uc.us.Lovetestcomment(n,get)
+	c.JSON(200, gin.H{"message": message})
+}
+func (uc *TestControllers) Unlovetestcomment(c *gin.Context) {
+	var get request.Commentid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	message:= uc.us.Unlovetestcomment(n,get)
+	c.JSON(200, gin.H{"message": message})
+}
+func (uc *TestControllers) Showlovetestcomment(c *gin.Context) {
+	var get request.Commentid
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	name,_:=c.Get("username")
+	n,_:=name.(string)
+	test:= uc.us.Showlovetestcomment(n,get)
+	c.JSON(200, gin.H{"message": test})
+}

circle/controllers/user_contorllers.go

@@ -138,27 +138,47 @@ func (uc *UserControllers) Getname(c *gin.Context) {
 	c.JSON(200, gin.H{"success": message})
 }
 func (uc *UserControllers) Mytest(c *gin.Context) {
+	var get request.Number
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
 	name,_:=c.Get("username")
 	n,_:=name.(string)
-	test:=uc.us.Mytest(n)
+	test:=uc.us.Mytest(n, get.Page)
     c.JSON(200, gin.H{"success": test})
 }
 func (uc *UserControllers) Mypractice(c *gin.Context) {
+	var get request.Number
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
 	name,_:=c.Get("username")
 	n,_:=name.(string)
-	practice:=uc.us.Mypractice(n)
+	practice:=uc.us.Mypractice(n, get.Page)
 	c.JSON(200, gin.H{"success": practice})
 }
 func (uc *UserControllers) MyDoTest(c *gin.Context) {
+	var get request.Number
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
 	name,_:=c.Get("username")
 	n,_:=name.(string)
-	test:=uc.us.MyDoTest(n)
+	test:=uc.us.MyDoTest(n, get.Page)
 	c.JSON(200, gin.H{"success": test})
 }
 func (uc *UserControllers) MyDoPractice(c *gin.Context) {
+	var get request.Number
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
 	name,_:=c.Get("username")
 	n,_:=name.(string)
-	practice:=uc.us.MyDoPractice(n)
+	practice:=uc.us.MyDoPractice(n, get.Page)
 	c.JSON(200, gin.H{"success": practice})
 }
 func (uc *UserControllers) MyUser(c *gin.Context){

circle/dao/circle_dao.go

@@ -45,4 +45,11 @@ func (ud *CircleDao) GetIdByUser(name string) (int, error) {
 	var id int
 	err := database.DB.Model(&models.User{}).Where("name = ?", name).Select("id").First(&id).Error
 	return id, err
+}
+func (ud *CircleDao) UnFollowCircle(circleid int, userid int) error {
+	return database.DB.Where("circleid=? and userid=?", circleid, userid).Delete(&models.FollowCircle{}).Error
+}
+func (ud *CircleDao) ShowFollowCircle(circleid int, userid int) error {
+	err:=database.DB.Where("circleid=? and userid=?", circleid, userid).First(&models.FollowCircle{}).Error
+	return err
 }

circle/dao/practice_dao.go

@@ -162,4 +162,12 @@ func (ud *PracticeDao) UpdatePracticeSituation(practicesituation *models.Practic
 		return fmt.Errorf("更新练习记录失败: %w", err)
 	}
 	return nil
+}
+func (ud *PracticeDao) GetPracticeCommentByID(commentid int) (models.PracticeComment, error) {
+	var comment models.PracticeComment
+	err := database.DB.Where("commentid = ?", commentid).First(&comment).Error
+	return comment, err
+}
+func (ud *PracticeDao) UpdatePracticeComment(comment *models.PracticeComment) error {
+	return database.DB.Save(comment).Error
 }

circle/dao/search_dao.go

@@ -12,7 +12,7 @@ func NewSearchDao(db *gorm.DB) *SearchDao {
 }
 func (ud *SearchDao) SearchCircle(circlekey string) ([]models.Circle) {
 	var circle []models.Circle
-	_ = database.DB.Where("name LIKE ?", "%"+circlekey+"%").Find(&circle).Error
+	_ = database.DB.Where("name LIKE ?", "%"+circlekey+"%").Where("status = ?", "approved").Find(&circle).Error
 	return circle
 }
 func (ud *SearchDao) SearchTest(testkey string) ([]models.Test) {
@@ -33,7 +33,7 @@ func (ud *SearchDao) SearchHistory(searchkey string,userid int)  {
 }
 func (ud *SearchDao) ShowSearchHistory(userid int) ([]models.SearchHistory){
 	var searchhistory []models.SearchHistory
-	_ = database.DB.Where("userid = ?", userid).Find(&searchhistory).Error
+	_ = database.DB.Where("userid = ?", userid).Order("id DESC").Find(&searchhistory).Error
 	return searchhistory
 }
 func (ud *SearchDao) DeleteHistory(id int)  {

circle/dao/test_dao.go

@@ -166,4 +166,12 @@ func (ud *TestDao) GetUserByName(name string) (*models.User, error) {
 	var user models.User
 	err := database.DB.Where("name = ?", name).First(&user).Error
 	return &user, err
+}
+func (ud *TestDao) GetTestCommentByID(commentid int) (models.TestComment, error) {
+	var comment models.TestComment
+	err := database.DB.Where("commentid = ?", commentid).First(&comment).Error
+	return comment, err
+}
+func (ud *TestDao) UpdateTestComment(comment *models.TestComment) error {
+	return database.DB.Save(comment).Error
 }