refactor: message related (#81)

sinchang · JacksonTian · commit 7917c96fbc93 · 2018-03-16T16:17:55.000+08:00
* refactor: message related

* chore: improve

* test: improve

* fix: signin page 500
diff --git a/app/controller/message.js b/app/controller/message.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const Controller = require('egg').Controller;
+
+class MessageController extends Controller {
+  async index() {
+    const { ctx } = this;
+    const userId = ctx.user._id;
+    const msgService = ctx.service.message;
+    const [ readMessageResults, unReadMessageResults ] = await Promise.all([
+      msgService.getReadMessagesByUserId(userId),
+      msgService.getUnreadMessagesByUserId(userId),
+    ]);
+    const hasReadMessages = await Promise.all(readMessageResults.map(async message => await msgService.getMessageRelations(message)));
+    const hasUnReadMessages = await Promise.all(unReadMessageResults.map(async message => await msgService.getMessageRelations(message)));
+
+    // 把未读消息全部设置成已读
+    await msgService.updateMessagesToRead(userId, unReadMessageResults);
+    await ctx.render('message/index.html', { has_read_messages: hasReadMessages, hasnot_read_messages: hasUnReadMessages });
+  }
+}
+
+module.exports = MessageController;
diff --git a/app/controller/reply.js b/app/controller/reply.js
@@ -46,7 +46,7 @@ class ReplyController extends Controller {
       service.topic.updateLastReply(topic_id, reply._id),
     ]);
 
-    service.at.sendMessageToMentionUsers(newContent, topic_id, user_id, reply._id);
+    await service.at.sendMessageToMentionUsers(newContent, topic_id, user_id, reply._id);
     if (topic.author_id.toString() !== user_id.toString()) {
       await service.message.sendReplyMessage(topic.author_id, user_id, topic._id, reply._id);
     }
diff --git a/app/controller/topic.js b/app/controller/topic.js
@@ -234,8 +234,7 @@ class TopicController extends Controller {
       await service.at.sendMessageToMentionUsers(
         content,
         topic._id,
-        ctx.user._id,
-        'at'
+        ctx.user._id
       );
 
       ctx.redirect('/topic/' + topic._id);
diff --git a/app/controller/user.js b/app/controller/user.js
@@ -223,8 +223,6 @@ class UserController extends Controller {
       user.signature = signature;
       user.weibo = weibo;
       await user.save();
-
-      ctx.user = user.toObject({ virtual: true });
       return ctx.redirect('/setting?save=success');
     }
 
diff --git a/app/router.js b/app/router.js
@@ -6,7 +6,7 @@
 module.exports = app => {
   const { router, controller, config, middleware } = app;
 
-  const { site, sign, user, topic, rss, search, page, reply } = controller;
+  const { site, sign, user, topic, rss, search, page, reply, message } = controller;
 
   const userRequired = middleware.userRequired();
   const adminRequired = middleware.adminRequired();
@@ -63,7 +63,7 @@ module.exports = app => {
   router.post('/user/:name/delete_all', adminRequired, user.deleteAll); // 删除某用户所有发言
 
   // // message controler
-  // router.get('/my/messages', userRequired, message.index); // 用户个人的所有消息页
+  router.get('/my/messages', userRequired, message.index); // 用户个人的所有消息页
 
   // topic
 
diff --git a/app/service/at.js b/app/service/at.js
@@ -48,7 +48,7 @@ class AtService extends Service {
    * @param {String} type 回复类型
    * @param {String} reply_id 回复ID
    */
-  async sendMessageToMentionUsers(text, topicId, authorId, type, reply_id = null) {
+  async sendMessageToMentionUsers(text, topicId, authorId, reply_id = null) {
     let users = await this.service.user.getUsersByNames(this.fetchUsers(text));
 
     users = users.filter(user => {
@@ -61,7 +61,6 @@ class AtService extends Service {
           user._id,
           authorId,
           topicId,
-          type,
           reply_id
         );
       })
diff --git a/app/service/message.js b/app/service/message.js
@@ -118,10 +118,22 @@ class MessageService extends Service {
     return this.ctx.model.Message.update(query, update, { multi: true }).exec();
   }
 
-  async sendAtMessage(userId, authorId, topicId, type, replyId) {
+  async sendAtMessage(userId, authorId, topicId, replyId) {
     const message = this.ctx.model.Message();
 
-    message.type = type;
+    message.type = 'at';
+    message.master_id = userId;
+    message.author_id = authorId;
+    message.topic_id = topicId;
+    message.reply_id = replyId;
+
+    return message.save();
+  }
+
+  async sendReplyMessage(userId, authorId, topicId, replyId) {
+    const message = this.ctx.model.Message();
+
+    message.type = 'reply';
     message.master_id = userId;
     message.author_id = authorId;
     message.topic_id = topicId;
diff --git a/app/view/message/index.html b/app/view/message/index.html
@@ -0,0 +1,35 @@
+<%- include('../sidebar.html') %>
+
+<div id='content'>
+  <div class='panel'>
+    <div class='header'>
+      <ul class='breadcrumb'>
+        <li><a href='/'>主页</a><span class='divider'>/</span></li>
+        <li class='active'>新消息</li>
+      </ul>
+    </div>
+    <% if (typeof(hasnot_read_messages) !== 'undefined' && hasnot_read_messages.length > 0) { %>
+      <% hasnot_read_messages.map((message, index) => { %>
+        <%- include('./message.html', { message, index }) %>
+      <%}) %>
+    <% } else { %>
+    <div class='inner'>
+      <p>无消息</p>
+    </div>
+    <% } %>
+  </div>
+  <div class='panel'>
+    <div class='header'>
+      <span class='col_fade'>过往信息</span>
+    </div>
+    <% if (typeof(has_read_messages) !== 'undefined' && has_read_messages.length > 0) { %>
+    <% has_read_messages.map((message, index) => { %>
+      <%- include('./message.html', { message, index }) %>
+    <%}) %>
+    <% } else { %>
+    <div class='inner'>
+      <p>无消息</p>
+    </div>
+    <% } %>
+  </div>
+</div>
diff --git a/app/view/message/message.html b/app/view/message/message.html
@@ -0,0 +1,39 @@
+<% if (message.has_read) { %>
+  <div class='cell' message_id='<%= message._id %>'>
+    <% } else { %>
+    <div class='cell message' message_id='<%= message._id %>'>
+      <% } %>
+      <% if(message.type == 'reply'){ %>
+      <span>
+        <a href="/user/<%= message.author.loginname %>" target='_blank'><%= message.author.loginname %></a>
+        回复了你的话题
+        <a href="/topic/<%- message.topic.topic._id + (message.reply ? '#' + message.reply._id : '') %>" target='_blank'><%=
+          message.topic.topic.title %></a>
+      </span>
+      <% } %>
+      <% if(message.type == 'reply2'){ %>
+      <span>
+        <a href="/user/<%= message.author.loginname %>" target='_blank'><%= message.author.loginname %></a>
+        在话题
+        <a href="/topic/<%= message.topic.topic._id + (message.reply ? '#' + message.reply._id : '') %>" target='_blank'><%=
+          message.topic.topic.title %></a>
+        中回复了你的回复
+      </span>
+      <% } %>
+      <% if(message.type == 'follow'){ %>
+    <span>
+      <a href="/user/<%= message.author.loginname %>" target='_blank'><%= message.author.loginname %></a>
+      关注了你
+    </span>
+      <% } %>
+      <% if (message.type == 'at'){ %>
+      <span>
+        <a href="/user/<%= message.author.loginname %>" target='_blank'><%= message.author.loginname %></a>
+        在话题
+        <a href="/topic/<%= message.topic.topic._id + (message.reply ? '#' + message.reply._id : '') %>" target='_blank'><%=
+          message.topic.topic.title %></a>
+        中@了你
+      </span>
+      <% } %>
+  
+    </div>
diff --git a/app/view/sign/signin.html b/app/view/sign/signin.html
@@ -1,4 +1,4 @@
-<%- include ../sidebar.html %>
+<%- include('../sidebar.html') %>
 
 <div id='content'>
   <div class='panel'>
diff --git a/test/app/controller/message.test.js b/test/app/controller/message.test.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const { app, assert } = require('egg-mock/bootstrap');
+
+describe('test/app/controller/message.test.js', () => {
+  let user1,
+    user2,
+    topicId;
+
+  before(async function() {
+    const ctx = app.mockContext();
+    const loginname1 = `loginname1_${Date.now()}`;
+    const loginname2 = `loginname2_${Date.now()}`;
+    const email1 = `${loginname1}@test.com`;
+    const email2 = `${loginname2}@test.com`;
+    user1 = await ctx.service.user.newAndSave('name', loginname1, 'pass', email1, 'avatar_url', 'active');
+    user2 = await ctx.service.user.newAndSave('name', loginname2, 'pass', email2, 'avatar_url', 'active');
+    assert(user1.loginname === loginname1);
+    assert(user2.loginname === loginname2);
+
+    const title = 'first post';
+    const content = 'hello world';
+    const tab = 'share';
+    const topic = await ctx.service.topic.newAndSave(title, content, tab, user1._id);
+    topicId = topic._id;
+    assert(topic.title === title);
+    assert(topic.content === content);
+    assert(topic.tab === tab);
+    assert.equal(topic.author_id, user1._id);
+  });
+
+  it('should GET /my/messages', async () => {
+    const ctx = app.mockContext({
+      user: {
+        name: user2.name,
+        _id: user2._id,
+        is_admin: false,
+      },
+    });
+
+    const message = await ctx.service.message.sendAtMessage(user2._id, user1._id, topicId);
+    let result = await app.httpRequest().get('/my/messages');
+    assert(result.status === 200);
+    assert(result.text.includes('first post'));
+
+    ctx.service.message.updateOneMessageToRead(message._id);
+    result = await app.httpRequest().get('/my/messages');
+    assert(result.status === 200);
+    assert(result.text.includes('first post'));
+  });
+});
diff --git a/test/app/service/at.test.js b/test/app/service/at.test.js
@@ -8,7 +8,6 @@ describe('test/app/service/at.test.js', () => {
     loginname2,
     user1,
     user2,
-    replyId,
     ctx,
     atService;
   before(async function() {
@@ -35,30 +34,23 @@ describe('test/app/service/at.test.js', () => {
     assert(reply.content === 'hi');
     assert(reply.author_id === user1._id);
     assert(reply.topic_id === topicId);
-    replyId = reply._id;
   });
 
   it('fetchUsers should ok', async () => {
-    const result1 = await atService.fetchUsers();
-    assert(result1.length === 0);
-    const result2 = await ctx.service.at.fetchUsers('good job!!! @sinchang @cnode');
-    assert(result2[0] === 'sinchang');
-    assert(result2[1] === 'cnode');
+    let result = await atService.fetchUsers();
+    assert(result.length === 0);
+    result = await ctx.service.at.fetchUsers('good job!!! @sinchang @cnode');
+    assert(result[0] === 'sinchang');
+    assert(result[1] === 'cnode');
   });
 
   it('sendMessageToMentionUsers should ok', async () => {
-    const result1 = await atService.sendMessageToMentionUsers(`hi!!!@${loginname2}`, topicId, user1._id, 'at');
-    assert(result1[0].type === 'at');
-    assert(result1[0].topic_id === topicId);
-    assert(result1[0].author_id === user1._id);
-    assert.equal(result1[0].master_id.toString(), user2._id);
-    assert(result1[0].reply_id === null);
-    const result2 = await atService.sendMessageToMentionUsers(`hi!!!@${loginname2}`, topicId, user1._id, 'reply2', replyId);
-    assert(result2[0].type === 'reply2');
-    assert(result2[0].topic_id === topicId);
-    assert(result2[0].author_id === user1._id);
-    assert.equal(result2[0].master_id.toString(), user2._id);
-    assert(result2[0].reply_id === replyId);
+    const result = await atService.sendMessageToMentionUsers(`hi!!!@${loginname2}`, topicId, user1._id);
+    assert(result[0].type === 'at');
+    assert(result[0].topic_id === topicId);
+    assert(result[0].author_id === user1._id);
+    assert.equal(result[0].master_id.toString(), user2._id);
+    assert(result[0].reply_id === null);
   });
 
   it('linkUsers should ok', async () => {
diff --git a/test/app/service/message.test.js b/test/app/service/message.test.js
@@ -33,29 +33,37 @@ describe('test/app/service/message.test.js', () => {
   });
 
   it('sendAtMessage should ok', async () => {
-    const result = await messageService.sendAtMessage(user2._id, user1._id, topicId, 'at');
-    message = result;
+    message = await messageService.sendAtMessage(user2._id, user1._id, topicId);
     assert(message.type === 'at');
     assert(message.topic_id.toString() === topicId.toString());
     assert(message.author_id === user1._id);
     assert.equal(message.master_id.toString(), user2._id);
   });
 
+  it('sendReplyMessage should ok', async () => {
+    const result = await messageService.sendReplyMessage(user2._id, user1._id, topicId);
+    assert(result.type === 'reply');
+    assert(result.topic_id.toString() === topicId.toString());
+    assert(result.author_id === user1._id);
+    assert.equal(result.master_id.toString(), user2._id);
+  });
+
   it('getMessagesCount should ok', async () => {
     const result = await messageService.getMessagesCount(user2._id);
     assert(result >= 1);
   });
 
   it('getMessageRelations should ok', async () => {
-    const result1 = await messageService.getMessageRelations(message);
-    assert(result1.topic_id === message.topic_id);
-    const mockMessage1 = await messageService.sendAtMessage(user2._id, '565c4473d0bc14ae279399fe', user1._id, 'at');
-    const result2 = await messageService.getMessageRelations(mockMessage1);
-    assert(result2.is_invalid === true);
-    assert(result1.topic_id === message.topic_id);
-    const mockMessage2 = await messageService.sendAtMessage(user2._id, topicId, user1._id, 'at1');
-    const result3 = await messageService.getMessageRelations(mockMessage2);
-    assert(result3.is_invalid === true);
+    let result = await messageService.getMessageRelations(message);
+    assert(result.topic.topic._id.toString() === message.topic_id.toString());
+
+    const mockMessage1 = await messageService.sendAtMessage(user2._id, '565c4473d0bc14ae279399fe', user1._id);
+    result = await messageService.getMessageRelations(mockMessage1);
+    assert(result.is_invalid === true);
+
+    message.type = 'at1';
+    result = await messageService.getMessageRelations(message);
+    assert(result.is_invalid === true);
   });
 
   it('getMessageById should ok', async () => {
@@ -74,18 +82,18 @@ describe('test/app/service/message.test.js', () => {
   });
 
   it('updateMessagesToRead should ok', async () => {
-    const result1 = await messageService.updateMessagesToRead(user2._id, []);
-    assert(result1 === undefined);
+    let result = await messageService.updateMessagesToRead(user2._id, []);
+    assert(result === undefined);
 
-    const result2 = await messageService.updateMessagesToRead(user2._id, [ message ]);
-    assert(result2.ok === 1);
+    result = await messageService.updateMessagesToRead(user2._id, [ message ]);
+    assert(result.ok === 1);
   });
 
   it('updateOneMessageToRead should ok', async () => {
-    const message = await messageService.sendAtMessage(user2._id, topicId, user1._id, 'at');
-    const result1 = await messageService.updateOneMessageToRead();
-    assert(result1 === undefined);
-    const result2 = await messageService.updateOneMessageToRead(message._id);
-    assert(result2.ok === 1);
+    const message = await messageService.sendAtMessage(user2._id, topicId, user1._id);
+    let result = await messageService.updateOneMessageToRead();
+    assert(result === undefined);
+    result = await messageService.updateOneMessageToRead(message._id);
+    assert(result.ok === 1);
   });
 });
diff --git a/test/app/service/reply.test.js b/test/app/service/reply.test.js
@@ -2,7 +2,7 @@
 
 const { app, assert } = require('egg-mock/bootstrap');
 
-describe('reply service', () => {
+describe('test/app/service/reply.test.js', () => {
   let topic,
     user,
     reply;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ReplyController extends Controller {`
`46`	`46`	`service.topic.updateLastReply(topic_id, reply._id),`
`47`	`47`	`]);`
`48`	`48`
`49`		`- service.at.sendMessageToMentionUsers(newContent, topic_id, user_id, reply._id);`
	`49`	`+ await service.at.sendMessageToMentionUsers(newContent, topic_id, user_id, reply._id);`
`50`	`50`	`if (topic.author_id.toString() !== user_id.toString()) {`
`51`	`51`	`await service.message.sendReplyMessage(topic.author_id, user_id, topic._id, reply._id);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,8 +223,6 @@ class UserController extends Controller {`
`223`	`223`	`user.signature = signature;`
`224`	`224`	`user.weibo = weibo;`
`225`	`225`	`await user.save();`
`226`		`-`
`227`		`- ctx.user = user.toObject({ virtual: true });`
`228`	`226`	`return ctx.redirect('/setting?save=success');`
`229`	`227`	`}`
`230`	`228`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<%- include ../sidebar.html %>`
	`1`	`+<%- include('../sidebar.html') %>`
`2`	`2`
`3`	`3`	`<div id='content'>`
`4`	`4`	`<div class='panel'>`