fix bug: Status of the message

Author: skiffer-git

pkg/db/chat_log_model.go

@@ -49,6 +49,7 @@ func (d *DataBase) SearchMessageByKeyword(keyword string, startTime, endTime int
 	}
 	return result, err
 }
+
 func (d *DataBase) BatchUpdateMessageList(MessageList []*LocalChatLog) error {
 	if MessageList == nil {
 		return nil
@@ -67,6 +68,7 @@ func (d *DataBase) BatchUpdateMessageList(MessageList []*LocalChatLog) error {
 	}
 	return nil
 }
+
 func (d *DataBase) MessageIfExists(ClientMsgID string) (bool, error) {
 	d.mRWMutex.Lock()
 	defer d.mRWMutex.Unlock()
@@ -150,6 +152,7 @@ func (d *DataBase) UpdateMessageTimeAndStatus(clientMsgID string, serverMsgID st
 	}
 	return utils.Wrap(t.Error, "UpdateMessageStatusBySourceID failed")
 }
+
 func (d *DataBase) GetMessageList(sourceID string, sessionType, count int, startTime int64) (result []*LocalChatLog, err error) {
 	d.mRWMutex.Lock()
 	defer d.mRWMutex.Unlock()
@@ -168,6 +171,19 @@ func (d *DataBase) GetMessageList(sourceID string, sessionType, count int, start
 	}
 	return result, err
 }
+
+func (d *DataBase) GetSendingMessageList() (result []*LocalChatLog, err error) {
+	d.mRWMutex.Lock()
+	defer d.mRWMutex.Unlock()
+	var messageList []LocalChatLog
+	err = utils.Wrap(d.conn.Where("status = ", constant.MsgStatusSendFailed).Find(&messageList).Error, "GetMessageList failed")
+	for _, v := range messageList {
+		v1 := v
+		result = append(result, &v1)
+	}
+	return result, err
+}
+
 func (d *DataBase) UpdateMessageHasRead(sendID string, msgIDList []string) error {
 	d.mRWMutex.Lock()
 	defer d.mRWMutex.Unlock()

pkg/db/data_model_struct.go

@@ -42,6 +42,7 @@ type LocalFriend struct {
 	Birth          uint32 `gorm:"column:birth" json:"birth"`
 	Email          string `gorm:"column:email;type:varchar(64)" json:"email"`
 	Ex             string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	AttachedInfo   string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 //message FriendRequest{
@@ -74,6 +75,8 @@ type LocalFriendRequest struct {
 	HandleMsg     string `gorm:"column:handle_msg;type:varchar(255)" json:"handleMsg"`
 	HandleTime    uint32 `gorm:"column:handle_time" json:"handleTime"`
 	Ex            string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+
+	AttachedInfo string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 //message GroupInfo{
@@ -119,6 +122,7 @@ type LocalGroup struct {
 	OwnerUserID   string `gorm:"column:owner_user_id;type:varchar(64)" json:"ownerUserID"`
 	MemberCount   int32  `gorm:"column:member_count" json:"memberCount"`
 	Ex            string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	AttachedInfo  string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 //message GroupMemberFullInfo {
@@ -152,6 +156,7 @@ type LocalGroupMember struct {
 	JoinSource     int32  `gorm:"column:join_source" json:"joinSource"`
 	OperatorUserID string `gorm:"column:operator_user_id;type:varchar(64)" json:"operatorUserID"`
 	Ex             string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	AttachedInfo   string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 //message GroupRequest{
@@ -190,6 +195,7 @@ type LocalGroupRequest struct {
 	HandleUserID string `gorm:"column:handle_user_id;type:varchar(64)" json:"handleUserID"`
 	HandledTime  uint32 `gorm:"column:handle_time" json:"handledTime"`
 	Ex           string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	AttachedInfo string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 //string UserID = 1;
@@ -214,6 +220,7 @@ type LocalUser struct {
 	CreateTime     uint32 `gorm:"column:create_time" json:"createTime"`
 	AppMangerLevel int32  `gorm:"column:app_manger_level" json:"-"`
 	Ex             string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	AttachedInfo   string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 //message BlackInfo{
@@ -235,6 +242,7 @@ type LocalBlack struct {
 	AddSource      int32  `gorm:"column:add_source" json:"addSource"`
 	OperatorUserID string `gorm:"column:operator_user_id;type:varchar(64)" json:"operatorUserID"`
 	Ex             string `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	AttachedInfo   string `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
 }
 
 type LocalSeqData struct {

pkg/db/db_init.go

@@ -19,7 +19,28 @@ type DataBase struct {
 
 func NewDataBase(loginUserID string, dbDir string) (*DataBase, error) {
 	dataBase := &DataBase{loginUserID: loginUserID, dbDir: dbDir}
-	return dataBase, utils.Wrap(dataBase.initDB(), "db init error")
+	err := dataBase.initDB()
+	if err != nil {
+		return dataBase, utils.Wrap(err, "initDB failed")
+	}
+	dataBase.setChatLogFailedStatus()
+	return dataBase, nil
+}
+
+func (d *DataBase) setChatLogFailedStatus() {
+	msgList, err := d.GetSendingMessageList()
+	if err != nil {
+		log.Error("", "GetSendingMessageList failed ", err.Error())
+		return
+	}
+	for _, v := range msgList {
+		v.Status = constant.MsgStatusSendFailed
+		err := d.UpdateMessage(v)
+		if err != nil {
+			log.Error("", "UpdateMessage failed ", err.Error(), v)
+			continue
+		}
+	}
 }
 
 func (d *DataBase) initDB() error {