|
@ -20,6 +20,7 @@ let configFile = require('../../include/commons').CONFIG_FILE;
|
|
|
let config = require('../../resources/config/' + configFile);
|
|
|
let logger = require('../../util/log');
|
|
|
let pubSub = require("../redis/pubSub.js");
|
|
|
let async = require("async");
|
|
|
|
|
|
const REDIS_KEYS = require('../../include/commons').REDIS_KEYS;
|
|
|
|
|
@ -98,7 +99,10 @@ class Messages extends RedisModel {
|
|
|
let sessionKey = RedisModel.makeRedisKey(REDIS_KEYS.Session, sessionId);
|
|
|
let messageKey = RedisModel.makeRedisKey(REDIS_KEYS.Messages, sessionId);
|
|
|
let messageTimestampKey = RedisModel.makeRedisKey(REDIS_KEYS.MessagesByTimestamp, sessionId);
|
|
|
|
|
|
log.info(" message.timestamp = " + message.timestamp);
|
|
|
log.info(" message.sender_id = " + message.sender_id);
|
|
|
log.info(" message.sender_name= " + message.sender_name);
|
|
|
log.info(" message.timestamp.getTime() = " + message.timestamp.getTime());
|
|
|
let msgJson = {
|
|
|
id: message.id,
|
|
|
sender_id: message.sender_id,
|
|
@ -218,11 +222,34 @@ class Messages extends RedisModel {
|
|
|
*/
|
|
|
updateMsgContent(sessionType,sessionId, messageId, content,handler) {
|
|
|
let self = this;
|
|
|
MessageRepo.updateMsgContent(sessionType,sessionId, messageId, content, function (err, res) {
|
|
|
async.waterfall( [
|
|
|
function (callback) {
|
|
|
MessageRepo.selectOneMessage(sessionType, messageId, function (err, res) {
|
|
|
if (err) {
|
|
|
ModelUtil.emitError(self.eventEmitter, {message: "this message not exist,id: " + messageId});
|
|
|
} else {
|
|
|
res[0].content = content;
|
|
|
log.info("res[0].timestamp="+res[0].timestamp.getTime());
|
|
|
callback(null,res[0]);
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
function (messageObj) {
|
|
|
log.info(" 11messages.timestamp="+messageObj.timestamp.getTime());
|
|
|
let messages = new Messages();
|
|
|
messages.saveMessageToRedis(sessionId, sessionType, messageId, messageObj);
|
|
|
MessageRepo.updateMsgContent(sessionType,sessionId, messageId, content, function (err, res) {
|
|
|
if (err) {
|
|
|
ModelUtil.emitError(self.eventEmitter, {message: "update message content failed: " + err});
|
|
|
} else {
|
|
|
ModelUtil.emitOK(self.eventEmitter, {status: 200,data: content});
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
|
|
|
], function (err, res) {
|
|
|
if (err) {
|
|
|
ModelUtil.emitError(self.eventEmitter, {message: "update message content failed: " + err});
|
|
|
} else {
|
|
|
ModelUtil.emitOK(self.eventEmitter, {status: 200,data: content});
|
|
|
ModelUtil.emitError(self.eventEmitter, "update message content failed:" + err);
|
|
|
}
|
|
|
});
|
|
|
}
|