diff options
Diffstat (limited to 'server/models/user.js')
-rw-r--r-- | server/models/user.js | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/server/models/user.js b/server/models/user.js index d289da19a..c9c35b3e2 100644 --- a/server/models/user.js +++ b/server/models/user.js | |||
@@ -1,10 +1,15 @@ | |||
1 | const mongoose = require('mongoose') | 1 | const mongoose = require('mongoose') |
2 | 2 | ||
3 | const customUsersValidators = require('../helpers/custom-validators').users | 3 | const customUsersValidators = require('../helpers/custom-validators').users |
4 | const modelUtils = require('./utils') | ||
4 | 5 | ||
5 | // --------------------------------------------------------------------------- | 6 | // --------------------------------------------------------------------------- |
6 | 7 | ||
7 | const UserSchema = mongoose.Schema({ | 8 | const UserSchema = mongoose.Schema({ |
9 | createdDate: { | ||
10 | type: Date, | ||
11 | default: Date.now | ||
12 | }, | ||
8 | password: String, | 13 | password: String, |
9 | username: String, | 14 | username: String, |
10 | role: String | 15 | role: String |
@@ -19,9 +24,9 @@ UserSchema.methods = { | |||
19 | } | 24 | } |
20 | 25 | ||
21 | UserSchema.statics = { | 26 | UserSchema.statics = { |
22 | count: count, | 27 | countTotal: countTotal, |
23 | getByUsernameAndPassword: getByUsernameAndPassword, | 28 | getByUsernameAndPassword: getByUsernameAndPassword, |
24 | list: list, | 29 | listForApi: listForApi, |
25 | loadById: loadById, | 30 | loadById: loadById, |
26 | loadByUsername: loadByUsername | 31 | loadByUsername: loadByUsername |
27 | } | 32 | } |
@@ -30,7 +35,7 @@ mongoose.model('User', UserSchema) | |||
30 | 35 | ||
31 | // --------------------------------------------------------------------------- | 36 | // --------------------------------------------------------------------------- |
32 | 37 | ||
33 | function count (callback) { | 38 | function countTotal (callback) { |
34 | return this.count(callback) | 39 | return this.count(callback) |
35 | } | 40 | } |
36 | 41 | ||
@@ -38,8 +43,9 @@ function getByUsernameAndPassword (username, password) { | |||
38 | return this.findOne({ username: username, password: password }) | 43 | return this.findOne({ username: username, password: password }) |
39 | } | 44 | } |
40 | 45 | ||
41 | function list (callback) { | 46 | function listForApi (start, count, sort, callback) { |
42 | return this.find(callback) | 47 | const query = {} |
48 | return modelUtils.listForApiWithCount.call(this, query, start, count, sort, callback) | ||
43 | } | 49 | } |
44 | 50 | ||
45 | function loadById (id, callback) { | 51 | function loadById (id, callback) { |