[API] Refactor and Bug fix

This commit is contained in:
syuilo
2017-06-13 02:12:30 +09:00
parent 17182266fc
commit 5880b90f59
4 changed files with 74 additions and 67 deletions

View File

@@ -1,8 +1,7 @@
import * as mongodb from 'mongodb';
import * as websocket from 'websocket';
import * as redis from 'redis';
import Message from '../models/messaging-message';
import { publishMessagingStream } from '../event';
import read from '../common/read-messaging-message';
export default function messagingStream(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
const otherparty = request.resourceURL.query.otherparty;
@@ -18,42 +17,8 @@ export default function messagingStream(request: websocket.request, connection:
switch (msg.type) {
case 'read':
if (!msg.id) {
return;
}
const id = new mongodb.ObjectID(msg.id);
// Fetch message
// SELECT _id, user_id, is_read
const message = await Message.findOne({
_id: id,
recipient_id: user._id
}, {
fields: {
_id: true,
user_id: true,
is_read: true
}
});
if (message == null) {
return;
}
if (message.is_read) {
return;
}
// Update documents
await Message.update({
_id: id
}, {
$set: { is_read: true }
});
// Publish event
publishMessagingStream(message.user_id, user._id, 'read', id.toString());
if (!msg.id) return;
read(user._id, otherparty, msg.id);
break;
}
});