feat: search in loacl, google, baidu (#107)

feat: search local and ut

test: inprove test coverage

fix: baidu sit search, return redirect, default google serach

fix: service/search

test: service.search.test.js

test: rm unreach code

Author: lqs469

app/controller/search.js

@@ -6,7 +6,20 @@ class SearchController extends Controller {
   async index() {
     let q = this.ctx.query.q;
     q = encodeURIComponent(q);
-    this.ctx.redirect(`https://www.google.com.hk/#hl=zh-CN&q=site:cnodejs.org+${q}`);
+    if (q.length === 0) {
+      return this.ctx.redirect('/');
+    }
+
+    switch (this.config.search) {
+      case 'google':
+        return this.ctx.redirect(`https://www.google.com.hk/#hl=zh-CN&q=site:cnodejs.org+${q}`);
+      case 'baidu':
+        return this.ctx.redirect(`https://www.baidu.com/s?wd=site:cnodejs.org+${q}`);
+      case 'local':
+        return await this.ctx.render('search/index', await this.service.search.searchLocal(this.ctx.query, q));
+      default:
+        return this.ctx.redirect('/');
+    }
   }
 }
 

app/controller/user.js

@@ -252,16 +252,12 @@ class UserController extends Controller {
   async toggleStar() {
     const { ctx, service } = this;
     const user_id = ctx.request.body.user_id;
-    const user = await service.user.getUserById(user_id);
-    if (!user) {
-      ctx.body = { status: 'failed', message: '用户不存在' };
-      return;
-    }
 
+    const user = await service.user.getUserById(user_id);
     user.is_star = !user.is_star;
     await user.save();
-
     ctx.body = { status: 'success' };
+    return;
   }
 
   async block() {

app/public/stylesheets/style.less

@@ -530,6 +530,8 @@ a.user_avatar:hover {
 .user .user_avatar {
   width: 32px;
   height: 32px;
+  display: inline-block;
+  overflow: hidden;
 }
 
 .user .user_name {
@@ -834,7 +836,7 @@ textarea#title {
   font-weight: 700;
 
   img {
-    vertical-align: initial;   
+    vertical-align: initial;
   }
 }
 
@@ -1318,4 +1320,4 @@ textarea.editor {
 
 .github-login-btn {
   display: inline-block;
-}
+}

app/service/search.js

@@ -0,0 +1,95 @@
+'use strict';
+
+const Service = require('egg').Service;
+
+class SearchService extends Service {
+  constructor(app) {
+    super(app);
+    this.limit = this.config.list_topic_count;
+  }
+
+  /*
+   * 根据关键字查询本地数据库
+   */
+  async searchLocal(query, keyword) {
+    const { tab } = query;
+    const page = parseInt(query.page) || 1;
+    let users = [];
+    let topics = [];
+    let data = [];
+    let count = this.limit;
+
+    switch (tab) {
+      case 'user':
+        [ data, count ] = await this.searchUser(keyword, page);
+        break;
+      case 'topic':
+        [ data, count ] = await this.searchTopic(keyword, page);
+        break;
+      default:
+        [ users, topics ] = await this.searchUserAndTopic(keyword, page);
+    }
+
+    const pages = Math.ceil(count / this.limit);
+    return {
+      keyword,
+      data,
+      users,
+      topics,
+      current_page: parseInt(query.page) || 1,
+      tab,
+      pages,
+      base: '/search?q=' + keyword,
+    };
+  }
+
+  queryFactory(keyword, searchKey, page) {
+    const opt = { skip: (page - 1) * this.limit, limit: this.limit, sort: '-create_at' };
+    return [
+      { [searchKey]: { $regex: new RegExp(keyword, 'i') } },
+      opt,
+    ];
+  }
+
+  /*
+   * 根据关键字查找用户列表
+   * @param {String} keyword 关键字, {Number} page 第几页
+   * @return {Promise[data, count]} 承载用户列表, 查询总数的 Promise 对象
+   */
+  searchUser(keyword, page) {
+    const searchQuery = this.queryFactory(keyword, 'name', page);
+    return Promise.all([
+      this.service.user.getUsersByQuery(...searchQuery),
+      this.service.user.getCountByQuery(...searchQuery),
+    ]);
+  }
+
+  /*
+   * 根据关键字查找帖子列表
+   * @param {String} keyword 关键字, {Number} page 第几页
+   * @return {Promise[data, count]} 承载帖子列表, 查询总数的 Promise 对象
+   */
+  searchTopic(keyword, page) {
+    const searchQuery = this.queryFactory(keyword, 'title', page);
+    return Promise.all([
+      this.service.topic.getTopicsByQuery(...searchQuery),
+      this.service.topic.getCountByQuery(...searchQuery),
+    ]);
+  }
+
+  /*
+   * 根据关键字查找用户和帖子列表
+   * @param {String} keyword 关键字, {Number} page 第几页
+   * @return {Promise[data, count]} 承载用户列表, 帖子列表的 Promise 对象
+   */
+  searchUserAndTopic(keyword, page) {
+    const userQuery = this.queryFactory(keyword, 'name', page);
+    const topicQuery = this.queryFactory(keyword, 'title', page);
+    return Promise.all([
+      this.service.user.getUsersByQuery(...userQuery),
+      this.service.topic.getTopicsByQuery(...topicQuery),
+    ]);
+  }
+}
+
+module.exports = SearchService;

app/service/user.js

@@ -83,6 +83,14 @@ class UserService extends Service {
     return this.ctx.model.User.find(query, '', opt).exec();
   }
 
+  /*
+   * 获取关键词能搜索到的用户数量
+   * @param {String} query 搜索关键词
+   */
+  getCountByQuery(query) {
+    return this.ctx.model.User.count(query).exec();
+  }
+
   /*
    * 根据查询条件，获取一个用户
    * @param {String} name 用户名

app/view/search/index.html

@@ -0,0 +1,103 @@
+<%- include('../sidebar.html') %>
+
+<% if (tab === 'user') { users = data }%>
+<% if (tab === 'topic') { topics = data }%>
+<div id='content'>
+  <div class='panel'>
+    <div class='header'>
+      <ul class='breadcrumb'>
+        <li><a href='/'>主页</a><span class='divider'>/</span></li>
+        <li class='active'><a href='<%= base %>'>搜索</a></li>
+      </ul>
+    </div>
+    <div class='inner'>
+      <% if (typeof users !== 'undefined' && users.length > 0) { %>
+        <% users.map(user => { %>
+          <%- include('../user/user.html', { user: user }) %>
+        <% }) %>
+        <% if (!tab) { %>
+          <% var user_url = base + (base.indexOf('?') < 0 ? '?' : '&') + 'tab=user'; %>
+          <div>
+            <a href="<%= user_url %>">查看更多用户 ...</a>
+          </div>
+        <% } %>
+      <% } else if (!tab) { %>
+        <p>没有找到用户</p>
+      <% } %>
+      <% if (!tab) { %><hr /><% } %>
+      <% if (typeof topics !== 'undefined' && topics.length > 0) { %>
+        <div id="topic_list">
+          <% topics.map(topic => { %>
+            <%- include('../topic/abstract.html', { topic: topic }) %>
+          <% }) %>
+        </div>
+        <% if (!tab) { %>
+          <% var topic_url = base + (base.indexOf('?') < 0 ? '?' : '&') + 'tab=topic'; %>
+          <div>
+            <a href="<%= topic_url %>">查看更多帖子 ...</a>
+          </div>
+        <% } %>
+      <% } else if (!tab) { %>
+        <p>没有找到帖子</p>
+      <% } %>
+
+      <% if (tab) { %>
+      <div class='pagination' current_page='<%= current_page %>'>
+        <ul>
+          <% var base_url = base + (base.indexOf('?') < 0 ? '?' : '&')
+            + 'tab=' + (typeof tab !== 'undefined' ? tab : '') + '&page='; %>
+          <% if (current_page == 1) { %>
+          <li class='disabled'><a>«</a></li>
+          <% } else { %>
+          <li><a href="<%= base_url %>1">«</a></li>
+          <% } %>
+
+          <%
+          var page_start = current_page - 2 > 0 ? current_page - 2 : 1;
+          var page_end = page_start + 4 >= pages ? pages : page_start + 4;
+          %>
+
+          <% if (page_start > 1) { %>
+          <li><a>...</a></li>
+          <% } %>
+
+          <% for(var i = page_start; i <= page_end; i++) { %>
+          <% if (i === current_page) { %>
+          <li class='disabled'><a><%= i %></a></li>
+          <% } else { %>
+          <li><a href='<%= base_url + i %>'><%= i %></a></li>
+          <% } %>
+          <% } %>
+
+          <% if (page_end < pages ) { %>
+          <li><a>...</a></li>
+          <% } %>
+
+          <% if (current_page == pages) { %>
+          <li class='disabled'><a>»</a></li>
+          <% } else { %>
+          <li><a href='<%= base_url + pages %>'>»</a></li>
+          <% } %>
+        </ul>
+      </div>
+      <% } %>
+    </div>
+  </div>
+</div>
+<script>
+  $('#q').val('<%- keyword %>');
+  $(document).ready(function () {
+    var $nav = $('.pagination');
+    var current_page = $nav.attr('current_page');
+    if (current_page) {
+      $nav.find('li').each(function () {
+        var $li = $(this);
+        var $a = $li.find('a');
+        if ($a.html() == current_page) {
+          $li.addClass('active');
+          $a.removeAttr('href');
+        }
+      });
+    }
+  });
+</script>

config/config.default.js

@@ -158,5 +158,7 @@ module.exports = appInfo => {
   // 每个 IP 每天可创建用户数
   config.create_user_per_ip = 1000;
 
+  config.search = 'google'; // 'google', 'baidu', 'local'
+
   return config;
 };

test/app/controller/search.test.js

@@ -1,9 +1,37 @@
 'use strict';
 
-const { app } = require('egg-mock/bootstrap');
+const { app, assert } = require('egg-mock/bootstrap');
 
 describe('test/app/controller/search.test.js', () => {
-  it('search should ok', async () => {
-    await app.httpRequest().get('/search').expect(302);
+  it('search null should redirect index', async () => {
+    const res = await app.httpRequest().get('/search?q=');
+    assert(res.status === 302);
+    app.config.search = 'bing';
+    const res1 = await app.httpRequest().get('/search?q=test');
+    assert(res1.status === 302);
+  });
+
+  it('search google should ok', async () => {
+    app.config.search = 'google';
+    const res = await app.httpRequest().get('/search?q=test');
+    assert(res.status === 302);
+    assert(res.headers.location.indexOf('https://www.google.com.hk/') > -1);
+  });
+
+  it('search baidu ok', async () => {
+    app.config.search = 'baidu';
+    const res = await app.httpRequest().get('/search?q=test');
+    assert(res.status === 302);
+    assert(res.headers.location.indexOf('https://www.baidu.com/') > -1);
+  });
+
+  it('search local ok', async () => {
+    app.config.search = 'local';
+    const res = await app.httpRequest().get('/search?q=test');
+    assert(res.status === 200);
+    const res1 = await app.httpRequest().get('/search?q=test&tab=user');
+    assert(res1.status === 200);
+    const res2 = await app.httpRequest().get('/search?q=test&tab=topic');
+    assert(res2.status === 200);
   });
 });

test/app/controller/user.test.js

@@ -220,8 +220,8 @@ describe('test/app/controller/user.test.js', () => {
 
 
     it('should POST /user/set_star ok', async () => {
-      const result = await handleAdminPost('/user/set_star', { user_id: user._id });
-      assert(result.is_star === true);
+      const res = await handleAdminPost('/user/set_star', { user_id: user._id });
+      assert(res.is_star === true);
     });
 
     it('should POST /user/cancel_star ok', async () => {

test/app/service/search.test.js

@@ -0,0 +1,46 @@
+'use strict';
+
+const { app, assert } = require('egg-mock/bootstrap');
+
+describe('test/app/service/search.test.js', () => {
+  const keyword = `keyword_${Date.now()}`;
+  const page = 1;
+  let ctx;
+
+  before(async function() {
+    ctx = app.mockContext();
+    const loginname = keyword;
+    const email = `${loginname}@test.com`;
+    const user = await ctx.service.user.newAndSave(loginname, loginname, 'pass', email, 'avatar_url', 'active');
+    assert(user.loginname === loginname);
+    const userId = user._id;
+    const title = keyword;
+    const content = 'hello world';
+    const tab = 'share';
+    const topic = await ctx.service.topic.newAndSave(title, content, tab, userId);
+    assert(topic.title === title);
+    assert(topic.content === content);
+    assert(topic.tab === tab);
+    assert(topic.author_id === userId);
+  });
+
+  it('searchUser should ok', async () => {
+    const [ data, count ] = await ctx.service.search.searchUser(keyword, page);
+    assert(data[0].loginname === keyword);
+    assert(count === 1);
+  });
+
+  it('searchTopic should ok', async () => {
+    const [ data, count ] = await ctx.service.search.searchTopic(keyword, page);
+    assert(data[0].title === keyword);
+    assert(count === 1);
+  });
+
+  it('searchUserAndTopic should ok', async () => {
+    const [ user, topic ] = await ctx.service.search.searchUserAndTopic(keyword, page);
+    assert(user.length === 1);
+    assert(user[0].name === keyword);
+    assert(topic.length === 1);
+    assert(topic[0].title === keyword);
+  });
+});