2
0
Эх сурвалжийг харах

created "sort" function in server side and fix to easier look about "orColumns"

ryuichi-e 6 жил өмнө
parent
commit
108ac665bb

+ 16 - 4
src/server/routes/apiv3/users.js

@@ -140,24 +140,36 @@ module.exports = (crowi) => {
 
   router.get('/search-user-status/', validator.statusList, ApiV3FormValidator, async(req, res) => {
 
-    // status
     const page = parseInt(req.query.page) || 1;
+    // status
     const { statusList } = req.body;
     const statusNoList = statusList.map(element => statusNo[element]);
     // Search from input
-    const inputWord = req.body.inputWord || 1;
+    const inputWord = req.body.inputWord || '';
     const searchWord = new RegExp(`${inputWord}`);
+    const orColumns = ['name', 'username', 'email'];
+    const orOutput = {};
+    orColumns.forEach((element) => {
+      orOutput[element] = { $in: searchWord };
+    });
+
+    // Sort
+    const { descColumns } = req.body;
+    const sortOutput = {};
+    descColumns.forEach((element) => {
+      sortOutput[element] = -1;
+    });
 
     try {
       const paginateResult = await User.paginate(
         {
           $and: [
             { status: { $in: statusNoList } },
-            { $or: [{ name: { $in: searchWord } }, { username: { $in: searchWord } }, { email: { $in: searchWord } }] },
+            { $or: [orOutput] },
           ],
         },
         {
-          sort: { status: 1, username: 1, createdAt: 1 },
+          sort: sortOutput,
           page,
           limit: PAGE_ITEMS,
         },