@@ -3,3 +3,8 @@
 
 Refs:
 https://medium.com/@mranjan215/client-side-databases-34e3ec912015
+
+
+https://github.com/techfort/LokiJS
+https://github.com/typicode/lowdb
+https://github.com/louischatriot/nedb
@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import Dexie from 'dexie'
 
 import { User } from '../_types/User'
@@ -13,6 +12,8 @@ const usersData = createUsersData({ includeOrganizations: false })
 const usersToOrganizationsData = createUsersToOrganizationsData()
 const organizationsData = createOrganizationsData({ includeUsers: false })
 
+console.log('usersData', usersData)
+
 //
 // Declare Database
 //
@@ -24,10 +25,10 @@ class ModularAdminDatabase extends Dexie {
   public constructor() {
     super('ModularAdminDatabase')
     this.version(1).stores({
-      organizations: '++id,name,username',
+      organizations: '++id,name,username,updatedAt,createdAt',
       users:
-        '++id,firstName,lastName,displayName,username,email,password,avatarUrl,globalRole,status',
-      usersToOrganizations: '++id,organizationId,userId,role',
+        '++id,firstName,lastName,displayName,username,email,password,avatarUrl,globalRole,status,updatedAt,createdAt',
+      usersToOrganizations: '++id,organizationId,userId,role,updatedAt,createdAt',
     })
     this.organizations = this.table('organizations')
     this.users = this.table('users')
@@ -46,6 +47,7 @@ export const init = async function() {
     await db.users.clear()
     await db.usersToOrganizations.clear()
 
+    // Add the data
     await db.users.bulkAdd(usersData.list)
     await db.organizations.bulkAdd(organizationsData.list)
     await db.usersToOrganizations.bulkAdd(usersToOrganizationsData.list)
 
@@ -2,6 +2,7 @@ import _ from 'lodash'
 import { rest } from 'msw'
 
 import config from '_config'
+import db from './db'
 import { create as createUsersData } from '../_data/usersData'
 
 const apiUrl = config.api.url
@@ -17,23 +18,42 @@ export default [
     let offset = parseInt(req.query.get('offset') || '10')
     let order = JSON.parse(req.query.get('order') || '{}')
 
-    const usersAll = order
-      ? _.orderBy(usersData.list, [order.orderBy], [order.order])
-      : usersData.list
+    try {
+      let table = db.users
+      let selection = table.toCollection()
 
-    const result = {
-      users: usersAll.slice(offset, offset + limit),
-      count: usersAll.length,
-    }
+      if (order && order.order === 'desc') {
+        selection = table.orderBy(order.orderBy).reverse()
+      } else if (order && order.order !== 'desc') {
+        selection = table.orderBy(order.orderBy)
+      }
 
-    return res(
-      // Set custom status
-      ctx.status(200),
-      // Delay the response
-      ctx.delay(500),
-      // send JSON response body
-      ctx.json(result),
-    )
+      selection = selection.limit(limit).offset(offset)
+
+      const users = await selection.toArray()
+      const count = await selection.count()
+
+      return res(
+        // Set custom status
+        ctx.status(200),
+        // Delay the response
+        ctx.delay(500),
+        // send JSON response body
+        ctx.json({
+          users,
+          count,
+        }),
+      )
+    } catch (err) {
+      console.error(err)
+
+      return res(
+        ctx.status(400),
+        ctx.json({
+          message: err.message,
+        }),
+      )
+    }
   }),
 
   rest.get(`${apiUrl}/users/:userId`, (req, res, ctx) => {