fix: 删除好友

danmuking · Apr 19, 2024 · c39a2a9 · c39a2a9
1 parent 7c5d43b
commit c39a2a9
Show file tree

Hide file tree

Showing 17 changed files with 245 additions and 228 deletions.
diff --git a/controller/friend_controller.go b/controller/friend_controller.go
@@ -15,7 +15,7 @@ import (
 //	@Param		msg	body		string				true	"验证消息"
 //	@Success	200	{object}	resp.ResponseData	"成功"
 //	@Failure	500	{object}	resp.ResponseData	"内部错误"
-//	@Router		/api/contact/add [post]
+//	@Router		/api/user/add [post]
 func ApplyFriendController(c *gin.Context) {
 	uid := c.GetInt64("uid")
 	applyReq := req.UserApplyReq{}
@@ -28,3 +28,22 @@ func ApplyFriendController(c *gin.Context) {
 	resp.ReturnResponse(c, response)
 	return
 }
+
+// DeleteFriendController 删除好友
+//
+//	@Summary	删除好友
+//	@Produce	json
+//	@Param		uid	body		int					true	"好友uid"
+//	@Success	200	{object}	resp.ResponseData	"成功"
+//	@Failure	500	{object}	resp.ResponseData	"内部错误"
+//	@Router		/api/user/delete/:uid [delete]
+func DeleteFriendController(c *gin.Context) {
+	uid := c.GetInt64("uid")
+	deleteFriendReq := req.DeleteFriendReq{}
+	if err := c.ShouldBindUri(&deleteFriendReq); err != nil {
+		resp.ErrorResponse(c, "参数错误")
+		return
+	}
+	response := service.DeleteFriendService(uid, deleteFriendReq)
+	resp.ReturnResponse(c, response)
+}
diff --git a/dal/model/message.gen.go b/dal/model/message.gen.go
diff --git a/dal/model/room.gen.go b/dal/model/room.gen.go
diff --git a/dal/model/room_friend.gen.go b/dal/model/room_friend.gen.go
diff --git a/dal/query/message.gen.go b/dal/query/message.gen.go
diff --git a/dal/query/room.gen.go b/dal/query/room.gen.go
diff --git a/dal/query/room_friend.gen.go b/dal/query/room_friend.gen.go
diff --git a/domain/enum/redis.go b/domain/enum/redis.go
@@ -8,4 +8,6 @@ const (
 	User       = Project + "user:"
 	UserFriend = Project + "userFriend:"
 	UserApply  = Project + "userApply:"
+	RoomFriend = Project + "roomFriend:"
+	Contact    = Project + "contact:"
 )
diff --git a/domain/vo/req/delete_friend_req.go b/domain/vo/req/delete_friend_req.go
@@ -0,0 +1,5 @@
+package req
+
+type DeleteFriendReq struct {
+	Uid int64 `uri:"uid" binding:"required"`
+}
diff --git a/event/listener/friend_new_event.go b/event/listener/friend_new_event.go
@@ -71,9 +71,9 @@ func FriendNewEvent(friend model.UserFriend) {
 		FromUID: friend.UID,
 		Content: "你们已经是好友了，开始聊天吧",
 		// TODO: 抽取为常量
-		Status: 0,
-		Type:   enum.TextMessage,
-		Extra:  "{}",
+		DeleteStatus: 0,
+		Type:         enum.TextMessage,
+		Extra:        "{}",
 	}
 	if err := service.SendTextMsg(&newMsg); err != nil {
 		log.Println("发送消息失败", err.Error())

diff --git a/pkg/enum/common_enum.go b/pkg/enum/common_enum.go
@@ -1,6 +1,8 @@
 package enum
 
 const (
-	YES = 2
-	NO  = 1
+	YES     = 2
+	NO      = 1
+	NORMAL  = 0
+	DELETED = 1
 )
diff --git a/routes/init_router.go b/routes/init_router.go
@@ -48,7 +48,7 @@ func initGin() {
 		//添加好友
 		apiUser.POST("/add", controller.ApplyFriendController)
 		//删除好友
-		apiUser.DELETE("/delete", service.DeleteFriendService)
+		apiUser.DELETE("/delete/:uid", controller.DeleteFriendController)
 		//获取好友申请列表
 		apiUser.GET("/getApplyList", service.GetApplyList)
 		//同意好友申请

diff --git a/service/contact_service.go b/service/contact_service.go
@@ -110,7 +110,7 @@ func getContactDto(contact model.Contact) (*dto.ContactDto, error) {
 		contactDto.Avatar = userR.Avatar
 		contactDto.LastTime = contact.ActiveTime
 	}
-	count, err := msgQ.Where(msg.RoomID.Eq(contact.RoomID), msg.Status.Eq(enum.NORMAL), msg.CreateTime.Gt(contact.ReadTime)).Limit(99).Count()
+	count, err := msgQ.Where(msg.RoomID.Eq(contact.RoomID), msg.DeleteStatus.Eq(enum.NORMAL), msg.CreateTime.Gt(contact.ReadTime)).Limit(99).Count()
 	if err != nil {
 		global.Logger.Errorf("统计未读数失败 %s", err)
 		return nil, err