fix(qna): questions-filter is case-insensitive (#980)

botpress · Oct 3, 2018 · 03fa755 · 03fa755
1 parent c8dd522
commit 03fa755
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/packages/functionals/botpress-qna/src/index.js b/packages/functionals/botpress-qna/src/index.js
@@ -171,7 +171,11 @@ module.exports = {
       const filteredQuestions = allQuestions.filter(({ questions, metadata }) => {
         const category = getFieldFromMetadata(metadata, 'category')
 
-        const isRightId = questions.join('\n').indexOf(question) !== -1
+        const isRightId =
+          questions
+            .join('\n')
+            .toLowerCase()
+            .indexOf(question.toLowerCase()) !== -1
 
         if (!categories.length) {
           return isRightId
@@ -208,15 +212,10 @@ module.exports = {
       return { items, count }
     }
 
-    router.get('/', async ({ query: { limit, offset } }, res) => {
+    router.get('/', async ({ query: { question = '', categories = [], limit, offset } }, res) => {
       try {
-        const items = await this.storage.all({
-          limit: limit ? parseInt(limit) : undefined,
-          offset: offset ? parseInt(offset) : undefined
-        })
-
-        const overallItemsCount = await this.storage.count()
-        res.send({ items, overallItemsCount, hasCategory: !!this.isMicrosoftMakerUsed })
+        const items = await getQuestions({ question, categories }, { limit, offset })
+        res.send({ ...items, hasCategory: !!this.isMicrosoftMakerUsed })
       } catch (e) {
         logger.error('QnA Error', e, e.stack)
         res.status(500).send(e.message || 'Error')
@@ -328,15 +327,8 @@ module.exports = {
       res.end(csvUploadStatuses[req.params.csvUploadStatusId])
     })
 
-    router.get('/category/list', (req, res) => {
+    router.get('/categories', (req, res) => {
       res.send({ categories })
     })
-
-    router.get('/questions/filter', async (req, res) => {
-      const { query: { question = '', categories = [], limit, offset } } = req
-      const questionsData = await getQuestions({ question, categories }, { limit, offset })
-
-      res.send(questionsData)
-    })
   }
 }
diff --git a/packages/functionals/botpress-qna/src/views/index.js b/packages/functionals/botpress-qna/src/views/index.js
@@ -74,7 +74,7 @@ export default class QnaAdmin extends Component {
   }
 
   fetchCategories() {
-    this.props.bp.axios.get('/api/botpress-qna/category/list').then(({ data: { categories } }) => {
+    this.props.bp.axios.get('/api/botpress-qna/categories').then(({ data: { categories } }) => {
       const categoriesOptions = categories.map(category => ({ label: category, value: category }))
 
       this.setState({ categoriesOptions })
@@ -97,7 +97,7 @@ export default class QnaAdmin extends Component {
     const categories = filterCategory.map(({ value }) => value)
 
     this.props.bp.axios
-      .get('/api/botpress-qna/questions/filter', {
+      .get('/api/botpress-qna/', {
         params: {
           question,
           categories,