Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 3a778e8

Browse files
only load needed fields for related users
1 parent ee24554 commit 3a778e8

File tree

6 files changed

+33
-23
lines changed

6 files changed

+33
-23
lines changed

server/seeder/development/users-candos.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = (seederstore) => {
55

66
return {
77
services: [{
8-
count: 80,
8+
count: 50,
99
path: 'users-candos',
1010
templates: [
1111
{
@@ -28,4 +28,4 @@ module.exports = (seederstore) => {
2828
]
2929
}]
3030
};
31-
};
31+
};

server/services/comments/comments.hooks.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ const userSchema = {
2323
parentField: 'userId',
2424
childField: '_id',
2525
query: {
26-
$limit: 1
26+
$limit: 1,
27+
$select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
2728
}
2829
}
2930
};
@@ -100,20 +101,28 @@ module.exports = {
100101

101102
after: {
102103
all: [
103-
populate({ schema: userSchema }),
104104
xss({ fields: xssFields }),
105-
keepDeletedDataFields()
105+
keepDeletedDataFields(),
106+
discard('wasSeeded')
106107
],
107108
find: [
109+
populate({ schema: userSchema }),
108110
discard('content', 'user.coverImg', 'badgeIds')
109111
],
110-
get: [],
112+
get: [
113+
populate({ schema: userSchema })
114+
],
111115
create: [
116+
populate({ schema: userSchema }),
112117
createMentionNotifications(),
113118
createNotifications()
114119
],
115-
update: [],
116-
patch: [],
120+
update: [
121+
createMentionNotifications()
122+
],
123+
patch: [
124+
createMentionNotifications()
125+
],
117126
remove: []
118127
},
119128

server/services/contributions/contributions.hooks.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const {authenticate} = require('feathers-authentication').hooks;
2-
const {when, unless, isProvider, populate, softDelete, setNow} = require('feathers-hooks-common');
2+
const {discard, when, unless, isProvider, populate, softDelete, setNow} = require('feathers-hooks-common');
33
const {
44
//queryWithCurrentUser,
55
associateCurrentUser,
@@ -28,7 +28,8 @@ const userSchema = {
2828
parentField: 'userId',
2929
childField: '_id',
3030
query: {
31-
$limit: 1
31+
$limit: 1,
32+
$select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
3233
}
3334
}
3435
};
@@ -49,6 +50,9 @@ const candosSchema = {
4950
nameAs: 'candoUsers',
5051
parentField: '_id',
5152
childField: 'contributionId',
53+
query: {
54+
$select: ['userId']
55+
},
5256
asArray: true
5357
}
5458
};
@@ -60,16 +64,9 @@ const commentsSchema = {
6064
parentField: '_id',
6165
childField: 'contributionId',
6266
query: {
63-
$select: ['_id']
67+
$select: ['_id', 'contributionId']
6468
},
6569
asArray: true
66-
//,
67-
//include: {
68-
// service: 'users',
69-
// nameAs: 'user',
70-
// parentField: 'userId',
71-
// childField: '_id'
72-
//}
7370
}
7471
};
7572

@@ -192,7 +189,8 @@ module.exports = {
192189
'createdAt',
193190
'updatedAt'
194191
]
195-
})
192+
}),
193+
discard('wasSeeded')
196194
],
197195
find: [
198196
when(isSingleItem(),

server/services/notifications/notifications.hooks.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ const commentSchema = {
2222
parentField: 'userId',
2323
childField: '_id',
2424
query: {
25-
$limit: 1
25+
$limit: 1,
26+
$select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
2627
}
2728
}
2829
}
@@ -47,7 +48,8 @@ const userSchema = {
4748
parentField: 'relatedUserId',
4849
childField: '_id',
4950
query: {
50-
$limit: 1
51+
$limit: 1,
52+
$select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
5153
}
5254
}
5355
};

server/services/organizations/organizations.hooks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ const reviewerSchema = {
3434
parentField: 'reviewedBy',
3535
childField: '_id',
3636
query: {
37-
$limit: 1
37+
$limit: 1,
38+
$select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
3839
}
3940
}
4041
};

server/services/users/users.hooks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const cleanupBasicData = when(isProvider('external'),
2121
discard('password', '_computed', 'verifyExpires', 'resetExpires', 'verifyChanges')
2222
);
2323
const cleanupPersonalData = when(isProvider('external'),
24-
discard('email', 'verifyToken', 'verifyShortToken', 'doiToken', 'systemNnotificationsSeen')
24+
discard('email', 'verifyToken', 'verifyShortToken', 'doiToken', 'systemNotificationsSeen')
2525
);
2626

2727
const restrict = [

0 commit comments

Comments
 (0)