Delete message by ID

- delete by only message id Author: [email protected]
thanhpp · Jan 22, 2022 · 6fca4f2 · 6fca4f2
1 parent 1c7996f
commit 6fca4f2
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 2 deletions.
diff --git a/docs/Zola.postman_collection.json b/docs/Zola.postman_collection.json
@@ -2887,6 +2887,63 @@
 						}
 					},
 					"response": []
+				},
+				{
+					"name": "delete conversation",
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{token}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "DELETE",
+						"header": [],
+						"url": {
+							"raw": "{{auco}}/conversations/e92beb1c-6faa-4f04-b805-c968916711f0",
+							"host": [
+								"{{auco}}"
+							],
+							"path": [
+								"conversations",
+								"e92beb1c-6faa-4f04-b805-c968916711f0"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "delete message",
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{token}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "DELETE",
+						"header": [],
+						"url": {
+							"raw": "{{auco}}/conversations/message/d83bd715-2985-4530-bbd8-22c3a846c656|1642789194219",
+							"host": [
+								"{{auco}}"
+							],
+							"path": [
+								"conversations",
+								"message",
+								"d83bd715-2985-4530-bbd8-22c3a846c656|1642789194219"
+							]
+						}
+					},
+					"response": []
 				}
 			]
 		},

diff --git a/internal/auco/app/app_errors.go b/internal/auco/app/app_errors.go
@@ -3,6 +3,8 @@ package app
 import "errors"
 
 var (
-	ErrBlocked     = errors.New("blocked")
-	ErrInvalidUser = errors.New("invalid user")
+	ErrBlocked      = errors.New("blocked")
+	ErrInvalidUser  = errors.New("invalid user")
+	ErrInvalidMsgID = errors.New("invalid msgID")
+	ErrNotSender    = errors.New("not sender")
 )
diff --git a/internal/auco/app/cvsthandler_deletemsg.go b/internal/auco/app/cvsthandler_deletemsg.go
@@ -0,0 +1,35 @@
+package app
+
+import (
+	"context"
+	"strconv"
+	"strings"
+
+	"github.com/thanhpp/zola/pkg/logger"
+)
+
+func (c ConversationHandler) DeleteMessage(ctx context.Context, requestorID, msgID string) error {
+	msgIDSlice := strings.Split(msgID, "|")
+	if len(msgIDSlice) != 2 {
+		logger.Errorf("ConversationHandler - invalid msgID len: %d", len(msgIDSlice))
+		return ErrInvalidMsgID
+	}
+
+	createdAtStr := msgIDSlice[1]
+	createdAtInt64, err := strconv.ParseInt(createdAtStr, 10, 64)
+	if err != nil {
+		logger.Errorf("ConversationHandler - invalid msgID createdAt: %v", err)
+		return ErrInvalidMsgID
+	}
+
+	msg, err := c.msgRepo.GetMessage(ctx, msgIDSlice[0], createdAtInt64)
+	if err != nil {
+		return err
+	}
+
+	if msg.SenderID != requestorID {
+		return ErrNotSender
+	}
+
+	return c.msgRepo.DeleteMessage(ctx, msgIDSlice[0], createdAtInt64)
+}
diff --git a/internal/auco/app/repository.go b/internal/auco/app/repository.go
@@ -7,6 +7,7 @@ import (
 
 var (
 	ErrRoomNotFound = errors.New("room not found")
+	ErrMsgNotFound  = errors.New("msg not found")
 )
 
 type RoomRepository interface {
@@ -23,8 +24,10 @@ type MessageRepository interface {
 	// read
 	GetLastMessageByRoomID(ctx context.Context, roomID string) (*WsMessage, error)
 	GetMessagesByRoomID(ctx context.Context, roomID string, offset, limit int) ([]*WsMessage, error)
+	GetMessage(ctx context.Context, roomID string, createdAt int64) (*WsMessage, error)
 
 	// write
 	CreateMessage(msg *WsMessage) error
 	DeleteByRoomID(ctx context.Context, roomID string) error
+	DeleteMessage(ctx context.Context, roomID string, createdAt int64) error
 }
diff --git a/internal/auco/app/wsclient_handler.go b/internal/auco/app/wsclient_handler.go
@@ -62,6 +62,11 @@ func (c *WsClient) handleSend(msg *WsMessage) {
 		return
 	}
 
+	// check content
+	if len(msg.Content) == 0 {
+		return
+	}
+
 	// create a new message
 	newMsg, err := c.wsManager.fac.NewMessage(room.ID, msg.SenderID, msg.ReceiverID, msg.Created, msg.Content, false)
 	if err != nil {

diff --git a/internal/auco/infra/adapter/gormdb/messagedb.go b/internal/auco/infra/adapter/gormdb/messagedb.go
@@ -55,3 +55,7 @@ func (g gormDB) CreateMessage(msg *app.WsMessage) error {
 func (g gormDB) DeleteByRoomID(ctx context.Context, roomID string) error {
 	return g.db.Model(g.msgModel).WithContext(ctx).Where("room_id = ?", roomID).Delete(MessageDB{}).Error
 }
+
+func (g gormDB) DeleteMessage(ctx context.Context, roomID string, createdAt int64) error {
+	return g.db.Model(g.msgModel).WithContext(ctx).Where("room_id = ? AND created_at = ?", roomID, createdAt).Delete(MessageDB{}).Error
+}
diff --git a/internal/auco/infra/adapter/gormdb/messsagedb_read.go b/internal/auco/infra/adapter/gormdb/messsagedb_read.go
@@ -2,8 +2,10 @@ package gormdb
 
 import (
 	"context"
+	"errors"
 
 	"github.com/thanhpp/zola/internal/auco/app"
+	"gorm.io/gorm"
 )
 
 func (g gormDB) GetLastMessageByRoomID(ctx context.Context, roomID string) (*app.WsMessage, error) {
@@ -40,3 +42,19 @@ func (g gormDB) GetMessagesByRoomID(ctx context.Context, roomID string, offset,
 
 	return listMsg, nil
 }
+
+func (g gormDB) GetMessage(ctx context.Context, roomID string, createdAt int64) (*app.WsMessage, error) {
+	var msgDB = new(MessageDB)
+
+	err := g.db.Model(g.msgModel).
+		Where("room_id = ? AND created_at = ?", roomID, createdAt).
+		Take(msgDB).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, app.ErrMsgNotFound
+		}
+		return nil, err
+	}
+
+	return g.unmarshalMessage(msgDB)
+}
diff --git a/internal/auco/infra/adapter/gormdb/roomdb.go b/internal/auco/infra/adapter/gormdb/roomdb.go
@@ -2,10 +2,12 @@ package gormdb
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"github.com/thanhpp/zola/internal/auco/app"
 	"github.com/thanhpp/zola/pkg/logger"
+	"gorm.io/gorm"
 )
 
 type RoomDB struct {
@@ -37,6 +39,9 @@ func (g gormDB) GetRoomByID(ctx context.Context, roomID string) (*app.WsRoom, er
 
 	err := g.db.Model(g.roomModel).WithContext(ctx).Where("id = ?", roomID).Take(roomDB).Error
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, app.ErrRoomNotFound
+		}
 		return nil, err
 	}
 

diff --git a/internal/auco/infra/port/websocketserver/controller/cvsctrl_delete.go b/internal/auco/infra/port/websocketserver/controller/cvsctrl_delete.go
@@ -32,3 +32,25 @@ func (ctrl ConversationController) DeleteByConversationID(c *gin.Context) {
 
 	c.JSON(http.StatusOK, resp)
 }
+
+func (ctrl ConversationController) DeleteMessage(c *gin.Context) {
+	requestorID, err := getRequestorIDFromClaims(c)
+	if err != nil {
+		logger.Errorf("CvsCtrl - get claims %v", err)
+		ginAbortUnauthorized(c, responsevalue.CodeInvalidateUser, "invalid user", nil)
+		return
+	}
+
+	messageID := c.Param("id")
+
+	if err := ctrl.conversationHandler.DeleteMessage(c, requestorID, messageID); err != nil {
+		logger.Errorf("CvsCtrl - delete message %v", err)
+		ginAbortInternalError(c, responsevalue.CodeUnknownError, responsevalue.MsgUnknownError, err.Error())
+		return
+	}
+
+	resp := new(dto.DefaultResp)
+	resp.SetCode(responsevalue.CodeOK)
+	resp.SetMsg(responsevalue.MsgOK)
+	c.JSON(http.StatusOK, resp)
+}
diff --git a/internal/auco/infra/port/websocketserver/router.go b/internal/auco/infra/port/websocketserver/router.go
@@ -43,6 +43,7 @@ func (s *WebsocketServer) newRouter() *gin.Engine {
 		conversationGr.GET("/partner/:id", cCtrl.GetByPartnerID)
 		conversationGr.GET("/:id", cCtrl.GetByRoomID)
 		conversationGr.DELETE("/:id", cCtrl.DeleteByConversationID)
+		conversationGr.DELETE("/message/:id", cCtrl.DeleteMessage)
 	}
 
 	return router