status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix author creation in operationCallback might cause unique constraint validation error

This commit is contained in:
Wu Cheng-Han 2017-01-12 17:18:24 +08:00
parent ffa14cfeef
commit 7e191acbde
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/realtime.js
View File

@ -652,17 +652,25 @@ function operationCallback(socket, operation) {
if (!user) return; if (!user) return;
userId = socket.request.user.id; userId = socket.request.user.id;
if (!note.authors[userId]) { if (!note.authors[userId]) {
models.Author.create({ models.Author.findOrCreate({
noteId: noteId, where: {
userId: userId, noteId: noteId,
color: user.color userId: userId
}).then(function (author) { },
note.authors[author.userId] = { defaults: {
userid: author.userId, noteId: noteId,
color: author.color, userId: userId,
photo: user.photo, color: user.color
name: user.name }
}; }).spread(function (author, created) {
if (author) {
note.authors[author.userId] = {
userid: author.userId,
color: author.color,
photo: user.photo,
name: user.name
};
}
}).catch(function (err) { }).catch(function (err) {
return logger.error('operation callback failed: ' + err); return logger.error('operation callback failed: ' + err);
}); });